From 7f3f0327c2e497921d3fd5ad1cf5554ced932e89 Mon Sep 17 00:00:00 2001 From: Simon Cooksey Date: Tue, 3 Mar 2015 12:45:08 +0000 Subject: [PATCH 1/2] Added XC syntax --- .gitmodules | 3 +++ grammars.yml | 4 ++++ lib/linguist/languages.yml | 2 +- vendor/grammars/xc.tmbundle | 1 + 4 files changed, 9 insertions(+), 1 deletion(-) create mode 160000 vendor/grammars/xc.tmbundle diff --git a/.gitmodules b/.gitmodules index 59844ad561..6990a425d7 100644 --- a/.gitmodules +++ b/.gitmodules @@ -642,3 +642,6 @@ [submodule "vendor/grammars/sublime-varnish"] path = vendor/grammars/sublime-varnish url = https://github.com/brandonwamboldt/sublime-varnish +[submodule "vendor/grammars/xc.tmbundle"] + path = vendor/grammars/xc.tmbundle + url = https://github.com/graymalkin/xc.tmbundle diff --git a/grammars.yml b/grammars.yml index 9edb205c4d..695dbd44ac 100644 --- a/grammars.yml +++ b/grammars.yml @@ -530,6 +530,10 @@ vendor/grammars/verilog.tmbundle: - source.verilog vendor/grammars/x86-assembly-textmate-bundle: - source.asm.x86 +vendor/grammars/xc.tmbundle/: +- source.c +- source.c.platform +- source.xc vendor/grammars/xml.tmbundle: - text.xml - text.xml.xsl diff --git a/lib/linguist/languages.yml b/lib/linguist/languages.yml index 70d52869f8..6c6f0a6558 100644 --- a/lib/linguist/languages.yml +++ b/lib/linguist/languages.yml @@ -3237,7 +3237,7 @@ XC: color: "#99DA07" extensions: - .xc - tm_scope: source.c + tm_scope: source.xc ace_mode: c_cpp XML: diff --git a/vendor/grammars/xc.tmbundle b/vendor/grammars/xc.tmbundle new file mode 160000 index 0000000000..83a61a2630 --- /dev/null +++ b/vendor/grammars/xc.tmbundle @@ -0,0 +1 @@ +Subproject commit 83a61a26308208ee95354965fe023954c11b6e30 From 3a56d632e1456301424d6955842b8f5a22229f52 Mon Sep 17 00:00:00 2001 From: Simon Cooksey Date: Tue, 3 Mar 2015 13:02:58 +0000 Subject: [PATCH 2/2] Fixed build by removing duplicate C syntax definition --- grammars.yml | 2 -- vendor/grammars/xc.tmbundle | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/grammars.yml b/grammars.yml index 695dbd44ac..048f7da8ca 100644 --- a/grammars.yml +++ b/grammars.yml @@ -531,8 +531,6 @@ vendor/grammars/verilog.tmbundle: vendor/grammars/x86-assembly-textmate-bundle: - source.asm.x86 vendor/grammars/xc.tmbundle/: -- source.c -- source.c.platform - source.xc vendor/grammars/xml.tmbundle: - text.xml diff --git a/vendor/grammars/xc.tmbundle b/vendor/grammars/xc.tmbundle index 83a61a2630..7239c92bd6 160000 --- a/vendor/grammars/xc.tmbundle +++ b/vendor/grammars/xc.tmbundle @@ -1 +1 @@ -Subproject commit 83a61a26308208ee95354965fe023954c11b6e30 +Subproject commit 7239c92bd612b01fc5bfea36056d530db78d6c64