From 0f4955e5d565220742a0239aeae7c48426d29d0b Mon Sep 17 00:00:00 2001 From: Alex Arslan Date: Thu, 9 Nov 2017 00:39:37 -0800 Subject: [PATCH] Update Julia definitions to use Atom instead of TextMate (#3871) --- .gitmodules | 6 ++--- grammars.yml | 5 ++-- test/test_grammars.rb | 2 +- vendor/README.md | 2 +- vendor/grammars/Julia.tmbundle | 1 - vendor/grammars/atom-language-julia | 1 + vendor/licenses/grammar/Julia.tmbundle.txt | 27 ------------------- .../licenses/grammar/atom-language-julia.txt | 27 +++++++++++++++++++ 8 files changed, 36 insertions(+), 35 deletions(-) delete mode 160000 vendor/grammars/Julia.tmbundle create mode 160000 vendor/grammars/atom-language-julia delete mode 100644 vendor/licenses/grammar/Julia.tmbundle.txt create mode 100644 vendor/licenses/grammar/atom-language-julia.txt diff --git a/.gitmodules b/.gitmodules index ae65e0a1..1aa4e352 100644 --- a/.gitmodules +++ b/.gitmodules @@ -169,9 +169,6 @@ [submodule "vendor/grammars/Agda.tmbundle"] path = vendor/grammars/Agda.tmbundle url = https://github.com/mokus0/Agda.tmbundle -[submodule "vendor/grammars/Julia.tmbundle"] - path = vendor/grammars/Julia.tmbundle - url = https://github.com/JuliaEditorSupport/Julia.tmbundle [submodule "vendor/grammars/ooc.tmbundle"] path = vendor/grammars/ooc.tmbundle url = https://github.com/nilium/ooc.tmbundle @@ -883,3 +880,6 @@ [submodule "vendor/grammars/wdl-sublime-syntax-highlighter"] path = vendor/grammars/wdl-sublime-syntax-highlighter url = https://github.com/broadinstitute/wdl-sublime-syntax-highlighter +[submodule "vendor/grammars/atom-language-julia"] + path = vendor/grammars/atom-language-julia + url = https://github.com/JuliaEditorSupport/atom-language-julia diff --git a/grammars.yml b/grammars.yml index 5eea9735..a537b54e 100755 --- a/grammars.yml +++ b/grammars.yml @@ -45,8 +45,6 @@ vendor/grammars/Isabelle.tmbundle: - source.isabelle.theory vendor/grammars/JSyntax: - source.j -vendor/grammars/Julia.tmbundle: -- source.julia vendor/grammars/Lean.tmbundle: - source.lean vendor/grammars/LiveScript.tmbundle: @@ -192,6 +190,9 @@ vendor/grammars/atom-language-1c-bsl: vendor/grammars/atom-language-clean: - source.clean - text.restructuredtext.clean +vendor/grammars/atom-language-julia: +- source.julia +- source.julia.console vendor/grammars/atom-language-p4: - source.p4 vendor/grammars/atom-language-perl6: diff --git a/test/test_grammars.rb b/test/test_grammars.rb index 3c140cc7..2a15b0a8 100644 --- a/test/test_grammars.rb +++ b/test/test_grammars.rb @@ -23,7 +23,6 @@ class TestGrammars < Minitest::Test "8653305b358375d0fced85dc24793b99919b11ef", # language-shellscript "9f0c0b0926a18f5038e455e8df60221125fc3111", # elixir-tmbundle "a4dadb2374282098c5b8b14df308906f5347d79a", # mako-tmbundle - "b9b24778619dce325b651f0d77cbc72e7ae0b0a3", # Julia.tmbundle "e06722add999e7428048abcc067cd85f1f7ca71c", # r.tmbundle "50b14a0e3f03d7ca754dac42ffb33302b5882b78", # smalltalk-tmbundle "eafbc4a2f283752858e6908907f3c0c90188785b", # gap-tmbundle @@ -44,6 +43,7 @@ class TestGrammars < Minitest::Test "9dafd4e2a79cb13a6793b93877a254bc4d351e74", # sublime-text-ox "8e111741d97ba2e27b3d18a309d426b4a37e604f", # sublime-varnish "23d2538e33ce62d58abda2c039364b92f64ea6bc", # sublime-angelscript + "53714285caad3c480ebd248c490509695d10404b", # atom-language-julia ].freeze # List of allowed SPDX license names diff --git a/vendor/README.md b/vendor/README.md index 031d2ad0..c9b79e09 100644 --- a/vendor/README.md +++ b/vendor/README.md @@ -182,7 +182,7 @@ This is a list of grammars that Linguist selects to provide syntax highlighting - **JSONiq:** [wcandillon/language-jsoniq](https://github.com/wcandillon/language-jsoniq) - **JSONLD:** [atom/language-javascript](https://github.com/atom/language-javascript) - **JSX:** [github-linguist/language-babel](https://github.com/github-linguist/language-babel) -- **Julia:** [JuliaEditorSupport/Julia.tmbundle](https://github.com/JuliaEditorSupport/Julia.tmbundle) +- **Julia:** [JuliaEditorSupport/atom-language-julia](https://github.com/JuliaEditorSupport/atom-language-julia) - **Jupyter Notebook:** [textmate/json.tmbundle](https://github.com/textmate/json.tmbundle) - **KiCad Layout:** [Alhadis/language-pcb](https://github.com/Alhadis/language-pcb) - **KiCad Legacy Layout:** [Alhadis/language-pcb](https://github.com/Alhadis/language-pcb) diff --git a/vendor/grammars/Julia.tmbundle b/vendor/grammars/Julia.tmbundle deleted file mode 160000 index 443f9e86..00000000 --- a/vendor/grammars/Julia.tmbundle +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 443f9e8689cf83336e4dfbf6b86c21a10693e16e diff --git a/vendor/grammars/atom-language-julia b/vendor/grammars/atom-language-julia new file mode 160000 index 00000000..4e8896ed --- /dev/null +++ b/vendor/grammars/atom-language-julia @@ -0,0 +1 @@ +Subproject commit 4e8896ed0b9ec8464e94c90ec6d3a001edc7b1f5 diff --git a/vendor/licenses/grammar/Julia.tmbundle.txt b/vendor/licenses/grammar/Julia.tmbundle.txt deleted file mode 100644 index c7f2c8f4..00000000 --- a/vendor/licenses/grammar/Julia.tmbundle.txt +++ /dev/null @@ -1,27 +0,0 @@ ---- -type: grammar -name: Julia.tmbundle -license: mit ---- -Copyright (c) 2012-2014 Stefan Karpinski, Elliot Saba, Dirk Gadsden, -Adam Strzelecki, Jonathan Malmaud and other contributors: - -https://github.com/JuliaEditorSupport/Julia.tmbundle/contributors - -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/atom-language-julia.txt b/vendor/licenses/grammar/atom-language-julia.txt new file mode 100644 index 00000000..e45395b6 --- /dev/null +++ b/vendor/licenses/grammar/atom-language-julia.txt @@ -0,0 +1,27 @@ +--- +type: grammar +name: atom-language-julia +license: mit +--- +The atom-language-julia package is licensed under the MIT "Expat" License: + +> Copyright (c) 2015 +> +> 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.