feat: remove abell v1 highlights

abelljs · May 25, 2022 · 38fa57a · 38fa57a
1 parent e7f822c
commit 38fa57a
Show file tree

Hide file tree

Showing 5 changed files with 92 additions and 172 deletions.
diff --git a/language-configuration.json b/language-configuration.json
@@ -13,8 +13,6 @@
     ],
     // symbols that are auto closed when typing
     "autoClosingPairs": [
-        ["<AbellComponent>", "\n</AbellComponent>"],
-        ["<template>", "\n</template>"],
         ["{", "}"],
         ["[", "]"],
         ["(", ")"],

diff --git a/package.json b/package.json
@@ -1,95 +1,95 @@
 {
-    "name": "abell-language-features",
-    "displayName": "Abell Language Features",
-    "description": "Syntax Highlighting for .abell files to help you make static sites even faster",
-    "version": "0.1.1",
-    "publisher": "saurabh",
-    "author": {
-        "name": "saurabhdaware"
-    },
-    "icon": "images/logo-512.png",
-    "galleryBanner": {
-        "color": "#f9f9f9"
-    },
-    "license": "MIT",
-    "repository": {
-        "type": "git",
-        "url": "https://github.com/abelljs/vscode-abell-language-features.git"
-    },
-    "homepage": "https://github.com/abelljs/vscode-abell-language-features/blob/main/README.md",
-    "bugs": {
-        "url": "https://github.com/abelljs/vscode-abell-language-features/issues",
-        "email": "[email protected]"
-    },
-    "engines": {
-        "vscode": "^1.44.0"
-    },
-    "categories": [
-        "Programming Languages",
-        "Snippets"
-    ],
-    "activationEvents": [
-        "onLanguage:abell"
-    ],
-    "main": "./client/out/extension",
-    "contributes": {
-        "languages": [
-            {
-                "id": "abell",
-                "aliases": [
-                    "Abell",
-                    "abell"
-                ],
-                "extensions": [
-                    ".abell"
-                ],
-                "configuration": "./language-configuration.json"
-            }
+  "name": "abell-language-features",
+  "displayName": "Abell Language Features",
+  "description": "Syntax Highlighting for .abell files to help you make static sites even faster",
+  "version": "0.1.1",
+  "publisher": "saurabh",
+  "author": {
+    "name": "saurabhdaware"
+  },
+  "icon": "images/logo-512.png",
+  "galleryBanner": {
+    "color": "#f9f9f9"
+  },
+  "license": "MIT",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/abelljs/vscode-abell-language-features.git"
+  },
+  "homepage": "https://github.com/abelljs/vscode-abell-language-features/blob/main/README.md",
+  "bugs": {
+    "url": "https://github.com/abelljs/vscode-abell-language-features/issues",
+    "email": "[email protected]"
+  },
+  "engines": {
+    "vscode": "^1.44.0"
+  },
+  "categories": [
+    "Programming Languages",
+    "Snippets"
+  ],
+  "activationEvents": [
+    "onLanguage:abell"
+  ],
+  "main": "./client/out/extension",
+  "contributes": {
+    "languages": [
+      {
+        "id": "abell",
+        "aliases": [
+          "Abell",
+          "abell"
         ],
-        "grammars": [
-            {
-                "path": "./syntaxes/html-injections.json",
-                "scopeName": "abell-in-html.injection",
-                "injectTo": [
-                    "source.abell"
-                ]
-            },
-            {
-                "path": "./syntaxes/js-injections.json",
-                "scopeName": "html-in-js.injection",
-                "injectTo": [
-                    "source.abell"
-                ]
-            },
-            {
-                "language": "abell",
-                "scopeName": "source.abell",
-                "path": "./syntaxes/abell.tmLanguage.json",
-                "embeddedLanguages": {
-                    "meta.embedded.block.javascript": "javascript"
-                }
-            }
+        "extensions": [
+          ".abell"
         ],
-        "snippets": [
-            {
-                "language": "abell",
-                "path": "./snippets/snippets.json"
-            }
+        "configuration": "./language-configuration.json"
+      }
+    ],
+    "grammars": [
+      {
+        "path": "./syntaxes/html-injections.json",
+        "scopeName": "abell-in-html.injection",
+        "injectTo": [
+          "source.abell"
         ]
-    },
-    "scripts": {
-        "vscode:prepublish": "cd client && npm install && cd .. && npm run compile",
-        "compile": "tsc -b",
-        "watch": "tsc -b -w",
-        "postinstall": "cd client && npm install && cd ../server && npm install && cd ..",
-        "test": "sh ./scripts/e2e.sh"
-    },
-    "devDependencies": {
-        "@types/mocha": "^5.2.7",
-        "@types/node": "^12.12.0",
-        "@typescript-eslint/eslint-plugin": "^3.0.2",
-        "@typescript-eslint/parser": "^3.0.2",
-        "eslint": "^7.1.0",
-        "typescript": "^3.9.4"
-    }
+      },
+      {
+        "path": "./syntaxes/js-injections.json",
+        "scopeName": "html-in-js.injection",
+        "injectTo": [
+          "source.abell"
+        ]
+      },
+      {
+        "language": "abell",
+        "scopeName": "source.abell",
+        "path": "./syntaxes/abell.tmLanguage.json",
+        "embeddedLanguages": {
+          "meta.embedded.block.javascript": "javascript"
+        }
+      }
+    ],
+    "snippets": [
+      {
+        "language": "abell",
+        "path": "./snippets/snippets.json"
+      }
+    ]
+  },
+  "scripts": {
+    "vscode:prepublish": "cd client && npm install && cd .. && npm run compile",
+    "compile": "tsc -b",
+    "watch": "tsc -b -w",
+    "postinstall": "cd client && npm install && cd ../server && npm install && cd ..",
+    "test": "sh ./scripts/e2e.sh"
+  },
+  "devDependencies": {
+    "@types/mocha": "^5.2.7",
+    "@types/node": "^12.12.0",
+    "@typescript-eslint/eslint-plugin": "^3.0.2",
+    "@typescript-eslint/parser": "^3.0.2",
+    "eslint": "^7.1.0",
+    "typescript": "^3.9.4"
+  }
 }
diff --git a/snippets/snippets.json b/snippets/snippets.json
@@ -5,12 +5,5 @@
       "<html>\n<body>\n  {{ $1 }}\n</body>\n</html>"
     ],
     "description": "Start HTML page with Abell Template"
-  },
-  "Abell Component": {
-    "prefix": "component",
-    "body":[
-      "<AbellComponent>\n<template>\n  $1\n</template>\n<style>\n  $2\n</style>\n<script>\n  $3\n</script>\n</AbellComponent>"
-    ],
-    "description": "Start Abell Component"
   }
 }
diff --git a/syntaxes/abell.tmLanguage.json b/syntaxes/abell.tmLanguage.json
@@ -3,12 +3,6 @@
 	"name": "Abell",
 	"scopeName": "source.abell",
 	"patterns": [
-		{
-			"include": "#dynamic-markdown"
-		},
-		{
-			"include": "#highlight-components"
-		},
 		{
 			"include": "text.html.basic"
 		},
@@ -17,71 +11,6 @@
 		}
 	],
 	"repository": {
-		"dynamic-markdown": {
-			"begin": "<(AbellMarkdown)>",
-			"end": "</(AbellMarkdown)>",
-			"beginCaptures": {
-				"0": {
-					"name": "punctuation.definition.tag.begin.html"
-				},
-				"1": {
-					"name": "support.class"
-				},
-				"2": {
-					"name": "punctuation.definition.tag.end.html"
-				}
-			},
-			"endCaptures": {
-				"0": {
-					"name": "punctuation.definition.tag.begin.html"
-				},
-				"1": {
-					"name": "support.class"
-				},
-				"2": {
-					"name": "punctuation.definition.tag.end.html"
-				}
-			},
-			"patterns": [
-				{
-					"include": "$self"
-				},
-				{
-					"include": "text.html.markdown"
-				}
-			]
-		},
-		"highlight-components": {
-			"begin": "</?([A-Z][A-Za-z]* ?)",
-			"end": "/?>",
-			"beginCaptures": {
-				"0": {
-					"name": "punctuation.definition.tag.begin.html"
-				},
-				"1": {
-					"name": "support.class"
-				}
-			},
-			"endCaptures": {
-				"0": {
-					"name": "punctuation.definition.tag.end.html"
-				}
-			},
-			"contentName": "components.abell",
-			"patterns": [
-				{
-					"match": "props",
-					"name": "entity.other.attribute-name"
-				},
-				{
-					"match": "=",
-					"name": "punctuation.separator.key-value.html"
-				},
-				{
-					"include": "source.js"
-				}
-			]
-		},
 		"highlight-abell-block": {
 			"begin": "(?<!\\\\){{",
 			"end": "}}",

diff --git a/syntaxes/html-injections.json b/syntaxes/html-injections.json
@@ -3,14 +3,14 @@
   "injectionSelector": "L:string.quoted.double.html, L:string.quoted.single.html, L:source.css",
   "patterns": [
     {
-      "include": "#highlight-abell-block"
+      "include": "#highlight-abell-block-in-html"
     },
     {
       "include": "#highlight-js-literal"
     }
   ],
   "repository": {
-    "highlight-abell-block": {
+    "highlight-abell-block-in-html": {
       "begin": "(?<!\\\\){{",
       "end": "}}",
       "beginCaptures": {