Fix completion scopes

Author: Michael Lyons

Razor/support/Comments.tmPreferences

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

WebForms/support/Comments.tmPreferences

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

WebForms/support/Symbol List Directives.tmPreferences

@@ -4,7 +4,7 @@
 	<key>name</key>
 	<string>Symbol List: .Net Directives</string>
 	<key>scope</key>
-	<string>text.html constant.language.processing-directive</string>
+	<string>text.html.cs constant.language.processing-directive</string>
 	<key>settings</key>
 	<dict>
 		<key>showInSymbolList</key>

WebForms/support/code-blocks/code-block.sublime-snippet

@@ -1,5 +1,5 @@
 <snippet>
-    <scope>embedding.cshtml.aspnet - source.cs</scope>
+    <scope>text.html.cs.webforms - source.cs - comment</scope>
     <tabTrigger>&lt;%</tabTrigger>
     <content><![CDATA[<%
     ${1}

WebForms/support/code-blocks/foreach-block.sublime-snippet

@@ -1,5 +1,5 @@
 <snippet>
-    <scope>embedding.cshtml.aspnet - source.cs</scope>
+    <scope>text.html.cs.webforms - source.cs - comment</scope>
     <tabTrigger>foreach</tabTrigger>
     <content><![CDATA[<% foreach (var ${1:item} in ${2:Enumerable}) { %>
     ${3}

WebForms/support/code-blocks/if-block.sublime-snippet

@@ -1,5 +1,5 @@
 <snippet>
-    <scope>embedding.cshtml.aspnet - source.cs</scope>
+    <scope>text.html.cs.webforms - source.cs - comment</scope>
     <tabTrigger>if</tabTrigger>
     <content><![CDATA[<% if (${1:true}) { %>
     ${2}

WebForms/support/controls/Repeater.sublime-snippet

@@ -1,5 +1,5 @@
 <snippet>
-    <scope>embedding.cshtml.aspnet - source.cs</scope>
+    <scope>text.html.cs.webforms - source.cs - comment</scope>
     <tabTrigger>&lt;asp:Repeater</tabTrigger>
     <content><![CDATA[<asp:Repeater runat="server">
     <ItemTemplate>

WebForms/support/directives/OutputCache.sublime-completions

@@ -1,6 +1,6 @@
 {
     // https://msdn.microsoft.com/en-us/library/hdxfb6cy(v=vs.100).aspx
-    "scope": "embedding.cshtml.aspnet meta.block.processing-directive.contents.outputcache",
+    "scope": "text.html.cs.webforms 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}\" " },

WebForms/support/directives/directive types.sublime-completions

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

WebForms/support/expressions/appsetting.sublime-snippet

@@ -1,5 +1,5 @@
 <snippet>
-    <scope>embedding.cshtml.aspnet - source.cs</scope>
+    <scope>text.html.cs.webforms - source.cs - comment</scope>
     <tabTrigger>&lt;%$</tabTrigger>
     <content><![CDATA[<%\$ ${1:AppSettings}: ${2:key} %>]]></content>
     <description>&lt;%$ … %&gt;</description>

WebForms/support/expressions/databound-encoded.sublime-snippet

@@ -1,5 +1,5 @@
 <snippet>
-    <scope>embedding.cshtml.aspnet - source.cs</scope>
+    <scope>text.html.cs.webforms - source.cs - comment</scope>
     <tabTrigger>&lt;%#:</tabTrigger>
     <content><![CDATA[<%#: Eval(\"${1:Property}\") %>]]></content>
     <description>&lt;%#: Eval(…) %&gt;</description>

WebForms/support/expressions/databound.sublime-snippet

@@ -1,5 +1,5 @@
 <snippet>
-    <scope>embedding.cshtml.aspnet - source.cs</scope>
+    <scope>text.html.cs.webforms - source.cs - comment</scope>
     <tabTrigger>&lt;%#</tabTrigger>
     <content><![CDATA[<%# Eval("${1:Property}") %>]]></content>
     <description>&lt;%# Eval(…) %&gt;</description>

WebForms/support/expressions/directive.sublime-snippet

@@ -1,5 +1,5 @@
 <snippet>
-    <scope>embedding.cshtml.aspnet - source.cs</scope>
+    <scope>text.html.cs.webforms - source.cs - comment</scope>
     <tabTrigger>&lt;%@</tabTrigger>
     <content><![CDATA[<%@ ${1:Directive} %>]]></content>
     <description>&lt;%@ … %&gt;</description>

WebForms/support/expressions/encoded.sublime-snippet

@@ -1,5 +1,5 @@
 <snippet>
-    <scope>embedding.cshtml.aspnet - source.cs</scope>
+    <scope>text.html.cs.webforms - source.cs - comment</scope>
     <tabTrigger>&lt;%:</tabTrigger>
     <content><![CDATA[<%: ${1:Object} %>]]></content>
     <description>&lt;%: … %&gt;</description>

WebForms/support/expressions/literal.sublime-snippet

@@ -1,5 +1,5 @@
 <snippet>
-    <scope>embedding.cshtml.aspnet - source.cs</scope>
+    <scope>text.html.cs.webforms - source.cs - comment</scope>
     <tabTrigger>&lt;%=</tabTrigger>
     <content><![CDATA[<%= ${1:Object} %>]]></content>
     <description>&lt;%= … %&gt;</description>

WebForms/support/root.sublime-completions

@@ -1,5 +1,5 @@
 {
-    "scope": "embedding.cshtml.aspnet - source.cs",
+    "scope": "text.html.cs.webforms - source.cs - comment",
     "completions": [
         // Directives
         {