Merge remote-tracking branch 'upstream/master' into fix-1830

Author: Raul E Rangel

.github/workflows/ci.yml

@@ -29,6 +29,7 @@ jobs:
   run_syntax_tests:
     name: Test on Build ${{ matrix.sublime-build }} (${{ matrix.sublime-channel }})
     runs-on: ubuntu-latest
+    timeout-minutes: 15 # default is 6 hours!
     continue-on-error: ${{ matrix.optional }}
     strategy:
       max-parallel: 2
@@ -39,7 +40,7 @@ jobs:
             sublime-build: 4121
             optional: true
           - sublime-channel: dev
-            sublime-build: 4120
+            sublime-build: 4122
             optional: false
     steps:
 

C#/C#.sublime-syntax

@@ -174,6 +174,11 @@ contexts:
         - include: comments
         - match: $
           pop: true
+    - match: '\b(nullable)\s+(enable|disable|restore)(?:\s+(annotations|warnings))?\b'
+      captures:
+        1: keyword.other.preprocessor.cs
+        2: keyword.other.preprocessor.cs
+        3: keyword.other.preprocessor.cs
     - match: .*
       scope: invalid.illegal.cs
     - match: $
@@ -216,6 +221,8 @@ contexts:
       scope: invalid.illegal.stray.brace.cs
 
   using:
+    - match: \bglobal\b
+      scope: storage.modifier.cs
     - match: '\b(using)\s+(?={{name}}\s*=\s*)'
       captures:
         1: keyword.control.import.cs
@@ -243,7 +250,7 @@ contexts:
     - match: '='
       scope: keyword.operator.assignment.cs
     - match: \.
-      scope: punctuation.separator.namespace.cs
+      scope: meta.path.cs punctuation.separator.namespace.cs
     - match: '<'
       scope: meta.generic.cs punctuation.definition.generic.begin.cs
       push: type_argument
@@ -290,10 +297,12 @@ contexts:
         1: storage.type.class.cs
         2: entity.name.class.cs
       push: [class_signature, data_type_signature]
-    - match: \b(record)\s+({{name}})
+    - match: (?:\b(readonly)\s+)?\b(record)\s+(?:(struct)\s+)?({{name}})
       captures:
-        1: storage.type.class.record.cs
-        2: entity.name.class.cs
+        1: storage.modifier.cs
+        2: storage.type.class.record.cs
+        3: storage.type.struct.record.cs
+        4: entity.name.class.cs
       push: [record_signature, data_type_signature]
     - match: '(?:\b(readonly)\s+)?(?:\b(ref)\s+)?\b(struct)\s+({{name}})'
       captures:
@@ -514,7 +523,7 @@ contexts:
     - match: '({{name}})?(\.)'
       captures:
         1: meta.path.cs
-        2: punctuation.accessor.dot.namespace.cs
+        2: meta.path.cs punctuation.accessor.dot.namespace.cs
     - match: ','
       scope: punctuation.separator.inherited-class.cs
 
@@ -564,12 +573,12 @@ contexts:
       scope: storage.modifier.access.cs
     - match: '\boperator\b'
       scope: storage.modifier.cs
-      push: method_name
+      push: method_name_or_member_variable
     - match: '({{name}})\s*(<)'
       captures:
         1: support.type.cs
         2: meta.generic.cs punctuation.definition.generic.begin.cs
-      push: [method_name, type_argument]
+      push: [method_name_or_member_variable, type_argument]
     - match: '(~{{name}})(\s*)(\()'
       captures:
         1: meta.method.cs entity.name.function.destructor.cs
@@ -599,11 +608,11 @@ contexts:
             5: punctuation.section.brackets.end.cs
             6: keyword.operator.pointer.cs
         - match: ''
-          set: method_name
+          set: method_name_or_member_variable
     - match: (?=\()
-      push: [method_name, type_tuple]
+      push: [method_name_or_member_variable, type_tuple]
 
-  method_name: # also matches member variables
+  method_name_or_member_variable:
     - match: '\.'
       scope: punctuation.accessor.dot.cs
     - match: '(operator)\s*({{unary_op}}|{{bin_op}})\s*(\()'
@@ -612,31 +621,45 @@ contexts:
         2: meta.method.cs entity.name.function.cs
         3: meta.method.parameters.cs punctuation.section.parameters.begin.cs
       set: [method_body_transition, method_params]
-    - match: '({{name}}\s*)?((=>)\s*)'
+    - match: (?={{name}})
+      branch_point: method_or_member_variable_name
+      branch:
+        - member_lambda_or_plain
+        - method_name
+      pop: true
+
+  member_lambda_or_plain:
+    - match: ({{name}})\s*(=>)
+      scope: meta.method.cs
       captures:
         1: variable.other.member.cs
-        2: meta.method.cs
-        3: keyword.declaration.function.accessor.get.cs
+        2: keyword.declaration.function.accessor.get.cs
       set:
         - meta_scope: meta.property.cs
         - meta_content_scope: meta.method.cs
         - include: line_of_code_in
-    - match: '({{name}})\s*(?==[^>])'
-      captures:
-        1: variable.other.member.cs
+    - match: (?={{namespaced_name}}\s+{{name}}\s+=>)
+      pop: true
+    - match: '{{name}}'
+      scope: variable.other.member.cs
+    - match: (?==[^>])
       set: member_variables_declaration
+    - match: ';'
+      scope: punctuation.terminator.statement.cs
+      pop: true
+    - match: (?=\})
+      pop: true
+    - match: (?=\S)
+      fail: method_or_member_variable_name
+
+  method_name:
     - match: '({{name}})?\s*(\()'
-      # here the name is optionnal since it may already have been match by
+      # here the name is optional since it may already have been matched by
       # '{{name}}\s*(<)' (see rule below)
       captures:
         1: meta.method.cs entity.name.function.cs
         2: meta.method.parameters.cs punctuation.section.parameters.begin.cs
       set: [method_body_transition, method_params]
-    - match: '({{name}})\s*(;)'
-      captures:
-        1: variable.other.member.cs
-        2: punctuation.terminator.statement.cs
-      pop: true
     - match: '({{name}})\s*(<)(?=[^(]*>\.)'
       scope: meta.method.cs
       captures:
@@ -682,6 +705,9 @@ contexts:
           pop: true
     - match: '(?=\s*\{)'
       set: method_accessor
+    - match: ';'
+      scope: punctuation.terminator.statement.cs
+      pop: true
 
   method_body_transition:
     - match: ''
@@ -838,7 +864,7 @@ contexts:
 
   attribute_in:
     - meta_scope: meta.annotation.cs
-    - match: '({{name}})(\()'
+    - match: '({{name}})\s*(\()'
       captures:
         1: variable.annotation.cs
         2: meta.group.cs punctuation.section.group.begin.cs

C#/tests/syntax_test_C#10.cs

@@ -0,0 +1,46 @@
+/// SYNTAX TEST "Packages/C#/C#.sublime-syntax"
+
+global using Newtonsoft.Json;
+/// ^^ storage.modifier
+///    ^^^^^ keyword.control.import
+///          ^^^^^^^^^^^^^^^ meta.path
+///                    ^ punctuation.separator.namespace
+///                         ^ punctuation.terminator - meta.path
+global using static Console.WriteLine;
+/// ^^ storage.modifier
+///    ^^^^^ keyword.control.import
+///          ^^^^^^ keyword.control.import
+///                 ^^^^^^^^^^^^^^^^^ meta.path
+///                        ^ punctuation.separator.namespace
+///                                  ^ punctuation.terminator
+
+namespace Example;
+///^^^^^^ meta.namespace storage.type.namespace
+///       ^^^^^^^ meta.namespace entity.name.namespace
+///              ^ punctuation.terminator.statement
+
+public record struct Person(string Name);
+/// ^^ storage.modifier.access
+///    ^^^^^^^^^^^^^^^^^^^^ meta.class.record
+///    ^^^^^^ storage.type.class.record
+///           ^^^^^^ storage.type.struct.record
+///                  ^^^^^^ entity.name.class
+///                        ^ punctuation.section.group.begin
+///                         ^^^^^^^^^^^^ meta.class.body meta.method.parameters
+///                         ^^^^^^ storage.type
+///                                ^^^^ variable.parameter
+///                                    ^ punctuation.section.parameters.end
+///                                     ^ punctuation.terminator.statement
+
+public readonly record struct Person(string Name);
+///^^^ storage.modifier.access
+///    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ meta.class.record
+///    ^^^^^^^^ storage.modifier
+///             ^^^^^^ storage.type.class.record
+///                    ^^^^^^ storage.type.struct.record
+///                           ^^^^^^ entity.name.class
+///                                 ^ punctuation.section.group.begin
+///                                  ^^^^^^ storage.type
+///                                         ^^^^ variable.parameter
+///                                             ^ punctuation.section.parameters.end
+///                                              ^ punctuation.terminator.statement

C#/tests/syntax_test_C#8.cs

@@ -86,7 +86,7 @@ public struct Point3D
 ///               ^^^ storage.modifier
 ///                   ^^^^^^^^ storage.modifier
 ///                            ^^^^^^^ support.type
-///                                    ^^^^^^^ variable.other.member
+///                                    ^^^^^^ variable.other.member
 ///                                           ^^ keyword.declaration.function.accessor.get
 ///                                              ^^^ keyword.other
 ///                                                  ^^^^^^ variable.other

C#/tests/syntax_test_GeneralStructure.cs

@@ -788,6 +788,21 @@ public virtual ActionResult Process([ModelBinder(typeof(MyModelBinder))]
         {
         }
 
+        [SomeAttribute (Url="//")]
+///     ^^^^^^^^^^^^^^^^^^^^^^^^^^ meta.annotation - comment
+///     ^ punctuation.definition.annotation.begin
+///      ^^^^^^^^^^^^^ variable.annotation
+///                    ^ punctuation.section.group.begin
+///                     ^^^ variable.parameter
+///                        ^ keyword.operator.assignment
+///                         ^^^^ string.quoted.double
+///                             ^ punctuation.section.group.end
+///                              ^ punctuation.definition.annotation.end
+///                               ^ - meta.annotation
+        void Test() {
+        }
+
+
         int Method4 => 5;
 ///     ^^^ storage.type
 ///         ^^^^^^^ variable.other.member
@@ -1372,3 +1387,53 @@ public int Counter
         set => counter = value;
     }
 }
+
+public class MyClass
+{
+    Dictionary<MyEnum, List<uint>> myDict
+/// ^^^^^^^^^^ support.type
+///           ^ punctuation.definition.generic.begin
+///            ^^^^^^ support.type
+///                  ^ punctuation.separator.type
+///                    ^^^^ support.type
+///                        ^ punctuation.definition.generic.begin
+///                         ^^^^ storage.type
+///                             ^^ punctuation.definition.generic.end
+///                                ^^^^^^ variable.other.member
+        = new Dictionary<MyEnum, List<uint>>
+///     ^ keyword.operator.assignment.variable
+///       ^^^ keyword.operator.new
+        {
+            [One] = new List<uint>
+            {
+                1, 2, 3
+            },
+            [Two] = new List<uint>
+            {
+                4, 5, 6
+            }
+        };
+///     ^ punctuation.section.braces.end - invalid
+///      ^ punctuation.terminator.statement - invalid
+}
+
+public class MyClass
+{
+    bool var // missing semi-colon
+/// ^^^^ storage.type
+///      ^^^ variable.other.member
+
+    bool var => return 0;
+/// ^^^^ storage.type
+///      ^^^ variable.other.member
+///          ^^ keyword.declaration.function.accessor.get
+///             ^^^^^^ keyword.other
+///                    ^ meta.number.integer.decimal constant.numeric.value
+///                     ^ punctuation.terminator.statement
+
+    bool var // missing semi-colon
+/// ^^^^ storage.type
+///      ^^^ variable.other.member
+}
+/// <- meta.class.body meta.block punctuation.section.block.end
+/// ^ - meta

C#/tests/syntax_test_PreprocessorDirectives.cs

@@ -68,3 +68,25 @@ static void Main()
 //         ^^^^^ variable.other.section
 #endregion
 // ^^ storage.type.section
+
+#nullable enable
+/// ^^ meta.preprocessor keyword.other.preprocessor
+///       ^^ meta.preprocessor keyword.other.preprocessor
+
+#nullable disable
+/// ^^ meta.preprocessor keyword.other.preprocessor
+///       ^^ meta.preprocessor keyword.other.preprocessor
+
+#nullable restore
+/// ^^ meta.preprocessor keyword.other.preprocessor
+///       ^^ meta.preprocessor keyword.other.preprocessor
+
+#nullable enable annotations
+/// ^^ meta.preprocessor keyword.other.preprocessor
+///       ^^ meta.preprocessor keyword.other.preprocessor
+///              ^^ meta.preprocessor keyword.other.preprocessor
+
+#nullable disable warnings
+/// ^^ meta.preprocessor keyword.other.preprocessor
+///       ^^ meta.preprocessor keyword.other.preprocessor
+// /              ^^ meta.preprocessor keyword.other.preprocessor

Git Formats/Git Code Owners.sublime-syntax

@@ -0,0 +1,50 @@
+%YAML 1.2
+---
+# Syntax based on documentation here:
+# https://git-scm.com/docs/gitignore
+# https://docs.github.com/en/github/creating-cloning-and-archiving-repositories/about-code-owners#codeowners-syntax
+
+name: Git Code Owners
+scope: text.git.codeowners
+version: 2
+
+file_extensions:
+  - CODEOWNERS
+
+contexts:
+
+  main:
+    - include: Git Common.sublime-syntax#comments
+    # note:
+    # - ignore whitespace at the beginning of a line
+    # - patterns may not start with operators: - !
+    # - escaped hash tags are not supported
+    - match: '[-!]|\\#|(?=\S)'
+      scope: invalid.illegal.operator.git.codeowners
+      push:
+        - pattern-content
+        - Git Common.sublime-syntax#fnmatch-start
+
+  pattern-content:
+    - meta_content_scope: meta.path.pattern.git.codeowners entity.name.pattern.git.codeowners
+    - match: \s+(?=([^\@\s]+)?\@)
+      set: owners
+    # note: character classes are not supported
+    - include: Git Common.sublime-syntax#fnmatch-common
+    - include: eol-pop
+
+  owners:
+    - meta_content_scope: meta.owners.git.codeowners
+    - include: Git Common.sublime-syntax#username
+    - include: emails
+    - include: eol-pop
+
+  emails:
+    - match: (?=\S)
+      push:
+        - Git Common.sublime-syntax#email-meta
+        - Git Common.sublime-syntax#email-name
+
+  eol-pop:
+    - match: $
+      pop: 1