From c0b3b1e2860fe74c2523f23d5e1bf3fcce6b17e3 Mon Sep 17 00:00:00 2001 From: Guillaume Brunerie Date: Thu, 9 Jan 2020 23:06:42 +0100 Subject: [PATCH] change the source of syntax highlighting for Agda --- .gitmodules | 6 ++-- grammars.yml | 4 +-- vendor/README.md | 2 +- vendor/grammars/Agda.tmbundle | 1 - .../grammars/agda-github-syntax-highlighting | 1 + vendor/licenses/grammar/Agda.tmbundle.txt | 35 ------------------- .../agda-github-syntax-highlighting.txt | 27 ++++++++++++++ 7 files changed, 34 insertions(+), 42 deletions(-) delete mode 160000 vendor/grammars/Agda.tmbundle create mode 160000 vendor/grammars/agda-github-syntax-highlighting delete mode 100644 vendor/licenses/grammar/Agda.tmbundle.txt create mode 100644 vendor/licenses/grammar/agda-github-syntax-highlighting.txt diff --git a/.gitmodules b/.gitmodules index 21ba1c93e1..2e20c393d3 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,9 +1,6 @@ [submodule "vendor/CodeMirror"] path = vendor/CodeMirror url = https://github.com/codemirror/CodeMirror -[submodule "vendor/grammars/Agda.tmbundle"] - path = vendor/grammars/Agda.tmbundle - url = https://github.com/mokus0/Agda.tmbundle [submodule "vendor/grammars/Alloy.tmbundle"] path = vendor/grammars/Alloy.tmbundle url = https://github.com/macekond/Alloy.tmbundle @@ -197,6 +194,9 @@ [submodule "vendor/grammars/ada.tmbundle"] path = vendor/grammars/ada.tmbundle url = https://github.com/textmate/ada.tmbundle +[submodule "vendor/grammars/agda-github-syntax-highlighting"] + path = vendor/grammars/agda-github-syntax-highlighting + url = https://github.com/agda/agda-github-syntax-highlighting [submodule "vendor/grammars/ampl"] path = vendor/grammars/ampl url = https://github.com/ampl/sublime-ampl diff --git a/grammars.yml b/grammars.yml index 011a7a5728..a93f45d344 100755 --- a/grammars.yml +++ b/grammars.yml @@ -3,8 +3,6 @@ https://bitbucket.org/Clams/sublimesystemverilog/get/default.tar.gz: - source.ucfconstraints https://svn.edgewall.org/repos/genshi/contrib/textmate/Genshi.tmbundle/Syntaxes/Markup%20Template%20%28XML%29.tmLanguage: - text.xml.genshi -vendor/grammars/Agda.tmbundle: -- source.agda vendor/grammars/Alloy.tmbundle: - source.alloy vendor/grammars/Assembly-Syntax-Definition: @@ -166,6 +164,8 @@ vendor/grammars/actionscript3-tmbundle/: - text.xml.flex-config vendor/grammars/ada.tmbundle: - source.ada +vendor/grammars/agda-github-syntax-highlighting: +- source.agda vendor/grammars/ampl: - source.ampl vendor/grammars/ant.tmbundle: diff --git a/vendor/README.md b/vendor/README.md index 040a8b61af..32913db805 100644 --- a/vendor/README.md +++ b/vendor/README.md @@ -18,7 +18,7 @@ This is a list of grammars that Linguist selects to provide syntax highlighting - **ActionScript:** [simongregory/actionscript3-tmbundle](https://github.com/simongregory/actionscript3-tmbundle) - **Ada:** [textmate/ada.tmbundle](https://github.com/textmate/ada.tmbundle) - **Adobe Font Metrics:** [Alhadis/language-fontforge](https://github.com/Alhadis/language-fontforge) -- **Agda:** [mokus0/Agda.tmbundle](https://github.com/mokus0/Agda.tmbundle) +- **Agda:** [agda/agda-github-syntax-highlighting](https://github.com/agda/agda-github-syntax-highlighting) - **Alloy:** [macekond/Alloy.tmbundle](https://github.com/macekond/Alloy.tmbundle) - **Alpine Abuild:** [atom/language-shellscript](https://github.com/atom/language-shellscript) - **Altium Designer:** [textmate/ini.tmbundle](https://github.com/textmate/ini.tmbundle) diff --git a/vendor/grammars/Agda.tmbundle b/vendor/grammars/Agda.tmbundle deleted file mode 160000 index 68a218c489..0000000000 --- a/vendor/grammars/Agda.tmbundle +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 68a218c489c809655f74164f83b78d359a82989a diff --git a/vendor/grammars/agda-github-syntax-highlighting b/vendor/grammars/agda-github-syntax-highlighting new file mode 160000 index 0000000000..c8e9a442dc --- /dev/null +++ b/vendor/grammars/agda-github-syntax-highlighting @@ -0,0 +1 @@ +Subproject commit c8e9a442dcdb10cc52e5d532c0e8b5a0fa1f26fc diff --git a/vendor/licenses/grammar/Agda.tmbundle.txt b/vendor/licenses/grammar/Agda.tmbundle.txt deleted file mode 100644 index 1f91ecd4b2..0000000000 --- a/vendor/licenses/grammar/Agda.tmbundle.txt +++ /dev/null @@ -1,35 +0,0 @@ ---- -type: grammar -name: Agda.tmbundle -version: 0ac22a3c6b231e620c7fa5bd8e83808d33c052ec -license: bsd-3-clause ---- -Copyright (c) 2014 James Cook -All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions -are met: - -1. Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - -2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - -3. Neither the name of the author nor the names of his contributors - may be used to endorse or promote products derived from this software - without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``AS IS'' AND ANY EXPRESS OR -IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -DISCLAIMED. IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE LIABLE FOR -ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS -OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, -STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN -ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -POSSIBILITY OF SUCH DAMAGE. \ No newline at end of file diff --git a/vendor/licenses/grammar/agda-github-syntax-highlighting.txt b/vendor/licenses/grammar/agda-github-syntax-highlighting.txt new file mode 100644 index 0000000000..2297f6296f --- /dev/null +++ b/vendor/licenses/grammar/agda-github-syntax-highlighting.txt @@ -0,0 +1,27 @@ +--- +type: grammar +name: agda-github-syntax-highlighting +version: c8e9a442dcdb10cc52e5d532c0e8b5a0fa1f26fc +license: mit +--- +MIT License + +Copyright (c) 2020 Agda Github Community + +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. \ No newline at end of file