Merge pull request atom#32 from darylrobbins/json

Json Fixes
rgreenjr · May 23, 2015 · 10fb906 · 10fb906
2 parents fc6b0e7 + 7e73b9a
commit 10fb906
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 3 deletions.
diff --git a/spec/json.json b/spec/json.json
@@ -6,7 +6,19 @@
   },
   {
     "title": "oranges",
-    "count": [17500, null],
-    "description": {"text": "...", "sensitive": false}
+    "count": [17500, null, "String"],
+    "description": {"text": "She said, \"Hello\"", "sensitive": false}
+  },
+  {
+    "deeply_nested": {
+      "key": {
+        "key": {
+          "key": {
+            "array": [1, "two", null],
+            "string": "hello"
+          }
+        }
+      }
+    }
   }
 ]
diff --git a/spec/yaml.yml b/spec/yaml.yml
@@ -0,0 +1,15 @@
+root:
+  unquoted_string: lorem ipsem
+  quotwed_string: "lorem ipsum"
+  integer: 123
+  float: 3.14
+  boolean: true
+  null: null
+  list:
+    - one
+    - two
+    - three
+  map_list:
+    - one: 1
+    - two: "two"
+    - three: 3.0
diff --git a/styles/languages/json.less b/styles/languages/json.less
@@ -1,12 +1,21 @@
 .source.json {
   .meta.structure.dictionary.json {
-    & > .string.quoted.json, .punctuation.string {
+    & > .string.quoted.json {
+      & > .punctuation.string {
+        color: @red;
+      }
       color: @red;
     }
+  }
 
+  .meta.structure.dictionary.json, .meta.structure.array.json {
     & > .value.json > .string.quoted.json,
     & > .value.json > .string.quoted.json > .punctuation {
       color: @green;
     }
+
+    & > .constant.language.json {
+      color: @cyan;
+    }
   }
 }