We are now only matching templates immediately closing (e.g. <template>)

- Everyone can use the word 'template' in custom blocks now - Fixes #1088
vuejs · Feb 14, 2019 · f2326d4 · f2326d4
1 parent ea3cce5
commit f2326d4
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/syntaxes/vue-generated.json b/syntaxes/vue-generated.json
@@ -205,7 +205,7 @@
       ]
     },
     {
-      "begin": "(<)(template)(?![^/>]*/>\\s*$)",
+      "begin": "(<)(template)(?=>\\s*$)",
       "beginCaptures": {
         "1": {
           "name": "punctuation.definition.tag.begin.html"
@@ -214,7 +214,7 @@
           "name": "entity.name.tag.template.html"
         }
       },
-      "end": "(</)(template)(>)",
+      "end": "(<\\/)(template)(>)",
       "endCaptures": {
         "1": {
           "name": "punctuation.definition.tag.begin.html"

diff --git a/syntaxes/vue.tmLanguage.json b/syntaxes/vue.tmLanguage.json
@@ -205,7 +205,7 @@
       ]
     },
     {
-      "begin": "(<)(template)(?![^/>]*/>\\s*$)",
+      "begin": "(<)(template)(?=>\\s*$)",
       "beginCaptures": {
         "1": {
           "name": "punctuation.definition.tag.begin.html"
@@ -214,7 +214,7 @@
           "name": "entity.name.tag.template.html"
         }
       },
-      "end": "(</)(template)(>)",
+      "end": "(<\\/)(template)(>)",
       "endCaptures": {
         "1": {
           "name": "punctuation.definition.tag.begin.html"

diff --git a/syntaxes/vue.yaml b/syntaxes/vue.yaml
@@ -102,11 +102,11 @@ patterns:
           - include: text.pug.slm
 
   # html
-  - begin: (<)(template)(?![^/>]*/>\s*$)
+  - begin: (<)(template)(?=>\s*$)
     beginCaptures:
       '1': { name: punctuation.definition.tag.begin.html }
       '2': { name: entity.name.tag.template.html }
-    end: (</)(template)(>)
+    end: (<\/)(template)(>)
     endCaptures:
       '1': { name: punctuation.definition.tag.begin.html }
       '2': { name: entity.name.tag.template.html }