Fixed s tag being marked as deprecated

ghaschel · Sep 13, 2019 · 28be961 · 28be961
1 parent 5ab6910
commit 28be961
Show file tree

Hide file tree

Showing 6 changed files with 118 additions and 117 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Change Log
 
+# 1.3.1 (13/09/2019)
+
+- Fixed `s` tag being marked as deprecated [#29](https://github.com/ghaschel/vscode-angular-html/issues/29)
+
 # 1.3.0 (23/08/2019)
 
 - Fixed missing `router-outlet` to structural tags differentiation [#24](https://github.com/ghaschel/vscode-angular-html/issues/24)
@@ -9,7 +13,7 @@
 # 1.2.0 (23/08/2019)
 
 - Fixed the dom events that were being overwritted by the attributes without equal [#25](https://github.com/ghaschel/vscode-angular-html/issues/25)
-- Added `else` and `then` keywords to *ngIf directives [#23](https://github.com/ghaschel/vscode-angular-html/issues/23)
+- Added `else` and `then` keywords to \*ngIf directives [#23](https://github.com/ghaschel/vscode-angular-html/issues/23)
 - Added color differentiation for angular structural tags [#24](https://github.com/ghaschel/vscode-angular-html/issues/24)
 
 # 1.1.4 (15/08/2019)

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
   "name": "vscode-angular-html",
   "displayName": "vscode-angular-html",
   "description": "Syntax highlighting for angular HTML Template files",
-  "version": "1.3.0",
+  "version": "1.3.1",
   "publisher": "ghaschel",
   "license": "MIT",
   "repository": {

diff --git a/src/repository/tags/tag-deprecated.json5 b/src/repository/tags/tag-deprecated.json5
@@ -1,23 +1,23 @@
 {
   repository: {
-    'tag-deprecated': {
+    "tag-deprecated": {
       beginCaptures: {
-        '1': {
-          name: 'punctuation.definition.tag.begin.html'
+        "1": {
+          name: "punctuation.definition.tag.begin.html"
         },
-        '2': {
-          name: 'invalid.deprecated.tag'
+        "2": {
+          name: "invalid.deprecated.tag"
         }
       },
       endCaptures: {
-        '1': {
-          name: 'punctuation.definition.tag.end.html'
+        "1": {
+          name: "punctuation.definition.tag.end.html"
         }
       },
-      begin: '(<\\/?)(acronym|applet|basefont|big|center|dir|font|frameset|frame|isindex|noframes|strike|s|tt|u)\\b',
-      end: '(\\/?>)',
-      name: 'invalid.deprecated.tag',
-      patterns: [{ include: '#tag-stuff' }]
+      begin: "(<\\/?)(acronym|applet|basefont|big|center|dir|font|frameset|frame|isindex|noframes|strike|tt|u)\\b",
+      end: "(\\/?>)",
+      name: "invalid.deprecated.tag",
+      patterns: [{ include: "#tag-stuff" }]
     }
   }
 }
diff --git a/syntaxes/angular-html.tmLanguage.json b/syntaxes/angular-html.tmLanguage.json
@@ -281,98 +281,6 @@
             "name": "string.unquoted.html",
             "patterns": []
         },
-        "angular-directives": {
-            "captures": {
-                "3": {
-                    "name": "string.regexp"
-                },
-                "4": {
-                    "name": "constant.character.entity.html"
-                },
-                "5": {
-                    "name": "constant.numeric.angular-directive"
-                },
-                "6": {
-                    "name": "keyword.operator.entity.html"
-                },
-                "7": {
-                    "name": "constant.character.unit"
-                },
-                "8": {
-                    "name": "string.regexp"
-                },
-                "9": {
-                    "name": "constant.character.entity.html"
-                }
-            },
-            "begin": "((?:\\b(v-)|(\\*|\\#|[\\[\\(]{1,2}))(@)?([a-zA-Z0-9\\-_\\$]+)(?:[\\:\\.]([a-zA-Z0-9\\-_\\%]+))?(?:\\.([a-zA-Z0-9\\-_\\%]+))*)([\\]\\)]{1,2})?*(=)?",
-            "end": "(?<='|\")|(?=[\\s<>`])",
-            "name": "meta.directive.angular",
-            "patterns": [
-                {
-                    "beginCaptures": {
-                        "1": {
-                            "name": "string.quoted.double.html"
-                        },
-                        "2": {
-                            "name": "string.regexp"
-                        }
-                    },
-                    "patterns": [
-                        {
-                            "match": "\\?\\.|\\!\\.|\\.|\\,|\\;|\\?|\\!|\\:",
-                            "name": "keyword.operator.punctuation"
-                        },
-                        {
-                            "match": "\\blet\\b\\s",
-                            "name": "keyword.operator.expression.let.js"
-                        },
-                        {
-                            "include": "#angular-expression"
-                        }
-                    ],
-                    "begin": "(\")[\\s\\n]*(\\{)?",
-                    "endCaptures": {
-                        "1": {
-                            "name": "string.regexp"
-                        },
-                        "2": {
-                            "name": "string.quoted.double.html"
-                        }
-                    },
-                    "end": "(\\})?[\\s\\n]*(\")",
-                    "name": "source.directive.angular"
-                }
-            ]
-        },
-        "angular-interpolations": {
-            "patterns": [
-                {
-                    "beginCaptures": {
-                        "0": {
-                            "name": "string.regexp.angular-interpolation.begin"
-                        }
-                    },
-                    "patterns": [
-                        {
-                            "match": "\\?\\.|\\!\\.|\\.|\\!|\\?|\\:|\\;|\\,",
-                            "name": "keyword.operator.navigation"
-                        },
-                        {
-                            "include": "#angular-expression"
-                        }
-                    ],
-                    "begin": "\\{\\{\\{?",
-                    "endCaptures": {
-                        "0": {
-                            "name": "string.regexp.angular-interpolation.end"
-                        }
-                    },
-                    "end": "\\}\\}\\}?",
-                    "name": "expression.angular-interpolation"
-                }
-            ]
-        },
         "angular-expression": {
             "name": "meta.expression.ts",
             "patterns": [
@@ -2767,7 +2675,7 @@
                     "name": "punctuation.definition.tag.end.html"
                 }
             },
-            "begin": "(<\\/?)(acronym|applet|basefont|big|center|dir|font|frameset|frame|isindex|noframes|strike|s|tt|u)\\b",
+            "begin": "(<\\/?)(acronym|applet|basefont|big|center|dir|font|frameset|frame|isindex|noframes|strike|tt|u)\\b",
             "end": "(\\/?>)",
             "name": "invalid.deprecated.tag",
             "patterns": [
@@ -2978,6 +2886,98 @@
                     "include": "source.css.scss"
                 }
             ]
+        },
+        "angular-directives": {
+            "captures": {
+                "3": {
+                    "name": "string.regexp"
+                },
+                "4": {
+                    "name": "constant.character.entity.html"
+                },
+                "5": {
+                    "name": "constant.numeric.angular-directive"
+                },
+                "6": {
+                    "name": "keyword.operator.entity.html"
+                },
+                "7": {
+                    "name": "constant.character.unit"
+                },
+                "8": {
+                    "name": "string.regexp"
+                },
+                "9": {
+                    "name": "constant.character.entity.html"
+                }
+            },
+            "begin": "((?:\\b(v-)|(\\*|\\#|[\\[\\(]{1,2}))(@)?([a-zA-Z0-9\\-_\\$]+)(?:[\\:\\.]([a-zA-Z0-9\\-_\\%]+))?(?:\\.([a-zA-Z0-9\\-_\\%]+))*)([\\]\\)]{1,2})?*(=)?",
+            "end": "(?<='|\")|(?=[\\s<>`])",
+            "name": "meta.directive.angular",
+            "patterns": [
+                {
+                    "beginCaptures": {
+                        "1": {
+                            "name": "string.quoted.double.html"
+                        },
+                        "2": {
+                            "name": "string.regexp"
+                        }
+                    },
+                    "patterns": [
+                        {
+                            "match": "\\?\\.|\\!\\.|\\.|\\,|\\;|\\?|\\!|\\:",
+                            "name": "keyword.operator.punctuation"
+                        },
+                        {
+                            "match": "\\blet\\b\\s",
+                            "name": "keyword.operator.expression.let.js"
+                        },
+                        {
+                            "include": "#angular-expression"
+                        }
+                    ],
+                    "begin": "(\")[\\s\\n]*(\\{)?",
+                    "endCaptures": {
+                        "1": {
+                            "name": "string.regexp"
+                        },
+                        "2": {
+                            "name": "string.quoted.double.html"
+                        }
+                    },
+                    "end": "(\\})?[\\s\\n]*(\")",
+                    "name": "source.directive.angular"
+                }
+            ]
+        },
+        "angular-interpolations": {
+            "patterns": [
+                {
+                    "beginCaptures": {
+                        "0": {
+                            "name": "string.regexp.angular-interpolation.begin"
+                        }
+                    },
+                    "patterns": [
+                        {
+                            "match": "\\?\\.|\\!\\.|\\.|\\!|\\?|\\:|\\;|\\,",
+                            "name": "keyword.operator.navigation"
+                        },
+                        {
+                            "include": "#angular-expression"
+                        }
+                    ],
+                    "begin": "\\{\\{\\{?",
+                    "endCaptures": {
+                        "0": {
+                            "name": "string.regexp.angular-interpolation.end"
+                        }
+                    },
+                    "end": "\\}\\}\\}?",
+                    "name": "expression.angular-interpolation"
+                }
+            ]
         }
     }
 }
diff --git a/test/test.component.html b/test/test.component.html
@@ -1,7 +1,8 @@
 DOCTYPE
 
 <!DOCTYPE html>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!DOCTYPE HTML
+          PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 
 COMMENTS
 
@@ -230,13 +231,12 @@ <h6 align=""></h6>
 
 <router-outlet></router-outlet>
 
-<div * test=""></div>
+<div *
+     test=""></div>
 
-<input 
-      type="text"
+<input type="text"
        #color
-       placeholder="Hex color value"
->
+       placeholder="Hex color value">
 <button (click)="printValue(color.value)">
   Show color
 </button>
@@ -307,8 +307,6 @@ <h6 align=""></h6>
 
 </noframes>
 
-<s class=""></s>
-
 <strike class="ste">teste testestestestes </strike>
 
 <tt> </tt>
@@ -445,8 +443,7 @@ <h6 align=""></h6>
 
 GENERIC ATTRIBUTES
 
-<div 
-     class="test"
+<div class="test"
      id="test"
      aria-label="test"
      no-value