From e98728595bc2f3e72b0668d60e31cbe441c48799 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ad=C3=A6dra?= Date: Thu, 21 Sep 2017 10:52:10 +0200 Subject: [PATCH] Change Ruby grammar source (#3782) * Move the Ruby grammar to use Atom's one --- .gitmodules | 7 ++--- grammars.yml | 7 +++-- vendor/README.md | 8 ++--- vendor/grammars/language-ruby | 1 + vendor/grammars/ruby.tmbundle | 1 - vendor/licenses/grammar/language-ruby.txt | 36 +++++++++++++++++++++++ 6 files changed, 48 insertions(+), 12 deletions(-) create mode 160000 vendor/grammars/language-ruby delete mode 160000 vendor/grammars/ruby.tmbundle create mode 100644 vendor/licenses/grammar/language-ruby.txt diff --git a/.gitmodules b/.gitmodules index b77bb22d..fcce81cd 100644 --- a/.gitmodules +++ b/.gitmodules @@ -400,10 +400,6 @@ [submodule "vendor/grammars/sublime_cobol"] path = vendor/grammars/sublime_cobol url = https://bitbucket.org/bitlang/sublime_cobol -[submodule "vendor/grammars/ruby.tmbundle"] - path = vendor/grammars/ruby.tmbundle - url = https://github.com/aroben/ruby.tmbundle - branch = pl [submodule "vendor/grammars/IDL-Syntax"] path = vendor/grammars/IDL-Syntax url = https://github.com/andik/IDL-Syntax @@ -878,3 +874,6 @@ [submodule "vendor/grammars/language-ballerina"] path = vendor/grammars/language-ballerina url = https://github.com/ballerinalang/plugin-vscode +[submodule "vendor/grammars/language-ruby"] + path = vendor/grammars/language-ruby + url = https://github.com/atom/language-ruby diff --git a/grammars.yml b/grammars.yml index 5fd445e7..62dfc961 100755 --- a/grammars.yml +++ b/grammars.yml @@ -463,6 +463,10 @@ vendor/grammars/language-roff: vendor/grammars/language-rpm-spec: - source.changelogs.rpm-spec - source.rpm-spec +vendor/grammars/language-ruby: +- source.ruby +- source.ruby.gemfile +- text.html.erb vendor/grammars/language-shellscript: - source.shell - text.shell-session @@ -592,9 +596,6 @@ vendor/grammars/rascal-syntax-highlighting: - source.rascal vendor/grammars/ruby-slim.tmbundle: - text.slim -vendor/grammars/ruby.tmbundle: -- source.ruby -- text.html.erb vendor/grammars/sas.tmbundle: - source.SASLog - source.sas diff --git a/vendor/README.md b/vendor/README.md index def84896..32f2e9cc 100644 --- a/vendor/README.md +++ b/vendor/README.md @@ -155,7 +155,7 @@ This is a list of grammars that Linguist selects to provide syntax highlighting - **HTML+Django:** [textmate/python-django.tmbundle](https://github.com/textmate/python-django.tmbundle) - **HTML+ECR:** [atom-crystal/language-crystal](https://github.com/atom-crystal/language-crystal) - **HTML+EEX:** [elixir-lang/elixir-tmbundle](https://github.com/elixir-lang/elixir-tmbundle) -- **HTML+ERB:** [aroben/ruby.tmbundle](https://github.com/aroben/ruby.tmbundle) +- **HTML+ERB:** [atom/language-ruby](https://github.com/atom/language-ruby) - **HTML+PHP:** [textmate/php.tmbundle](https://github.com/textmate/php.tmbundle) - **HTTP:** [httpspec/sublime-highlighting](https://github.com/httpspec/sublime-highlighting) - **IDL:** [mgalloy/idl.tmbundle](https://github.com/mgalloy/idl.tmbundle) @@ -219,7 +219,7 @@ This is a list of grammars that Linguist selects to provide syntax highlighting - **Mercury:** [sebgod/mercury-tmlanguage](https://github.com/sebgod/mercury-tmlanguage) - **Meson:** [TingPing/language-meson](https://github.com/TingPing/language-meson) - **Metal:** [textmate/c.tmbundle](https://github.com/textmate/c.tmbundle) -- **Mirah:** [aroben/ruby.tmbundle](https://github.com/aroben/ruby.tmbundle) +- **Mirah:** [atom/language-ruby](https://github.com/atom/language-ruby) - **Modelica:** [BorisChumichev/modelicaSublimeTextPackage](https://github.com/BorisChumichev/modelicaSublimeTextPackage) - **Modula-2:** [harogaston/Sublime-Modula-2](https://github.com/harogaston/Sublime-Modula-2) - **Monkey:** [gingerbeardman/monkey.tmbundle](https://github.com/gingerbeardman/monkey.tmbundle) @@ -303,14 +303,14 @@ This is a list of grammars that Linguist selects to provide syntax highlighting - **Ren'Py:** [williamd1k0/language-renpy](https://github.com/williamd1k0/language-renpy) - **reStructuredText:** [Lukasa/language-restructuredtext](https://github.com/Lukasa/language-restructuredtext) - **REXX:** [mblocker/rexx-sublime](https://github.com/mblocker/rexx-sublime) -- **RHTML:** [aroben/ruby.tmbundle](https://github.com/aroben/ruby.tmbundle) +- **RHTML:** [atom/language-ruby](https://github.com/atom/language-ruby) - **Ring:** [MahmoudFayed/atom-language-ring](https://github.com/MahmoudFayed/atom-language-ring) - **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) +- **Ruby:** [atom/language-ruby](https://github.com/atom/language-ruby) - **RUNOFF:** [Alhadis/language-roff](https://github.com/Alhadis/language-roff) - **Rust:** [zargony/atom-language-rust](https://github.com/zargony/atom-language-rust) - **Sage:** [MagicStack/MagicPython](https://github.com/MagicStack/MagicPython) diff --git a/vendor/grammars/language-ruby b/vendor/grammars/language-ruby new file mode 160000 index 00000000..035fbc18 --- /dev/null +++ b/vendor/grammars/language-ruby @@ -0,0 +1 @@ +Subproject commit 035fbc18a223bfac6ce9a3bf51d0cc65317fd37d diff --git a/vendor/grammars/ruby.tmbundle b/vendor/grammars/ruby.tmbundle deleted file mode 160000 index 4bb5c2e3..00000000 --- a/vendor/grammars/ruby.tmbundle +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 4bb5c2e315f5c6ca2931df0b43aeec55ace774e7 diff --git a/vendor/licenses/grammar/language-ruby.txt b/vendor/licenses/grammar/language-ruby.txt new file mode 100644 index 00000000..726e348d --- /dev/null +++ b/vendor/licenses/grammar/language-ruby.txt @@ -0,0 +1,36 @@ +--- +type: grammar +name: language-ruby +license: mit +--- +Copyright (c) 2014 GitHub Inc. + +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. + +-------------------------------------------------------------------- + +This package was derived from a TextMate bundle located at +https://github.com/textmate/ruby.tmbundle and distributed under the following +license, located in `README.mdown`: + +Permission to copy, use, modify, sell and distribute this +software is granted. This software is provided "as is" without +express or implied warranty, and with no claim as to its +suitability for any purpose.