use a fnction

Author: meganrogge

src/vs/platform/terminal/common/capabilities/commandDetectionCapability.ts

@@ -806,7 +806,8 @@ function parseAliases(aliasString: string, isWindows?: boolean): string[][] {
 		} else if (shellType === 'bash') {
 			aliases.push(row.substring(6).split('='));
 		} else {
-			aliases.push(row.split('\s+'));
+			// to do - way to avoid this filtering?
+			aliases.push(row.split(' ').filter(s => !!s.trim()));
 		}
 	}
 	console.log(aliases);

src/vs/workbench/contrib/terminal/browser/media/shellIntegration.ps1

@@ -16,30 +16,41 @@ if ($ExecutionContext.SessionState.LanguageMode -ne "FullLanguage") {
 $Global:__VSCodeOriginalPrompt = $function:Prompt
 
 $Global:__LastHistoryId = -1
+function Set-Serialized
+{
+	param ([string] $toSerialize)
+	$toSerialize = $toSerialize.Replace("\", "\\").Replace("`n", "\x0a").Replace(";", "\x3b")
+	return $toSerialize
+}
 
-
-function Global:Prompt() {
+function Global:Prompt()
+{
 	$FakeCode = [int]!$global:?
 	$LastHistoryEntry = Get-History -Count 1
 	# Skip finishing the command if the first command has not yet started
-	if ($Global:__LastHistoryId -ne -1) {
-		if ($LastHistoryEntry.Id -eq $Global:__LastHistoryId) {
+	if ($Global:__LastHistoryId -ne -1)
+	{
+		if ($LastHistoryEntry.Id -eq $Global:__LastHistoryId)
+		{
 			# Don't provide a command line or exit code if there was no history entry (eg. ctrl+c, enter on no command)
 			$Result  = "`e]633;E`a"
 			$Result += "`e]633;D`a"
-		} else {
+		} else
+		{
 			# Command finished command line
 			# OSC 633 ; A ; <CommandLine?> ST
 			$Result  = "`e]633;E;"
 			# Sanitize the command line to ensure it can get transferred to the terminal and can be parsed
 			# correctly. This isn't entirely safe but good for most cases, it's important for the Pt parameter
 			# to only be composed of _printable_ characters as per the spec.
-			if ($LastHistoryEntry.CommandLine) {
+			if ($LastHistoryEntry.CommandLine)
+			{
 				$CommandLine = $LastHistoryEntry.CommandLine
-			} else {
+			} else
+			{
 				$CommandLine = ""
 			}
-			$Result += $CommandLine.Replace("\", "\\").Replace("`n", "\x0a").Replace(";", "\x3b")
+			$Result += Set-Serialized($CommandLine)
 			$Result += "`a"
 			# Command finished exit code
 			# OSC 633 ; D [; <ExitCode>] ST
@@ -51,9 +62,13 @@ function Global:Prompt() {
 	$Result += "`e]633;A`a"
 	# Current working directory
 	# OSC 633 ; <Property>=<Value> ST
-	$Result += if($pwd.Provider.Name -eq 'FileSystem'){"`e]633;P;Cwd=$($pwd.ProviderPath)`a"}
+	$Result += if($pwd.Provider.Name -eq 'FileSystem')
+	{"`e]633;P;Cwd=$($pwd.ProviderPath)`a"
+ }
 	# Before running the original prompt, put $? back to what it was:
-	if ($FakeCode -ne 0) { Write-Error "failure" -ea ignore }
+	if ($FakeCode -ne 0)
+	{ Write-Error "failure" -ea ignore
+ }
 	# Run the original prompt
 	$Result += $Global:__VSCodeOriginalPrompt.Invoke()
 	# Write command started
@@ -64,9 +79,11 @@ function Global:Prompt() {
 
 # Only send the command executed sequence when PSReadLine is loaded, if not shell integration should
 # still work thanks to the command line sequence
-if (Get-Module -Name PSReadLine) {
+if (Get-Module -Name PSReadLine)
+{
 	$__VSCodeOriginalPSConsoleHostReadLine = $function:PSConsoleHostReadLine
-	function Global:PSConsoleHostReadLine {
+	function Global:PSConsoleHostReadLine
+	{
 		$tmp = $__VSCodeOriginalPSConsoleHostReadLine.Invoke()
 		# Write command executed sequence directly to Console to avoid the new line from Write-Host
 		[Console]::Write("`e]633;C`a")
@@ -78,21 +95,27 @@ if (Get-Module -Name PSReadLine) {
 [Console]::Write("`e]633;P;IsWindows=$($IsWindows)`a")
 
 # Set always on key handlers which map to default VS Code keybindings
-function Set-MappedKeyHandler {
+function Set-MappedKeyHandler
+{
 	param ([string[]] $Chord, [string[]]$Sequence)
 	$Handler = $(Get-PSReadLineKeyHandler -Chord $Chord | Select-Object -First 1)
-	if ($Handler) {
+	if ($Handler)
+	{
 		Set-PSReadLineKeyHandler -Chord $Sequence -Function $Handler.Function
 	}
 }
-function Set-MappedKeyHandlers {
+function Set-MappedKeyHandlers
+{
 	Set-MappedKeyHandler -Chord Ctrl+Spacebar -Sequence 'F12,a'
 	Set-MappedKeyHandler -Chord Alt+Spacebar -Sequence 'F12,b'
 	Set-MappedKeyHandler -Chord Shift+Enter -Sequence 'F12,c'
 	Set-MappedKeyHandler -Chord Shift+End -Sequence 'F12,d'
 }
+
 Set-MappedKeyHandlers
 $result = $(Get-Alias | Select-Object Name, Definition)
 $resultStr = Out-String -InputObject $result
-$resultStr = $resultStr.Replace("\", "\\").Replace("`n", "\x0a").Replace(";", "\x3b")
+$resultStr = Set-Serialized($resultStr)
 [Console]::Write("`e]633;P;UserAliases=$resultStr`a")
+
+