GNOME.org
 

[gtksourceview] New JavaScript Object Notation lang

commit dd8663dd0caaae5b511d6702520a836be6319161
Author: admin logicplace com <admin logicplace com>
Date:   Sun Oct 9 02:13:00 2011 -0700

    New JavaScript Object Notation lang
    
    https://bugzilla.gnome.org/show_bug.cgi?id=660194

 data/language-specs/Makefile.am     |    1 +
 data/language-specs/javascript.lang |   15 +++--
 data/language-specs/json.lang       |  123 +++++++++++++++++++++++++++++++++++
 po/POTFILES.in                      |    1 +
 tests/testfiles.sh                  |   15 ++++
 5 files changed, 150 insertions(+), 5 deletions(-)
---
diff --git a/data/language-specs/Makefile.am b/data/language-specs/Makefile.am
index c3919c0..9b4c152 100644
--- a/data/language-specs/Makefile.am
+++ b/data/language-specs/Makefile.am
@@ -48,6 +48,7 @@ LANGUAGES =			\
 	ini.lang		\
 	java.lang		\
 	javascript.lang		\
+	json.lang		\
 	latex.lang		\
 	libtool.lang		\
 	lua.lang		\
diff --git a/data/language-specs/javascript.lang b/data/language-specs/javascript.lang
index b011c8a..1da8cd9 100644
--- a/data/language-specs/javascript.lang
+++ b/data/language-specs/javascript.lang
@@ -27,7 +27,7 @@
 <language id="js" _name="JavaScript" version="2.0" _section="Scripts">
   <metadata>
     <property name="mimetypes">application/javascript;application/x-javascript;text/x-javascript;text/javascript;text/x-js</property>
-    <property name="globs">*.js;*.json</property>
+    <property name="globs">*.js;*.node</property>
     <property name="line-comment-start">//</property>
     <property name="block-comment-start">/*</property>
     <property name="block-comment-end">*/</property>
@@ -37,13 +37,14 @@
     <style id="escape"          _name="Escaped Character"        map-to="def:special-char"/>
     <style id="null-value"      _name="Null Value"               map-to="def:special-constant"/>
     <style id="undefined-value" _name="Undefined Value"          map-to="def:special-constant"/>
-    <style id="boolean"         _name="Boolean value"            map-to="def:boolean"/>
+    <style id="boolean"         _name="Boolean Value"            map-to="def:boolean"/>
     <style id="keyword"         _name="Keyword"                  map-to="def:keyword"/>
     <style id="type"            _name="Data Type"                map-to="def:type"/>
     <style id="function"        _name="Function"                 map-to="def:builtin"/>
     <style id="properties"      _name="Properties"               map-to="def:statement"/>
     <style id="constructors"    _name="Constructors"             map-to="def:type"/>
     <style id="future-words"    _name="Future Reserved Keywords" map-to="def:error"/>
+    <style id="string"          _name="String"                   map-to="def:string"/>
     <style id="regex"           _name="Regular Expression"       map-to="def:string"/>
   </styles>
 
@@ -93,6 +94,11 @@
     <context id="undefined-value" style-ref="undefined-value">
       <keyword>undefined</keyword>
     </context>
+
+    <context id="null-value" style-ref="null-value">
+      <keyword>null</keyword>
+    </context>
+
     <context id="boolean" style-ref="boolean">
       <keyword>false</keyword>
       <keyword>true</keyword>
@@ -138,7 +144,6 @@
     <context id="types" style-ref="type">
       <keyword>Infinity</keyword>
       <keyword>NaN</keyword>
-      <keyword>null</keyword>
     </context>
 
     <context id="functions" style-ref="function">
@@ -309,8 +314,8 @@
         <context ref="def:c-like-comment"/>
         <context ref="def:c-like-comment-multiline"/>
         <context ref="def:c-like-close-comment-outside-comment"/>
-        <context ref="def:string"/>
-        <context ref="def:single-quoted-string"/>
+        <context ref="def:string" style-ref="string"/>
+        <context ref="def:single-quoted-string" style-ref="string"/>
         <context ref="def:float"/>
         <context ref="def:decimal"/>
         <context ref="def:octal"/>
diff --git a/data/language-specs/json.lang b/data/language-specs/json.lang
new file mode 100755
index 0000000..e8b8c69
--- /dev/null
+++ b/data/language-specs/json.lang
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ This file is part of GtkSourceView
+
+ Author: Sapphire Becker <guess logicplace com>
+ Copyright (C) 2011 by Sapphire Becker <guess logicplace com>
+
+ GtkSourceView is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ GtkSourceView is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+-->
+<!--
+ TODO:
+  If once-only or end-parent is ever supported for context-reference and
+  context-to-be-included elements this can be updated to allow only one
+  value in the doc, after a key, and between each comma in an array. Also
+  I'd be able to add support for displaying an error for trailing commas.
+-->
+<language id="json" name="JSON" version="2.0" _section="Others">
+  <metadata>
+    <property name="globs">*.json</property>
+  </metadata>
+
+  <styles>
+    <style id="keyname"       _name="Key"                   map-to="def:constant"/>
+    <style id="special-char"  _name="Escaped Character"     map-to="js:escape"/>
+    <style id="string"        _name="String"                map-to="js:string"/>
+    <style id="null-value"    _name="Null Value"            map-to="js:null-value"/>
+    <style id="boolean"       _name="Boolean Value"         map-to="js:boolean"/>
+    <style id="error"         _name="Error"                 map-to="def:error"/>
+    <style id="decimal"       _name="Decimal"               map-to="def:decimal"/>
+    <style id="float"         _name="Floating point number" map-to="def:floating-point"/>
+  </styles>
+
+  <definitions>
+    <context id="array">
+      <start>\[</start>
+      <end>\]</end>
+      <include>
+        <context>
+          <start></start>
+          <end>,|\s*(?=\&#93;)</end>
+            <include>
+            <context ref="value"/>
+          </include>
+        </context>
+      </include>
+    </context>
+
+    <context id="object">
+      <start>\{</start>
+      <end>\}</end>
+      <include>
+        <context ref="string" style-ref="keyname"/>
+        <context>
+          <start>:</start>
+          <end>,|\s*(?=})</end>
+          <include>
+            <context sub-pattern="0" where="start" style-ref="keyname"/>
+            <context ref="value"/>
+          </include>
+        </context>
+        <context ref="catchall"/>
+      </include>
+    </context>
+
+    <context id="string" style-ref="string" end-at-line-end="true">
+      <start>"</start>
+      <end>"</end>
+      <include>
+        <context id="valid-escape" style-ref="special-char">
+          <match>\\(?:[ntrfb"\\/]|u[0-9a-fA-F]{4})</match>
+        </context>
+        <context id="invalid-escape" style-ref="error">
+          <match>\\(?:x[0-9a-fA-F]{2}|[0-3]?[0-7]{1,2}|.)</match>
+        </context>
+        <context id="line-continue" style-ref="error">
+          <start>\\$</start>
+          <end>^</end>
+        </context>
+      </include>
+    </context>
+
+    <context id="decimal" style-ref="decimal">
+      <match>-?(?:[1-9][0-9]*|0)(?![.eE])</match>
+    </context>
+
+    <context id="float" style-ref="float">
+      <match>-?(?:[1-9][0-9]*|0)(?:\.[0-9]+)?(?:[eE][+\-]?[0-9]+)?</match>
+    </context>
+
+    <context id="catchall" style-ref="error" extend-parent="false">
+      <match>\S</match>
+    </context>
+
+    <context id="value"><include>
+      <context ref="object"/>
+      <context ref="array"/>
+      <context ref="string"/>
+      <context ref="decimal"/>
+      <context ref="float"/>
+      <context ref="js:null-value" style-ref="null-value"/>
+      <context ref="js:boolean" style-ref="boolean"/>
+      <context ref="catchall"/>
+    </include></context>
+
+    <context id="json" class="no-spell-check">
+      <include>
+        <context ref="value"/>
+      </include>
+    </context>
+  </definitions>
+</language>
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 4944d4e..3754435 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -45,6 +45,7 @@ data/language-specs/imagej.lang
 data/language-specs/ini.lang
 data/language-specs/java.lang
 data/language-specs/javascript.lang
+data/language-specs/json.lang
 data/language-specs/latex.lang
 data/language-specs/libtool.lang
 data/language-specs/lua.lang
diff --git a/tests/testfiles.sh b/tests/testfiles.sh
index c496c95..eb323a9 100755
--- a/tests/testfiles.sh
+++ b/tests/testfiles.sh
@@ -1041,3 +1041,18 @@ greptest.sh:
 
 CLEANFILES = greptest.sh
 EOFEOF
+
+cat > $dir/file.json <<EOFEOF
+{
+	"hi": -1.1e1, "b": 2,
+	"abc": "hi",
+	"dce": [
+		1.2, 2e10, -3,
+		1, 2,
+		"string"
+	],
+	"fgh": {
+		"a": 1
+	}
+}
+EOFEOF
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]