From 99dcd501aa7fa8d4efb4459ae79841de48a562a8 Mon Sep 17 00:00:00 2001 From: Arfon Smith Date: Fri, 15 May 2015 10:50:05 -0500 Subject: [PATCH 1/4] Grammars update --- vendor/grammars/Elm.tmLanguage | 2 +- vendor/grammars/IDL-Syntax | 2 +- vendor/grammars/NimLime | 2 +- vendor/grammars/Sublime-Coq | 2 +- vendor/grammars/Sublime-Red | 2 +- vendor/grammars/Sublime-SQF-Language | 2 +- vendor/grammars/SublimePapyrus | 2 +- vendor/grammars/api-blueprint-sublime-plugin | 2 +- vendor/grammars/asciidoc.tmbundle | 2 +- vendor/grammars/ats.sublime | 2 +- vendor/grammars/bro-sublime | 2 +- vendor/grammars/ceylon-sublimetext | 2 +- vendor/grammars/chapel-tmbundle | 2 +- vendor/grammars/d.tmbundle | 2 +- vendor/grammars/dart-sublime-bundle | 2 +- vendor/grammars/factor | 2 +- vendor/grammars/fsharpbinding | 2 +- vendor/grammars/gap-tmbundle | 2 +- vendor/grammars/haxe-sublime-bundle | 2 +- vendor/grammars/html.tmbundle | 2 +- vendor/grammars/idl.tmbundle | 2 +- vendor/grammars/language-clojure | 2 +- vendor/grammars/language-coffee-script | 2 +- vendor/grammars/language-gfm | 2 +- vendor/grammars/language-javascript | 2 +- vendor/grammars/language-shellscript | 2 +- vendor/grammars/latex.tmbundle | 2 +- vendor/grammars/lisp.tmbundle | 2 +- vendor/grammars/ocaml.tmbundle | 2 +- vendor/grammars/perl.tmbundle | 2 +- vendor/grammars/php-smarty.tmbundle | 2 +- vendor/grammars/php.tmbundle | 2 +- vendor/grammars/r.tmbundle | 2 +- vendor/grammars/sas.tmbundle | 2 +- vendor/grammars/sublime-mask | 2 +- vendor/grammars/sublime-netlinx | 2 +- vendor/grammars/sublime-rust | 2 +- vendor/grammars/sublime_cobol | 2 +- 38 files changed, 38 insertions(+), 38 deletions(-) diff --git a/vendor/grammars/Elm.tmLanguage b/vendor/grammars/Elm.tmLanguage index f52478b0..8137f5a4 160000 --- a/vendor/grammars/Elm.tmLanguage +++ b/vendor/grammars/Elm.tmLanguage @@ -1 +1 @@ -Subproject commit f52478b0b66d3b9aa90dbaa8cac912d87cc28a7b +Subproject commit 8137f5a48c76c4303394d7da6f3a19bf61056cc6 diff --git a/vendor/grammars/IDL-Syntax b/vendor/grammars/IDL-Syntax index 3baeaeaf..ee1bded3 160000 --- a/vendor/grammars/IDL-Syntax +++ b/vendor/grammars/IDL-Syntax @@ -1 +1 @@ -Subproject commit 3baeaeafac9e30e8a4b0789105641e0b59da32a9 +Subproject commit ee1bded38ba22716c3fb916795ca6d18f766f014 diff --git a/vendor/grammars/NimLime b/vendor/grammars/NimLime index e31e1f53..663b4175 160000 --- a/vendor/grammars/NimLime +++ b/vendor/grammars/NimLime @@ -1 +1 @@ -Subproject commit e31e1f5329b420879c50f230118cc81972710c71 +Subproject commit 663b417558e47ad4c9f8744cd15860652051e05d diff --git a/vendor/grammars/Sublime-Coq b/vendor/grammars/Sublime-Coq index 964eb8f9..0909903a 160000 --- a/vendor/grammars/Sublime-Coq +++ b/vendor/grammars/Sublime-Coq @@ -1 +1 @@ -Subproject commit 964eb8f914cd65f107f55eef8e51372fdf77bd53 +Subproject commit 0909903a9ac9bb4771d78dc6e0a306196d0fe068 diff --git a/vendor/grammars/Sublime-Red b/vendor/grammars/Sublime-Red index 085e0f43..def7baed 160000 --- a/vendor/grammars/Sublime-Red +++ b/vendor/grammars/Sublime-Red @@ -1 +1 @@ -Subproject commit 085e0f43b3b829ec63a3cedaa1b87c85275d526f +Subproject commit def7baed855873ab6730502baf07ce014b922ad9 diff --git a/vendor/grammars/Sublime-SQF-Language b/vendor/grammars/Sublime-SQF-Language index 0313fbe6..6d0f3f6c 160000 --- a/vendor/grammars/Sublime-SQF-Language +++ b/vendor/grammars/Sublime-SQF-Language @@ -1 +1 @@ -Subproject commit 0313fbe6fb962a21c337a327dcb72235af913536 +Subproject commit 6d0f3f6cee23a79f59af9ab263841c1533cd54f1 diff --git a/vendor/grammars/SublimePapyrus b/vendor/grammars/SublimePapyrus index 9ae03977..26036db1 160000 --- a/vendor/grammars/SublimePapyrus +++ b/vendor/grammars/SublimePapyrus @@ -1 +1 @@ -Subproject commit 9ae03977b68314597cc585ffada1998b3b1ef3be +Subproject commit 26036db16d588552b542fdd236d3982b99e4fdb7 diff --git a/vendor/grammars/api-blueprint-sublime-plugin b/vendor/grammars/api-blueprint-sublime-plugin index 4713b0e8..e5289f42 160000 --- a/vendor/grammars/api-blueprint-sublime-plugin +++ b/vendor/grammars/api-blueprint-sublime-plugin @@ -1 +1 @@ -Subproject commit 4713b0e8248b63d993ec5bcaf3d70051e56acec2 +Subproject commit e5289f429be68c1ab5df4ca099578eaa84e41dc8 diff --git a/vendor/grammars/asciidoc.tmbundle b/vendor/grammars/asciidoc.tmbundle index 28063ea4..2d3f7a4f 160000 --- a/vendor/grammars/asciidoc.tmbundle +++ b/vendor/grammars/asciidoc.tmbundle @@ -1 +1 @@ -Subproject commit 28063ea46c1b47d7aec7da39801679763ab00825 +Subproject commit 2d3f7a4f58bf626ca7c47112cdf346128851e0d3 diff --git a/vendor/grammars/ats.sublime b/vendor/grammars/ats.sublime index 2565468f..d6317b23 160000 --- a/vendor/grammars/ats.sublime +++ b/vendor/grammars/ats.sublime @@ -1 +1 @@ -Subproject commit 2565468fd437fbe436bc21509a72ba8bad35fc7c +Subproject commit d6317b2309055954d4f024479a6b6b6115acf3ba diff --git a/vendor/grammars/bro-sublime b/vendor/grammars/bro-sublime index 7a8983d9..8219f5ee 160000 --- a/vendor/grammars/bro-sublime +++ b/vendor/grammars/bro-sublime @@ -1 +1 @@ -Subproject commit 7a8983d93ecdb2535b00348b2ed15a964fe6884f +Subproject commit 8219f5ee09cff98756641dde8a93456ff77b9e92 diff --git a/vendor/grammars/ceylon-sublimetext b/vendor/grammars/ceylon-sublimetext index 07029801..67ae76cf 160000 --- a/vendor/grammars/ceylon-sublimetext +++ b/vendor/grammars/ceylon-sublimetext @@ -1 +1 @@ -Subproject commit 070298013e732cc7233c5169181a4a65c0ad6ef9 +Subproject commit 67ae76cfb1d992f4718ac121008f5d974b370cc2 diff --git a/vendor/grammars/chapel-tmbundle b/vendor/grammars/chapel-tmbundle index d52e9b14..03c5d256 160000 --- a/vendor/grammars/chapel-tmbundle +++ b/vendor/grammars/chapel-tmbundle @@ -1 +1 @@ -Subproject commit d52e9b1417a5aa41e417876e121adb880d6a1ff7 +Subproject commit 03c5d25641aef5809d0ce8ce28790c96afe174b5 diff --git a/vendor/grammars/d.tmbundle b/vendor/grammars/d.tmbundle index a6931961..ccb8b6ba 160000 --- a/vendor/grammars/d.tmbundle +++ b/vendor/grammars/d.tmbundle @@ -1 +1 @@ -Subproject commit a6931961dafe68349ca0c388d225987bcf2ce049 +Subproject commit ccb8b6ba11def16841d22852cb6e942cbcdd8974 diff --git a/vendor/grammars/dart-sublime-bundle b/vendor/grammars/dart-sublime-bundle index 2914099c..4c599ca5 160000 --- a/vendor/grammars/dart-sublime-bundle +++ b/vendor/grammars/dart-sublime-bundle @@ -1 +1 @@ -Subproject commit 2914099c31092978a631953704031d3a6e028125 +Subproject commit 4c599ca5f2e48296228e29de49155a9e1d7b7b13 diff --git a/vendor/grammars/factor b/vendor/grammars/factor index 1d1ef907..aa1a5f22 160000 --- a/vendor/grammars/factor +++ b/vendor/grammars/factor @@ -1 +1 @@ -Subproject commit 1d1ef9079cb9af228fc1b3e95720e3fc2e73d3bf +Subproject commit aa1a5f22ba8c2621b35c71af067c2a819c035a52 diff --git a/vendor/grammars/fsharpbinding b/vendor/grammars/fsharpbinding index e64619da..ad3f0734 160000 --- a/vendor/grammars/fsharpbinding +++ b/vendor/grammars/fsharpbinding @@ -1 +1 @@ -Subproject commit e64619da3c08576ac468a2bac7477e6e537ddf22 +Subproject commit ad3f073464d29d1641ce70a7f626fc11e6480667 diff --git a/vendor/grammars/gap-tmbundle b/vendor/grammars/gap-tmbundle index 291a0469..ce4ff698 160000 --- a/vendor/grammars/gap-tmbundle +++ b/vendor/grammars/gap-tmbundle @@ -1 +1 @@ -Subproject commit 291a0469dd4eb7082b08e828edc8bf0cfbb9b599 +Subproject commit ce4ff698ebb4a692f0b9a3ab5e30853b87fd2b34 diff --git a/vendor/grammars/haxe-sublime-bundle b/vendor/grammars/haxe-sublime-bundle index de60e51d..487bb30d 160000 --- a/vendor/grammars/haxe-sublime-bundle +++ b/vendor/grammars/haxe-sublime-bundle @@ -1 +1 @@ -Subproject commit de60e51dc1bfcb66ccf0c3b481c180c4674656b0 +Subproject commit 487bb30d3a1d1b893e924b6139c10dc44c9c0911 diff --git a/vendor/grammars/html.tmbundle b/vendor/grammars/html.tmbundle index d1231e3d..e87e8de6 160000 --- a/vendor/grammars/html.tmbundle +++ b/vendor/grammars/html.tmbundle @@ -1 +1 @@ -Subproject commit d1231e3da1c22d3a5310223881b89c311aec9f04 +Subproject commit e87e8de6486a509bf304bba264a9fd2370f4ca64 diff --git a/vendor/grammars/idl.tmbundle b/vendor/grammars/idl.tmbundle index 95f17ac4..91baae91 160000 --- a/vendor/grammars/idl.tmbundle +++ b/vendor/grammars/idl.tmbundle @@ -1 +1 @@ -Subproject commit 95f17ac40b99ace47a26e7751c7b5de45b13b1c0 +Subproject commit 91baae9134c2de3b6f48f902c5fb64ed8b384894 diff --git a/vendor/grammars/language-clojure b/vendor/grammars/language-clojure index b8dfdf5d..efe9297f 160000 --- a/vendor/grammars/language-clojure +++ b/vendor/grammars/language-clojure @@ -1 +1 @@ -Subproject commit b8dfdf5dceeff927406dd5ff72246a60f9d16dfa +Subproject commit efe9297f7b3b87f865d89340db9fe9217dfdf258 diff --git a/vendor/grammars/language-coffee-script b/vendor/grammars/language-coffee-script index d86c8963..203cbf09 160000 --- a/vendor/grammars/language-coffee-script +++ b/vendor/grammars/language-coffee-script @@ -1 +1 @@ -Subproject commit d86c8963dcee0ab811da05a175b2218045d0c124 +Subproject commit 203cbf09295c7f1c2ac9e01cc72c9a9356f58a3d diff --git a/vendor/grammars/language-gfm b/vendor/grammars/language-gfm index 6ca2ea2a..998b156a 160000 --- a/vendor/grammars/language-gfm +++ b/vendor/grammars/language-gfm @@ -1 +1 @@ -Subproject commit 6ca2ea2ac50fe02cde1bcec114c66101129daab6 +Subproject commit 998b156ada5d9c0476d8a4110c72d8f9dfcb5a8b diff --git a/vendor/grammars/language-javascript b/vendor/grammars/language-javascript index 3028ec95..9f55d133 160000 --- a/vendor/grammars/language-javascript +++ b/vendor/grammars/language-javascript @@ -1 +1 @@ -Subproject commit 3028ec95a23ccf3cc4899646f9387a79db713b11 +Subproject commit 9f55d13319ac91f1c5f3a8a7ce44f3f4fe2ebde8 diff --git a/vendor/grammars/language-shellscript b/vendor/grammars/language-shellscript index 2163c458..abf186b4 160000 --- a/vendor/grammars/language-shellscript +++ b/vendor/grammars/language-shellscript @@ -1 +1 @@ -Subproject commit 2163c45828d825b6142d6d5785b9333965bea98d +Subproject commit abf186b46f972b5b8491069d8f8c8ef5efe6ff15 diff --git a/vendor/grammars/latex.tmbundle b/vendor/grammars/latex.tmbundle index 52bed0cd..b244177a 160000 --- a/vendor/grammars/latex.tmbundle +++ b/vendor/grammars/latex.tmbundle @@ -1 +1 @@ -Subproject commit 52bed0cd3a455500ef620f083a3d2b78b789bdd4 +Subproject commit b244177ac84068dcf8be5e824857668109c8891a diff --git a/vendor/grammars/lisp.tmbundle b/vendor/grammars/lisp.tmbundle index 0c1d1baa..6d116d77 160000 --- a/vendor/grammars/lisp.tmbundle +++ b/vendor/grammars/lisp.tmbundle @@ -1 +1 @@ -Subproject commit 0c1d1baa16db1889aa7081bcda8ce9e5b4be85cd +Subproject commit 6d116d77b6e3d6b04d863c558527008db482b48a diff --git a/vendor/grammars/ocaml.tmbundle b/vendor/grammars/ocaml.tmbundle index 903fc455..81589400 160000 --- a/vendor/grammars/ocaml.tmbundle +++ b/vendor/grammars/ocaml.tmbundle @@ -1 +1 @@ -Subproject commit 903fc455163c90d38db77c47ca636392550967f0 +Subproject commit 8158940052861bcf90c28f343dff2c50ab440b3f diff --git a/vendor/grammars/perl.tmbundle b/vendor/grammars/perl.tmbundle index b1f624ee..4b768e2c 160000 --- a/vendor/grammars/perl.tmbundle +++ b/vendor/grammars/perl.tmbundle @@ -1 +1 @@ -Subproject commit b1f624ee3a3825f6dd1233f6379cc4d0deaac4e0 +Subproject commit 4b768e2ce11adc7926fd31cf5c9a3b83e05d05ca diff --git a/vendor/grammars/php-smarty.tmbundle b/vendor/grammars/php-smarty.tmbundle index cbcdb59c..6f3630fe 160000 --- a/vendor/grammars/php-smarty.tmbundle +++ b/vendor/grammars/php-smarty.tmbundle @@ -1 +1 @@ -Subproject commit cbcdb59cb3590417d63efd8f30f07ac9eaa8143d +Subproject commit 6f3630fe0de4323295516e2505f20ea7bbd781bd diff --git a/vendor/grammars/php.tmbundle b/vendor/grammars/php.tmbundle index 7178a102..0239f475 160000 --- a/vendor/grammars/php.tmbundle +++ b/vendor/grammars/php.tmbundle @@ -1 +1 @@ -Subproject commit 7178a102ce62352d3512301f62ddec8157cd0d8a +Subproject commit 0239f475bbf97ab68dddb4f456f7fbf7a8f4bf76 diff --git a/vendor/grammars/r.tmbundle b/vendor/grammars/r.tmbundle index d602893b..44691a07 160000 --- a/vendor/grammars/r.tmbundle +++ b/vendor/grammars/r.tmbundle @@ -1 +1 @@ -Subproject commit d602893b72cb79611363b10efaeed8480a3e96d6 +Subproject commit 44691a07734715b11a130a4af409508f53f83aa1 diff --git a/vendor/grammars/sas.tmbundle b/vendor/grammars/sas.tmbundle index aefac510..a9689f43 160000 --- a/vendor/grammars/sas.tmbundle +++ b/vendor/grammars/sas.tmbundle @@ -1 +1 @@ -Subproject commit aefac51088df579fec4df0e3d8459f31b461d60f +Subproject commit a9689f436f49b1aa8f882119bdd8d77172af0501 diff --git a/vendor/grammars/sublime-mask b/vendor/grammars/sublime-mask index 6f12d284..55f087b4 160000 --- a/vendor/grammars/sublime-mask +++ b/vendor/grammars/sublime-mask @@ -1 +1 @@ -Subproject commit 6f12d2841d008fb02eee912485cebcad7151d4f0 +Subproject commit 55f087b49e379eb0ddcaa2788d5610cb854b82bf diff --git a/vendor/grammars/sublime-netlinx b/vendor/grammars/sublime-netlinx index 2bdcfad2..a1093189 160000 --- a/vendor/grammars/sublime-netlinx +++ b/vendor/grammars/sublime-netlinx @@ -1 +1 @@ -Subproject commit 2bdcfad2a5b2f04e459db5a2edb8ef33f74c1994 +Subproject commit a109318915751ff318de4b4d3bfc34ee57cec921 diff --git a/vendor/grammars/sublime-rust b/vendor/grammars/sublime-rust index a1c3d2dc..454e0960 160000 --- a/vendor/grammars/sublime-rust +++ b/vendor/grammars/sublime-rust @@ -1 +1 @@ -Subproject commit a1c3d2dc96c68326416c3b8c8402a8020d29b94d +Subproject commit 454e0960c1999082dc344e55cca234ea40335392 diff --git a/vendor/grammars/sublime_cobol b/vendor/grammars/sublime_cobol index b848a101..b4e9df77 160000 --- a/vendor/grammars/sublime_cobol +++ b/vendor/grammars/sublime_cobol @@ -1 +1 @@ -Subproject commit b848a101048aaf9582d95868983386a3e8e39896 +Subproject commit b4e9df779969c982768ab7c2cadc9b3ca072f3f0 From fa8998c6b6b0ab8861686201bd0c81242b6a4cb8 Mon Sep 17 00:00:00 2001 From: Arfon Smith Date: Fri, 15 May 2015 10:55:50 -0500 Subject: [PATCH 2/4] Fixing up grammars --- grammars.yml | 4 ++-- lib/linguist/languages.yml | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/grammars.yml b/grammars.yml index 04c5bd86..b78010d6 100644 --- a/grammars.yml +++ b/grammars.yml @@ -402,7 +402,7 @@ vendor/grammars/perl.tmbundle/: - source.perl - source.perl.6 vendor/grammars/php-smarty.tmbundle: -- source.smarty +- text.html.smarty vendor/grammars/php.tmbundle: - text.html.php vendor/grammars/pike-textmate: @@ -435,8 +435,8 @@ vendor/grammars/ruby.tmbundle: - source.ruby - text.html.erb vendor/grammars/sas.tmbundle: -- source.SASLog - source.sas +- source.sas_log vendor/grammars/sass-textmate-bundle: - source.sass vendor/grammars/scala.tmbundle: diff --git a/lib/linguist/languages.yml b/lib/linguist/languages.yml index ca88446f..e2c82ab8 100644 --- a/lib/linguist/languages.yml +++ b/lib/linguist/languages.yml @@ -1363,7 +1363,7 @@ HyPhy: extensions: - .bf tm_scope: none - + IDL: type: programming color: "#a3522f" @@ -1685,7 +1685,7 @@ Latte: group: HTML extensions: - .latte - tm_scope: source.smarty + tm_scope: text.html.smarty ace_mode: smarty Lean: @@ -3077,6 +3077,7 @@ Smarty: extensions: - .tpl ace_mode: smarty + tm_scope: text.html.smarty SourcePawn: type: programming From 3878afa2e0f29b8e472dbaa40842e64c78a0a5ba Mon Sep 17 00:00:00 2001 From: Arfon Smith Date: Fri, 15 May 2015 10:56:36 -0500 Subject: [PATCH 3/4] Bumping to v4.5.5 --- lib/linguist/version.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/linguist/version.rb b/lib/linguist/version.rb index f46571b1..cb53f37a 100644 --- a/lib/linguist/version.rb +++ b/lib/linguist/version.rb @@ -1,3 +1,3 @@ module Linguist - VERSION = "4.5.4" + VERSION = "4.5.5" end From 6062d3b25cbe99b8660724250436eeb249483119 Mon Sep 17 00:00:00 2001 From: Arfon Smith Date: Mon, 18 May 2015 14:41:36 -0500 Subject: [PATCH 4/4] Temporarily removing Handlebars highlighting --- .gitmodules | 3 --- grammars.yml | 2 -- lib/linguist/languages.yml | 2 +- vendor/grammars/Handlebars | 1 - 4 files changed, 1 insertion(+), 7 deletions(-) delete mode 160000 vendor/grammars/Handlebars diff --git a/.gitmodules b/.gitmodules index 3bedd29a..315e5065 100644 --- a/.gitmodules +++ b/.gitmodules @@ -118,9 +118,6 @@ [submodule "vendor/grammars/cucumber-tmbundle"] path = vendor/grammars/cucumber-tmbundle url = https://github.com/cucumber/cucumber-tmbundle -[submodule "vendor/grammars/Handlebars"] - path = vendor/grammars/Handlebars - url = https://github.com/daaain/Handlebars [submodule "vendor/grammars/powershell"] path = vendor/grammars/powershell url = https://github.com/SublimeText/PowerShell diff --git a/grammars.yml b/grammars.yml index b78010d6..a1250b5b 100644 --- a/grammars.yml +++ b/grammars.yml @@ -50,8 +50,6 @@ vendor/grammars/G-Code/: - source.gcode vendor/grammars/GDScript-sublime/: - source.gdscript -vendor/grammars/Handlebars: -- text.html.handlebars vendor/grammars/IDL-Syntax: - source.webidl vendor/grammars/InnoSetup/: diff --git a/lib/linguist/languages.yml b/lib/linguist/languages.yml index e2c82ab8..c62f57d6 100644 --- a/lib/linguist/languages.yml +++ b/lib/linguist/languages.yml @@ -1319,7 +1319,7 @@ Handlebars: extensions: - .handlebars - .hbs - tm_scope: text.html.handlebars + tm_scope: none ace_mode: handlebars Harbour: diff --git a/vendor/grammars/Handlebars b/vendor/grammars/Handlebars deleted file mode 160000 index 35d82156..00000000 --- a/vendor/grammars/Handlebars +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 35d821569d562403af8b85a4e8d9acc841656b41