From c27728584177966a0ee56ebfd9c45a03a69d75ce Mon Sep 17 00:00:00 2001 From: blue Date: Wed, 5 Feb 2020 19:14:52 +0000 Subject: [PATCH 1/3] Add Requires Assembly and PSEdition parameters Previously they were not treated the way -Modules/-Version/etc were --- PowerShellSyntax.tmLanguage | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PowerShellSyntax.tmLanguage b/PowerShellSyntax.tmLanguage index 60dd69d..7e66a0d 100644 --- a/PowerShellSyntax.tmLanguage +++ b/PowerShellSyntax.tmLanguage @@ -1212,7 +1212,7 @@ match - \-(?i:Modules|PSSnapin|RunAsAdministrator|ShellId|Version) + \-(?i:Modules|PSSnapin|RunAsAdministrator|ShellId|Version|Assembly|PSEdition) name keyword.other.powershell From cc0fe51262c161b6193c55fa163f4c802f6e152f Mon Sep 17 00:00:00 2001 From: blue Date: Wed, 5 Feb 2020 20:16:07 +0000 Subject: [PATCH 2/3] Add test for #Requires -PSEdition --- examples/TheBigTestFile.ps1 | 1 + spec/testfiles/syntax_test_TheBigTestFile.ps1 | 7 ++++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/examples/TheBigTestFile.ps1 b/examples/TheBigTestFile.ps1 index 39b0d89..652d7f5 100644 --- a/examples/TheBigTestFile.ps1 +++ b/examples/TheBigTestFile.ps1 @@ -10,6 +10,7 @@ using namespace System.Management.Automation #Requires -Modules PSWorkflow, ActiveDirectory #Requires -Modules PSWorkflow,ActiveDirectory #Requires -ShellId MyLocalShell +#Requires -PSEdition Core #Requires -Modules PSWorkflow @{ ModuleName="PSScheduledJob" ModuleVersion="1.0.0.0" diff --git a/spec/testfiles/syntax_test_TheBigTestFile.ps1 b/spec/testfiles/syntax_test_TheBigTestFile.ps1 index 89d416a..9e40615 100644 --- a/spec/testfiles/syntax_test_TheBigTestFile.ps1 +++ b/spec/testfiles/syntax_test_TheBigTestFile.ps1 @@ -63,6 +63,11 @@ using namespace System.Management.Automation # ^ meta.requires.powershell keyword.control.requires.powershell # ^^^^^^^^ meta.requires.powershell keyword.other.powershell # ^^^^^^^^^^^^ meta.requires.powershell variable.parameter.powershell +#Requires -PSEdition Core +# <- punctuation.definition.comment.powershell +# ^ meta.requires.powershell keyword.control.requires.powershell +# ^^^^^^^^^^ meta.requires.powershell keyword.other.powershell +# ^^^^ meta.requires.powershell variable.parameter.powershell #Requires -Modules PSWorkflow, @{ModuleName="PSScheduledJob"; ModuleVersion="1.0.0.0"} # <- punctuation.definition.comment.powershell # ^ meta.requires.powershell keyword.control.requires.powershell @@ -1234,4 +1239,4 @@ $ConfirmPreference $DebugPreference $ErrorActionPreference $ErrorView $FormatEnu # <- variable.language.powershell # ^ variable.language.powershell ^ variable.language.powershell ^ variable.language.powershell ^ variable.language.powershell ^ variable.language.powershell ^ variable.language.powershell ^ variable.language.powershell ^ variable.language.powershell ^ variable.language.powershell ^ variable.language.powershell ^ variable.language.powershell ^ variable.language.powershell ^ variable.language.powershell ^ variable.language.powershell ^ variable.language.powershell ^ variable.language.powershell # ^ variable.language.powershell ^ variable.language.powershell ^ variable.language.powershell ^ variable.language.powershell ^ variable.language.powershell ^ variable.language.powershell ^ variable.language.powershell ^ variable.language.powershell ^ variable.language.powershell ^ variable.language.powershell ^ variable.language.powershell ^ variable.language.powershell ^ variable.language.powershell -# ^ variable.language.powershell ^ variable.language.powershell ^ variable.language.powershell ^ variable.language.powershell ^ variable.language.powershell \ No newline at end of file +# ^ variable.language.powershell ^ variable.language.powershell ^ variable.language.powershell ^ variable.language.powershell ^ variable.language.powershell From 069f8b028f45c72237f93f059c60a29403541787 Mon Sep 17 00:00:00 2001 From: blue Date: Wed, 5 Feb 2020 20:39:30 +0000 Subject: [PATCH 3/3] Add test for #Requires -Assembly --- examples/TheBigTestFile.ps1 | 1 + spec/testfiles/syntax_test_TheBigTestFile.ps1 | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/examples/TheBigTestFile.ps1 b/examples/TheBigTestFile.ps1 index 652d7f5..91ccb59 100644 --- a/examples/TheBigTestFile.ps1 +++ b/examples/TheBigTestFile.ps1 @@ -11,6 +11,7 @@ using namespace System.Management.Automation #Requires -Modules PSWorkflow,ActiveDirectory #Requires -ShellId MyLocalShell #Requires -PSEdition Core +#Requires -Assembly System #Requires -Modules PSWorkflow @{ ModuleName="PSScheduledJob" ModuleVersion="1.0.0.0" diff --git a/spec/testfiles/syntax_test_TheBigTestFile.ps1 b/spec/testfiles/syntax_test_TheBigTestFile.ps1 index 9e40615..c6d3820 100644 --- a/spec/testfiles/syntax_test_TheBigTestFile.ps1 +++ b/spec/testfiles/syntax_test_TheBigTestFile.ps1 @@ -68,6 +68,11 @@ using namespace System.Management.Automation # ^ meta.requires.powershell keyword.control.requires.powershell # ^^^^^^^^^^ meta.requires.powershell keyword.other.powershell # ^^^^ meta.requires.powershell variable.parameter.powershell +#Requires -Assembly System +# <- punctuation.definition.comment.powershell +# ^ meta.requires.powershell keyword.control.requires.powershell +# ^^^^^^^^^ meta.requires.powershell keyword.other.powershell +# ^^^^^^ meta.requires.powershell variable.parameter.powershell #Requires -Modules PSWorkflow, @{ModuleName="PSScheduledJob"; ModuleVersion="1.0.0.0"} # <- punctuation.definition.comment.powershell # ^ meta.requires.powershell keyword.control.requires.powershell