From ea3e79a631fb2cd1f1b3c7fa9c6f68892b478892 Mon Sep 17 00:00:00 2001 From: Colin Seymour Date: Sun, 15 Oct 2017 09:52:27 +0100 Subject: [PATCH] Release v5.3.0 (#3859) * Update grammars * Update haskell scopes to match updated grammar * Bump version to 5.3.0 --- grammars.yml | 2 ++ lib/linguist/version.rb | 2 +- vendor/CodeMirror | 2 +- vendor/grammars/Docker.tmbundle | 2 +- vendor/grammars/MagicPython | 2 +- vendor/grammars/Modelica | 2 +- vendor/grammars/Sublime-SQF-Language | 2 +- vendor/grammars/SublimePuppet | 2 +- vendor/grammars/Terraform.tmLanguage | 2 +- vendor/grammars/TypeScript-TmLanguage | 2 +- vendor/grammars/VBDotNetSyntax | 2 +- vendor/grammars/atom-language-purescript | 2 +- vendor/grammars/atom-language-rust | 2 +- vendor/grammars/chapel-tmbundle | 2 +- vendor/grammars/dartlang | 2 +- vendor/grammars/data-weave-tmLanguage | 2 +- vendor/grammars/elixir-tmbundle | 2 +- vendor/grammars/language-ballerina | 2 +- vendor/grammars/language-blade | 2 +- vendor/grammars/language-coffee-script | 2 +- vendor/grammars/language-crystal | 2 +- vendor/grammars/language-csharp | 2 +- vendor/grammars/language-csound | 2 +- vendor/grammars/language-css | 2 +- vendor/grammars/language-emacs-lisp | 2 +- vendor/grammars/language-fontforge | 2 +- vendor/grammars/language-gfm | 2 +- vendor/grammars/language-haml | 2 +- vendor/grammars/language-haskell | 2 +- vendor/grammars/language-javascript | 2 +- vendor/grammars/language-jison | 2 +- vendor/grammars/language-pan | 2 +- vendor/grammars/language-reason | 2 +- vendor/grammars/language-ruby | 2 +- vendor/grammars/language-shellscript | 2 +- vendor/grammars/language-supercollider | 2 +- vendor/grammars/language-typelanguage | 2 +- vendor/grammars/language-viml | 2 +- vendor/grammars/language-yaml | 2 +- vendor/grammars/latex.tmbundle | 2 +- vendor/grammars/marko-tmbundle | 2 +- vendor/grammars/pawn-sublime-language | 2 +- vendor/grammars/ruby-slim.tmbundle | 2 +- vendor/grammars/scala.tmbundle | 2 +- vendor/grammars/secondlife-lsl | 2 +- vendor/grammars/shaders-tmLanguage | 2 +- vendor/grammars/sublime_cobol | 2 +- vendor/grammars/swift.tmbundle | 2 +- vendor/grammars/vue-syntax-highlight | 2 +- 49 files changed, 50 insertions(+), 48 deletions(-) diff --git a/grammars.yml b/grammars.yml index 62a50611..5eea9735 100755 --- a/grammars.yml +++ b/grammars.yml @@ -403,6 +403,7 @@ vendor/grammars/language-haml: - text.haml - text.hamlc vendor/grammars/language-haskell: +- annotation.liquidhaskell.haskell - hint.haskell - hint.message.haskell - hint.type.haskell @@ -410,6 +411,7 @@ vendor/grammars/language-haskell: - source.cabal - source.haskell - source.hsc2hs +- source.hsig - text.tex.latex.haskell vendor/grammars/language-inform7: - source.inform7 diff --git a/lib/linguist/version.rb b/lib/linguist/version.rb index 1e0d5e1f..bb385074 100644 --- a/lib/linguist/version.rb +++ b/lib/linguist/version.rb @@ -1,3 +1,3 @@ module Linguist - VERSION = "5.2.0" + VERSION = "5.3.0" end diff --git a/vendor/CodeMirror b/vendor/CodeMirror index 974b698f..dcdf0146 160000 --- a/vendor/CodeMirror +++ b/vendor/CodeMirror @@ -1 +1 @@ -Subproject commit 974b698fac730685ec51761338786e6801ae366c +Subproject commit dcdf0146e19e9452f8961c1df89534b325593d01 diff --git a/vendor/grammars/Docker.tmbundle b/vendor/grammars/Docker.tmbundle index 378d7eb1..41b5d53c 160000 --- a/vendor/grammars/Docker.tmbundle +++ b/vendor/grammars/Docker.tmbundle @@ -1 +1 @@ -Subproject commit 378d7eb15607154f5523de4153c77b21f673bf4f +Subproject commit 41b5d53ca4ed839bf89f9da7e63441b748991413 diff --git a/vendor/grammars/MagicPython b/vendor/grammars/MagicPython index d39070f6..935abefe 160000 --- a/vendor/grammars/MagicPython +++ b/vendor/grammars/MagicPython @@ -1 +1 @@ -Subproject commit d39070f6212b43803c67d61110dfd243b4a21923 +Subproject commit 935abefebfd4a75fe5741a99de0b51a7542efb5b diff --git a/vendor/grammars/Modelica b/vendor/grammars/Modelica index 9e12e9d2..c64d74b0 160000 --- a/vendor/grammars/Modelica +++ b/vendor/grammars/Modelica @@ -1 +1 @@ -Subproject commit 9e12e9d23c35f9dc83f6594fd3379e7b8309490c +Subproject commit c64d74b0096e7ebf5fbf1bb6812203b9b1292d6a diff --git a/vendor/grammars/Sublime-SQF-Language b/vendor/grammars/Sublime-SQF-Language index ee30a860..2a2e9223 160000 --- a/vendor/grammars/Sublime-SQF-Language +++ b/vendor/grammars/Sublime-SQF-Language @@ -1 +1 @@ -Subproject commit ee30a860e07c9c9ebdc8ab79a86ae71cd5485027 +Subproject commit 2a2e9223a0731b9ca22642363a9f49d49aa75cd5 diff --git a/vendor/grammars/SublimePuppet b/vendor/grammars/SublimePuppet index b523a061..97484d7f 160000 --- a/vendor/grammars/SublimePuppet +++ b/vendor/grammars/SublimePuppet @@ -1 +1 @@ -Subproject commit b523a061c17e75da686c9b3baf06a8cdb59f39d3 +Subproject commit 97484d7f9b1084fb0ea392ad6a2ce886f176a242 diff --git a/vendor/grammars/Terraform.tmLanguage b/vendor/grammars/Terraform.tmLanguage index 3ca5d5d3..2ccc9880 160000 --- a/vendor/grammars/Terraform.tmLanguage +++ b/vendor/grammars/Terraform.tmLanguage @@ -1 +1 @@ -Subproject commit 3ca5d5d3de4e80e2adef82cfbbab4683498ae52f +Subproject commit 2ccc98804646d0e8b381ff2854610bfe4e51551f diff --git a/vendor/grammars/TypeScript-TmLanguage b/vendor/grammars/TypeScript-TmLanguage index c1e19d3d..824f47ea 160000 --- a/vendor/grammars/TypeScript-TmLanguage +++ b/vendor/grammars/TypeScript-TmLanguage @@ -1 +1 @@ -Subproject commit c1e19d3d4f6ecc6b2ba6c1d31b90e9042627031f +Subproject commit 824f47ea6e98590ac2e75db5bebdf6eff71421ad diff --git a/vendor/grammars/VBDotNetSyntax b/vendor/grammars/VBDotNetSyntax index 4c14dda6..efaa4187 160000 --- a/vendor/grammars/VBDotNetSyntax +++ b/vendor/grammars/VBDotNetSyntax @@ -1 +1 @@ -Subproject commit 4c14dda6f7e1b61cd1db71b27b3ceee77759ea80 +Subproject commit efaa4187fe75634c0f01c294c0d9624d141cd649 diff --git a/vendor/grammars/atom-language-purescript b/vendor/grammars/atom-language-purescript index c590de5b..9d7e24f2 160000 --- a/vendor/grammars/atom-language-purescript +++ b/vendor/grammars/atom-language-purescript @@ -1 +1 @@ -Subproject commit c590de5bcb7c5e13d227840074d295e5d7fb0dd4 +Subproject commit 9d7e24f2f1ddeae9aa953c7d34ca567c0b1622af diff --git a/vendor/grammars/atom-language-rust b/vendor/grammars/atom-language-rust index 2d9f9899..59893b65 160000 --- a/vendor/grammars/atom-language-rust +++ b/vendor/grammars/atom-language-rust @@ -1 +1 @@ -Subproject commit 2d9f9899be6da0bed25bdddbc92d4aa8d7ad2770 +Subproject commit 59893b659a6d674d0d1f6c4158d0f60cea20d190 diff --git a/vendor/grammars/chapel-tmbundle b/vendor/grammars/chapel-tmbundle index d1f8d355..fe50e0bf 160000 --- a/vendor/grammars/chapel-tmbundle +++ b/vendor/grammars/chapel-tmbundle @@ -1 +1 @@ -Subproject commit d1f8d3555b2aca089a068f7e255c99db4527febe +Subproject commit fe50e0bf1eaa3c0a53fcc3a22c43ede528ad3afa diff --git a/vendor/grammars/dartlang b/vendor/grammars/dartlang index 74a079f9..18fa1505 160000 --- a/vendor/grammars/dartlang +++ b/vendor/grammars/dartlang @@ -1 +1 @@ -Subproject commit 74a079f999ccf6d5592a4ee1bd6512370857a597 +Subproject commit 18fa15059bf1f5ceca951102c6bdec56a289bd5d diff --git a/vendor/grammars/data-weave-tmLanguage b/vendor/grammars/data-weave-tmLanguage index c20cee1c..ad3c9b39 160000 --- a/vendor/grammars/data-weave-tmLanguage +++ b/vendor/grammars/data-weave-tmLanguage @@ -1 +1 @@ -Subproject commit c20cee1c62664eef2aee68c4636e1bd1868620a9 +Subproject commit ad3c9b39ecaa140d33132028ab0c7b3b32d1dce6 diff --git a/vendor/grammars/elixir-tmbundle b/vendor/grammars/elixir-tmbundle index 1b4315ff..641e52c3 160000 --- a/vendor/grammars/elixir-tmbundle +++ b/vendor/grammars/elixir-tmbundle @@ -1 +1 @@ -Subproject commit 1b4315ffd8e01769c254f5f5dbccc23cc469a6b8 +Subproject commit 641e52c380e758b871d0c96d2a6d87039d359911 diff --git a/vendor/grammars/language-ballerina b/vendor/grammars/language-ballerina index 6c868f4f..91c724be 160000 --- a/vendor/grammars/language-ballerina +++ b/vendor/grammars/language-ballerina @@ -1 +1 @@ -Subproject commit 6c868f4f4a4303487bae219885fc808ab28fcb31 +Subproject commit 91c724bec6dcb6362c03157138bb16fde7672f65 diff --git a/vendor/grammars/language-blade b/vendor/grammars/language-blade index ac908bc1..bae0d6e8 160000 --- a/vendor/grammars/language-blade +++ b/vendor/grammars/language-blade @@ -1 +1 @@ -Subproject commit ac908bc12417394b1e6513d1ca3794521765a6e4 +Subproject commit bae0d6e865a6d8476a11bfd583000c63d9ff5efc diff --git a/vendor/grammars/language-coffee-script b/vendor/grammars/language-coffee-script index 7c4025c3..f822e403 160000 --- a/vendor/grammars/language-coffee-script +++ b/vendor/grammars/language-coffee-script @@ -1 +1 @@ -Subproject commit 7c4025c38649e543f46bdb208408a8f1fc1bfdf9 +Subproject commit f822e403c59a9c44f7be3c4f114ef104d7f14b93 diff --git a/vendor/grammars/language-crystal b/vendor/grammars/language-crystal index 0e3da8fc..0e47a524 160000 --- a/vendor/grammars/language-crystal +++ b/vendor/grammars/language-crystal @@ -1 +1 @@ -Subproject commit 0e3da8fc21a8a082332501c9d72f5c645f134ab4 +Subproject commit 0e47a5248eacc8891b5d292ec59f9aaf12bf8c33 diff --git a/vendor/grammars/language-csharp b/vendor/grammars/language-csharp index 2d5f0422..364ba38e 160000 --- a/vendor/grammars/language-csharp +++ b/vendor/grammars/language-csharp @@ -1 +1 @@ -Subproject commit 2d5f04229aa107672b0024071c8addb4a5178a5b +Subproject commit 364ba38ee2e9abcd219bfc7684f206f29715d894 diff --git a/vendor/grammars/language-csound b/vendor/grammars/language-csound index ca43af59..b2478382 160000 --- a/vendor/grammars/language-csound +++ b/vendor/grammars/language-csound @@ -1 +1 @@ -Subproject commit ca43af5995ef8f25feb67f112eac612b272df1c2 +Subproject commit b24783820b76e864e6a5482589de17abb40e5cf3 diff --git a/vendor/grammars/language-css b/vendor/grammars/language-css index 8d8c6c1a..0f7e61c6 160000 --- a/vendor/grammars/language-css +++ b/vendor/grammars/language-css @@ -1 +1 @@ -Subproject commit 8d8c6c1a0a995521768c8330715f4d5c8d725c35 +Subproject commit 0f7e61c67d2482c3b70997bb433342a315b93c71 diff --git a/vendor/grammars/language-emacs-lisp b/vendor/grammars/language-emacs-lisp index 1be3d89b..ee4168ae 160000 --- a/vendor/grammars/language-emacs-lisp +++ b/vendor/grammars/language-emacs-lisp @@ -1 +1 @@ -Subproject commit 1be3d89bbe7c4124490b4cbf195a68af8024fc58 +Subproject commit ee4168aeac921538bb05bad01ff8191bc847f7ad diff --git a/vendor/grammars/language-fontforge b/vendor/grammars/language-fontforge index f513ccab..c96542a1 160000 --- a/vendor/grammars/language-fontforge +++ b/vendor/grammars/language-fontforge @@ -1 +1 @@ -Subproject commit f513ccabea9fc1062348a6c8255e83e84aa3105f +Subproject commit c96542a1e7f801e86c595d0012772aab3801c1f4 diff --git a/vendor/grammars/language-gfm b/vendor/grammars/language-gfm index 866e7fb7..d7e06213 160000 --- a/vendor/grammars/language-gfm +++ b/vendor/grammars/language-gfm @@ -1 +1 @@ -Subproject commit 866e7fb7df48067939d7eb3a1e9c90f0dbeb96ea +Subproject commit d7e06213bebaf9e4827365106c45986fb3fc8270 diff --git a/vendor/grammars/language-haml b/vendor/grammars/language-haml index 9abf167c..4e7460af 160000 --- a/vendor/grammars/language-haml +++ b/vendor/grammars/language-haml @@ -1 +1 @@ -Subproject commit 9abf167c37f640826459ec69278e7396be5a6d56 +Subproject commit 4e7460af0365ab25ced64a7ee2f01db7fd5351fc diff --git a/vendor/grammars/language-haskell b/vendor/grammars/language-haskell index d81dbcb6..c8778adf 160000 --- a/vendor/grammars/language-haskell +++ b/vendor/grammars/language-haskell @@ -1 +1 @@ -Subproject commit d81dbcb6c4d7688489da16dbb4fc5b82449d896d +Subproject commit c8778adf83b66b68c1b31406ac6592341e1c4938 diff --git a/vendor/grammars/language-javascript b/vendor/grammars/language-javascript index 4740b9fc..70138ec0 160000 --- a/vendor/grammars/language-javascript +++ b/vendor/grammars/language-javascript @@ -1 +1 @@ -Subproject commit 4740b9fc1c10a1ed7f7fcd9c83f6eb45a4c72461 +Subproject commit 70138ec06a9f82a8bc2a4e17a2b799b56a5ff6da diff --git a/vendor/grammars/language-jison b/vendor/grammars/language-jison index 632867ac..0e897be1 160000 --- a/vendor/grammars/language-jison +++ b/vendor/grammars/language-jison @@ -1 +1 @@ -Subproject commit 632867ac57b5945379d7817c0321ca5910112ab6 +Subproject commit 0e897be16c5a159921acfb7f3e4afc751139aede diff --git a/vendor/grammars/language-pan b/vendor/grammars/language-pan index 0e362fd2..47914b98 160000 --- a/vendor/grammars/language-pan +++ b/vendor/grammars/language-pan @@ -1 +1 @@ -Subproject commit 0e362fd246ea6df78e62755610705610c03e33a6 +Subproject commit 47914b9872cd709331db787d777b96edc4163d19 diff --git a/vendor/grammars/language-reason b/vendor/grammars/language-reason index b545cf85..9de5b732 160000 --- a/vendor/grammars/language-reason +++ b/vendor/grammars/language-reason @@ -1 +1 @@ -Subproject commit b545cf85d68d74bfcd8de51baf8a570be5322c8e +Subproject commit 9de5b732b0a53f6f44bc7a9c717dce6162512ae2 diff --git a/vendor/grammars/language-ruby b/vendor/grammars/language-ruby index 035fbc18..3c789830 160000 --- a/vendor/grammars/language-ruby +++ b/vendor/grammars/language-ruby @@ -1 +1 @@ -Subproject commit 035fbc18a223bfac6ce9a3bf51d0cc65317fd37d +Subproject commit 3c78983017c34cfc234f73ed48eb6661f27358a4 diff --git a/vendor/grammars/language-shellscript b/vendor/grammars/language-shellscript index fe6d5a2f..3fcf4010 160000 --- a/vendor/grammars/language-shellscript +++ b/vendor/grammars/language-shellscript @@ -1 +1 @@ -Subproject commit fe6d5a2f7b09a55ddd01ae55267827d3cf8b6750 +Subproject commit 3fcf40105b5b5d0ba6667ea05499a8efd88ef9f5 diff --git a/vendor/grammars/language-supercollider b/vendor/grammars/language-supercollider index 28e5fb82..1d21ff70 160000 --- a/vendor/grammars/language-supercollider +++ b/vendor/grammars/language-supercollider @@ -1 +1 @@ -Subproject commit 28e5fb827cbf9d395762fe0fea28daff43fc2248 +Subproject commit 1d21ff70c8830610c7fa9ec408f377fc9bce0ba4 diff --git a/vendor/grammars/language-typelanguage b/vendor/grammars/language-typelanguage index de0a6b39..0b4cb312 160000 --- a/vendor/grammars/language-typelanguage +++ b/vendor/grammars/language-typelanguage @@ -1 +1 @@ -Subproject commit de0a6b3957a79260733ae0c7ef6d6a1283d4d084 +Subproject commit 0b4cb312aec17a72eab612a3e60daa239804f40f diff --git a/vendor/grammars/language-viml b/vendor/grammars/language-viml index 6f271d82..f405a613 160000 --- a/vendor/grammars/language-viml +++ b/vendor/grammars/language-viml @@ -1 +1 @@ -Subproject commit 6f271d8216781ea7f94f95475ecffa421ae39cc3 +Subproject commit f405a61327cc2121ed5a13489507360266e97bff diff --git a/vendor/grammars/language-yaml b/vendor/grammars/language-yaml index 1315da13..723b6ec9 160000 --- a/vendor/grammars/language-yaml +++ b/vendor/grammars/language-yaml @@ -1 +1 @@ -Subproject commit 1315da13535aba12d7ab26541d13d94e90d117b2 +Subproject commit 723b6ec9c305413f843551ed63662e1dec2f06a0 diff --git a/vendor/grammars/latex.tmbundle b/vendor/grammars/latex.tmbundle index 65c99a3d..b06ddd1f 160000 --- a/vendor/grammars/latex.tmbundle +++ b/vendor/grammars/latex.tmbundle @@ -1 +1 @@ -Subproject commit 65c99a3d28339ed83428528030a46edc736286a2 +Subproject commit b06ddd1f4e969c3ae4188b68a0b8302bb91aeb28 diff --git a/vendor/grammars/marko-tmbundle b/vendor/grammars/marko-tmbundle index 60cad9d7..36732334 160000 --- a/vendor/grammars/marko-tmbundle +++ b/vendor/grammars/marko-tmbundle @@ -1 +1 @@ -Subproject commit 60cad9d756f85aa9dd43e2cc8a492681cb780936 +Subproject commit 36732334f36f9036ec693563f354090b0f2ab750 diff --git a/vendor/grammars/pawn-sublime-language b/vendor/grammars/pawn-sublime-language index 111c0055..ac815f9c 160000 --- a/vendor/grammars/pawn-sublime-language +++ b/vendor/grammars/pawn-sublime-language @@ -1 +1 @@ -Subproject commit 111c00555cad56dd6a53b0c7cd8534b1eba6cef3 +Subproject commit ac815f9c397156413bb80977d499b89c8672a2e6 diff --git a/vendor/grammars/ruby-slim.tmbundle b/vendor/grammars/ruby-slim.tmbundle index 3a58baea..05c36916 160000 --- a/vendor/grammars/ruby-slim.tmbundle +++ b/vendor/grammars/ruby-slim.tmbundle @@ -1 +1 @@ -Subproject commit 3a58baeade2fdb203cd99fcf06b46d5a217484af +Subproject commit 05c369169c444f11f7605d342d529c6fe8797d34 diff --git a/vendor/grammars/scala.tmbundle b/vendor/grammars/scala.tmbundle index b15ed058..559beec0 160000 --- a/vendor/grammars/scala.tmbundle +++ b/vendor/grammars/scala.tmbundle @@ -1 +1 @@ -Subproject commit b15ed058e1d48394a3e36987507f5a8409c29684 +Subproject commit 559beec060634ee2c8015f777d09fc7a980fbde3 diff --git a/vendor/grammars/secondlife-lsl b/vendor/grammars/secondlife-lsl index 7e4a5de7..0d7fb898 160000 --- a/vendor/grammars/secondlife-lsl +++ b/vendor/grammars/secondlife-lsl @@ -1 +1 @@ -Subproject commit 7e4a5de7503eac2d0585a2ed12c9b76dd1cda5fc +Subproject commit 0d7fb8982d5fe6b1f7065dfbfe42d6e9eaf02251 diff --git a/vendor/grammars/shaders-tmLanguage b/vendor/grammars/shaders-tmLanguage index a6ee9f41..f1112857 160000 --- a/vendor/grammars/shaders-tmLanguage +++ b/vendor/grammars/shaders-tmLanguage @@ -1 +1 @@ -Subproject commit a6ee9f41e4b99812c6698462cae4868c80f82a3b +Subproject commit f1112857df602c8ae687964d9f6634a1d7fd9e42 diff --git a/vendor/grammars/sublime_cobol b/vendor/grammars/sublime_cobol index 28b953eb..f9a840a8 160000 --- a/vendor/grammars/sublime_cobol +++ b/vendor/grammars/sublime_cobol @@ -1 +1 @@ -Subproject commit 28b953eb0c56c1d90b4810ff49bf854b0c0d0990 +Subproject commit f9a840a8465c6bc9c95580ff24cd9ca46776b51a diff --git a/vendor/grammars/swift.tmbundle b/vendor/grammars/swift.tmbundle index ccd52c6e..c2737366 160000 --- a/vendor/grammars/swift.tmbundle +++ b/vendor/grammars/swift.tmbundle @@ -1 +1 @@ -Subproject commit ccd52c6e69b7a417ca48d4271d3621c9df146f07 +Subproject commit c27373669c2d5aa573e3c275955291e1d2d6d85d diff --git a/vendor/grammars/vue-syntax-highlight b/vendor/grammars/vue-syntax-highlight index f87459fc..52a41f40 160000 --- a/vendor/grammars/vue-syntax-highlight +++ b/vendor/grammars/vue-syntax-highlight @@ -1 +1 @@ -Subproject commit f87459fc1bf26a4b8e50e232757d4682892c971d +Subproject commit 52a41f4074135f92ad52d93aad008b7d59d20894