Refactor Razor C# inheritance

Author: michaelblyons

Razor/C# (Razor).sublime-syntax

@@ -1,6 +1,6 @@
 %YAML 1.2
 ---
-scope: source.cs.embedded.html
+scope: source.cs.embedded.html.cs.razor
 hidden: true
 # version: 2
 
@@ -33,3 +33,26 @@ contexts:
       scope: invalid.illegal.stray.cs
     - match: (?=})
       pop: 1
+
+  keywords:
+    - meta_prepend: true
+    - match: \bModel\b
+      scope: variable.language.this.razor
+    - match: \bHtml\b
+      scope: variable.language.this.razor
+
+  inside_triple_quoted_raw_string_syntax:
+    - meta_include_prototype: false
+    - include: immediately_pop
+
+  inside_verbatim_string_syntax:
+    - meta_include_prototype: false
+    - include: immediately_pop
+
+  inside_verbatim_format_string_syntax:
+    - meta_include_prototype: false
+    - include: immediately_pop
+
+  immediately_pop:
+    - match: ''
+      pop: 1

Razor/Razor.sublime-syntax

@@ -99,7 +99,7 @@ contexts:
             - match: \}
               scope: punctuation.section.block.end.cs-razor
               pop: true
-            - include: scope:source.cs#code_block_in
+            - include: Packages/HTML (C#)/Razor/C# (Razor).sublime-syntax#code_block_in
         - match: \s*(?!\{)(?=\S)
           scope: invalid.illegal.expected-block.cs-razor
           pop: true
@@ -111,15 +111,15 @@ contexts:
       push:
         - clear_scopes: 1
         - meta_content_scope: source.cs.embedded.html
-        - include: scope:source.cs#line_of_code
+        - include: Packages/HTML (C#)/Razor/C# (Razor).sublime-syntax#line_of_code
         - match: ''
           pop: true
       with_prototype:
         - include: razor-block-prototype
     - match: '[\w-+]+@\w+' # ignore email addresses
     - match: '@(?=(?:\w+\.)*\w+(?:[<\s]|$))'
       scope: punctuation.section.embedded.line.cs-razor
-      embed: scope:source.cs#line_of_code_in
+      embed: Packages/HTML (C#)/Razor/C# (Razor).sublime-syntax#line_of_code_in
       embed_scope: source.cs.embedded.html
       escape: $|(?=[<\s])
     - match: '@(?=(?:\w+\.)*\w+\()'
@@ -128,7 +128,7 @@ contexts:
         - meta_content_scope: source.cs.embedded.html
         - match: (?=[<\s])
           pop: true
-        - include: scope:source.cs#line_of_code_in
+        - include: Packages/HTML (C#)/Razor/C# (Razor).sublime-syntax#line_of_code_in
     - match: '@\('
       scope: punctuation.section.embedded.begin.cs-razor
       push:
@@ -137,7 +137,7 @@ contexts:
         - match: \)
           scope: punctuation.section.embedded.end.cs-razor
           pop: true
-        - include: scope:source.cs#line_of_code_in
+        - include: Packages/HTML (C#)/Razor/C# (Razor).sublime-syntax#line_of_code_in
     #- match: '@(?=\w+(?:\.\w+)*)(?!\s*[+=|(])' # TODO: support a.b[2] etc.
     #  comment: property/variable access
     #  scope: punctuation.section.embedded.line.cs-razor

Razor/embeddings/C# (for C# Razor HTML attribute).sublime-syntax

@@ -4,23 +4,11 @@ scope: source.cs.embedded.html-attribute-string.razor
 version: 1
 hidden: true
 
-extends: Packages/C#/C#.sublime-syntax
+extends: Packages/HTML (C#)/Razor/C# (Razor).sublime-syntax
 
 contexts:
 
   line_of_code_in:
     - meta_prepend: true
     - match: (?=")
       pop: 1
-
-  inside_triple_quoted_raw_string_syntax:
-    - meta_include_prototype: false
-    - include: immediately_pop
-
-  inside_verbatim_string_syntax:
-    - meta_include_prototype: false
-    - include: immediately_pop
-
-  inside_verbatim_format_string_syntax:
-    - meta_include_prototype: false
-    - include: immediately_pop

WebForms/C# (WebForms).sublime-syntax

@@ -1,6 +1,6 @@
 %YAML 1.2
 ---
-scope: source.cs.embedded.html
+scope: source.cs.embedded.html.cs.webforms
 hidden: true
 # version: 2