From 302cfea2953d45ed640915efcac9938324cb6a1f Mon Sep 17 00:00:00 2001 From: William Candillon Date: Mon, 8 Jun 2015 14:32:07 +0200 Subject: [PATCH 1/4] Update languages.yml --- lib/linguist/languages.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/linguist/languages.yml b/lib/linguist/languages.yml index ba5c0103..66d22263 100644 --- a/lib/linguist/languages.yml +++ b/lib/linguist/languages.yml @@ -1508,11 +1508,12 @@ JSONLD: tm_scope: source.js JSONiq: + color: "#40d47e" type: programming ace_mode: jsoniq extensions: - .jq - tm_scope: source.xquery + tm_scope: source.jq Jade: group: HTML @@ -3554,6 +3555,7 @@ XQuery: - .xqm - .xqy ace_mode: xquery + tm_scope: source.xq XS: type: programming From e1a8b5db1d3dd65d88cd24474f0014de2cc61d84 Mon Sep 17 00:00:00 2001 From: William Candillon Date: Mon, 8 Jun 2015 14:50:28 +0200 Subject: [PATCH 2/4] :new: XQuery & JSONiq support based on the Atom language-jsoniq package --- .gitmodules | 3 +++ grammars.yml | 3 +++ vendor/grammars/language-jsoniq | 1 + 3 files changed, 7 insertions(+) create mode 160000 vendor/grammars/language-jsoniq diff --git a/.gitmodules b/.gitmodules index edb00607..93a9e1cf 100644 --- a/.gitmodules +++ b/.gitmodules @@ -644,3 +644,6 @@ [submodule "vendor/grammars/smali-sublime"] path = vendor/grammars/smali-sublime url = https://github.com/ShaneWilton/sublime-smali +[submodule "vendor/grammars/language-jsoniq"] + path = vendor/grammars/language-jsoniq + url = http://github.com/wcandillon/language-jsoniq diff --git a/grammars.yml b/grammars.yml index 21a54c67..68f6119f 100644 --- a/grammars.yml +++ b/grammars.yml @@ -320,6 +320,9 @@ vendor/grammars/language-hy: vendor/grammars/language-javascript: - source.js - source.js.regexp +vendor/grammars/language-jsoniq/: +- source.jq +- source.xq vendor/grammars/language-python: - source.python - source.regexp.python diff --git a/vendor/grammars/language-jsoniq b/vendor/grammars/language-jsoniq new file mode 160000 index 00000000..f87a3766 --- /dev/null +++ b/vendor/grammars/language-jsoniq @@ -0,0 +1 @@ +Subproject commit f87a3766dd685af013a0c22463fc5d889b5b9364 From d1ae098c088f01934203ed9e9d17622603dec862 Mon Sep 17 00:00:00 2001 From: William Candillon Date: Mon, 8 Jun 2015 15:22:32 +0200 Subject: [PATCH 3/4] :arrow_up: --- vendor/grammars/language-jsoniq | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vendor/grammars/language-jsoniq b/vendor/grammars/language-jsoniq index f87a3766..2035c70e 160000 --- a/vendor/grammars/language-jsoniq +++ b/vendor/grammars/language-jsoniq @@ -1 +1 @@ -Subproject commit f87a3766dd685af013a0c22463fc5d889b5b9364 +Subproject commit 2035c70e72972ca3329f7fbd06c7ebb7095ef60c From 753bfd1dc5d4d7ce17ab11cdf7a2c46a1763dde3 Mon Sep 17 00:00:00 2001 From: William Candillon Date: Thu, 11 Jun 2015 19:07:19 +0200 Subject: [PATCH 4/4] :arrow_up: --- vendor/grammars/language-jsoniq | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vendor/grammars/language-jsoniq b/vendor/grammars/language-jsoniq index 2035c70e..3722100f 160000 --- a/vendor/grammars/language-jsoniq +++ b/vendor/grammars/language-jsoniq @@ -1 +1 @@ -Subproject commit 2035c70e72972ca3329f7fbd06c7ebb7095ef60c +Subproject commit 3722100fe6ae09da9ba8e434d8563bd592f62351