microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2025-12-10 00:27:05 -06:00
Code Issues Packages Projects Releases 177 Wiki Activity

ensure there's a space before reset char (#253925)

Browse Source 
fix #253190
This commit is contained in:
Megan Rogge 2025-07-03 21:08:37 -04:00 committed by GitHub
parent 51aa46f271
commit 81989afd86
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
extensions/terminal-suggest/src/tokens.ts
View File

@ -14,7 +14,7 @@ export const enum TokenType {
export const shellTypeResetChars = new Map<TerminalShellType, string[]>([
[TerminalShellType.Bash, ['>', '>>', '<', '2>', '2>>', '&>', '&>>', '|', '|&', '&&', '||', '&', ';', '(', '{', '<<']],
[TerminalShellType.Zsh, ['>', '>>', '<', '2>', '2>>', '&>', '&>>', '<>', '|', '|&', '&&', '||', '&', ';', '(', '{', '<<', '<<<', '<(']],
[TerminalShellType.PowerShell, ['>', '>>', '<', '2>', '2>>', '*>', '*>>', '|', ';', '-and', '-or', '-not', '!', '&', '-eq', '-ne', '-gt', '-lt', '-ge', '-le', '-like', '-notlike', '-match', '-notmatch', '-contains', '-notcontains', '-in', '-notin']]
[TerminalShellType.PowerShell, ['>', '>>', '<', '2>', '2>>', '*>', '*>>', '|', ';', ' -and ', ' -or ', ' -not ', '!', '&', ' -eq ', ' -ne ', ' -gt ', ' -lt ', ' -ge ', ' -le ', ' -like ', ' -notlike ', ' -match ', ' -notmatch ', ' -contains ', ' -notcontains ', ' -in ', ' -notin ']]
]);
export const defaultShellTypeResetChars = shellTypeResetChars.get(TerminalShellType.Bash)!;
@ -31,7 +31,7 @@ export function getTokenType(ctx: { commandLine: string; cursorPosition: number
// Look for " <reset char> " before the word
for (const resetChar of commandResetChars) {
const pattern = ` ${resetChar} `;
const pattern = shellType === TerminalShellType.PowerShell ? `${resetChar}` : ` ${resetChar} `;
if (beforeWord.endsWith(pattern)) {
return TokenType.Command;
}