From 79b3da822eac18d334e012e97442a654955a08a3 Mon Sep 17 00:00:00 2001 From: Adeel Mujahid <3840695+am11@users.noreply.github.com> Date: Tue, 6 Apr 2021 13:15:01 +0300 Subject: [PATCH] Fix Nixinova submodule issues (#5292) --- .gitmodules | 6 +++--- grammars.yml | 2 +- vendor/README.md | 6 +++--- vendor/grammars/Nixinova-tmLanguage | 1 - vendor/grammars/Nova.tmLanguage | 1 + ...nova-tmLanguage.dep.yml => Nova.tmLanguage.dep.yml} | 10 ++++++---- 6 files changed, 14 insertions(+), 12 deletions(-) delete mode 160000 vendor/grammars/Nixinova-tmLanguage create mode 160000 vendor/grammars/Nova.tmLanguage rename vendor/licenses/git_submodule/{Nixinova-tmLanguage.dep.yml => Nova.tmLanguage.dep.yml} (82%) diff --git a/.gitmodules b/.gitmodules index 3a7a7f0e15..eee69e552e 100644 --- a/.gitmodules +++ b/.gitmodules @@ -68,9 +68,9 @@ path = vendor/grammars/NimLime url = https://github.com/timotheecour/NimLime branch = master2 -[submodule "vendor/grammars/Nixinova-tmLanguage"] - path = vendor/grammars/Nixinova-tmLanguage - url = https://github.com/Nixinova/tmLanguage +[submodule "vendor/grammars/Nova.tmLanguage"] + path = vendor/grammars/Nova.tmLanguage + url = https://github.com/Nixinova/Nova.tmLanguage [submodule "vendor/grammars/ObjectScript.tmBundle"] path = vendor/grammars/ObjectScript.tmBundle url = https://github.com/intersystems-community/ObjectScript.tmBundle diff --git a/grammars.yml b/grammars.yml index d9001ff82f..64cf806c35 100644 --- a/grammars.yml +++ b/grammars.yml @@ -57,7 +57,7 @@ vendor/grammars/NimLime: - source.nim.comment - source.nim_filter - source.nimcfg -vendor/grammars/Nixinova-tmLanguage: +vendor/grammars/Nova.tmLanguage: - source.redirects - source.solution - text.robots-txt diff --git a/vendor/README.md b/vendor/README.md index 70c062fd1a..04f035da74 100644 --- a/vendor/README.md +++ b/vendor/README.md @@ -272,7 +272,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) -- **Microsoft Visual Studio Solution:** [Nixinova/tmLanguage](https://github.com/Nixinova/tmLanguage) +- **Microsoft Visual Studio Solution:** [Nixinova/Nova.tmLanguage](https://github.com/Nixinova/Nova.tmLanguage) - **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) @@ -378,7 +378,7 @@ This is a list of grammars that Linguist selects to provide syntax highlighting - **Rebol:** [Oldes/Sublime-REBOL](https://github.com/Oldes/Sublime-REBOL) - **Record Jar:** [Alhadis/language-etc](https://github.com/Alhadis/language-etc) - **Red:** [Oldes/Sublime-Red](https://github.com/Oldes/Sublime-Red) -- **Redirect Rules:** [Nixinova/tmLanguage](https://github.com/Nixinova/tmLanguage) +- **Redirect Rules:** [Nixinova/Nova.tmLanguage](https://github.com/Nixinova/Nova.tmLanguage) - **Regular Expression:** [Alhadis/language-regexp](https://github.com/Alhadis/language-regexp) - **Ren'Py:** [williamd1k0/language-renpy](https://github.com/williamd1k0/language-renpy) - **Rich Text Format:** [nwhetsell/language-rtf](https://github.com/nwhetsell/language-rtf) @@ -527,7 +527,7 @@ This is a list of grammars that Linguist selects to provide syntax highlighting - **ooc:** [nilium/ooc.tmbundle](https://github.com/nilium/ooc.tmbundle) - **q:** [komsit37/sublime-q](https://github.com/komsit37/sublime-q) - **reStructuredText:** [Lukasa/language-restructuredtext](https://github.com/Lukasa/language-restructuredtext) -- **robots.txt:** [Nixinova/tmLanguage](https://github.com/Nixinova/tmLanguage) +- **robots.txt:** [Nixinova/Nova.tmLanguage](https://github.com/Nixinova/Nova.tmLanguage) - **sed:** [Alhadis/language-sed](https://github.com/Alhadis/language-sed) - **wdl:** [broadinstitute/wdl-sublime-syntax-highlighter](https://github.com/broadinstitute/wdl-sublime-syntax-highlighter) - **wisp:** [atom/language-clojure](https://github.com/atom/language-clojure) diff --git a/vendor/grammars/Nixinova-tmLanguage b/vendor/grammars/Nixinova-tmLanguage deleted file mode 160000 index a5d2226e9f..0000000000 --- a/vendor/grammars/Nixinova-tmLanguage +++ /dev/null @@ -1 +0,0 @@ -Subproject commit a5d2226e9fadf709c661ce760ed81a6a021ea93c diff --git a/vendor/grammars/Nova.tmLanguage b/vendor/grammars/Nova.tmLanguage new file mode 160000 index 0000000000..126a9b6129 --- /dev/null +++ b/vendor/grammars/Nova.tmLanguage @@ -0,0 +1 @@ +Subproject commit 126a9b612960496a1a28120c502418ba5d124487 diff --git a/vendor/licenses/git_submodule/Nixinova-tmLanguage.dep.yml b/vendor/licenses/git_submodule/Nova.tmLanguage.dep.yml similarity index 82% rename from vendor/licenses/git_submodule/Nixinova-tmLanguage.dep.yml rename to vendor/licenses/git_submodule/Nova.tmLanguage.dep.yml index cec276e140..ddd6e2f6e2 100644 --- a/vendor/licenses/git_submodule/Nixinova-tmLanguage.dep.yml +++ b/vendor/licenses/git_submodule/Nova.tmLanguage.dep.yml @@ -1,11 +1,13 @@ --- +name: Nova.tmLanguage +version: 126a9b612960496a1a28120c502418ba5d124487 type: git_submodule -name: Nixinova-tmLanguage -version: a5d2226e9fadf709c661ce760ed81a6a021ea93c +homepage: https://github.com/Nixinova/Nova.tmLanguage license: isc licenses: -- text: |- - # ISC License +- sources: license.md + text: | + # ISC License Copyright © 2021 Nixinova