Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-05-24 09:21:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #223734 from microsoft/tyriar/223316

Browse Source 
Normalize path depending on OS separator
This commit is contained in:
Daniel Imms
2024-07-25 08:51:31 -07:00
committed by GitHub
parent bdde2df59d f1cb13bb1b
commit 9f6ceb0fe7
1 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/vs/workbench/contrib/terminalContrib/suggest/browser/terminalSuggestAddon.ts
+13 -3
View File
@@ -111,6 +111,7 @@ export class SuggestAddon extends Disposable implements ITerminalAddon, ISuggest
private _screen?: HTMLElement;
private _suggestWidget?: SimpleSuggestWidget;
private _enableWidget: boolean = true;
private _pathSeparator: string = sep;
private _isFilteringDirectories: boolean = false;
private _codeCompletionsRequested: boolean = false;
@@ -271,7 +272,7 @@ export class SuggestAddon extends Disposable implements ITerminalAddon, ISuggest
this._cursorIndexDelta = this._currentPromptInputState.cursorIndex - this._initialPromptInputState.cursorIndex;
let leadingLineContent = this._leadingLineContent + this._currentPromptInputState.value.substring(this._leadingLineContent.length, this._leadingLineContent.length + this._cursorIndexDelta);
if (this._isFilteringDirectories) {
leadingLineContent = leadingLineContent.replaceAll('/', '\\');
leadingLineContent = normalizePathSeparator(leadingLineContent, this._pathSeparator);
}
const lineContext = new LineContext(leadingLineContent, this._cursorIndexDelta);
this._suggestWidget.setLineContext(lineContext);
@@ -353,9 +354,11 @@ export class SuggestAddon extends Disposable implements ITerminalAddon, ISuggest
this._cursorIndexDelta = 0;
let leadingLineContent = this._leadingLineContent + this._currentPromptInputState.value.substring(this._leadingLineContent.length, this._leadingLineContent.length + this._cursorIndexDelta);
this._isFilteringDirectories = completions.every(e => e.completion.isDirectory || e.completion.isFile);
this._isFilteringDirectories = completions.some(e => e.completion.isDirectory) && completions.every(e => e.completion.isDirectory || e.completion.isFile);
if (this._isFilteringDirectories) {
leadingLineContent = leadingLineContent.replaceAll('/', '\\');
const firstDir = completions.find(e => e.completion.isDirectory);
this._pathSeparator = firstDir?.completion.label.match(/(?<sep>[\\\/])/)?.groups?.sep ?? sep;
leadingLineContent = normalizePathSeparator(leadingLineContent, this._pathSeparator);
}
const lineContext = new LineContext(leadingLineContent, this._cursorIndexDelta);
const model = new SimpleCompletionModel(completions, lineContext, replacementIndex, replacementLength);
@@ -726,3 +729,10 @@ function getIcon(resultType: number, tooltip: string): ThemeIcon {
}
return pwshTypeToIconMap[resultType] ?? Codicon.symbolText;
}
function normalizePathSeparator(path: string, sep: string): string {
if (sep === '/') {
return path.replaceAll('\\', '/');
}
return path.replaceAll('/', '\\');
}