From 5d176a781c274bbca36d959652f6e466f2395d21 Mon Sep 17 00:00:00 2001 From: Arfon Smith Date: Tue, 20 Oct 2015 19:24:04 +0100 Subject: [PATCH] Fixing the build :-\ --- grammars.yml | 1 - lib/linguist/languages.yml | 22 +++++++++---------- .../{index.html.erb => index.html.eex} | 0 vendor/grammars/InnoSetup | 2 +- vendor/grammars/NimLime | 2 +- vendor/grammars/Stylus | 2 +- vendor/grammars/abap.tmbundle | 2 +- vendor/grammars/atom-fsharp | 2 +- vendor/grammars/dart-sublime-bundle | 2 +- vendor/grammars/factor | 2 +- vendor/grammars/haxe-sublime-bundle | 2 +- vendor/grammars/language-babel | 2 +- vendor/grammars/language-clojure | 2 +- vendor/grammars/language-csharp | 2 +- vendor/grammars/language-hy | 2 +- vendor/grammars/language-javascript | 2 +- vendor/grammars/language-python | 2 +- vendor/grammars/language-shellscript | 2 +- vendor/grammars/latex.tmbundle | 2 +- vendor/grammars/nesC.tmbundle | 2 +- vendor/grammars/php.tmbundle | 2 +- vendor/grammars/sublime-rust | 2 +- vendor/grammars/sublime-typescript | 2 +- 23 files changed, 31 insertions(+), 32 deletions(-) rename samples/HTML+EEX/{index.html.erb => index.html.eex} (100%) diff --git a/grammars.yml b/grammars.yml index c2be7632..4eee0d23 100644 --- a/grammars.yml +++ b/grammars.yml @@ -250,7 +250,6 @@ vendor/grammars/elixir-tmbundle: - source.elixir - text.elixir - text.html.elixir -- text.html.eex vendor/grammars/erlang.tmbundle: - source.erlang - text.html.erlang.yaws diff --git a/lib/linguist/languages.yml b/lib/linguist/languages.yml index 107dc3d1..c1191dbc 100644 --- a/lib/linguist/languages.yml +++ b/lib/linguist/languages.yml @@ -1029,14 +1029,6 @@ Forth: - .fs ace_mode: forth -Frege: - type: programming - color: "#00cafe" - extensions: - - .fr - tm_scope: source.haskell - ace_mode: haskell - FreeMarker: type: programming color: "#0050b2" @@ -1047,6 +1039,14 @@ FreeMarker: tm_scope: text.html.ftl ace_mode: ftl +Frege: + type: programming + color: "#00cafe" + extensions: + - .fr + tm_scope: source.haskell + ace_mode: haskell + G-code: type: data extensions: @@ -1335,13 +1335,13 @@ HTML+Django: HTML+EEX: type: markup - tm_scope: text.html.eex + tm_scope: text.html.elixir group: HTML aliases: - eex extensions: - .eex - ace_mode: html_eex + ace_mode: text HTML+ERB: type: markup @@ -1352,7 +1352,7 @@ HTML+ERB: extensions: - .erb - .erb.deface - ace_mode: html_ruby + ace_mode: text HTML+PHP: type: markup diff --git a/samples/HTML+EEX/index.html.erb b/samples/HTML+EEX/index.html.eex similarity index 100% rename from samples/HTML+EEX/index.html.erb rename to samples/HTML+EEX/index.html.eex diff --git a/vendor/grammars/InnoSetup b/vendor/grammars/InnoSetup index 9a8fca6c..a7f79fd1 160000 --- a/vendor/grammars/InnoSetup +++ b/vendor/grammars/InnoSetup @@ -1 +1 @@ -Subproject commit 9a8fca6c05a59dcbd90113c06545e45f83a7a075 +Subproject commit a7f79fd1a530adbcfe8f660eb1b9c48dc3bd5ede diff --git a/vendor/grammars/NimLime b/vendor/grammars/NimLime index 50d7344f..51118338 160000 --- a/vendor/grammars/NimLime +++ b/vendor/grammars/NimLime @@ -1 +1 @@ -Subproject commit 50d7344f9b4f50823ac64d14c162982edf8b8056 +Subproject commit 5111833868d63c7a35e6e9f0aa443e0d1832db7a diff --git a/vendor/grammars/Stylus b/vendor/grammars/Stylus index 8b1c77d0..9766d8d9 160000 --- a/vendor/grammars/Stylus +++ b/vendor/grammars/Stylus @@ -1 +1 @@ -Subproject commit 8b1c77d0543d12984ebb872180d942629edc31ac +Subproject commit 9766d8d936a9939dfd11b5d73cb0e9542b2a078f diff --git a/vendor/grammars/abap.tmbundle b/vendor/grammars/abap.tmbundle index e8619c96..8ab33a89 160000 --- a/vendor/grammars/abap.tmbundle +++ b/vendor/grammars/abap.tmbundle @@ -1 +1 @@ -Subproject commit e8619c9692b0ef74e288832660257f6e3477030c +Subproject commit 8ab33a89780139f8ceb37cc412c30cef2f206a49 diff --git a/vendor/grammars/atom-fsharp b/vendor/grammars/atom-fsharp index 053f5dc3..7051d65d 160000 --- a/vendor/grammars/atom-fsharp +++ b/vendor/grammars/atom-fsharp @@ -1 +1 @@ -Subproject commit 053f5dc3abd329369d272afd4cca3114636e0c70 +Subproject commit 7051d65d639ee209533354097a4b31e4f097d37d diff --git a/vendor/grammars/dart-sublime-bundle b/vendor/grammars/dart-sublime-bundle index 2e5295ab..d891fb36 160000 --- a/vendor/grammars/dart-sublime-bundle +++ b/vendor/grammars/dart-sublime-bundle @@ -1 +1 @@ -Subproject commit 2e5295ab32859d12714c8b44516d8a214eb73ecd +Subproject commit d891fb36c98ca0b111a35cba109b05a16b6c4b83 diff --git a/vendor/grammars/factor b/vendor/grammars/factor index 0f387e75..9b5cb445 160000 --- a/vendor/grammars/factor +++ b/vendor/grammars/factor @@ -1 +1 @@ -Subproject commit 0f387e750d4f7a8dca06af95faacdd9482d467d4 +Subproject commit 9b5cb445ee65d70d6b16bd65abb979f932441b93 diff --git a/vendor/grammars/haxe-sublime-bundle b/vendor/grammars/haxe-sublime-bundle index c3b96f1c..94cc8eea 160000 --- a/vendor/grammars/haxe-sublime-bundle +++ b/vendor/grammars/haxe-sublime-bundle @@ -1 +1 @@ -Subproject commit c3b96f1c754ebc91bacc2926412042567fabbb5a +Subproject commit 94cc8eea31127365556ef9bbb1db78ef6bfdd2e5 diff --git a/vendor/grammars/language-babel b/vendor/grammars/language-babel index b49eb323..44ff68da 160000 --- a/vendor/grammars/language-babel +++ b/vendor/grammars/language-babel @@ -1 +1 @@ -Subproject commit b49eb3238820a00f8034e50b4b632915ce17368d +Subproject commit 44ff68da9ee1df3710513d3b4de21f46ec6d0ed0 diff --git a/vendor/grammars/language-clojure b/vendor/grammars/language-clojure index 6dfdabde..3173abe9 160000 --- a/vendor/grammars/language-clojure +++ b/vendor/grammars/language-clojure @@ -1 +1 @@ -Subproject commit 6dfdabde51699585f1f648bce10012b24befc4a3 +Subproject commit 3173abe9956a597944468fcef7b877b017149d50 diff --git a/vendor/grammars/language-csharp b/vendor/grammars/language-csharp index 4c4dbea3..f635e67e 160000 --- a/vendor/grammars/language-csharp +++ b/vendor/grammars/language-csharp @@ -1 +1 @@ -Subproject commit 4c4dbea32393a32510bb60d95b49633dd09e9e06 +Subproject commit f635e67edef4e2fe68c3526e1ad26ed66f01aa62 diff --git a/vendor/grammars/language-hy b/vendor/grammars/language-hy index f9750744..93d267de 160000 --- a/vendor/grammars/language-hy +++ b/vendor/grammars/language-hy @@ -1 +1 @@ -Subproject commit f9750744ae4b8519314dff7d57abc527b91a0ef2 +Subproject commit 93d267de4cdd8a099f34fb334bae0515a9734cd9 diff --git a/vendor/grammars/language-javascript b/vendor/grammars/language-javascript index f7e166b6..9d69b86e 160000 --- a/vendor/grammars/language-javascript +++ b/vendor/grammars/language-javascript @@ -1 +1 @@ -Subproject commit f7e166b65d38069345ff0a8bbe59847a5f43ef4d +Subproject commit 9d69b86e30ac05b300937d14ac7168ccace8d857 diff --git a/vendor/grammars/language-python b/vendor/grammars/language-python index 44e1d183..6d7b52b8 160000 --- a/vendor/grammars/language-python +++ b/vendor/grammars/language-python @@ -1 +1 @@ -Subproject commit 44e1d1836675a9b19928a5b2cfce83613fd5b706 +Subproject commit 6d7b52b8823954c33a698e5d10721cee326c5fa1 diff --git a/vendor/grammars/language-shellscript b/vendor/grammars/language-shellscript index d034fecc..0bbc7eee 160000 --- a/vendor/grammars/language-shellscript +++ b/vendor/grammars/language-shellscript @@ -1 +1 @@ -Subproject commit d034fecce883fe047ef8fd3b5ef2179182815ed3 +Subproject commit 0bbc7eee5af6c591c02e2af8d02fe35927b4f4cb diff --git a/vendor/grammars/latex.tmbundle b/vendor/grammars/latex.tmbundle index 6358337b..d40245e1 160000 --- a/vendor/grammars/latex.tmbundle +++ b/vendor/grammars/latex.tmbundle @@ -1 +1 @@ -Subproject commit 6358337b629fd9c17ac8c92f00e88859e6577d4f +Subproject commit d40245e130abc81e0df5d7cb50f3bec995335b8c diff --git a/vendor/grammars/nesC.tmbundle b/vendor/grammars/nesC.tmbundle index d0d322ce..f58def8c 160000 --- a/vendor/grammars/nesC.tmbundle +++ b/vendor/grammars/nesC.tmbundle @@ -1 +1 @@ -Subproject commit d0d322ceafe3c4d8affc0e8b767fb6ad65c52704 +Subproject commit f58def8c5552dcb3ab6b55632fcad8a54ba2724e diff --git a/vendor/grammars/php.tmbundle b/vendor/grammars/php.tmbundle index baad8758..2ecaa60d 160000 --- a/vendor/grammars/php.tmbundle +++ b/vendor/grammars/php.tmbundle @@ -1 +1 @@ -Subproject commit baad875878c402b7b404a63616531644e538bf0c +Subproject commit 2ecaa60d92b92d4c07f243207ba1d5b2114bb70a diff --git a/vendor/grammars/sublime-rust b/vendor/grammars/sublime-rust index 4fcfd98b..06a278cc 160000 --- a/vendor/grammars/sublime-rust +++ b/vendor/grammars/sublime-rust @@ -1 +1 @@ -Subproject commit 4fcfd98b22f179ed4d1f3dde4a0f21f8c651d4f3 +Subproject commit 06a278ccfaf5e542d26a95d66c734b4407bc4912 diff --git a/vendor/grammars/sublime-typescript b/vendor/grammars/sublime-typescript index 066599f6..d80e89cb 160000 --- a/vendor/grammars/sublime-typescript +++ b/vendor/grammars/sublime-typescript @@ -1 +1 @@ -Subproject commit 066599f6afba3838c8fb053b6a0efb1308d626ad +Subproject commit d80e89cbfb458279c45f32bb2d821ef72cb3d73d