Skip to content

Remove lsp priority sorting #260640

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 11, 2025
Merged

Remove lsp priority sorting #260640

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 0 additions & 12 deletions src/vs/workbench/contrib/terminalContrib/suggest/browser/terminalCompletionModel.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,18 +26,6 @@ const compareCompletionsFn = (leadingLineContent: string, a: TerminalCompletionI
return 1;
}

// Boost LSP provider completions
const lspProviderId = 'python';
const aIsLsp = a.completion.provider.includes(lspProviderId);
const bIsLsp = b.completion.provider.includes(lspProviderId);

if (aIsLsp && !bIsLsp) {
return -1;
}
if (bIsLsp && !aIsLsp) {
return 1;
}

// Sort by the score
let score = b.score[0] - a.score[0];
if (score !== 0) {
Expand Down
42 changes: 0 additions & 42 deletions ...vs/workbench/contrib/terminalContrib/suggest/test/browser/terminalCompletionModel.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,48 +283,6 @@ suite('TerminalCompletionModel', function () {
});
});

suite('lsp priority sorting', () => {

suite('Sort Python provider items', () => {
test('Prioritize items with "python" in provider name when inside REPL', () => {
const items = [
createItem({ label: 'b_default_provider', provider: 'defaultProvider' }),
createItem({ label: 'a_python_provider', provider: 'ms-python.python' })
];
const model = new TerminalCompletionModel(items, new LineContext('', 0));
assertItems(model, ['a_python_provider', 'b_default_provider']);
});

test('should sort "python" provider items above others', () => {
const items = [
createItem({ label: 'z_default', provider: 'default' }),
createItem({ label: 'c_python', provider: 'ms-python.pylance' }),
createItem({ label: 'a_default', provider: 'default' }),
createItem({ label: 'b_python', provider: 'ms-python.python' })
];
const model = new TerminalCompletionModel(items, new LineContext('', 0));
assertItems(model, ['b_python', 'c_python', 'a_default', 'z_default']);
});

test('InlineSuggestionAlwaysOnTop should still be prioritized over "python" provider', () => {
const items = [
createItem({ label: 'b_python', provider: 'python_provider' }),
new TerminalCompletionItem({
label: 'a_always_on_top',
provider: 'core',
replacementIndex: 0,
replacementLength: 0,
kind: TerminalCompletionItemKind.InlineSuggestionAlwaysOnTop
}),
createItem({ label: 'c_default', provider: 'default_provider' })
];
const model = new TerminalCompletionModel(items, new LineContext('', 0));
assertItems(model, ['a_always_on_top', 'b_python', 'c_default']);
});
});


});

suite('git branch priority sorting', () => {
test('should prioritize main and master branches for git commands', () => {
Expand Down
Loading