From 45fcc62663da45455a343f37083d0884664d6162 Mon Sep 17 00:00:00 2001
From: Michael Lyons <github@michael.lyo.nz>
Date: Mon, 13 Apr 2026 10:39:02 -0400
Subject: [PATCH 1/3] Drop 4201 for CI

Re-enable when there's a dev release with the C# change
---
 .github/workflows/syntax.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/syntax.yml b/.github/workflows/syntax.yml
index adc2738..4dd4155 100644
--- a/.github/workflows/syntax.yml
+++ b/.github/workflows/syntax.yml
@@ -28,8 +28,8 @@ jobs:
             packages: master
           - build: stable
             packages: master
-          - build: 4201
-            packages: binary
+          # - build: 4201
+          #   packages: binary
     steps:
       - uses: actions/checkout@v6
       - uses: SublimeText/syntax-test-action@v2

From 0a07741e4a2ccf4092810f9b81b3ec33dc44bfd3 Mon Sep 17 00:00:00 2001
From: Michael Lyons <github@michael.lyo.nz>
Date: Sat, 11 Apr 2026 11:55:01 -0400
Subject: [PATCH 2/3] Update WebForms for C# `version: 2`

---
 Razor/C# (Razor).sublime-syntax       | 2 +-
 WebForms/C# (WebForms).sublime-syntax | 2 +-
 WebForms/ashx.sublime-syntax          | 1 +
 WebForms/tests/syntax_test_ashx.ashx  | 2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/Razor/C# (Razor).sublime-syntax b/Razor/C# (Razor).sublime-syntax
index 91d2189..70c6097 100644
--- a/Razor/C# (Razor).sublime-syntax	
+++ b/Razor/C# (Razor).sublime-syntax	
@@ -2,7 +2,7 @@
 ---
 scope: source.cs.embedded.html.cs.razor
 hidden: true
-# version: 2
+version: 2
 
 extends: Packages/C#/C#.sublime-syntax
 
diff --git a/WebForms/C# (WebForms).sublime-syntax b/WebForms/C# (WebForms).sublime-syntax
index 5abdbb8..94ca5e7 100644
--- a/WebForms/C# (WebForms).sublime-syntax	
+++ b/WebForms/C# (WebForms).sublime-syntax	
@@ -2,7 +2,7 @@
 ---
 scope: source.cs.embedded.html.cs.webforms
 hidden: true
-# version: 2
+version: 2
 
 extends: Packages/C#/C#.sublime-syntax
 
diff --git a/WebForms/ashx.sublime-syntax b/WebForms/ashx.sublime-syntax
index 544df03..dbbb13d 100644
--- a/WebForms/ashx.sublime-syntax
+++ b/WebForms/ashx.sublime-syntax
@@ -3,6 +3,7 @@
 # http://www.sublimetext.com/docs/syntax.html
 name: .Net Web Handler (ASHX)
 scope: source.cs.webforms.ashx
+version: 2
 
 extends: Packages/C#/C#.sublime-syntax
 
diff --git a/WebForms/tests/syntax_test_ashx.ashx b/WebForms/tests/syntax_test_ashx.ashx
index 21196b8..aee8aa0 100644
--- a/WebForms/tests/syntax_test_ashx.ashx
+++ b/WebForms/tests/syntax_test_ashx.ashx
@@ -21,7 +21,7 @@ using System;
 using System.Web;
 //^^^ keyword.control.import.cs
 //    ^^^^^^^^^^ meta.path.cs
-//          ^ punctuation.separator.namespace.cs
+//          ^ punctuation.accessor.dot.cs
 //              ^ punctuation.terminator.statement.cs
 
 public class Handler : IHttpHandler

From 5d4378411dc4d78f6bcdfec6f95ac50edf06c357 Mon Sep 17 00:00:00 2001
From: Michael Lyons <github@michael.lyo.nz>
Date: Sat, 11 Apr 2026 12:41:51 -0400
Subject: [PATCH 3/3] Update Razor for C# `version: 2`

---
 Razor/C# (Razor).sublime-syntax               |  4 --
 ...or C# Razor HTML attribute).sublime-syntax |  2 +-
 Razor/tests/syntax_test_cshtml.cshtml         | 62 ++++++++++++-------
 3 files changed, 40 insertions(+), 28 deletions(-)

diff --git a/Razor/C# (Razor).sublime-syntax b/Razor/C# (Razor).sublime-syntax
index 70c6097..53df7c7 100644
--- a/Razor/C# (Razor).sublime-syntax	
+++ b/Razor/C# (Razor).sublime-syntax	
@@ -34,7 +34,3 @@ contexts:
   inside_verbatim_format_string_syntax:
     - meta_include_prototype: false
     - include: immediately_pop
-
-  immediately_pop:
-    - match: ''
-      pop: 1
diff --git a/Razor/embeddings/C# (for C# Razor HTML attribute).sublime-syntax b/Razor/embeddings/C# (for C# Razor HTML attribute).sublime-syntax
index c7a98ad..a59f87d 100644
--- a/Razor/embeddings/C# (for C# Razor HTML attribute).sublime-syntax	
+++ b/Razor/embeddings/C# (for C# Razor HTML attribute).sublime-syntax	
@@ -1,7 +1,7 @@
 %YAML 1.2
 ---
 scope: source.cs.embedded.html-attribute-string.razor
-version: 1
+version: 2
 hidden: true
 
 extends: Packages/HTML (C#)/Razor/C# (Razor).sublime-syntax
diff --git a/Razor/tests/syntax_test_cshtml.cshtml b/Razor/tests/syntax_test_cshtml.cshtml
index 2361e43..14531de 100644
--- a/Razor/tests/syntax_test_cshtml.cshtml
+++ b/Razor/tests/syntax_test_cshtml.cshtml
@@ -7,14 +7,15 @@
 <!--                             ^ - source.cs.embedded -->
 @model IEnumerable<SomeNamespace.SomeType>
 <!-- <- punctuation.section.embedded.line - source.cs.embedded -->
-<!-- ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ source.cs.embedded -->
-<!-- ^ keyword.other -->
-<!--   ^^^^^^^^^^^ support.type -->
-<!--              ^ punctuation.definition.generic.begin -->
-<!--               ^^^^^^^^^^^^^ support.type -->
-<!--                            ^ punctuation.accessor.dot.namespace -->
-<!--                             ^^^^^^^^ support.type -->
-<!--                                     ^ punctuation.definition.generic.end -->
+<!--^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ source.cs.embedded.html -->
+<!--^^ keyword.other.cs-razor -->
+<!--   ^^^^^^^^^^^ support.type.cs -->
+<!--              ^^^^^^^^^^^^^^^^^^^^^^^^ meta.generic.cs -->
+<!--              ^ punctuation.definition.generic.begin.cs -->
+<!--               ^^^^^^^^^^^^^ support.type.cs -->
+<!--                            ^ punctuation.accessor.dot.cs -->
+<!--                             ^^^^^^^^ support.type.cs -->
+<!--                                     ^ punctuation.definition.generic.end.cs -->
 <!--                                      ^ - source.cs.embedded -->
 
      <p>@@Username</p>
@@ -41,18 +42,28 @@
 <!--    ^^ punctuation.definition.comment.block.end.cs-razor -->
 
 <p>@DateTime.Now</p>
-<!-- ^^^^^^^ source.cs.embedded variable.other -->
-<!--        ^ source.cs.embedded punctuation.accessor.dot -->
-<!--         ^^^ source.cs.embedded variable.other -->
-<!--            ^^^ meta.tag.block.any -->
+<!--^^^^^^^^^^^^ source.cs.embedded.html -->
+<!--^^^^^^^^ variable.other.cs -->
+<!--        ^ punctuation.accessor.dot.cs -->
+<!--         ^^^ variable.other.cs -->
+<!--            ^^^^ meta.tag.block.any.html -->
+<!--            ^^ punctuation.definition.tag.begin.html -->
+<!--              ^ entity.name.tag.block.any.html -->
+<!--               ^ punctuation.definition.tag.end.html -->
 <p>@DateTime.IsLeapYear(2016)</p>
-<!-- ^^^^^^^ source.cs.embedded variable.other -->
-<!--        ^ source.cs.embedded punctuation.accessor.dot -->
-<!--         ^^^^^^^^^^ source.cs.embedded meta.function-call variable.function -->
-<!--                   ^ punctuation.section.group.begin -->
-<!--                    ^^^^ constant.numeric -->
-<!--                        ^ punctuation.section.group.end -->
-<!--                         ^^^ meta.tag.block.any -->
+<!--^^^^^^^^^^^^^^^^^^^^^^^^^ source.cs.embedded.html -->
+<!--^^^^^^^^ variable.other.cs -->
+<!--        ^ punctuation.accessor.dot.cs -->
+<!--         ^^^^^^^^^^^^^^^^ meta.function-call.cs -->
+<!--         ^^^^^^^^^^ variable.function.cs -->
+<!--                   ^^^^^^ meta.group.cs -->
+<!--                   ^ punctuation.section.group.begin.cs -->
+<!--                    ^^^^ meta.number.integer.decimal.cs constant.numeric.value.cs -->
+<!--                        ^ punctuation.section.group.end.cs -->
+<!--                         ^^^^ meta.tag.block.any.html -->
+<!--                         ^^ punctuation.definition.tag.begin.html -->
+<!--                           ^ entity.name.tag.block.any.html -->
+<!--                            ^ punctuation.definition.tag.end.html -->
 
      <p>@(GenericMethod<int>())</p>
 <!--    ^^ punctuation.section.embedded.begin -->
@@ -99,7 +110,10 @@ else
 @switch (value)
 {
     case 1:
-<!--^^^^ keyword.control.switch.case -->
+<!--^^^^^^^^ meta.block.cs -->
+<!--^^^^ keyword.control.conditional.case.cs -->
+<!--     ^ meta.number.integer.decimal.cs constant.numeric.value.cs -->
+<!--      ^ punctuation.separator.case-statement.cs -->
         <p>The value is 1!</p>
         break;
     case 1337:
@@ -134,9 +148,10 @@ else
 
 @{
     var quote = "The future depends on what you do today. - Mahatma Gandhi";
-<!--^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ meta.embedded.cs source.cs.embedded.html -->
+<!--^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ meta.embedded.cs source.cs.embedded.html -->
+<!--^^^ storage.type.variable.cs -->
 <!--    ^^^^^ variable.other.cs -->
-<!--          ^ keyword.operator.assignment.variable.cs -->
+<!--          ^ keyword.operator.assignment.cs -->
 <!--            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ meta.string.cs string.quoted.double.cs -->
 <!--            ^ punctuation.definition.string.begin.cs -->
 <!--                                                                      ^ punctuation.definition.string.end.cs -->
@@ -262,7 +277,7 @@ else
 <!--                               ^^^^^ variable.language.this.razor -->
 <!--                                    ^ punctuation.accessor.dot.cs -->
 <!--                                     ^^^^^^^^^^^ variable.other.cs -->
-<!--                                                 ^ keyword.operator.cs -->
+<!--                                                 ^ keyword.operator.arithmetic.cs -->
 <!--                                                   ^ meta.number.integer.decimal.cs constant.numeric.value.cs -->
 <!--                                                    ^ punctuation.section.group.end.cs -->
 <!--                                                     ^ meta.string.html string.quoted.double.html punctuation.definition.string.end.html -->
@@ -271,6 +286,7 @@ else
 <!--                                                        ^^ punctuation.definition.tag.begin.html -->
 <!--                                                          ^ entity.name.tag.inline.any.html -->
 <!--                                                           ^ punctuation.definition.tag.end.html -->
+
 </li>
 <li>
     <a href="@Model.FunctionCall("embedded string")">"quotes" everywhere</a>