Textmate: fix Razor expression classification inside of HTML tags (#7051

)

* fix html-razor textmate

- added textmate grammar to both razor and html (test) files so that we can correctly label razor components that are within html tags. We will need to update the html grammar used in razor as well
- updated tests to reflect the desire behavior, note that we changed some of the classification from existing tests as they were not correctly labeling razor grammar in html tags either

src/razor/syntaxes/aspnetcorerazor.tmLanguage.json

@@ -64,6 +64,16 @@
         }
       ]
     },
+    "implicit-or-explicit-expression": {
+      "patterns": [
+        {
+          "include": "#explicit-razor-expression"
+        },
+        {
+          "include": "#implicit-expression"
+        }
+      ]
+    },
     "escaped-transition": {
       "name": "constant.character.escape.razor.transition",
       "match": "@@"

src/razor/syntaxes/aspnetcorerazor.tmLanguage.yml

@@ -31,6 +31,12 @@ repository:
       - include: '#optionally-transitioned-csharp-control-structures'
       - include: '#implicit-expression'
 
+  # a clause to combine the explicit and implicit razor expressions, used by the html grammar
+  implicit-or-explicit-expression:
+    patterns:
+      - include: '#explicit-razor-expression'
+      - include: '#implicit-expression'
+
   escaped-transition:
     name: constant.character.escape.razor.transition
     match: '@@'

test/razorTests/Microsoft.AspNetCore.Razor.VSCode.Grammar.Test/embeddedGrammars/html.tmLanguage.json

@@ -113,6 +113,9 @@
 											},
 											"name": "string.quoted.double.html",
 											"patterns": [
+												{
+													"include": "text.aspnetcorerazor#implicit-or-explicit-expression"
+												},
 												{
 													"include": "#entities"
 												}
@@ -137,6 +140,9 @@
 											},
 											"name": "string.quoted.single.html",
 											"patterns": [
+												{
+													"include": "text.aspnetcorerazor#implicit-or-explicit-expression"
+												},
 												{
 													"include": "#entities"
 												}
@@ -403,6 +409,9 @@
 							},
 							"name": "string.quoted.double.html",
 							"patterns": [
+								{
+									"include": "text.aspnetcorerazor#implicit-or-explicit-expression"
+								},
 								{
 									"include": "#entities"
 								}
@@ -423,6 +432,9 @@
 							},
 							"name": "string.quoted.single.html",
 							"patterns": [
+								{
+									"include": "text.aspnetcorerazor#implicit-or-explicit-expression"
+								},
 								{
 									"include": "#entities"
 								}