From 42e542114b24617ac4240365ed69891ce1503046 Mon Sep 17 00:00:00 2001
From: John Roos <JohnRoos@users.noreply.github.com>
Date: Fri, 11 Nov 2022 05:53:36 +0100
Subject: [PATCH] Improved PowerShell lexer (#700)

---
 lexers/embedded/powershell.xml      |  6 ++++++
 lexers/testdata/powershell.actual   |  4 ++++
 lexers/testdata/powershell.expected | 17 ++++++++++++++++-
 3 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/lexers/embedded/powershell.xml b/lexers/embedded/powershell.xml
index d7bd02aeb..8eaa5807a 100644
--- a/lexers/embedded/powershell.xml
+++ b/lexers/embedded/powershell.xml
@@ -119,6 +119,9 @@
         <token type="Punctuation"/>
         <push state="child"/>
       </rule>
+      <rule pattern="(\$)((global|script|private|env):)?\w+">
+        <token type="NameVariable"/>
+      </rule>
       <rule pattern="&#34;&#34;">
         <token type="LiteralStringDouble"/>
       </rule>
@@ -139,6 +142,9 @@
         <token type="Punctuation"/>
         <push state="child"/>
       </rule>
+      <rule pattern="(\$)((global|script|private|env):)?\w+">
+        <token type="NameVariable"/>
+      </rule>
       <rule pattern="[^@\n]+&#34;]">
         <token type="LiteralStringHeredoc"/>
       </rule>
diff --git a/lexers/testdata/powershell.actual b/lexers/testdata/powershell.actual
index 6e7a5e209..f4b3dad92 100644
--- a/lexers/testdata/powershell.actual
+++ b/lexers/testdata/powershell.actual
@@ -1 +1,5 @@
 Get-ChildItem -Recurse -Force -ErrorAction SilentlyContinue -Name -Path C:\ *.txt
+$x = "Here is a $var inside a string"
+$x = @"
+Here is a $var inside a here-string
+"@
\ No newline at end of file
diff --git a/lexers/testdata/powershell.expected b/lexers/testdata/powershell.expected
index 0c6f29669..e513f1167 100644
--- a/lexers/testdata/powershell.expected
+++ b/lexers/testdata/powershell.expected
@@ -18,5 +18,20 @@
   {"type":"Text","value":" "},
   {"type":"Punctuation","value":"*."},
   {"type":"Name","value":"txt"},
-  {"type":"Text","value":"\n"}
+  {"type":"Text","value":"\n"},
+  {"type":"NameVariable","value":"$x"},
+  {"type":"Text","value":" "},
+  {"type":"Punctuation","value":"="},
+  {"type":"Text","value":" "},
+  {"type":"LiteralStringDouble","value":"\"Here is a "},
+  {"type":"NameVariable","value":"$var"},
+  {"type":"LiteralStringDouble","value":" inside a string\""},
+  {"type":"Text","value":"\n"},
+  {"type":"NameVariable","value":"$x"},
+  {"type":"Text","value":" "},
+  {"type":"Punctuation","value":"="},
+  {"type":"Text","value":" "},
+  {"type":"LiteralStringHeredoc","value":"@\"\nHere is a "},
+  {"type":"NameVariable","value":"$var"},
+  {"type":"LiteralStringHeredoc","value":" inside a here-string\n\"@"}
 ]