Skip to content
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

Jump to bottom

restore inline suggestion #203418

Merged
merged 2 commits into from
Jan 25, 2024
+8 −5
Merged

restore inline suggestion #203418

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
190cf31
restore inline suggestion
jrieken Jan 25, 2024
d2c9280
fix leak in test
jrieken Jan 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 6 additions & 3 deletions src/vs/editor/contrib/suggest/browser/suggestInlineCompletions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
import { CancellationToken } from 'vs/base/common/cancellation';
import { FuzzyScore } from 'vs/base/common/filters';
import { Iterable } from 'vs/base/common/iterator';
import { RefCountedDisposable } from 'vs/base/common/lifecycle';
import { Disposable, RefCountedDisposable } from 'vs/base/common/lifecycle';
import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService';
import { EditorOption } from 'vs/editor/common/config/editorOptions';
Expand Down Expand Up @@ -104,7 +104,7 @@ class InlineCompletionResults extends RefCountedDisposable implements InlineComp
}


export class SuggestInlineCompletions implements InlineCompletionsProvider<InlineCompletionResults> {
export class SuggestInlineCompletions extends Disposable implements InlineCompletionsProvider<InlineCompletionResults> {

private _lastResult?: InlineCompletionResults;

Expand All @@ -113,7 +113,10 @@ export class SuggestInlineCompletions implements InlineCompletionsProvider<Inlin
@IClipboardService private readonly _clipboardService: IClipboardService,
@ISuggestMemoryService private readonly _suggestMemoryService: ISuggestMemoryService,
@ICodeEditorService private readonly _editorService: ICodeEditorService,
) { }
) {
super();
this._store.add(_languageFeatureService.inlineCompletionsProvider.register('*', this));
}

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

Expand Down
4 changes: 2 additions & 2 deletions src/vs/editor/contrib/suggest/test/browser/suggestInlineCompletions.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ suite('Suggest Inline Completions', function () {

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

const completions: SuggestInlineCompletions = insta.createInstance(SuggestInlineCompletions);
const completions: SuggestInlineCompletions = disposables.add(insta.createInstance(SuggestInlineCompletions));

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

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

{
// unfiltered
Expand Down