Allow SmartInsertQuote to surround a keyword or variable (#1289)

theaquamarine · daxian-dbw · commit 40a02853a8bb · 2020-01-13T11:03:54.000-08:00
diff --git a/PSReadLine/SamplePSReadLineProfile.ps1 b/PSReadLine/SamplePSReadLineProfile.ps1
@@ -202,13 +202,14 @@ Set-PSReadLineKeyHandler -Key '"',"'" `
     }
 
     if ($token.Extent.StartOffset -eq $cursor) {
-        if ($token.Kind -eq [TokenKind]::Generic -or $token.Kind -eq [TokenKind]::Identifier) {
+        if ($token.Kind -eq [TokenKind]::Generic -or $token.Kind -eq [TokenKind]::Identifier -or 
+            $token.Kind -eq [TokenKind]::Variable -or $token.TokenFlags.hasFlag([TokenFlags]::Keyword)) {
             $end = $token.Extent.EndOffset
             $len = $end - $cursor
             [Microsoft.PowerShell.PSConsoleReadLine]::Replace($cursor, $len, $quote + $line.SubString($cursor, $len) + $quote)
             [Microsoft.PowerShell.PSConsoleReadLine]::SetCursorPosition($end + 2)
+            return
         }
-        return
     }
 
     # We failed to be smart, so just insert a single quote

Original file line number	Diff line number	Diff line change
@@ -202,13 +202,14 @@ Set-PSReadLineKeyHandler -Key '"',"'" `
`202`	`202`	`}`
`203`	`203`
`204`	`204`	`if ($token.Extent.StartOffset -eq $cursor) {`
`205`		`- if ($token.Kind -eq [TokenKind]::Generic -or $token.Kind -eq [TokenKind]::Identifier) {`
	`205`	`+ if ($token.Kind -eq [TokenKind]::Generic -or $token.Kind -eq [TokenKind]::Identifier -or`
	`206`	`+ $token.Kind -eq [TokenKind]::Variable -or $token.TokenFlags.hasFlag([TokenFlags]::Keyword)) {`
`206`	`207`	`$end = $token.Extent.EndOffset`
`207`	`208`	`$len = $end - $cursor`
`208`	`209`	`[Microsoft.PowerShell.PSConsoleReadLine]::Replace($cursor, $len, $quote + $line.SubString($cursor, $len) + $quote)`
`209`	`210`	`[Microsoft.PowerShell.PSConsoleReadLine]::SetCursorPosition($end + 2)`
	`211`	`+ return`
`210`	`212`	`}`
`211`		`- return`
`212`	`213`	`}`
`213`	`214`
`214`	`215`	`# We failed to be smart, so just insert a single quote`