Rename root scope to embedding like PHP

This lets people set color schemes that show embedding without being
overly cluttered.

Author: michaelblyons

Comments.tmPreferences

@@ -4,7 +4,7 @@
     <key>name</key>
     <string>Comments</string>
     <key>scope</key>
-    <string>text.html.cshtml</string>
+    <string>embedding.cshtml</string>
     <key>settings</key>
     <dict>
         <key>shellVariables</key>

ashx.sublime-syntax

@@ -5,13 +5,12 @@ name: .Net Web Handler (ASHX)
 first_line_match: <%@\s*WebHandler
 file_extensions:
   - ashx
-scope: source.cs.ashx
+scope: embedding.ashx
 contexts:
   main:
     - match: ''
       set: scope:source.cs
       with_prototype:
-        - include: directive-type
         - include: directive
 
   directive-generic-attribute:

completions/cshtml.sublime-completions

@@ -1,5 +1,5 @@
 {
-    "scope": "text.html.cshtml - source.cs",
+    "scope": "embedding.cshtml - source.cs",
     "completions": [
         // Expressions
         { "trigger": "exp\t<%= … %>", "contents": "<%= ${1:Object} %>"},

completions/directives/OutputCache.sublime-completions

@@ -1,6 +1,6 @@
 {
     // https://msdn.microsoft.com/en-us/library/hdxfb6cy(v=vs.100).aspx
-    "scope": "text.html.cshtml meta.block.processing-directive.contents.outputcache",
+    "scope": "embedding.cshtml meta.block.processing-directive.contents.outputcache",
     "completions": [
         { "trigger": "Duration\tOutputCache", "contents": "Duration=\"${1:120}\" " },
         { "trigger": "Location\tOutputCache", "contents": "Location=\"${1:Any | Client | Downstream | Server | None | ServerAndClient}\" " },
@@ -12,7 +12,7 @@
         { "trigger": "VaryByContentEncoding\tOutputCache", "contents": "VaryByContentEncoding=\"${1:Encoding}\" " },
         { "trigger": "CacheProfile\tOutputCache", "contents": "CacheProfile=\"${1:CacheProfileName}\" " },
         { "trigger": "NoStore\tOutputCache", "contents": "NoStore=\"${1:true}\" " },
-        { "trigger": "SqlDependency\tOutputCache", "contents": "SqlDependency=\"${1:${2:DatabaseName}:${2:TableName}\" " },
+        { "trigger": "SqlDependency\tOutputCache", "contents": "SqlDependency=\"${1:${2:DatabaseName}:${3:TableName}}\" " },
         { "trigger": "ProviderName\tOutputCache", "contents": "ProviderName=\"${1:ProviderName}\" " },
     ]
 }

completions/directives/root.sublime-completions

@@ -1,6 +1,6 @@
 {
     // https://msdn.microsoft.com/en-us/library/xz702w3e(v=vs.100).aspx
-    "scope": "text.html.cshtml meta.block.processing-directive - meta.block.processing-directive.contents",
+    "scope": "embedding.cshtml meta.block.processing-directive - meta.block.processing-directive.contents",
     "completions": [
         { "trigger": "Application\tDirective", "contents": "Application" },
         { "trigger": "Page\tDirective", "contents": "Page" },

cshtml.sublime-syntax

@@ -8,7 +8,7 @@ file_extensions:
   - asax
   - cshtml
   - master
-scope: text.html.cshtml
+scope: embedding.cshtml
 contexts:
   main:
     - include: html
@@ -185,7 +185,6 @@ contexts:
         9: punctuation.definition.string.begin.cshtml
         10: punctuation.definition.string.end.cshtml
       push:
-        - meta_content_scope: source.cs.embedded.html
         - match: (?i)(</)(script)(>)
           captures:
             1: punctuation.definition.tag.begin.html
@@ -195,6 +194,7 @@ contexts:
         - match: '>'
           scope: punctuation.definition.tag.end.html
           embed: scope:source.cs
+          embed_scope: source.cs.embedded.html
           escape: (?i)(?=</script)
         - include: scope:text.html.basic#tag-stuff
 

tests/syntax_test_aspx.aspx

@@ -52,6 +52,7 @@
 //            ^^^^^^^^    string.quoted.double.cshtml
 //            ^           punctuation.definition.string.begin.cshtml
 //                   ^    punctuation.definition.string.end.cshtml
+//                    ^^^^^^^^^^^^^^^  - source.cs.embedded.html
 //                     ^^^^^^^^        entity.other.attribute-name
 //                             ^       punctuation.separator.key-value
 //                              ^^^^   string.quoted.double
@@ -74,8 +75,12 @@
             foo += foo;
         }
     }
-</script>
-// ^^^^^^^^^ - source.cs.embedded.html
+   </script>
+// <- source.cs.embedded.html
+// ^^         punctuation.definition.tag.begin.html
+//   ^^^^^^   entity.name.tag.html
+//         ^  punctuation.definition.tag.end.html
+// ^^^^^^^^^^ - source.cs.embedded.html
 
 <!DOCTYPE html>
 <html>