From c53e5b4925a8494e905c908130bf4e2a9c2b8fd6 Mon Sep 17 00:00:00 2001
From: matteocoder <22897138+matteocoder@users.noreply.github.com>
Date: Wed, 8 Jan 2025 08:30:03 +0100
Subject: [PATCH 1/7] Change keyword matching regex

Keywords (with the exception of 'where' and 'foreach') should not be considered as such if they are preceded by a '.'.
The tests relative to keywords used as members or methods now pass.
'process' is now considered a block keyword.
---
 PowerShell.sublime-syntax        | 48 +++++++++++++++++---------------
 Tests/syntax_test_PowerShell.ps1 |  6 ++++
 2 files changed, 31 insertions(+), 23 deletions(-)

diff --git a/PowerShell.sublime-syntax b/PowerShell.sublime-syntax
index 8d1941b..9601eb1 100644
--- a/PowerShell.sublime-syntax
+++ b/PowerShell.sublime-syntax
@@ -76,70 +76,72 @@ contexts:
     - match: \b[\w.-]+\.(?i:exe|com|cmd|bat)\b
       scope: variable.function.powershell
     # Exceptions
-    - match: \b(?i:throw){{kebab_break}}
+    - match: (?<![.])\b(?i:throw){{kebab_break}}
       scope: keyword.control.exception.raise.powershell
-    - match: \b(?i:try){{kebab_break}}
+    - match: (?<![.])\b(?i:try){{kebab_break}}
       scope: keyword.control.exception.try.powershell
-    - match: \b(?i:catch|trap){{kebab_break}}
+    - match: (?<![.])\b(?i:catch|trap){{kebab_break}}
       scope: keyword.control.exception.catch.powershell
-    - match: \b(?i:finally){{kebab_break}}
+    - match: (?<![.])\b(?i:finally){{kebab_break}}
       scope: keyword.control.exception.finally.powershell
     # Conditionals
-    - match: \b(?i:if){{kebab_break}}
+    - match: (?<![.])\b(?i:if){{kebab_break}}
       scope: keyword.control.conditional.if.powershell
-    - match: \b(?i:elseif){{kebab_break}}
+    - match: (?<![.])\b(?i:elseif){{kebab_break}}
       scope: keyword.control.conditional.elseif.powershell
-    - match: \b(?i:else){{kebab_break}}
+    - match: (?<![.])\b(?i:else){{kebab_break}}
       scope: keyword.control.conditional.else.powershell
-    - match: \b(?i:switch){{kebab_break}}
+    - match: (?<![.])\b(?i:switch){{kebab_break}}
       scope: keyword.control.conditional.switch.powershell
     - match: \?
       scope: keyword.control.conditional.select.powershell
     - match: \b(?i:where(?!-object)){{kebab_break}}
       scope: keyword.control.conditional.select.powershell
     # Begin/End
-    - match: \b(?i:begin){{kebab_break}}
+    - match: (?<![.])\b(?i:begin){{kebab_break}}
       scope: keyword.context.block.begin.powershell
-    - match: \b(?i:end){{kebab_break}}
+    - match: (?<![.])\b(?i:process){{kebab_break}}
+      scope: keyword.context.block.process.powershell
+    - match: (?<![.])\b(?i:end){{kebab_break}}
       scope: keyword.context.block.end.powershell
-    - match: \b(?i:clean){{kebab_break}}
+    - match: (?<![.])\b(?i:clean){{kebab_break}}
       scope: keyword.context.block.clean.powershell
     # Loops
     - match: \b(?i:for|foreach(?!-object)){{kebab_break}}
       scope: keyword.control.loop.for.powershell
-    - match: \b(?i:do){{kebab_break}}
+    - match: (?<![.])\b(?i:do){{kebab_break}}
       scope: keyword.control.loop.do-while.powershell
-    - match: \b(?i:while){{kebab_break}}
+    - match: (?<![.])\b(?i:while){{kebab_break}}
       scope: keyword.control.loop.while.powershell
-    - match: \b(?i:until){{kebab_break}}
+    - match: (?<![.])\b(?i:until){{kebab_break}}
       scope: keyword.control.loop.repeat-until.powershell
     # Flow
-    - match: \b(?i:break){{kebab_break}}
+    - match: (?<![.])\b(?i:break){{kebab_break}}
       scope: keyword.control.flow.break.powershell
-    - match: \b(?i:continue){{kebab_break}}
+    - match: (?<![.])\b(?i:continue){{kebab_break}}
       scope: keyword.control.flow.continue.powershell
-    - match: \b(?i:exit){{kebab_break}}
+    - match: (?<![.])\b(?i:exit){{kebab_break}}
       scope: keyword.control.flow.exit.powershell
-    - match: \b(?i:return){{kebab_break}}
+    - match: (?<![.])\b(?i:return){{kebab_break}}
       scope: keyword.control.flow.return.powershell
     # Declaration
-    - match: \b(?i:var){{kebab_break}}
+    - match: (?<![.])\b(?i:var){{kebab_break}}
       # scope: storage.type.variable.powershell
       scope: keyword.declaration.variable.powershell
-    - match: \b(?i:(?:dynamic)?param){{kebab_break}}
+    - match: (?<![.])\b(?i:(?:dynamic)?param){{kebab_break}}
       scope: keyword.declaration.parameter.powershell  # This scope is not standard
     # Uncategorized keywords
-    - match: \b(?i:data|default|define|from|in|inlinescript|parallel|process){{kebab_break}}
+    - match: (?<![.])\b(?i:data|default|define|from|in|inlinescript|parallel){{kebab_break}}
       scope: keyword.control.powershell
     - match: \B--%\B
       scope: keyword.control.powershell
       push:
         - meta_content_scope: string.unquoted.powershell
         - include: pop-before-newline
-    - match: \b(?i:hidden|static)\b
+    - match: (?<![.])\b(?i:hidden|static)\b
       # This should only be relevant inside a class but will require a rework of how classes are matched. This is a temp fix.
       scope: storage.modifier.powershell
-    - match: \b((?i:class))\s+([\w-]+)\b
+    - match: (?<![.])\b((?i:class))\s+([\w-]+)\b
       captures:
         1: storage.type.class.powershell
         2: meta.class.powershell entity.name.class.powershell
diff --git a/Tests/syntax_test_PowerShell.ps1 b/Tests/syntax_test_PowerShell.ps1
index c9b7626..2103b13 100644
--- a/Tests/syntax_test_PowerShell.ps1
+++ b/Tests/syntax_test_PowerShell.ps1
@@ -1360,6 +1360,12 @@ New-Object -TypeName System.Diagnostics.Process
 #                                       ^^^^^^^ - keyword.control
 New-Object -TypeName System.Data
 #                           ^^^^ - keyword.control
+New-Object -TypeName System.if
+#                           ^^ - keyword.control
+New-Object -TypeName System.Clean
+#                           ^^^^^ - keyword.control
+New-Object -TypeName System.Throw
+#                           ^^^^^ - keyword.control
 echo `"test`"
 #    ^^^^^^^^^ - string.quoted
 #    ^^ constant.character.escape

From ac61e7305c054b47c65d91f67ba5836cbb62f118 Mon Sep 17 00:00:00 2001
From: matteocoder <22897138+matteocoder@users.noreply.github.com>
Date: Wed, 8 Jan 2025 08:47:20 +0100
Subject: [PATCH 2/7] Add 'sequence' keyword

Also make the relative syntax test pass.
---
 PowerShell.sublime-syntax | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/PowerShell.sublime-syntax b/PowerShell.sublime-syntax
index 9601eb1..ff6ad8a 100644
--- a/PowerShell.sublime-syntax
+++ b/PowerShell.sublime-syntax
@@ -131,7 +131,7 @@ contexts:
     - match: (?<![.])\b(?i:(?:dynamic)?param){{kebab_break}}
       scope: keyword.declaration.parameter.powershell  # This scope is not standard
     # Uncategorized keywords
-    - match: (?<![.])\b(?i:data|default|define|from|in|inlinescript|parallel){{kebab_break}}
+    - match: (?<![.])\b(?i:data|default|define|from|in|inlinescript|parallel|sequence){{kebab_break}}
       scope: keyword.control.powershell
     - match: \B--%\B
       scope: keyword.control.powershell

From b73fae0036aed96d6c8be824d5affcb77f034dac Mon Sep 17 00:00:00 2001
From: matteocoder <22897138+matteocoder@users.noreply.github.com>
Date: Wed, 8 Jan 2025 09:08:16 +0100
Subject: [PATCH 3/7] Change test assertion in Function syntax test

Now the test reflects the change of the 'process' keyword from uncategorised to block.
---
 Tests/syntax_test_Function.ps1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Tests/syntax_test_Function.ps1 b/Tests/syntax_test_Function.ps1
index 3c16339..6688d66 100644
--- a/Tests/syntax_test_Function.ps1
+++ b/Tests/syntax_test_Function.ps1
@@ -376,7 +376,7 @@ function Verb-Noun {
     {
     }
     Process {
-    # <- keyword.control
+    # <- keyword.context.block.process
         if ($pscmdlet.ShouldProcess("Target", "Operation")) {
         # <- keyword.control
         #  ^ punctuation.section.group.begin

From 11aecf61f3a4c66baf7b4ac1672acd730b5621b2 Mon Sep 17 00:00:00 2001
From: matteocoder <22897138+matteocoder@users.noreply.github.com>
Date: Wed, 8 Jan 2025 09:12:20 +0100
Subject: [PATCH 4/7] Change Parameter matching regex to match
 'PositionalBinding'

The relevant test in the function syntax test now passes.
---
 PowerShell.sublime-syntax | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/PowerShell.sublime-syntax b/PowerShell.sublime-syntax
index ff6ad8a..1668c59 100644
--- a/PowerShell.sublime-syntax
+++ b/PowerShell.sublime-syntax
@@ -294,9 +294,9 @@ contexts:
                 (?xi:
                   \b(
                     Mandatory | ValueFromPipeline(?:ByPropertyName)?
-                  | ValueFromRemainingArguments | Position
+                  | ValueFromRemainingArguments | Position(?:alBinding)?
                   | (?:Default)?ParameterSetName | SupportsShouldProcess | SupportsPaging
-                  | PositionalBinding | HelpUri | ConfirmImpact | HelpMessage
+                  | HelpUri | ConfirmImpact | HelpMessage
                   )
                   \s*(=)?
                 )

From e180d24b49acf8cf1f93dc498b823ddf1272b157 Mon Sep 17 00:00:00 2001
From: matteocoder <22897138+matteocoder@users.noreply.github.com>
Date: Wed, 8 Jan 2025 19:28:39 +0100
Subject: [PATCH 5/7] Consume string with a trailing dot before checking for
 keywords

This makes negative lookbehind assertions on keywords unnecessary.
---
 PowerShell.sublime-syntax        | 52 +++++++++++++++++---------------
 Tests/syntax_test_PowerShell.ps1 | 12 ++++----
 2 files changed, 34 insertions(+), 30 deletions(-)

diff --git a/PowerShell.sublime-syntax b/PowerShell.sublime-syntax
index 1668c59..ed6041c 100644
--- a/PowerShell.sublime-syntax
+++ b/PowerShell.sublime-syntax
@@ -75,73 +75,77 @@ contexts:
         - include: main
     - match: \b[\w.-]+\.(?i:exe|com|cmd|bat)\b
       scope: variable.function.powershell
+    # Consume a string with a trailing dot
+    # to prevent members with particular names from being recognized as keywords.
+    - match: \b[\w-]+(?=\.)
+      push: members
     # Exceptions
-    - match: (?<![.])\b(?i:throw){{kebab_break}}
+    - match: \b(?i:throw){{kebab_break}}
       scope: keyword.control.exception.raise.powershell
-    - match: (?<![.])\b(?i:try){{kebab_break}}
+    - match: \b(?i:try){{kebab_break}}
       scope: keyword.control.exception.try.powershell
-    - match: (?<![.])\b(?i:catch|trap){{kebab_break}}
+    - match: \b(?i:catch|trap){{kebab_break}}
       scope: keyword.control.exception.catch.powershell
-    - match: (?<![.])\b(?i:finally){{kebab_break}}
+    - match: \b(?i:finally){{kebab_break}}
       scope: keyword.control.exception.finally.powershell
     # Conditionals
-    - match: (?<![.])\b(?i:if){{kebab_break}}
+    - match: \b(?i:if){{kebab_break}}
       scope: keyword.control.conditional.if.powershell
-    - match: (?<![.])\b(?i:elseif){{kebab_break}}
+    - match: \b(?i:elseif){{kebab_break}}
       scope: keyword.control.conditional.elseif.powershell
-    - match: (?<![.])\b(?i:else){{kebab_break}}
+    - match: \b(?i:else){{kebab_break}}
       scope: keyword.control.conditional.else.powershell
-    - match: (?<![.])\b(?i:switch){{kebab_break}}
+    - match: \b(?i:switch){{kebab_break}}
       scope: keyword.control.conditional.switch.powershell
     - match: \?
       scope: keyword.control.conditional.select.powershell
     - match: \b(?i:where(?!-object)){{kebab_break}}
       scope: keyword.control.conditional.select.powershell
     # Begin/End
-    - match: (?<![.])\b(?i:begin){{kebab_break}}
+    - match: \b(?i:begin){{kebab_break}}
       scope: keyword.context.block.begin.powershell
-    - match: (?<![.])\b(?i:process){{kebab_break}}
+    - match: \b(?i:process){{kebab_break}}
       scope: keyword.context.block.process.powershell
-    - match: (?<![.])\b(?i:end){{kebab_break}}
+    - match: \b(?i:end){{kebab_break}}
       scope: keyword.context.block.end.powershell
-    - match: (?<![.])\b(?i:clean){{kebab_break}}
+    - match: \b(?i:clean){{kebab_break}}
       scope: keyword.context.block.clean.powershell
     # Loops
     - match: \b(?i:for|foreach(?!-object)){{kebab_break}}
       scope: keyword.control.loop.for.powershell
-    - match: (?<![.])\b(?i:do){{kebab_break}}
+    - match: \b(?i:do){{kebab_break}}
       scope: keyword.control.loop.do-while.powershell
-    - match: (?<![.])\b(?i:while){{kebab_break}}
+    - match: \b(?i:while){{kebab_break}}
       scope: keyword.control.loop.while.powershell
-    - match: (?<![.])\b(?i:until){{kebab_break}}
+    - match: \b(?i:until){{kebab_break}}
       scope: keyword.control.loop.repeat-until.powershell
     # Flow
-    - match: (?<![.])\b(?i:break){{kebab_break}}
+    - match: \b(?i:break){{kebab_break}}
       scope: keyword.control.flow.break.powershell
-    - match: (?<![.])\b(?i:continue){{kebab_break}}
+    - match: \b(?i:continue){{kebab_break}}
       scope: keyword.control.flow.continue.powershell
-    - match: (?<![.])\b(?i:exit){{kebab_break}}
+    - match: \b(?i:exit){{kebab_break}}
       scope: keyword.control.flow.exit.powershell
-    - match: (?<![.])\b(?i:return){{kebab_break}}
+    - match: \b(?i:return){{kebab_break}}
       scope: keyword.control.flow.return.powershell
     # Declaration
-    - match: (?<![.])\b(?i:var){{kebab_break}}
+    - match: \b(?i:var){{kebab_break}}
       # scope: storage.type.variable.powershell
       scope: keyword.declaration.variable.powershell
-    - match: (?<![.])\b(?i:(?:dynamic)?param){{kebab_break}}
+    - match: \b(?i:(?:dynamic)?param){{kebab_break}}
       scope: keyword.declaration.parameter.powershell  # This scope is not standard
     # Uncategorized keywords
-    - match: (?<![.])\b(?i:data|default|define|from|in|inlinescript|parallel|sequence){{kebab_break}}
+    - match: \b(?i:data|default|define|from|in|inlinescript|parallel|sequence){{kebab_break}}
       scope: keyword.control.powershell
     - match: \B--%\B
       scope: keyword.control.powershell
       push:
         - meta_content_scope: string.unquoted.powershell
         - include: pop-before-newline
-    - match: (?<![.])\b(?i:hidden|static)\b
+    - match: \b(?i:hidden|static)\b
       # This should only be relevant inside a class but will require a rework of how classes are matched. This is a temp fix.
       scope: storage.modifier.powershell
-    - match: (?<![.])\b((?i:class))\s+([\w-]+)\b
+    - match: \b((?i:class))\s+([\w-]+)\b
       captures:
         1: storage.type.class.powershell
         2: meta.class.powershell entity.name.class.powershell
diff --git a/Tests/syntax_test_PowerShell.ps1 b/Tests/syntax_test_PowerShell.ps1
index 2103b13..b882559 100644
--- a/Tests/syntax_test_PowerShell.ps1
+++ b/Tests/syntax_test_PowerShell.ps1
@@ -1360,12 +1360,12 @@ New-Object -TypeName System.Diagnostics.Process
 #                                       ^^^^^^^ - keyword.control
 New-Object -TypeName System.Data
 #                           ^^^^ - keyword.control
-New-Object -TypeName System.if
-#                           ^^ - keyword.control
-New-Object -TypeName System.Clean
-#                           ^^^^^ - keyword.control
-New-Object -TypeName System.Throw
-#                           ^^^^^ - keyword.control
+New-Object -TypeName Sy-stem.if
+#                            ^^ - keyword.control
+New-Object -TypeName S_ystem.Clean
+#                            ^^^^^ - keyword.control
+New-Object -TypeName Sy_stem-.Throw
+#                             ^^^^^ - keyword.control
 echo `"test`"
 #    ^^^^^^^^^ - string.quoted
 #    ^^ constant.character.escape

From 4fd944a0a6d7db24dfc3989874ecbe162e21345d Mon Sep 17 00:00:00 2001
From: matteocoder <22897138+matteocoder@users.noreply.github.com>
Date: Fri, 10 Jan 2025 14:01:57 +0200
Subject: [PATCH 6/7] Add scope to matched unquoted strings

Co-authored-by: deathaxe <deathaxe82@googlemail.com>
---
 PowerShell.sublime-syntax | 1 +
 1 file changed, 1 insertion(+)

diff --git a/PowerShell.sublime-syntax b/PowerShell.sublime-syntax
index ed6041c..2ba24e7 100644
--- a/PowerShell.sublime-syntax
+++ b/PowerShell.sublime-syntax
@@ -78,6 +78,7 @@ contexts:
     # Consume a string with a trailing dot
     # to prevent members with particular names from being recognized as keywords.
     - match: \b[\w-]+(?=\.)
+      scope: variable.other.object.powershell
       push: members
     # Exceptions
     - match: \b(?i:throw){{kebab_break}}

From 808aa94420e1d35d7b6b7d58ccb31d0b1c91e0a9 Mon Sep 17 00:00:00 2001
From: matteocoder <22897138+matteocoder@users.noreply.github.com>
Date: Fri, 10 Jan 2025 20:32:33 +0200
Subject: [PATCH 7/7] Match word boundary to avoid highlighting invalid
 arguments

Co-authored-by: deathaxe <deathaxe82@googlemail.com>
---
 PowerShell.sublime-syntax | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/PowerShell.sublime-syntax b/PowerShell.sublime-syntax
index 2ba24e7..ad864df 100644
--- a/PowerShell.sublime-syntax
+++ b/PowerShell.sublime-syntax
@@ -302,7 +302,7 @@ contexts:
                   | ValueFromRemainingArguments | Position(?:alBinding)?
                   | (?:Default)?ParameterSetName | SupportsShouldProcess | SupportsPaging
                   | HelpUri | ConfirmImpact | HelpMessage
-                  )
+                  )\b
                   \s*(=)?
                 )
               captures: