Merge branch 'master' into pr/shellscript/fix-qualifiers

Author: deathaxe

C#/C#.sublime-syntax

@@ -14,10 +14,12 @@ file_extensions:
 
 first_line_match: |-
   (?xi:
-    ^ \s* // .*? -\*- .*? \b(c\#|cs|csharp)\b .*? -\*-  # editorconfig
+    ^ \#! .* {{shebang_language}}                       # shebang
+  | ^ \s* // .*? -\*- .*? \b(c\#|cs|csharp)\b .*? -\*-  # editorconfig
   )
 
 variables:
+  shebang_language: \bdotnet\s+run\b
 
   bin_op: '(?:\+|->|-|\*|/|%|\|\||&&|\||&|\^|<<|>>|=>|<=|<|>=|>|==|!=|\?\?)'
   unary_op: '(?:\+\+|--|-|~|!|&|\*)'
@@ -59,6 +61,11 @@ contexts:
         2: punctuation.definition.preprocessor.cs
       push: preprocessor_option
 
+  main:
+    - meta_include_prototype: false
+    - match: ''
+      push: [statements, shebang]
+
     # comments
   comments:
     - match: '^\s*(///)'
@@ -192,8 +199,11 @@ contexts:
         1: keyword.other.preprocessor.cs
         2: keyword.other.preprocessor.cs
         3: keyword.other.preprocessor.cs
-    - match: .*
-      scope: invalid.illegal.cs
+
+    - match: (:)(\w+)
+      captures:
+        1: punctuation.definition.preprocessor.cs
+        2: variable.language.cs
     - match: $
       pop: true
 
@@ -217,6 +227,23 @@ contexts:
         3: variable.other.section.cs
         4: meta.fold.end.cs
 
+  shebang:
+    - meta_include_prototype: false
+    - match: ^\s*(\#!)
+      captures:
+        1: punctuation.definition.comment.cs
+      set: shebang-body
+    - match: ^|(?=\S)  # Note: Ensure to highlight shebang if C# is embedded.
+      pop: 1
+
+  shebang-body:
+    - meta_include_prototype: false
+    - meta_scope: comment.line.shebang.cs
+    - match: '{{shebang_language}}'
+      scope: constant.language.shebang.cs
+    - match: $\n?
+      pop: 1
+
   # Pops out at the end of the line and handles comments.
   # Marks the rest of the line as invalid.
   option_done:
@@ -226,7 +253,7 @@ contexts:
     - match: \S
       scope: invalid.illegal.cs
 
-  main:
+  statements:
     - include: stray_close_bracket
     - match: '\{'
       scope: punctuation.section.block.begin.cs
@@ -235,7 +262,7 @@ contexts:
         - match: '\}'
           scope: punctuation.section.block.end.cs
           pop: true
-        - include: main
+        - include: statements
     - include: attribute
     - include: using
     - include: class_declaration
@@ -351,7 +378,7 @@ contexts:
     - match: \}
       scope: punctuation.section.block.end.cs
       pop: true
-    - include: main
+    - include: statements
 
   class_declaration:
     - match: \b(static|unsafe|abstract|partial|readonly|required|sealed)\b

C#/Indentation Rules.tmPreferences

@@ -20,14 +20,6 @@
 		[^}"']*                                  # followed by any number of characters that isn't a close brace or a string
 		$                                        # the end of the line
 		</string>
-		<key>indentNextLinePattern</key>
-		<string>(?x)^
-		(?! .* [;:{}]                   # do not indent when line ends with ;, :, {, or }
-		    \s* (//|/[*] .* [*]/ \s* $) #  …account for potential trailing comment
-		)
-		.* [^\s;:{}] \s* $              # indent next if this one isn’t
-		                                #  terminated with ;, :, {, or }
-		</string>
 		<key>unIndentedLinePattern</key>
 		<string>^\s*((/\*|\*/|//|#).*)?$</string>
 	</dict>

C#/tests/syntax_test_dotnetrun.cs

@@ -0,0 +1,45 @@
+#! SYNTAX TEST "Packages/C#/C#.sublime-syntax" dotnet run
+#! <- comment.line.shebang.cs punctuation.definition.comment.cs
+#!^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ comment.line.shebang.cs
+#!                                             ^^^^^^^^^^ constant.language.shebang.cs
+
+// https://devblogs.microsoft.com/dotnet/announcing-dotnet-run-app/
+
+#:package Humanizer@2.14.1
+#!^^^^^^^^^^^^^^^^^^^^^^^^ meta.preprocessor.cs
+#!^^^^^^^ variable.language.cs
+#!       ^^^^^^^^^^^^^^^^^ - variable - invalid
+#:sdk Microsoft.NET.Sdk.Web
+#!^^^^^^^^^^^^^^^^^^^^^^^^^ meta.preprocessor.cs
+#!^^^ variable.language.cs
+#!   ^^^^^^^^^^^^^^^^^^^^^^^ - variable - invalid
+#:property LangVersion preview
+#!^^^^^^^^^^^^^^^^^^^^^^^^^^^^ meta.preprocessor.cs
+#!^^^^^^^^ variable.language.cs
+#!        ^^^^^^^^^^^^^^^^^^^^^ - variable - invalid
+
+  #:package Microsoft.AspNetCore.OpenApi@10.*-*
+#!^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ meta.preprocessor.cs
+#!^ keyword.other.preprocessor.cs punctuation.definition.preprocessor.cs
+#! ^ punctuation.definition.preprocessor.cs
+#!  ^^^^^^^ variable.language.cs
+
+
+var builder = WebApplication.CreateBuilder();
+#!  ^^^^^^^ variable.other.cs
+#!          ^ keyword.operator.assignment.variable.cs
+#!            ^^^^^^^^^^^^^^ variable.other.cs
+#!                          ^ punctuation.accessor.dot.cs
+#!                           ^^^^^^^^^^^^^^^ meta.function-call.cs
+#!                           ^^^^^^^^^^^^^ variable.function.cs
+#!                                        ^^ meta.group.cs
+#!                                        ^ punctuation.section.group.begin.cs
+#!                                         ^ punctuation.section.group.end.cs
+#!                                          ^ punctuation.terminator.statement.cs
+
+builder.Services.AddOpenApi();
+
+var app = builder.Build();
+
+app.MapGet("/", () => "Hello, world!");
+app.Run();

Git Formats/Git Diff.sublime-syntax

@@ -392,6 +392,8 @@ contexts:
         # Combined mode can have multiple pre-commits
         - include: separator-comma
 
+    - include: pop-before-diff-header
+
   diff-content:
     - meta_content_scope: meta.block.delta.diff
     - include: pop-before-diff-header