Fix WebForms empty and close-} blocks

michaelblyons · michaelblyons · commit b14c07154f92 · 2025-08-17T15:27:30.000-04:00
diff --git a/WebForms/C# (WebForms).sublime-syntax b/WebForms/C# (WebForms).sublime-syntax
@@ -9,6 +9,11 @@ extends: Packages/C#/C#.sublime-syntax
 ##############################################################################
 
 contexts:
+  statements:
+    - meta_prepend: true
+    - match: (?=%>)
+      pop: 1
+
   code_block_in:
     - meta_prepend: true
     - match: (%>)(\s*\n)?
@@ -27,15 +32,3 @@ contexts:
       pop: 1
     - include: Packages/HTML (C#)/WebForms/WebForms.sublime-syntax#comments
     - include: Packages/HTML (C#)/WebForms/WebForms.sublime-syntax#html
-
-  stray-braces:
-    - match: \}
-      scope: invalid.illegal.stray.cs
-
-  stray-brackets:
-    - match: \]
-      scope: invalid.illegal.stray.cs
-
-  stray-parens:
-    - match: \)
-      scope: invalid.illegal.stray.cs
diff --git a/WebForms/tests/syntax_test_aspx.aspx b/WebForms/tests/syntax_test_aspx.aspx
@@ -102,22 +102,45 @@
 <body>
     <my:Bar runat="server" />
 
+    <% %>
+<%--^^^^^ meta.embedded.cs --%>
+<%--^^ punctuation.section.embedded.begin.cs-webforms --%>
+<%--  ^ source.cs.embedded.html --%>
+<%--   ^^ punctuation.section.embedded.end.cs-webforms - source --%>
+
+    <% } %>
+<%--^^^^^^^ meta.embedded.cs --%>
+<%--^^ punctuation.section.embedded.begin.cs-webforms --%>
+<%--  ^^^ source.cs.embedded.html --%>
+<%--   ^ invalid.illegal.stray.brace.cs --%>
+<%--     ^^ punctuation.section.embedded.end.cs-webforms - source --%>
+
     <% if(3 > 10)
 <%--^^         punctuation.section.embedded.begin - source.cs --%>
 <%--   ^^^^^^^^^^ source.cs.embedded.html --%>
         { %>
-<%--    ^         punctuation.section.block.begin --%>
-<%--      ^^      punctuation.section.embedded.end --%>
-<%--      ^^^^^   - source.cs.embedded.html --%>
+<%--^^^^^^ meta.embedded.cs source.cs.embedded.html --%>
+<%--    ^ punctuation.section.block.begin.cs --%>
+<%--      ^^ text.html.cs.webforms meta.embedded.cs punctuation.section.embedded.end.cs-webforms - source --%>
     <p>Baz</p>
     <% } else { %>
-<%--  ^^^^^^^^^^         source.cs.embedded.html --%>
-<%--   ^          punctuation.section.block.end --%>
-<%--     ^^^^ keyword.control.conditional.else --%>
-<%--          ^         punctuation.section.block.begin --%>
-<%--            ^^^    - source.cs.embedded.html --%>
+<%--^^ text.html.cs.webforms --%>
+<%--^^ meta.embedded.cs punctuation.section.embedded.begin.cs-webforms --%>
+<%--  ^^^^^^^^^^ meta.embedded.cs source.cs.embedded.html --%>
+<%--   ^ punctuation.section.block.end.cs --%>
+<%--     ^^^^^ keyword.control.conditional.else.cs --%>
+<%--          ^^ meta.block.cs --%>
+<%--          ^ punctuation.section.block.begin.cs --%>
+<%--            ^^ text.html.cs.webforms meta.embedded.cs punctuation.section.embedded.end.cs-webforms - source --%>
     <p>Biff</p>
     <% } %>
+<%--^^ text.html.cs.webforms --%>
+<%--^^ meta.embedded.cs punctuation.section.embedded.begin.cs-webforms --%>
+<%--  ^^^^^ meta.embedded.cs --%>
+<%--  ^^^ source.cs.embedded.html --%>
+<%--  ^^ meta.block.cs --%>
+<%--   ^ punctuation.section.block.end.cs --%>
+<%--     ^^ punctuation.section.embedded.end.cs-webforms - source --%>
 
     <p><%: variable %></p>
 <%--   ^^^                 punctuation.section.embedded.begin --%>
