Skip to content

Commit

Permalink
Merge pull request octocat#2 from github/master
Browse files Browse the repository at this point in the history
Update from upstream repo github/linguist
  • Loading branch information
osorgin authored Jul 14, 2016
2 parents fa817b6 + 36ba378 commit 6bf223e
Show file tree
Hide file tree
Showing 13 changed files with 7,890 additions and 6 deletions.
6 changes: 6 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -746,3 +746,9 @@ url = https://github.com/austinwagner/sublime-sourcepawn
[submodule "vendor/grammars/atom-language-srt"]
path = vendor/grammars/atom-language-srt
url = https://github.com/314eter/atom-language-srt
[submodule "vendor/grammars/language-agc"]
path = vendor/grammars/language-agc
url = https://github.com/Alhadis/language-agc
[submodule "vendor/grammars/language-blade"]
path = vendor/grammars/language-blade
url = https://github.com/jawee/language-blade
4 changes: 4 additions & 0 deletions grammars.yml
Original file line number Diff line number Diff line change
Expand Up @@ -327,11 +327,15 @@ vendor/grammars/json.tmbundle:
- source.json
vendor/grammars/kotlin-sublime-package:
- source.Kotlin
vendor/grammars/language-agc:
- source.agc
vendor/grammars/language-apl:
- source.apl
vendor/grammars/language-babel/:
- source.js.jsx
- source.regexp.babel
vendor/grammars/language-blade/:
- text.html.php.blade
vendor/grammars/language-click/:
- source.click
vendor/grammars/language-clojure:
Expand Down
8 changes: 8 additions & 0 deletions lib/linguist/heuristics.rb
Original file line number Diff line number Diff line change
Expand Up @@ -239,6 +239,14 @@ def call(data)
end
end

disambiguate ".md" do |data|
if /^[-a-z0-9=#!\*\[|]/i.match(data)
Language["Markdown"]
elsif /^(;;|\(define_)/.match(data)
Language["GCC machine description"]
end
end

disambiguate ".ml" do |data|
if /(^\s*module)|let rec |match\s+(\S+\s)+with/.match(data)
Language["OCaml"]
Expand Down
30 changes: 25 additions & 5 deletions lib/linguist/languages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -188,6 +188,15 @@ Apex:
tm_scope: source.java
ace_mode: java

Apollo Guidance Computer:
type: programming
color: "#0B3D91"
group: Assembly
extensions:
- .agc
tm_scope: source.agc
ace_mode: assembly_x86

AppleScript:
type: programming
aliases:
Expand Down Expand Up @@ -330,6 +339,15 @@ BitBake:
- .bb
ace_mode: text

Blade:
type: markup
group: HTML
extensions:
- .blade
- .blade.php
tm_scope: text.html.php.blade
ace_mode: text

BlitzBasic:
type: programming
aliases:
Expand Down Expand Up @@ -1182,6 +1200,13 @@ GAS:
tm_scope: source.assembly
ace_mode: assembly_x86

GCC Machine Description:
type: programming
extensions:
- .md
tm_scope: source.lisp
ace_mode: lisp

GDScript:
type: programming
extensions:
Expand Down Expand Up @@ -1340,7 +1365,6 @@ GraphQL:
type: data
extensions:
- .graphql
color: "#E535AB"
tm_scope: source.graphql
ace_mode: text

Expand Down Expand Up @@ -2207,7 +2231,6 @@ Markdown:
- .mkdown
- .ron
tm_scope: source.gfm
color: "#083FA1"

Mask:
type: markup
Expand Down Expand Up @@ -3087,7 +3110,6 @@ RDoc:
extensions:
- .rdoc
tm_scope: text.rdoc
color: "#8E84BF"

REALbasic:
type: programming
Expand Down Expand Up @@ -3978,7 +4000,6 @@ WebIDL:

World of Warcraft Addon Data:
type: data
color: "#e0b330"
extensions:
- .toc
tm_scope: source.toc
Expand Down Expand Up @@ -4288,7 +4309,6 @@ reStructuredText:
- .rest.txt
- .rst.txt
ace_mode: text
color: "#B3BCBC"

wisp:
type: programming
Expand Down
Loading

0 comments on commit 6bf223e

Please sign in to comment.