Merge pull request #15 from csharp/st4204-master

Prepare an update for new C# changes. See sublimehq/Packages#4547.

Author: michaelblyons

.github/workflows/package-review.yaml

@@ -11,7 +11,7 @@ jobs:
       - uses: actions/checkout@v6
 
       - name: Review artifact for Package Control
-        uses: kaste/st_package_reviewer/gh_action_package@ad89510c574e97d92cfd4d9e0f5c9029394f5c94
+        uses: kaste/st_package_reviewer/gh_action_package@v1
         with:
           package-name: 'HTML (C#)'
           st-build: 4204

.github/workflows/syntax.yml

@@ -3,6 +3,8 @@ name: Syntax Tests
 
 on:
   push:
+    branches:
+      - 'master'
     paths:
       - '.github/workflows/syntax.yml'
       - '**.sublime-syntax'
@@ -14,6 +16,7 @@ on:
       - '**.sublime-syntax'
       - '**/syntax_test_*'
       - '**.tmPreferences'
+  workflow_dispatch:
 
 jobs:
   main:

README.md

@@ -61,9 +61,9 @@ Microsoft later released
 a simplified, less-intrusive frontend templating syntax
 that supplanted WebForms.
 
-A huge thank-you is owed
-to [@keith-hall][keith]
-for his work on this.
+First version thanks to [Keith Hall][keith].
+Rebuilt by Michael Lyons.
+Also see [LoneBoco's version][loneboco].
 
 ### Current Support
 
@@ -79,13 +79,11 @@ for his work on this.
 
 ### Known issues
 
-- Trouble with `@(` in HTML attributes
-  if the expression contains `"`
-- Trouble with `@` expressions in HTML attributes
-  if they are inside `@` block expressions
-- Trouble with `@` expressions in embedded languages
-  (i.e. in JavaScript)
-  if they are inside `@` block expressions
+- Trouble with `@(` in CSS- or JS-embedding HTML attributes
+  if the expression contains the tag string delimiter.
+- No support for `@bind` attributes.
+- Chaining expressions together like `@if`-`for`-etc.
+  may require curly braces, even for single commands.
 - File new issues [on GitHub][gh]
 
 
@@ -94,3 +92,4 @@ for his work on this.
 [ss-docs]: https://www.sublimetext.com/docs/syntax.html
 [gh]: https://github.com/michaelblyons/SublimeSyntax-HTML-CSharp
 [keith]: https://github.com/keith-hall
+[loneboco]: https://github.com/LoneBoco/razor-sublime

Razor/C# (Razor implicit).sublime-syntax

@@ -0,0 +1,10 @@
+%YAML 1.2
+---
+scope: source.cs.embedded.cs.razor
+version: 2
+hidden: true
+
+extends: Packages/HTML (C#)/Razor/C# (Razor).sublime-syntax
+
+variables:
+  generic_declaration: (?!)

Razor/C# (Razor).sublime-syntax

@@ -6,11 +6,18 @@ version: 2
 
 extends: Packages/C#/C#.sublime-syntax
 
-##############################################################################
+variables:
+  sql_indicator: (?!)
 
 contexts:
 
-  stray_close_bracket:
+###[ CSHARP OVERRIDES ]########################################################
+
+  comments:
+    - meta_prepend: true
+    - include: Razor.sublime-syntax#comment
+
+  stray-punctuation:
     - match: \]|\)
       scope: invalid.illegal.stray.cs
     - match: (?=})
@@ -23,14 +30,46 @@ contexts:
     - match: \bHtml\b
       scope: variable.language.this.razor
 
-  inside_triple_quoted_raw_string_syntax:
-    - meta_include_prototype: false
-    - include: immediately_pop
+  inside-statement-block:
+    - meta_prepend: true
+    - include: Razor.sublime-syntax#razor-transitions
+
+  expression:
+    - meta_prepend: true
+    - include: Packages/HTML (C#)/Razor/Razor.sublime-syntax#razor-templated-delegates
+
+  # Don't let C# embed extra syntaxes in strings
+
+  inside-triple-quoted-raw-string-sql: []
+  inside-verbatim-string-sql: []
+  inside-verbatim-format-string-sql: []
 
-  inside_verbatim_string_syntax:
-    - meta_include_prototype: false
-    - include: immediately_pop
+###[ UTILITY ]#################################################################
 
-  inside_verbatim_format_string_syntax:
-    - meta_include_prototype: false
-    - include: immediately_pop
+  razor-functions-block:
+    - include: visibility
+    - include: modifiers
+    - include: local-declarations
+
+  embedded-statement-pop:
+    - include: embedded-statements
+    - include: statement-blocks
+    - include: else-pop
+
+  html-attribute-expression:
+    - include: Razor.sublime-syntax#expressions-explicit
+    - match: (?=["'\s])
+      pop: 1
+    - include: Razor.sublime-syntax#expressions
+
+  html-attribute-expression-double-quoted:
+    - include: Razor.sublime-syntax#expressions-explicit
+    - match: (?=["\s])
+      pop: 1
+    - include: Razor.sublime-syntax#expressions
+
+  html-attribute-expression-single-quoted:
+    - include: Razor.sublime-syntax#expressions-explicit
+    - match: (?=['\s])
+      pop: 1
+    - include: Razor.sublime-syntax#expressions

Razor/CSS (Razor).sublime-syntax

@@ -1,6 +1,6 @@
 %YAML 1.2
 ---
-name: CSS (WebForms)
+name: CSS (Razor)
 scope: source.css.cs.razor
 version: 2
 
@@ -11,34 +11,12 @@ contexts:
 
   prototype:
     - meta_prepend: true
-    - include: Razor.sublime-syntax#comments
-    - include: csharp-embedded
+    - include: Razor.sublime-syntax#expressions
 
-  string-content:
+  comments:
     - meta_prepend: true
-    - include: Razor.sublime-syntax#csharp-interpolations
-
-  csharp-interpolations:
-    - meta_include_prototype: false
-    # - match: (?=@)
-    #   push: csharp-interpolation-body
-    - include: Razor.sublime-syntax#csharp-interpolations
-
-  csharp-interpolation-body:
-    - clear_scopes: 1
-    - meta_include_prototype: false
-    - include: csharp-embedded
-    - include: immediately-pop
+    - include: Razor.sublime-syntax#razor-block-comments
 
-  csharp-embedded:
-    - meta_include_prototype: false
-    - include: Razor.sublime-syntax#razor-constructs
-    # - match: <%[=#:$]
-    #   scope: meta.embedded.cs punctuation.section.embedded.begin.cs-webforms
-    #   embed: Packages/C#/C#.sublime-syntax
-    #   embed_scope: meta.embedded.cs source.cs.embedded.css
-    #   escape: (%>)(\s*\n)?
-    #   escape_captures:
-    #     0: meta.embedded.cs
-    #     1: punctuation.section.embedded.end.cs-webforms
-    #     2: meta.html-newline-after-csharp.cs-webforms
+  string-content:
+    - meta_prepend: true
+    - include: Razor.sublime-syntax#expressions

Razor/JavaScript (Razor).sublime-syntax

@@ -9,25 +9,14 @@ extends: Packages/JavaScript/JavaScript.sublime-syntax
 
 contexts:
 
-  prototype:
+  comments:
     - meta_prepend: true
-    - include: Razor.sublime-syntax#comments
+    - include: Razor.sublime-syntax#razor-block-comments
 
-  string-content:
+  statement:
     - meta_prepend: true
-    - include: Razor.sublime-syntax#csharp-interpolations
-
-  csharp-interpolations:
-    - meta_include_prototype: false
-    - match: (?=<%[=#:$])
-      push: csharp-interpolation-body
-
-  csharp-interpolation-body:
-    - clear_scopes: 1
-    - meta_include_prototype: false
-    - include: csharp-embedded
-    - include: immediately-pop
+    - include: Razor.sublime-syntax#expressions
 
-  csharp-embedded:
-    - meta_include_prototype: false
-    - include: Razor.sublime-syntax#razor-constructs
+  string-content:
+    - meta_prepend: true
+    - include: Razor.sublime-syntax#expressions