Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-08-19 22:42:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

Only do special dir filtering when all completions are dirs

Browse Source
This commit is contained in:
Daniel Imms
2024-07-21 07:36:01 -07:00
parent 4c62fa2307
commit 3f33224c4a
3 changed files with 24 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/vs/workbench/contrib/terminalContrib/suggest/browser/terminalSuggestAddon.ts
+19 -4
View File
@@ -249,7 +249,11 @@ export class SuggestAddon extends Disposable implements ITerminalAddon, ISuggest
if (this._terminalSuggestWidgetVisibleContextKey.get()) {
this._cursorIndexDelta = this._currentPromptInputState.cursorIndex - this._initialPromptInputState.cursorIndex;
const lineContext = new LineContext(this._leadingLineContent + this._currentPromptInputState.value.substring(this._leadingLineContent.length, this._leadingLineContent.length + this._cursorIndexDelta), this._cursorIndexDelta);
let leadingLineContent = this._leadingLineContent + this._currentPromptInputState.value.substring(this._leadingLineContent.length, this._leadingLineContent.length + this._cursorIndexDelta);
if (this._model?.items.every(e => e.completion.isDirectory)) {
leadingLineContent = leadingLineContent.replaceAll('/', '\\');
}
const lineContext = new LineContext(leadingLineContent, this._cursorIndexDelta);
this._suggestWidget.setLineContext(lineContext);
}
@@ -327,7 +331,12 @@ export class SuggestAddon extends Disposable implements ITerminalAddon, ISuggest
ghostTextIndex: this._promptInputModel.ghostTextIndex
};
this._cursorIndexDelta = 0;
const lineContext = new LineContext(this._leadingLineContent + this._currentPromptInputState.value.substring(this._leadingLineContent.length, this._leadingLineContent.length + this._cursorIndexDelta), this._cursorIndexDelta);
let leadingLineContent = this._leadingLineContent + this._currentPromptInputState.value.substring(this._leadingLineContent.length, this._leadingLineContent.length + this._cursorIndexDelta);
if (this._model?.items.every(e => e.completion.isDirectory)) {
leadingLineContent = leadingLineContent.replaceAll('/', '\\');
}
const lineContext = new LineContext(leadingLineContent, this._cursorIndexDelta);
const model = new SimpleCompletionModel(completions, lineContext, replacementIndex, replacementLength);
this._handleCompletionModel(model);
}
@@ -625,6 +634,7 @@ export function parseCompletionsFromShell(leadingLineContent: string, rawComplet
icon: getIcon(e.ResultType, e.ToolTip),
detail: e.ToolTip,
isFile: e.ResultType === 3,
isDirectory: e.ResultType === 4,
})));
}
if (rawCompletions.length === 0) {
@@ -636,19 +646,24 @@ export function parseCompletionsFromShell(leadingLineContent: string, rawComplet
icon: getIcon(e[1], e[2]),
detail: e[2],
isFile: e[1] === 3,
isDirectory: e[1] === 4,
})));
}
if (Array.isArray(rawCompletions[0])) {
return (rawCompletions as CompressedPwshCompletion[]).map(e => (new SimpleCompletionItem({
label: e[0],
icon: getIcon(e[1], e[2]),
detail: e[2]
detail: e[2],
isFile: e[1] === 3,
isDirectory: e[1] === 4,
})));
}
return (rawCompletions as PwshCompletion[]).map(e => (new SimpleCompletionItem({
label: e.CompletionText,
icon: getIcon(e.ResultType, e.ToolTip),
detail: e.ToolTip
detail: e.ToolTip,
isFile: e.ResultType === 3,
isDirectory: e.ResultType === 4,
})));
}
src/vs/workbench/services/suggest/browser/simpleCompletionItem.ts
+4
View File
@@ -25,6 +25,10 @@ export interface ISimpleCompletion {
* first by extension length and then certain extensions will get a boost based on the OS.
*/
isFile?: boolean;
/**
* Whether the completion is a directory.
*/
isDirectory?: boolean;
}
export class SimpleCompletionItem {
src/vs/workbench/services/suggest/browser/simpleCompletionModel.ts
+1 -2
View File
@@ -81,7 +81,6 @@ export class SimpleCompletionModel {
const labelLengths: number[] = [];
const { leadingLineContent, characterCountDelta } = this._lineContext;
const formattedLeadingLineContent = isWindows ? leadingLineContent.replaceAll('/', '\\') : leadingLineContent;
let word = '';
let wordLow = '';
@@ -112,7 +111,7 @@ export class SimpleCompletionModel {
const overwriteBefore = this.replacementLength; // item.position.column - item.editStart.column;
const wordLen = overwriteBefore + characterCountDelta; // - (item.position.column - this._column);
if (word.length !== wordLen) {
word = wordLen === 0 ? '' : formattedLeadingLineContent.slice(-wordLen);
word = wordLen === 0 ? '' : leadingLineContent.slice(-wordLen);
wordLow = word.toLowerCase();
}