Skip to content

Commit 05a5962

Browse files
authored
Remove lsp priority sorting (#260640)
1 parent daa6664 commit 05a5962

File tree

2 files changed

+0
-54
lines changed

2 files changed

+0
-54
lines changed

src/vs/workbench/contrib/terminalContrib/suggest/browser/terminalCompletionModel.ts

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -26,18 +26,6 @@ const compareCompletionsFn = (leadingLineContent: string, a: TerminalCompletionI
2626
return 1;
2727
}
2828

29-
// Boost LSP provider completions
30-
const lspProviderId = 'python';
31-
const aIsLsp = a.completion.provider.includes(lspProviderId);
32-
const bIsLsp = b.completion.provider.includes(lspProviderId);
33-
34-
if (aIsLsp && !bIsLsp) {
35-
return -1;
36-
}
37-
if (bIsLsp && !aIsLsp) {
38-
return 1;
39-
}
40-
4129
// Sort by the score
4230
let score = b.score[0] - a.score[0];
4331
if (score !== 0) {

src/vs/workbench/contrib/terminalContrib/suggest/test/browser/terminalCompletionModel.test.ts

Lines changed: 0 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -283,48 +283,6 @@ suite('TerminalCompletionModel', function () {
283283
});
284284
});
285285

286-
suite('lsp priority sorting', () => {
287-
288-
suite('Sort Python provider items', () => {
289-
test('Prioritize items with "python" in provider name when inside REPL', () => {
290-
const items = [
291-
createItem({ label: 'b_default_provider', provider: 'defaultProvider' }),
292-
createItem({ label: 'a_python_provider', provider: 'ms-python.python' })
293-
];
294-
const model = new TerminalCompletionModel(items, new LineContext('', 0));
295-
assertItems(model, ['a_python_provider', 'b_default_provider']);
296-
});
297-
298-
test('should sort "python" provider items above others', () => {
299-
const items = [
300-
createItem({ label: 'z_default', provider: 'default' }),
301-
createItem({ label: 'c_python', provider: 'ms-python.pylance' }),
302-
createItem({ label: 'a_default', provider: 'default' }),
303-
createItem({ label: 'b_python', provider: 'ms-python.python' })
304-
];
305-
const model = new TerminalCompletionModel(items, new LineContext('', 0));
306-
assertItems(model, ['b_python', 'c_python', 'a_default', 'z_default']);
307-
});
308-
309-
test('InlineSuggestionAlwaysOnTop should still be prioritized over "python" provider', () => {
310-
const items = [
311-
createItem({ label: 'b_python', provider: 'python_provider' }),
312-
new TerminalCompletionItem({
313-
label: 'a_always_on_top',
314-
provider: 'core',
315-
replacementIndex: 0,
316-
replacementLength: 0,
317-
kind: TerminalCompletionItemKind.InlineSuggestionAlwaysOnTop
318-
}),
319-
createItem({ label: 'c_default', provider: 'default_provider' })
320-
];
321-
const model = new TerminalCompletionModel(items, new LineContext('', 0));
322-
assertItems(model, ['a_always_on_top', 'b_python', 'c_default']);
323-
});
324-
});
325-
326-
327-
});
328286

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

0 commit comments

Comments
 (0)