[HTML5] Change scopes to make debugging easier.

completition/html5/instruction.sublime-completions

@@ -11,7 +11,7 @@
     // License for the specific language governing permissions and limitations under
     // the License.
 
-    "scope": "text.html.5 - comment",
+    "scope": "text.html.html5 - comment",
     "completions": [
         {
             "trigger": "cdata",

snippets/html5/basic.sublime-snippet

@@ -12,7 +12,7 @@
  | the License.
 -->
 <snippet>
-    <scope>text.html.5</scope>
+    <scope>text.html.html5</scope>
     <tabTrigger>html5</tabTrigger>
     <description>HTML 5 basic page.</description>
     <content><![CDATA[

syntaxes/html5/attribute/normal.sublime-syntax

@@ -27,7 +27,7 @@ contexts:
     - match: |
         (?xi)
         {{commonIdentifier}}
-      scope: entity.name.attribute.html.5
+      scope: entity.name.attribute.html.html5
       set: value
 
   value:

syntaxes/html5/attribute/support/global.sublime-syntax

@@ -37,15 +37,15 @@ contexts:
             )
         )
       scope: >-
-        support.attribute.html.5
-        entity.name.attribute.html.5
+        support.attribute.html.html5
+        entity.name.attribute.html.html5
       set: value
 
   boolean:
     - match: hidden
       scope: >-
-        support.attribute.html.5
-        entity.name.attribute.html.5
+        support.attribute.html.html5
+        entity.name.attribute.html.html5
       pop: true
 
   value:

syntaxes/html5/attribute/value.sublime-syntax

@@ -20,7 +20,7 @@ scope: ...
 contexts:
   main:
     - match: \=
-      scope: operator.assignment.html.5
+      scope: operator.assignment.html.html5
       set: value
     - match: (?=\S)
       pop: true

syntaxes/html5/element/cdata.sublime-syntax

@@ -21,15 +21,15 @@ contexts:
   main:
     - match: (<!\[)(CDATA)(\[)
       captures:
-        0: tag.cdata.html.5
-        1: punctuation.delimiter.tag.begin.html.5
-        2: entity.name.tag.cdata.html.5
-        3: punctuation.delimiter.tag.begin.html.5
+        0: tag.cdata.html.html5
+        1: punctuation.delimiter.tag.begin.html.html5
+        2: entity.name.tag.cdata.html.html5
+        3: punctuation.delimiter.tag.begin.html.html5
       set: content
 
   content:
     - match: \]\]\>
       scope: >-
-        tag.cdata.html.5
-        punctuation.delimiter.tag.end.html.5
+        tag.cdata.html.html5
+        punctuation.delimiter.tag.end.html.html5
       pop: true

syntaxes/html5/element/comment.sublime-syntax

@@ -22,11 +22,11 @@ contexts:
     - match: |
         (?xi)
         <!--
-      scope: punctuation.comment.block.begin.html.5
+      scope: punctuation.comment.block.begin.html.html5
       set: comment
 
   comment:
-    - meta_scope: comment.block.html.5
+    - meta_scope: comment.block.html.html5
     - match: -->
-      scope: punctuation.comment.block.end.html.5
+      scope: punctuation.comment.block.end.html.html5
       pop: true

syntaxes/html5/element/doctype.sublime-syntax

@@ -21,8 +21,8 @@ contexts:
   main:
     - match: (?i)(<!)(DOCTYPE) html(>)
       captures:
-        0: tag.doctype.html.5
-        1: punctuation.delimiter.tag.begin.html.5
-        2: entity.name.tag.doctype.html.5
-        3: punctuation.delimiter.tag.end.html.5
+        0: tag.doctype.html.html5
+        1: punctuation.delimiter.tag.begin.html.html5
+        2: entity.name.tag.doctype.html.html5
+        3: punctuation.delimiter.tag.end.html.html5
       pop: true

syntaxes/html5/element/embedded.sublime-syntax

@@ -32,9 +32,9 @@ contexts:
           )
         )\b
       captures:
-        0: tag.open.embedded.html.5
-        1: punctuation.delimiter.tag.begin.html.5
-        2: entity.name.tag.embedded.html.5
+        0: tag.open.embedded.html.html5
+        1: punctuation.delimiter.tag.begin.html.html5
+        2: entity.name.tag.embedded.html.html5
       set: attributes
 
   other-elements:
@@ -52,9 +52,9 @@ contexts:
           )
         )\b
       captures:
-        0: tag.open.embedded.html.5
-        1: punctuation.delimiter.tag.begin.html.5
-        2: entity.name.tag.embedded.html.5
+        0: tag.open.embedded.html.html5
+        1: punctuation.delimiter.tag.begin.html.html5
+        2: entity.name.tag.embedded.html.html5
       set: [
         content,
         attributes
@@ -63,8 +63,8 @@ contexts:
   attributes:
     - match: \>
       scope: >-
-        tag.open.embedded.html.5
-        punctuation.delimiter.tag.end.html.5
+        tag.open.embedded.html.html5
+        punctuation.delimiter.tag.end.html.html5
       pop: true
     - include: Packages/Naomi/syntaxes/html5/attribute.no-pop.sublime-syntax
 
@@ -73,9 +73,9 @@ contexts:
         (?x)
         (</)(\2)(>)
       captures:
-        0: tag.close.embedded.html.5
-        1: punctuation.delimiter.tag.begin.html.5
-        2: entity.name.tag.embedded.html.5
-        3: punctuation.delimiter.tag.end.html.5
+        0: tag.close.embedded.html.html5
+        1: punctuation.delimiter.tag.begin.html.html5
+        2: entity.name.tag.embedded.html.html5
+        3: punctuation.delimiter.tag.end.html.html5
       pop: true
     - include: Packages/Naomi/syntaxes/html5/element.no-pop.sublime-syntax

syntaxes/html5/element/fjsx15-script.sublime-syntax

@@ -29,9 +29,9 @@ contexts:
           \s*"text/babel"
         )
       captures:
-        0: tag.open.other.html.5
-        1: punctuation.delimiter.tag.begin.html.5
-        2: entity.name.tag.other.html.5
+        0: tag.open.other.html.html5
+        1: punctuation.delimiter.tag.begin.html.html5
+        2: entity.name.tag.other.html.html5
       set: [
         embedded-fjsx15,
         attributes
@@ -42,10 +42,10 @@ contexts:
         (?x)
         (</)(\2)(>)
       captures:
-        0: tag.close.other.html.5
-        1: punctuation.delimiter.tag.begin.html.5
-        2: entity.name.tag.other.html.5
-        3: punctuation.delimiter.tag.end.html.5
+        0: tag.close.other.html.html5
+        1: punctuation.delimiter.tag.begin.html.html5
+        2: entity.name.tag.other.html.html5
+        3: punctuation.delimiter.tag.end.html.html5
       pop: true
     - match: (?=\S)
       push:
@@ -57,7 +57,7 @@ contexts:
   attributes:
     - match: \>
       scope: >-
-        tag.open.other.html.5
-        punctuation.delimiter.tag.end.html.5
+        tag.open.other.html.html5
+        punctuation.delimiter.tag.end.html.html5
       pop: true
     - include: Packages/Naomi/syntaxes/html5/attribute.no-pop.sublime-syntax

syntaxes/html5/element/form.sublime-syntax

@@ -25,9 +25,9 @@ contexts:
   void-elements:
     - match: (<)(input)\b
       captures:
-        0: tag.open.form.html.5
-        1: punctuation.delimiter.tag.begin.html.5
-        2: entity.name.tag.form.html.5
+        0: tag.open.form.html.html5
+        1: punctuation.delimiter.tag.begin.html.html5
+        2: entity.name.tag.form.html.html5
       set: attributes
 
   other-elements:
@@ -47,9 +47,9 @@ contexts:
           )
         )\b
       captures:
-        0: tag.open.form.html.5
-        1: punctuation.delimiter.tag.begin.html.5
-        2: entity.name.tag.form.html.5
+        0: tag.open.form.html.html5
+        1: punctuation.delimiter.tag.begin.html.html5
+        2: entity.name.tag.form.html.html5
       set: [
         content,
         attributes
@@ -58,8 +58,8 @@ contexts:
   attributes:
     - match: \>
       scope: >-
-        tag.open.form.html.5
-        punctuation.delimiter.tag.end.html.5
+        tag.open.form.html.html5
+        punctuation.delimiter.tag.end.html.html5
       pop: true
     - include: Packages/Naomi/syntaxes/html5/attribute.no-pop.sublime-syntax
 
@@ -68,9 +68,9 @@ contexts:
         (?x)
         (</)(\2)(>)
       captures:
-        0: tag.close.form.html.5
-        1: punctuation.delimiter.tag.begin.html.5
-        2: entity.name.tag.form.html.5
-        3: punctuation.delimiter.tag.end.html.5
+        0: tag.close.form.html.html5
+        1: punctuation.delimiter.tag.begin.html.html5
+        2: entity.name.tag.form.html.html5
+        3: punctuation.delimiter.tag.end.html.html5
       pop: true
     - include: Packages/Naomi/syntaxes/html5/element.no-pop.sublime-syntax

syntaxes/html5/element/head.sublime-syntax

@@ -23,9 +23,9 @@ contexts:
         (?xi)
         (<)(head)\b
       captures:
-        0: tag.open.head.html.5
-        1: punctuation.delimiter.tag.begin.html.5
-        2: entity.name.tag.head.html.5
+        0: tag.open.head.html.html5
+        1: punctuation.delimiter.tag.begin.html.html5
+        2: entity.name.tag.head.html.html5
       set: [
         content,
         attributes
@@ -34,8 +34,8 @@ contexts:
   attributes:
     - match: \>
       scope: >-
-        tag.open.head.html.5
-        punctuation.delimiter.tag.end.html.5
+        tag.open.head.html.html5
+        punctuation.delimiter.tag.end.html.html5
       pop: true
     - include: Packages/Naomi/syntaxes/html5/attribute.no-pop.sublime-syntax
 
@@ -44,9 +44,9 @@ contexts:
         (?xi)
         (</)(\2)(>)
       captures:
-        0: tag.close.head.html.5
-        1: punctuation.delimiter.tag.begin.html.5
-        2: entity.name.tag.head.html.5
-        3: punctuation.delimiter.tag.end.html.5
+        0: tag.close.head.html.html5
+        1: punctuation.delimiter.tag.begin.html.html5
+        2: entity.name.tag.head.html.html5
+        3: punctuation.delimiter.tag.end.html.html5
       pop: true
     - include: Packages/Naomi/syntaxes/html5/element.no-pop.sublime-syntax

syntaxes/html5/element/html.sublime-syntax

@@ -23,9 +23,9 @@ contexts:
         (?xi)
         (<)(html)\b
       captures:
-        0: tag.open.root.html.5
-        1: punctuation.delimiter.tag.begin.html.5
-        2: entity.name.tag.root.html.5
+        0: tag.open.root.html.html5
+        1: punctuation.delimiter.tag.begin.html.html5
+        2: entity.name.tag.root.html.html5
       set: [
         content,
         attributes
@@ -34,8 +34,8 @@ contexts:
   attributes:
     - match: \>
       scope: >-
-        tag.open.root.html.5
-        punctuation.delimiter.tag.end.html.5
+        tag.open.root.html.html5
+        punctuation.delimiter.tag.end.html.html5
       pop: true
     - include: Packages/Naomi/syntaxes/html5/attribute.no-pop.sublime-syntax
 
@@ -44,9 +44,9 @@ contexts:
         (?xi)
         (</)(\2)(>)
       captures:
-        0: tag.close.root.html.5
-        1: punctuation.delimiter.tag.begin.html.5
-        2: entity.name.tag.root.html.5
-        3: punctuation.delimiter.tag.end.html.5
+        0: tag.close.root.html.html5
+        1: punctuation.delimiter.tag.begin.html.html5
+        2: entity.name.tag.root.html.html5
+        3: punctuation.delimiter.tag.end.html.html5
       pop: true
     - include: Packages/Naomi/syntaxes/html5/element.no-pop.sublime-syntax

syntaxes/html5/element/other.sublime-syntax

@@ -44,8 +44,8 @@ contexts:
           )
         )\b
       captures:
-        1: punctuation.delimiter.tag.begin.html.5
-        2: entity.name.tag.other.html.5
+        1: punctuation.delimiter.tag.begin.html.html5
+        2: entity.name.tag.other.html.html5
       set: attributes
 
   other-elements:
@@ -139,8 +139,8 @@ contexts:
           )
         )\b
       captures:
-        1: punctuation.delimiter.tag.begin.html.5
-        2: entity.name.tag.other.html.5
+        1: punctuation.delimiter.tag.begin.html.html5
+        2: entity.name.tag.other.html.html5
       set: [
         content,
         attributes
@@ -149,8 +149,8 @@ contexts:
   attributes:
     - match: \>
       scope: >-
-        tag.open.other.html.5
-        punctuation.delimiter.tag.end.html.5
+        tag.open.other.html.html5
+        punctuation.delimiter.tag.end.html.html5
       pop: true
     - include: Packages/Naomi/syntaxes/html5/attribute.no-pop.sublime-syntax
 
@@ -159,9 +159,9 @@ contexts:
         (?x)
         (</)(\2)(>)
       captures:
-        0: tag.close.other.html.5
-        1: punctuation.delimiter.tag.begin.html.5
-        2: entity.name.tag.other.html.5
-        3: punctuation.delimiter.tag.end.html.5
+        0: tag.close.other.html.html5
+        1: punctuation.delimiter.tag.begin.html.html5
+        2: entity.name.tag.other.html.html5
+        3: punctuation.delimiter.tag.end.html.html5
       pop: true
     - include: Packages/Naomi/syntaxes/html5/element.no-pop.sublime-syntax