From e72347fd9840effa7aa7d153afdb10a7d8fbdec1 Mon Sep 17 00:00:00 2001 From: Karl Pettersson Date: Tue, 14 Mar 2017 00:59:35 +0100 Subject: [PATCH 1/3] Add alias for pandoc (#3493) --- lib/linguist/languages.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/linguist/languages.yml b/lib/linguist/languages.yml index 15211f6f..9d6e984c 100755 --- a/lib/linguist/languages.yml +++ b/lib/linguist/languages.yml @@ -2456,6 +2456,8 @@ Mako: language_id: 221 Markdown: type: prose + aliases: + - pandoc ace_mode: markdown codemirror_mode: gfm codemirror_mime_type: text/x-gfm From d57aa37fb7745685c14e8ec35496fca47ef127b5 Mon Sep 17 00:00:00 2001 From: Paul Chaignon Date: Tue, 14 Mar 2017 01:00:27 +0100 Subject: [PATCH 2/3] Grammar for OpenSCAD from Textmate bundle (#3502) --- .gitmodules | 3 +++ grammars.yml | 2 ++ lib/linguist/languages.yml | 2 +- vendor/README.md | 1 + vendor/grammars/openscad.tmbundle | 1 + vendor/licenses/grammar/openscad.tmbundle.txt | 25 +++++++++++++++++++ 6 files changed, 33 insertions(+), 1 deletion(-) create mode 160000 vendor/grammars/openscad.tmbundle create mode 100644 vendor/licenses/grammar/openscad.tmbundle.txt diff --git a/.gitmodules b/.gitmodules index 2e8110c7..8ba30b38 100644 --- a/.gitmodules +++ b/.gitmodules @@ -833,3 +833,6 @@ [submodule "vendor/grammars/language-jison"] path = vendor/grammars/language-jison url = https://github.com/cdibbs/language-jison +[submodule "vendor/grammars/openscad.tmbundle"] + path = vendor/grammars/openscad.tmbundle + url = https://github.com/tbuser/openscad.tmbundle diff --git a/grammars.yml b/grammars.yml index 256597c2..88ccc6ae 100755 --- a/grammars.yml +++ b/grammars.yml @@ -526,6 +526,8 @@ vendor/grammars/ooc.tmbundle: - source.ooc vendor/grammars/opa.tmbundle: - source.opa +vendor/grammars/openscad.tmbundle: +- source.scad vendor/grammars/oz-tmbundle/Syntaxes/Oz.tmLanguage: - source.oz vendor/grammars/parrot: diff --git a/lib/linguist/languages.yml b/lib/linguist/languages.yml index 9d6e984c..70dd650f 100755 --- a/lib/linguist/languages.yml +++ b/lib/linguist/languages.yml @@ -2932,7 +2932,7 @@ OpenSCAD: type: programming extensions: - ".scad" - tm_scope: none + tm_scope: source.scad ace_mode: scad language_id: 266 OpenType Feature File: diff --git a/vendor/README.md b/vendor/README.md index 453127b3..13819bac 100644 --- a/vendor/README.md +++ b/vendor/README.md @@ -239,6 +239,7 @@ This is a list of grammars that Linguist selects to provide syntax highlighting - **OpenCL:** [textmate/c.tmbundle](https://github.com/textmate/c.tmbundle) - **OpenEdge ABL:** [jfairbank/Sublime-Text-2-OpenEdge-ABL](https://github.com/jfairbank/Sublime-Text-2-OpenEdge-ABL) - **OpenRC runscript:** [atom/language-shellscript](https://github.com/atom/language-shellscript) +- **OpenSCAD:** [tbuser/openscad.tmbundle](https://github.com/tbuser/openscad.tmbundle) - **OpenType Feature File:** [Alhadis/language-fontforge](https://github.com/Alhadis/language-fontforge) - **Ox:** [andreashetland/sublime-text-ox](https://github.com/andreashetland/sublime-text-ox) - **Oz:** [eregon/oz-tmbundle](https://github.com/eregon/oz-tmbundle) diff --git a/vendor/grammars/openscad.tmbundle b/vendor/grammars/openscad.tmbundle new file mode 160000 index 00000000..87fae5d4 --- /dev/null +++ b/vendor/grammars/openscad.tmbundle @@ -0,0 +1 @@ +Subproject commit 87fae5d44058748b815c1bf070ab02fe5ad4f57e diff --git a/vendor/licenses/grammar/openscad.tmbundle.txt b/vendor/licenses/grammar/openscad.tmbundle.txt new file mode 100644 index 00000000..466bbdc2 --- /dev/null +++ b/vendor/licenses/grammar/openscad.tmbundle.txt @@ -0,0 +1,25 @@ +--- +type: grammar +name: openscad.tmbundle +license: mit +--- +Copyright (c) 2017 Tony Buser + +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. From 66018640846b038d1f6f452b8b62b7a2b5868f8d Mon Sep 17 00:00:00 2001 From: NN Date: Tue, 14 Mar 2017 02:01:58 +0200 Subject: [PATCH 3/3] Add wixproj as XML (#3511) * Add wixproj as XML WiX uses wixproj for projects. * Add wixproj sample --- lib/linguist/languages.yml | 1 + samples/XML/wixdemo.wixproj | 25 +++++++++++++++++++++++++ 2 files changed, 26 insertions(+) create mode 100644 samples/XML/wixdemo.wixproj diff --git a/lib/linguist/languages.yml b/lib/linguist/languages.yml index 70dd650f..eed7334b 100755 --- a/lib/linguist/languages.yml +++ b/lib/linguist/languages.yml @@ -4732,6 +4732,7 @@ XML: - ".vcxproj" - ".vssettings" - ".vxml" + - ".wixproj" - ".wsdl" - ".wsf" - ".wxi" diff --git a/samples/XML/wixdemo.wixproj b/samples/XML/wixdemo.wixproj new file mode 100644 index 00000000..325f9a50 --- /dev/null +++ b/samples/XML/wixdemo.wixproj @@ -0,0 +1,25 @@ + + + Debug + x86 + 3.0 + {c523055d-a9d0-4318-ae85-ec934d33204b} + 2.0 + WixProject1 + Package + $(MSBuildExtensionsPath)\Microsoft\WiX\v[[Version.Major]].x\Wix.targets + + + bin\$(Configuration)\ + obj\$(Configuration)\ + Debug + + + bin\$(Configuration)\ + obj\$(Configuration)\ + + + + + + \ No newline at end of file