Skip to content

Commit 589d37d

Browse files
authored
restore inline suggestion (microsoft#203418)
* restore inline suggestion fixes microsoft#175190 * fix leak in test
1 parent b10846f commit 589d37d

File tree

2 files changed

+8
-5
lines changed

2 files changed

+8
-5
lines changed

src/vs/editor/contrib/suggest/browser/suggestInlineCompletions.ts

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import { CancellationToken } from 'vs/base/common/cancellation';
77
import { FuzzyScore } from 'vs/base/common/filters';
88
import { Iterable } from 'vs/base/common/iterator';
9-
import { RefCountedDisposable } from 'vs/base/common/lifecycle';
9+
import { Disposable, RefCountedDisposable } from 'vs/base/common/lifecycle';
1010
import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
1111
import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService';
1212
import { EditorOption } from 'vs/editor/common/config/editorOptions';
@@ -104,7 +104,7 @@ class InlineCompletionResults extends RefCountedDisposable implements InlineComp
104104
}
105105

106106

107-
export class SuggestInlineCompletions implements InlineCompletionsProvider<InlineCompletionResults> {
107+
export class SuggestInlineCompletions extends Disposable implements InlineCompletionsProvider<InlineCompletionResults> {
108108

109109
private _lastResult?: InlineCompletionResults;
110110

@@ -113,7 +113,10 @@ export class SuggestInlineCompletions implements InlineCompletionsProvider<Inlin
113113
@IClipboardService private readonly _clipboardService: IClipboardService,
114114
@ISuggestMemoryService private readonly _suggestMemoryService: ISuggestMemoryService,
115115
@ICodeEditorService private readonly _editorService: ICodeEditorService,
116-
) { }
116+
) {
117+
super();
118+
this._store.add(_languageFeatureService.inlineCompletionsProvider.register('*', this));
119+
}
117120

118121
async provideInlineCompletions(model: ITextModel, position: Position, context: InlineCompletionContext, token: CancellationToken): Promise<InlineCompletionResults | undefined> {
119122

src/vs/editor/contrib/suggest/test/browser/suggestInlineCompletions.test.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ suite('Suggest Inline Completions', function () {
7676

7777
test('Aggressive inline completions when typing within line #146948', async function () {
7878

79-
const completions: SuggestInlineCompletions = insta.createInstance(SuggestInlineCompletions);
79+
const completions: SuggestInlineCompletions = disposables.add(insta.createInstance(SuggestInlineCompletions));
8080

8181
{
8282
// (1,3), end of word -> suggestions
@@ -92,7 +92,7 @@ suite('Suggest Inline Completions', function () {
9292
});
9393

9494
test('Snippets show in inline suggestions even though they are turned off #175190', async function () {
95-
const completions: SuggestInlineCompletions = insta.createInstance(SuggestInlineCompletions);
95+
const completions: SuggestInlineCompletions = disposables.add(insta.createInstance(SuggestInlineCompletions));
9696

9797
{
9898
// unfiltered

0 commit comments

Comments
 (0)