diff --git a/.gitmodules b/.gitmodules index 141ad26c..ff98aeef 100644 --- a/.gitmodules +++ b/.gitmodules @@ -244,9 +244,6 @@ [submodule "vendor/grammars/cpp-qt.tmbundle"] path = vendor/grammars/cpp-qt.tmbundle url = https://github.com/textmate/cpp-qt.tmbundle -[submodule "vendor/grammars/css.tmbundle"] - path = vendor/grammars/css.tmbundle - url = https://github.com/textmate/css.tmbundle [submodule "vendor/grammars/d.tmbundle"] path = vendor/grammars/d.tmbundle url = https://github.com/textmate/d.tmbundle @@ -815,3 +812,6 @@ [submodule "vendor/grammars/atom-language-rust"] path = vendor/grammars/atom-language-rust url = https://github.com/zargony/atom-language-rust +[submodule "vendor/grammars/language-css"] + path = vendor/grammars/language-css + url = https://github.com/atom/language-css diff --git a/grammars.yml b/grammars.yml index 98a9dd42..88060df5 100755 --- a/grammars.yml +++ b/grammars.yml @@ -234,8 +234,6 @@ vendor/grammars/cpp-qt.tmbundle: - source.qmake vendor/grammars/creole: - text.html.creole -vendor/grammars/css.tmbundle: -- source.css vendor/grammars/cucumber-tmbundle: - source.ruby.rspec.cucumber.steps - text.gherkin.feature @@ -369,6 +367,8 @@ vendor/grammars/language-csound: - source.csound - source.csound-document - source.csound-score +vendor/grammars/language-css: +- source.css vendor/grammars/language-emacs-lisp: - source.emacs.lisp vendor/grammars/language-fontforge: diff --git a/test/test_grammars.rb b/test/test_grammars.rb index b5fb06aa..35787788 100644 --- a/test/test_grammars.rb +++ b/test/test_grammars.rb @@ -41,7 +41,8 @@ class TestGrammars < Minitest::Test "241e5ddbb4423d792216783e9f668bd670b026e4", # ant.tmbundle "bdab9fdc21e6790b479ccb5945b78bc0f6ce2493", # language-blade "81711c69aa40135de7266c88b2f6ab28dbc1d81e", # atom-language-perl6 - "808e27f5e44167113198d277f47926c5d482eac8" # atom-language-rust + "808e27f5e44167113198d277f47926c5d482eac8", # atom-language-rust + "304be6184f7f344d44a1d13bddf511019624fd22", # language-css ].freeze # List of allowed SPDX license names diff --git a/vendor/README.md b/vendor/README.md index 125480ac..15654c34 100644 --- a/vendor/README.md +++ b/vendor/README.md @@ -76,7 +76,7 @@ This is a list of grammars that Linguist selects to provide syntax highlighting - **Csound:** [nwhetsell/language-csound](https://github.com/nwhetsell/language-csound) - **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) +- **CSS:** [atom/language-css](https://github.com/atom/language-css) - **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) @@ -84,7 +84,7 @@ This is a list of grammars that Linguist selects to provide syntax highlighting - **D-ObjDump:** [nanoant/assembly.tmbundle](https://github.com/nanoant/assembly.tmbundle) - **Dart:** [guillermooo/dart-sublime-bundle](https://github.com/guillermooo/dart-sublime-bundle) - **desktop:** [Mailaender/desktop.tmbundle](https://github.com/Mailaender/desktop.tmbundle) -- **Diff:** [textmate/diff.tmbundle](https://github.com/textmate/diff.tmbundle) +- **Diff:** [kivikakk/diff.tmbundle](https://github.com/kivikakk/diff.tmbundle) - **DM:** [PJB3005/atomic-dreams](https://github.com/PJB3005/atomic-dreams) - **DNS Zone:** [sixty4k/st2-zonefile](https://github.com/sixty4k/st2-zonefile) - **Dockerfile:** [asbjornenge/Docker.tmbundle](https://github.com/asbjornenge/Docker.tmbundle) diff --git a/vendor/grammars/css.tmbundle b/vendor/grammars/css.tmbundle deleted file mode 160000 index d79e9c01..00000000 --- a/vendor/grammars/css.tmbundle +++ /dev/null @@ -1 +0,0 @@ -Subproject commit d79e9c013769386a765198f7fb0f9dce39da829b diff --git a/vendor/grammars/language-css b/vendor/grammars/language-css new file mode 160000 index 00000000..5d4af2db --- /dev/null +++ b/vendor/grammars/language-css @@ -0,0 +1 @@ +Subproject commit 5d4af2db39dc5e4236e1a954610a0fb6ba7b5cdf diff --git a/vendor/licenses/grammar/css.tmbundle.txt b/vendor/licenses/grammar/css.tmbundle.txt deleted file mode 100644 index 8a2a765f..00000000 --- a/vendor/licenses/grammar/css.tmbundle.txt +++ /dev/null @@ -1,15 +0,0 @@ ---- -type: grammar -name: css.tmbundle -license: permissive -curated: true ---- - -If not otherwise specified (see below), files in this repository fall under the following license: - - 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. - -An exception is made for files in readable text which contain their own license information, or files where an accompanying file exists (in the same directory) with a “-license” suffix added to the base-name name of the original file, and an extension of txt, html, or similar. For example “tidy” is accompanied by “tidy-license.txt”. diff --git a/vendor/licenses/grammar/language-css.txt b/vendor/licenses/grammar/language-css.txt new file mode 100644 index 00000000..42e30cd4 --- /dev/null +++ b/vendor/licenses/grammar/language-css.txt @@ -0,0 +1,36 @@ +--- +type: grammar +name: language-css +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/css.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.