KevinMidboe/linguist
1
0
Fork 0
mirror of https://github.com/KevinMidboe/linguist.git synced 2025-10-29 17:50:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into NetLinx

Browse Source
This commit is contained in:
Arfon Smith
2015-03-24 11:41:26 -05:00
parent b302863a4d c9f8a2677a
commit 1940a9ea92
10 changed files with 44 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.gitmodules vendored
View File

@@ -648,3 +648,6 @@
[submodule "vendor/grammars/sublime-netlinx"] [submodule "vendor/grammars/sublime-netlinx"]
path = vendor/grammars/sublime-netlinx path = vendor/grammars/sublime-netlinx
url = https://github.com/amclain/sublime-netlinx url = https://github.com/amclain/sublime-netlinx
[submodule "vendor/grammars/Sublime-Red"]
path = vendor/grammars/Sublime-Red
url = https://github.com/Oldes/Sublime-Red

2
github-linguist.gemspec
View File

@@ -16,7 +16,7 @@ Gem::Specification.new do |s|
s.add_dependency 'charlock_holmes', '~> 0.7.3' s.add_dependency 'charlock_holmes', '~> 0.7.3'
s.add_dependency 'escape_utils', '~> 1.0.1' s.add_dependency 'escape_utils', '~> 1.0.1'
s.add_dependency 'mime-types', '>= 1.19' s.add_dependency 'mime-types', '>= 1.19'
s.add_dependency 'rugged', '~> 0.22.0b4' s.add_dependency 'rugged', '~> 0.23.0b1'
s.add_development_dependency 'minitest', '>= 5.0' s.add_development_dependency 'minitest', '>= 5.0'
s.add_development_dependency 'mocha' s.add_development_dependency 'mocha'

2
grammars.yml
View File

@@ -113,6 +113,8 @@ vendor/grammars/Sublime-QML:
- source.qml - source.qml
vendor/grammars/Sublime-REBOL: vendor/grammars/Sublime-REBOL:
- source.rebol - source.rebol
vendor/grammars/Sublime-Red:
- source.red
vendor/grammars/Sublime-SQF-Language: vendor/grammars/Sublime-SQF-Language:
- source.sqf - source.sqf
vendor/grammars/Sublime-Text-2-OpenEdge-ABL: vendor/grammars/Sublime-Text-2-OpenEdge-ABL:

10
lib/linguist/languages.yml
View File

@@ -711,6 +711,8 @@ DM:
DTrace: DTrace:
type: programming type: programming
aliases:
- dtrace-script
extensions: extensions:
- .d - .d
interpreters: interpreters:
@@ -2612,6 +2614,8 @@ Racket:
- .rktd - .rktd
- .rktl - .rktl
- .scrbl - .scrbl
interpreters:
- racket
tm_scope: source.racket tm_scope: source.racket
ace_mode: lisp ace_mode: lisp
@@ -2646,6 +2650,7 @@ Rebol:
- .r3 - .r3
- .rebol - .rebol
ace_mode: text ace_mode: text
tm_scope: source.rebol
Red: Red:
type: programming type: programming
@@ -2655,7 +2660,7 @@ Red:
- .reds - .reds
aliases: aliases:
- red/system - red/system
tm_scope: none tm_scope: source.red
ace_mode: text ace_mode: text
Redcode: Redcode:
@@ -2865,7 +2870,6 @@ Scheme:
- .ss - .ss
interpreters: interpreters:
- guile - guile
- racket
- bigloo - bigloo
- chicken - chicken
ace_mode: scheme ace_mode: scheme
@@ -3326,6 +3330,7 @@ XML:
- .rss - .rss
- .scxml - .scxml
- .srdf - .srdf
- .storyboard
- .stTheme - .stTheme
- .sublime-snippet - .sublime-snippet
- .targets - .targets
@@ -3349,6 +3354,7 @@ XML:
- .x3d - .x3d
- .xacro - .xacro
- .xaml - .xaml
- .xib
- .xlf - .xlf
- .xliff - .xliff
- .xmi - .xmi

2
samples/DTrace/javascript-trace.d
View File

@@ -1,4 +1,4 @@
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ /* -*- Mode: dtrace-script; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
/* ***** BEGIN LICENSE BLOCK ***** /* ***** BEGIN LICENSE BLOCK *****
* Version: MPL 1.1/GPL 2.0/LGPL 2.1 * Version: MPL 1.1/GPL 2.0/LGPL 2.1
* *

20
samples/XML/Application.xib Normal file
View File

@@ -0,0 +1,20 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="6211" systemVersion="14A298i" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES">
<dependencies>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="6204"/>
</dependencies>
<objects>
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="UIApplication">
<connections>
<outlet property="delegate" destination="bYg-Ix-Cfg" id="h4M-LL-qlT"/>
</connections>
</placeholder>
<placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
<customObject id="bYg-Ix-Cfg" userLabel="App Delegate"/>
<window opaque="NO" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" id="Na2-4i-xf1">
<rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
</window>
</objects>
</document>

7
samples/XML/Storyboard.storyboard Normal file
View File

@@ -0,0 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="6211" systemVersion="14A298i" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES">
<dependencies>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="6204"/>
</dependencies>
<scenes/>
</document>

1
test/test_grammars.rb
View File

@@ -13,7 +13,6 @@ class TestGrammars < Minitest::Test
# These grammars have no license but have been grandfathered in. New grammars # These grammars have no license but have been grandfathered in. New grammars
# must have a license that allows redistribution. # must have a license that allows redistribution.
"vendor/grammars/Sublime-Lasso", "vendor/grammars/Sublime-Lasso",
"vendor/grammars/Sublime-REBOL",
"vendor/grammars/x86-assembly-textmate-bundle" "vendor/grammars/x86-assembly-textmate-bundle"
].freeze ].freeze

2
vendor/grammars/Sublime-REBOL vendored

Submodule vendor/grammars/Sublime-REBOL updated: 977ba9bb58...102402f71a

1
vendor/grammars/Sublime-Red vendored Submodule

Submodule vendor/grammars/Sublime-Red added at 4c84201cd2