ALS-1432: remove comments from json

mulesoft-labs · Oct 18, 2021 · 1694771 · 1694771
1 parent 1249b8d
commit 1694771
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 35 deletions.
diff --git a/aml-json-configuration.json b/aml-json-configuration.json
@@ -0,0 +1,21 @@
+{
+    "brackets": [
+        ["{", "}"],
+        ["[", "]"],
+        ["(", ")"]
+    ],
+    "autoClosingPairs": [
+        ["{", "}"],
+        ["[", "]"],
+        ["(", ")"],
+        ["\"", "\""],
+        ["'", "'"]
+    ],
+    "surroundingPairs": [
+        ["{", "}"],
+        ["[", "]"],
+        ["(", ")"],
+        ["\"", "\""],
+        ["'", "'"]
+    ]
+}
diff --git a/package.json b/package.json
@@ -30,11 +30,21 @@
                     ".raml",
                     ".aml",
                     ".yaml",
-                    ".yml",
-                    ".json"
+                    ".yml"
                 ],
                 "configuration": "./aml-configuration.json"
             },
+            {
+                "id": "aml-json",
+                "aliases": [
+                    "ALS",
+                    "als"
+                ],
+                "extensions": [
+                    ".json"
+                ],
+                "configuration": "./aml-json-configuration.json"
+            },
             {
                 "id": "oas",
                 "aliases": [
@@ -75,6 +85,11 @@
                 "language": "aml",
                 "scopeName": "source.aml",
                 "path": "./syntaxes/aml.tmLanguage.json"
+            },
+            {
+                "language": "aml-json",
+                "scopeName": "source.json",
+                "path": "./syntaxes/json.tmLanguage.json"
             }
         ],
         "keywords": [

diff --git a/syntaxes/json.tmLanguage.json b/syntaxes/json.tmLanguage.json
@@ -34,39 +34,6 @@
 				}
 			]
 		},
-		"comments": {
-			"patterns": [
-				{
-					"begin": "/\\*\\*(?!/)",
-					"captures": {
-						"0": {
-							"name": "punctuation.definition.comment.json"
-						}
-					},
-					"end": "\\*/",
-					"name": "comment.block.documentation.json"
-				},
-				{
-					"begin": "/\\*",
-					"captures": {
-						"0": {
-							"name": "punctuation.definition.comment.json"
-						}
-					},
-					"end": "\\*/",
-					"name": "comment.block.json"
-				},
-				{
-					"captures": {
-						"1": {
-							"name": "punctuation.definition.comment.json"
-						}
-					},
-					"match": "(//).*$\\n?",
-					"name": "comment.line.double-slash.js"
-				}
-			]
-		},
 		"constant": {
 			"match": "\\b(?:true|false|null)\\b",
 			"name": "constant.language.json"