diff --git a/.gitmodules b/.gitmodules index 190b2bce..0db86125 100644 --- a/.gitmodules +++ b/.gitmodules @@ -130,9 +130,6 @@ [submodule "vendor/grammars/Sublime-Text-2-OpenEdge-ABL"] path = vendor/grammars/Sublime-Text-2-OpenEdge-ABL url = https://github.com/jfairbank/Sublime-Text-2-OpenEdge-ABL -[submodule "vendor/grammars/sublime-rust"] - path = vendor/grammars/sublime-rust - url = https://github.com/jhasse/sublime-rust [submodule "vendor/grammars/sublime-befunge"] path = vendor/grammars/sublime-befunge url = https://github.com/johanasplund/sublime-befunge @@ -815,3 +812,6 @@ [submodule "vendor/grammars/SublimeEthereum"] path = vendor/grammars/SublimeEthereum url = https://github.com/davidhq/SublimeEthereum.git +[submodule "vendor/grammars/atom-language-rust"] + path = vendor/grammars/atom-language-rust + url = https://github.com/zargony/atom-language-rust diff --git a/grammars.yml b/grammars.yml index da58965c..bc0c6397 100755 --- a/grammars.yml +++ b/grammars.yml @@ -187,6 +187,8 @@ vendor/grammars/atom-language-perl6: - source.regexp.perl6fe vendor/grammars/atom-language-purescript: - source.purescript +vendor/grammars/atom-language-rust: +- source.rust vendor/grammars/atom-language-srt: - text.srt vendor/grammars/atom-language-stan: @@ -613,8 +615,6 @@ vendor/grammars/sublime-rexx: - source.rexx vendor/grammars/sublime-robot-plugin: - text.robot -vendor/grammars/sublime-rust: -- source.rust vendor/grammars/sublime-spintools: - source.regexp.spin - source.spin diff --git a/test/test_grammars.rb b/test/test_grammars.rb index 90b8f53e..b5fb06aa 100644 --- a/test/test_grammars.rb +++ b/test/test_grammars.rb @@ -40,7 +40,8 @@ class TestGrammars < Minitest::Test "2f03492b52d7dd83b4e7472f01b87c6121e5b1a4", # monkey "241e5ddbb4423d792216783e9f668bd670b026e4", # ant.tmbundle "bdab9fdc21e6790b479ccb5945b78bc0f6ce2493", # language-blade - "81711c69aa40135de7266c88b2f6ab28dbc1d81e" # atom-language-perl6 + "81711c69aa40135de7266c88b2f6ab28dbc1d81e", # atom-language-perl6 + "808e27f5e44167113198d277f47926c5d482eac8" # atom-language-rust ].freeze # List of allowed SPDX license names diff --git a/vendor/README.md b/vendor/README.md index 80d8c117..125480ac 100644 --- a/vendor/README.md +++ b/vendor/README.md @@ -77,7 +77,6 @@ This is a list of grammars that Linguist selects to provide syntax highlighting - **Csound Document:** [nwhetsell/language-csound](https://github.com/nwhetsell/language-csound) - **Csound Score:** [nwhetsell/language-csound](https://github.com/nwhetsell/language-csound) - **CSS:** [textmate/css.tmbundle](https://github.com/textmate/css.tmbundle) -- **Cucumber:** [cucumber/cucumber-tmbundle](https://github.com/cucumber/cucumber-tmbundle) - **Cuda:** [harrism/sublimetext-cuda-cpp](https://github.com/harrism/sublimetext-cuda-cpp) - **Cycript:** [atom/language-javascript](https://github.com/atom/language-javascript) - **Cython:** [textmate/cython.tmbundle](https://github.com/textmate/cython.tmbundle) @@ -109,13 +108,12 @@ This is a list of grammars that Linguist selects to provide syntax highlighting - **Fancy:** [fancy-lang/fancy-tmbundle](https://github.com/fancy-lang/fancy-tmbundle) - **fish:** [l15n/fish-tmbundle](https://github.com/l15n/fish-tmbundle) - **Forth:** [textmate/forth.tmbundle](https://github.com/textmate/forth.tmbundle) -- **FORTRAN:** [textmate/fortran.tmbundle](https://github.com/textmate/fortran.tmbundle) +- **Fortran:** [textmate/fortran.tmbundle](https://github.com/textmate/fortran.tmbundle) - **FreeMarker:** [freemarker/FreeMarker.tmbundle](https://github.com/freemarker/FreeMarker.tmbundle) - **Frege:** [atom-haskell/language-haskell](https://github.com/atom-haskell/language-haskell) - **G-code:** [robotmaster/sublime-text-syntax-highlighting](https://github.com/robotmaster/sublime-text-syntax-highlighting) - **Game Maker Language:** [textmate/c.tmbundle](https://github.com/textmate/c.tmbundle) - **GAP:** [dhowden/gap-tmbundle](https://github.com/dhowden/gap-tmbundle) -- **GAS:** [Nessphoro/sublimeassembly](https://github.com/Nessphoro/sublimeassembly) - **GCC Machine Description:** [textmate/lisp.tmbundle](https://github.com/textmate/lisp.tmbundle) - **GDB:** [quarnster/SublimeGDB](https://github.com/quarnster/SublimeGDB) - **GDScript:** [beefsack/GDScript-sublime](https://github.com/beefsack/GDScript-sublime) @@ -123,6 +121,7 @@ This is a list of grammars that Linguist selects to provide syntax highlighting - **Gentoo Ebuild:** [atom/language-shellscript](https://github.com/atom/language-shellscript) - **Gentoo Eclass:** [atom/language-shellscript](https://github.com/atom/language-shellscript) - **Gettext Catalog:** [textmate/gettext.tmbundle](https://github.com/textmate/gettext.tmbundle) +- **Gherkin:** [cucumber/cucumber-tmbundle](https://github.com/cucumber/cucumber-tmbundle) - **GLSL:** [euler0/sublime-glsl](https://github.com/euler0/sublime-glsl) - **Glyph:** [textmate/tcl.tmbundle](https://github.com/textmate/tcl.tmbundle) - **GN:** [devoncarew/language-gn](https://github.com/devoncarew/language-gn) @@ -135,7 +134,6 @@ This is a list of grammars that Linguist selects to provide syntax highlighting - **Grammatical Framework:** [atom-haskell/language-haskell](https://github.com/atom-haskell/language-haskell) - **GraphQL:** [rmosolgo/language-graphql](https://github.com/rmosolgo/language-graphql) - **Graphviz (DOT):** [textmate/graphviz.tmbundle](https://github.com/textmate/graphviz.tmbundle) -- **Groff:** [Alhadis/language-roff](https://github.com/Alhadis/language-roff) - **Groovy:** [textmate/groovy.tmbundle](https://github.com/textmate/groovy.tmbundle) - **Groovy Server Pages:** [textmate/java.tmbundle](https://github.com/textmate/java.tmbundle) - **Hack:** [textmate/php.tmbundle](https://github.com/textmate/php.tmbundle) @@ -152,7 +150,6 @@ This is a list of grammars that Linguist selects to provide syntax highlighting - **HTML+ERB:** [aroben/ruby.tmbundle](https://github.com/aroben/ruby.tmbundle) - **HTML+PHP:** [textmate/php.tmbundle](https://github.com/textmate/php.tmbundle) - **HTTP:** [httpspec/sublime-highlighting](https://github.com/httpspec/sublime-highlighting) -- **Hy:** [rwtolbert/language-hy](https://github.com/rwtolbert/language-hy) - **IDL:** [mgalloy/idl.tmbundle](https://github.com/mgalloy/idl.tmbundle) - **Idris:** [idris-hackers/idris-sublime](https://github.com/idris-hackers/idris-sublime) - **Inform 7:** [erkyrath/language-inform7](https://github.com/erkyrath/language-inform7) @@ -162,7 +159,6 @@ This is a list of grammars that Linguist selects to provide syntax highlighting - **Isabelle:** [lsf37/Isabelle.tmbundle](https://github.com/lsf37/Isabelle.tmbundle) - **Isabelle ROOT:** [lsf37/Isabelle.tmbundle](https://github.com/lsf37/Isabelle.tmbundle) - **J:** [bcj/JSyntax](https://github.com/bcj/JSyntax) -- **Jade:** [davidrios/jade-tmbundle](https://github.com/davidrios/jade-tmbundle) - **Jasmin:** [atmarksharp/jasmin-sublime](https://github.com/atmarksharp/jasmin-sublime) - **Java:** [textmate/java.tmbundle](https://github.com/textmate/java.tmbundle) - **Java Server Pages:** [textmate/java.tmbundle](https://github.com/textmate/java.tmbundle) @@ -224,7 +220,7 @@ This is a list of grammars that Linguist selects to provide syntax highlighting - **NetLogo:** [textmate/lisp.tmbundle](https://github.com/textmate/lisp.tmbundle) - **NewLisp:** [textmate/lisp.tmbundle](https://github.com/textmate/lisp.tmbundle) - **Nginx:** [brandonwamboldt/sublime-nginx](https://github.com/brandonwamboldt/sublime-nginx) -- **Nimrod:** [Varriount/NimLime](https://github.com/Varriount/NimLime) +- **Nim:** [Varriount/NimLime](https://github.com/Varriount/NimLime) - **Ninja:** [khyo/language-ninja](https://github.com/khyo/language-ninja) - **Nit:** [R4PaSs/Sublime-Nit](https://github.com/R4PaSs/Sublime-Nit) - **Nix:** [wmertens/sublime-nix](https://github.com/wmertens/sublime-nix) @@ -265,6 +261,7 @@ This is a list of grammars that Linguist selects to provide syntax highlighting - **Prolog:** [alnkpa/sublimeprolog](https://github.com/alnkpa/sublimeprolog) - **Propeller Spin:** [bitbased/sublime-spintools](https://github.com/bitbased/sublime-spintools) - **Protocol Buffer:** [michaeledgar/protobuf-tmbundle](https://github.com/michaeledgar/protobuf-tmbundle) +- **Pug:** [davidrios/jade-tmbundle](https://github.com/davidrios/jade-tmbundle) - **Puppet:** [russCloak/SublimePuppet](https://github.com/russCloak/SublimePuppet) - **PureScript:** [purescript-contrib/atom-language-purescript](https://github.com/purescript-contrib/atom-language-purescript) - **Python:** [MagicStack/MagicPython](https://github.com/MagicStack/MagicPython) @@ -275,8 +272,10 @@ This is a list of grammars that Linguist selects to provide syntax highlighting - **R:** [textmate/r.tmbundle](https://github.com/textmate/r.tmbundle) - **Racket:** [soegaard/racket-highlight-for-github](https://github.com/soegaard/racket-highlight-for-github) - **RAML:** [atom/language-yaml](https://github.com/atom/language-yaml) +- **Rascal:** [usethesource/rascal-syntax-highlighting](https://github.com/usethesource/rascal-syntax-highlighting) - **RDoc:** [joshaven/RDoc.tmbundle](https://github.com/joshaven/RDoc.tmbundle) - **REALbasic:** [angryant0007/VBDotNetSyntax](https://github.com/angryant0007/VBDotNetSyntax) +- **Reason:** [facebook/reason](https://github.com/facebook/reason) - **Rebol:** [Oldes/Sublime-REBOL](https://github.com/Oldes/Sublime-REBOL) - **Red:** [Oldes/Sublime-Red](https://github.com/Oldes/Sublime-Red) - **Ren'Py:** [williamd1k0/language-renpy](https://github.com/williamd1k0/language-renpy) @@ -285,11 +284,12 @@ This is a list of grammars that Linguist selects to provide syntax highlighting - **RHTML:** [aroben/ruby.tmbundle](https://github.com/aroben/ruby.tmbundle) - **RMarkdown:** [atom/language-gfm](https://github.com/atom/language-gfm) - **RobotFramework:** [shellderp/sublime-robot-plugin](https://github.com/shellderp/sublime-robot-plugin) +- **Roff:** [Alhadis/language-roff](https://github.com/Alhadis/language-roff) - **Rouge:** [atom/language-clojure](https://github.com/atom/language-clojure) - **RPM Spec:** [waveclaw/language-rpm-spec](https://github.com/waveclaw/language-rpm-spec) - **Ruby:** [aroben/ruby.tmbundle](https://github.com/aroben/ruby.tmbundle) - **RUNOFF:** [Alhadis/language-roff](https://github.com/Alhadis/language-roff) -- **Rust:** [jhasse/sublime-rust](https://github.com/jhasse/sublime-rust) +- **Rust:** [zargony/atom-language-rust](https://github.com/zargony/atom-language-rust) - **Sage:** [MagicStack/MagicPython](https://github.com/MagicStack/MagicPython) - **SaltStack:** [saltstack/atom-salt](https://github.com/saltstack/atom-salt) - **SAS:** [rpardee/sas.tmbundle](https://github.com/rpardee/sas.tmbundle) @@ -341,6 +341,7 @@ This is a list of grammars that Linguist selects to provide syntax highlighting - **TypeScript:** [Microsoft/TypeScript-Sublime-Plugin](https://github.com/Microsoft/TypeScript-Sublime-Plugin) - **Unified Parallel C:** [textmate/c.tmbundle](https://github.com/textmate/c.tmbundle) - **Unity3D Asset:** [atom/language-yaml](https://github.com/atom/language-yaml) +- **Unix Assembly:** [Nessphoro/sublimeassembly](https://github.com/Nessphoro/sublimeassembly) - **Uno:** [atom/language-csharp](https://github.com/atom/language-csharp) - **UnrealScript:** [textmate/java.tmbundle](https://github.com/textmate/java.tmbundle) - **UrWeb:** [gwalborn/UrWeb-Language-Definition](https://github.com/gwalborn/UrWeb-Language-Definition) @@ -348,7 +349,7 @@ This is a list of grammars that Linguist selects to provide syntax highlighting - **VCL:** [brandonwamboldt/sublime-varnish](https://github.com/brandonwamboldt/sublime-varnish) - **Verilog:** [textmate/verilog.tmbundle](https://github.com/textmate/verilog.tmbundle) - **VHDL:** [textmate/vhdl.tmbundle](https://github.com/textmate/vhdl.tmbundle) -- **VimL:** [Alhadis/language-viml](https://github.com/Alhadis/language-viml) +- **Vim script:** [Alhadis/language-viml](https://github.com/Alhadis/language-viml) - **Visual Basic:** [angryant0007/VBDotNetSyntax](https://github.com/angryant0007/VBDotNetSyntax) - **Volt:** [textmate/d.tmbundle](https://github.com/textmate/d.tmbundle) - **Vue:** [vuejs/vue-syntax-highlight](https://github.com/vuejs/vue-syntax-highlight) diff --git a/vendor/grammars/atom-language-rust b/vendor/grammars/atom-language-rust new file mode 160000 index 00000000..2f514baa --- /dev/null +++ b/vendor/grammars/atom-language-rust @@ -0,0 +1 @@ +Subproject commit 2f514baad7eca4a1d587d85ea5aa6fb353281617 diff --git a/vendor/grammars/sublime-rust b/vendor/grammars/sublime-rust deleted file mode 160000 index 2ab00b44..00000000 --- a/vendor/grammars/sublime-rust +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 2ab00b44ef7b486d155274844f9b734050453bc1 diff --git a/vendor/licenses/grammar/atom-language-rust.txt b/vendor/licenses/grammar/atom-language-rust.txt new file mode 100644 index 00000000..2f67cabc --- /dev/null +++ b/vendor/licenses/grammar/atom-language-rust.txt @@ -0,0 +1,26 @@ +--- +type: grammar +name: atom-language-rust +license: other +--- +The MIT License (MIT) +===================== + +Copyright © `2013` `Andreas Neuhaus` `http://zargony.com/` + +Permission is hereby granted, free of charge, to any person obtaining a copy of +this software and associated documentation files (the “Software”), to deal in +the Software without restriction, including without limitation the rights to +use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of +the Software, and to permit persons to whom the Software is furnished to do so, +subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS +FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR +COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER +IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/vendor/licenses/grammar/language-hy.txt b/vendor/licenses/grammar/language-hy.txt deleted file mode 100644 index 49a8ad87..00000000 --- a/vendor/licenses/grammar/language-hy.txt +++ /dev/null @@ -1,25 +0,0 @@ ---- -type: grammar -name: language-hy -license: mit ---- -Copyright (c) 2014 Bob Tolbert (bob@tolbert.org) - -Permission is hereby granted, free of charge, to any person obtaining -a copy of this software and associated documentation files (the -"Software"), to deal in the Software without restriction, including -without limitation the rights to use, copy, modify, merge, publish, -distribute, sublicense, and/or sell copies of the Software, and to -permit persons to whom the Software is furnished to do so, subject to -the following conditions: - -The above copyright notice and this permission notice shall be -included in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE -LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/vendor/licenses/grammar/language-solidity.txt b/vendor/licenses/grammar/language-solidity.txt deleted file mode 100644 index 7443b261..00000000 --- a/vendor/licenses/grammar/language-solidity.txt +++ /dev/null @@ -1,19 +0,0 @@ -Copyright (c) 2015+ uniqpath - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE.. diff --git a/vendor/licenses/grammar/ninja.tmbundle.txt b/vendor/licenses/grammar/ninja.tmbundle.txt deleted file mode 100644 index 238a07ea..00000000 --- a/vendor/licenses/grammar/ninja.tmbundle.txt +++ /dev/null @@ -1,5 +0,0 @@ ---- -type: grammar -name: ninja.tmbundle -license: other ---- diff --git a/vendor/licenses/grammar/sublime-rust.txt b/vendor/licenses/grammar/sublime-rust.txt deleted file mode 100644 index 423d7ce3..00000000 --- a/vendor/licenses/grammar/sublime-rust.txt +++ /dev/null @@ -1,22 +0,0 @@ ---- -type: grammar -name: sublime-rust -license: mit ---- -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE.