Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions module/PowerShellRun/Private/ScriptRegistry.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,10 @@ class ScriptRegistry : EntryRegistry {

$this.scriptBlockCallback = {
$result = $args[0].Result
$scriptBlock = $args[0].ArgumentList
$scriptBlock, $argumentList = $args[0].ArgumentList

if ($result.KeyCombination -eq $script:globalStore.firstActionKey) {
& $scriptBlock
& $scriptBlock @argumentList
} elseif ($result.KeyCombination -eq $script:globalStore.secondActionKey) {
$scriptBlock.ToString()
} elseif ($result.KeyCombination -eq $script:globalStore.thirdActionKey) {
Expand All @@ -60,10 +60,10 @@ class ScriptRegistry : EntryRegistry {

$this.scriptFileCallback = {
$result = $args[0].Result
$filePath = $args[0].ArgumentList
$filePath, $argumentList = $args[0].ArgumentList

if ($result.KeyCombination -eq $script:globalStore.firstActionKey) {
& $filePath
& $filePath @argumentList
} elseif ($result.KeyCombination -eq $script:globalStore.secondActionKey) {
& $script:globalStore.defaultEditorScript $filePath
} elseif ($result.KeyCombination -eq $script:globalStore.thirdActionKey) {
Expand All @@ -79,7 +79,7 @@ class ScriptRegistry : EntryRegistry {
}
}

[void] AddScriptBlock($scriptBlock, $icon, $name, $description, $preview, [EntryGroup]$entryGroup) {
[void] AddScriptBlock($scriptBlock, $argumentList, $icon, $name, $description, $preview, [EntryGroup]$entryGroup) {
if (-not $this.isEnabled) {
Write-Warning -Message '"Script" category is disabled.'
return
Expand All @@ -98,7 +98,7 @@ class ScriptRegistry : EntryRegistry {

$entry.UserData = @{
ScriptBlock = $this.scriptBlockCallback
ArgumentList = $scriptBlock
ArgumentList = $scriptBlock, $argumentList
}

if ($entryGroup) {
Expand All @@ -109,7 +109,7 @@ class ScriptRegistry : EntryRegistry {
}
}

[void] AddScriptFile($filePath, $icon, $name, $description, $preview, [EntryGroup]$entryGroup) {
[void] AddScriptFile($filePath, $argumentList, $icon, $name, $description, $preview, [EntryGroup]$entryGroup) {
if (-not $this.isEnabled) {
Write-Warning -Message '"Script" category is disabled.'
return
Expand All @@ -129,7 +129,7 @@ class ScriptRegistry : EntryRegistry {

$entry.UserData = @{
ScriptBlock = $this.scriptFileCallback
ArgumentList = $filePath
ArgumentList = $filePath, $argumentList
}

if ($entryGroup) {
Expand Down
8 changes: 7 additions & 1 deletion module/PowerShellRun/Public/Add-PSRunScriptBlock.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@ Adds a ScriptBlock as an entry that can be invoked on selection. The entry belon
.PARAMETER ScriptBlock
The ScriptBlock that is invoked on selection.

.PARAMETER ArgumentList
The arguments that are passed to the ScriptBlock.

.PARAMETER Icon
The icon string.

Expand Down Expand Up @@ -43,6 +46,9 @@ function Add-PSRunScriptBlock {
[Parameter(Mandatory = $true, ValueFromPipelineByPropertyName = $true)]
[ScriptBlock]$ScriptBlock,

[Parameter(ValueFromPipelineByPropertyName = $true)]
[Object[]]$ArgumentList,

[Parameter(ValueFromPipelineByPropertyName = $true)]
[String]$Icon,

Expand All @@ -61,6 +67,6 @@ function Add-PSRunScriptBlock {

process {
$registry = $script:globalStore.GetRegistry('ScriptRegistry')
$registry.AddScriptBlock($ScriptBlock, $Icon, $Name, $Description, $Preview, $EntryGroup)
$registry.AddScriptBlock($ScriptBlock, $ArgumentList, $Icon, $Name, $Description, $Preview, $EntryGroup)
}
}
8 changes: 7 additions & 1 deletion module/PowerShellRun/Public/Add-PSRunScriptFile.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@ Adds a script file as an entry that can be invoked on selection. The entry belon
.PARAMETER Path
The filepath of the script file.

.PARAMETER ArgumentList
The arguments that are passed to the script file.

.PARAMETER Icon
The icon string.

Expand Down Expand Up @@ -41,6 +44,9 @@ function Add-PSRunScriptFile {
[Parameter(Mandatory = $true, ValueFromPipelineByPropertyName = $true)]
[String]$Path,

[Parameter(ValueFromPipelineByPropertyName = $true)]
[Object[]]$ArgumentList,

[Parameter(ValueFromPipelineByPropertyName = $true)]
[String]$Icon,

Expand All @@ -59,6 +65,6 @@ function Add-PSRunScriptFile {

process {
$registry = $script:globalStore.GetRegistry('ScriptRegistry')
$registry.AddScriptFile($Path, $Icon, $Name, $Description, $Preview, $EntryGroup)
$registry.AddScriptFile($Path, $ArgumentList, $Icon, $Name, $Description, $Preview, $EntryGroup)
}
}