From 71f93aa38eed15c56d23845904e4dab245b86cc3 Mon Sep 17 00:00:00 2001 From: Alex Dima Date: Tue, 24 May 2016 09:54:22 +0200 Subject: [PATCH] Fixes #6380: Markdown does not disable autotrigger suggest --- src/vs/editor/common/modes.ts | 2 -- src/vs/editor/common/modes/supports/suggestSupport.ts | 4 ---- src/vs/editor/contrib/suggest/browser/suggest.ts | 4 ---- src/vs/editor/contrib/suggest/browser/suggestModel.ts | 2 +- src/vs/languages/css/common/css.ts | 1 - src/vs/languages/handlebars/common/handlebars.ts | 1 - src/vs/languages/html/common/html.ts | 1 - src/vs/languages/json/common/json.ts | 1 - src/vs/languages/less/common/less.ts | 1 - src/vs/languages/markdown/common/markdown.ts | 1 - src/vs/languages/razor/common/razor.ts | 1 - src/vs/languages/sass/common/sass.ts | 1 - src/vs/languages/typescript/common/languageFeatures.ts | 4 ---- src/vs/workbench/api/node/extHostLanguageFeatures.ts | 1 - 14 files changed, 1 insertion(+), 24 deletions(-) diff --git a/src/vs/editor/common/modes.ts b/src/vs/editor/common/modes.ts index 0583a5569cc..5e3fd67cbb8 100644 --- a/src/vs/editor/common/modes.ts +++ b/src/vs/editor/common/modes.ts @@ -339,8 +339,6 @@ export interface ISuggestSupport { triggerCharacters: string[]; - shouldAutotriggerSuggest: boolean; - filter?: IFilter; provideCompletionItems(model:editorCommon.IReadOnlyModel, position:Position, token:CancellationToken): ISuggestResult[] | Thenable; diff --git a/src/vs/editor/common/modes/supports/suggestSupport.ts b/src/vs/editor/common/modes/supports/suggestSupport.ts index 9bf09c0a2cd..500e654c5bb 100644 --- a/src/vs/editor/common/modes/supports/suggestSupport.ts +++ b/src/vs/editor/common/modes/supports/suggestSupport.ts @@ -35,10 +35,6 @@ export class TextualSuggestSupport implements ISuggestSupport { return []; } - public get shouldAutotriggerSuggest(): boolean { - return true; - } - public get filter(): IFilter { return matchesStrictPrefix; } diff --git a/src/vs/editor/contrib/suggest/browser/suggest.ts b/src/vs/editor/contrib/suggest/browser/suggest.ts index caea6a07f9f..70b98b6a701 100644 --- a/src/vs/editor/contrib/suggest/browser/suggest.ts +++ b/src/vs/editor/contrib/suggest/browser/suggest.ts @@ -129,10 +129,6 @@ export class SuggestController implements IEditorContribution { } private triggerCharacterHandler(character: string, groups: ISuggestSupport[][]): void { - groups = groups.map(supports => { - return supports.filter(support => support.shouldAutotriggerSuggest); - }); - if (groups.length > 0) { this.triggerSuggest(character, groups).done(null, onUnexpectedError); } diff --git a/src/vs/editor/contrib/suggest/browser/suggestModel.ts b/src/vs/editor/contrib/suggest/browser/suggestModel.ts index 73a8221b2ef..fccd01c8a00 100644 --- a/src/vs/editor/contrib/suggest/browser/suggestModel.ts +++ b/src/vs/editor/contrib/suggest/browser/suggestModel.ts @@ -82,7 +82,7 @@ class Context { } const supports = SuggestRegistry.all(model); - this.isAutoTriggerEnabled = supports.some(s => s.shouldAutotriggerSuggest); + this.isAutoTriggerEnabled = (supports.length > 0); } public shouldAutoTrigger(): boolean { diff --git a/src/vs/languages/css/common/css.ts b/src/vs/languages/css/common/css.ts index ee6d165c445..a52b08584e9 100644 --- a/src/vs/languages/css/common/css.ts +++ b/src/vs/languages/css/common/css.ts @@ -359,7 +359,6 @@ export class CSSMode extends AbstractMode { modes.SuggestRegistry.register(this.getId(), { triggerCharacters: [' ', ':'], - shouldAutotriggerSuggest: true, provideCompletionItems: (model, position, token): Thenable => { return wireCancellationToken(token, this._provideCompletionItems(model.uri, position)); } diff --git a/src/vs/languages/handlebars/common/handlebars.ts b/src/vs/languages/handlebars/common/handlebars.ts index 289fee3277c..300ce3544ea 100644 --- a/src/vs/languages/handlebars/common/handlebars.ts +++ b/src/vs/languages/handlebars/common/handlebars.ts @@ -131,7 +131,6 @@ export class HandlebarsMode extends htmlMode.HTMLMode { modes.SuggestRegistry.register(this.getId(), { triggerCharacters: ['.', ':', '<', '"', '=', '/'], - shouldAutotriggerSuggest: true, provideCompletionItems: (model, position, token): Thenable => { return wireCancellationToken(token, this._provideCompletionItems(model.uri, position)); } diff --git a/src/vs/languages/html/common/html.ts b/src/vs/languages/html/common/html.ts index 1e954d6ff90..29da5657d31 100644 --- a/src/vs/languages/html/common/html.ts +++ b/src/vs/languages/html/common/html.ts @@ -339,7 +339,6 @@ export class HTMLMode extends AbstractMode impl modes.SuggestRegistry.register(this.getId(), { triggerCharacters: ['.', ':', '<', '"', '=', '/'], - shouldAutotriggerSuggest: true, provideCompletionItems: (model, position, token): Thenable => { return wireCancellationToken(token, this._provideCompletionItems(model.uri, position)); } diff --git a/src/vs/languages/json/common/json.ts b/src/vs/languages/json/common/json.ts index d7c37175ea9..e250f0ca23d 100644 --- a/src/vs/languages/json/common/json.ts +++ b/src/vs/languages/json/common/json.ts @@ -94,7 +94,6 @@ export class JSONMode extends AbstractMode { modes.SuggestRegistry.register(this.getId(), { triggerCharacters: [], - shouldAutotriggerSuggest: true, provideCompletionItems: (model, position, token): Thenable => { return wireCancellationToken(token, this._provideCompletionItems(model.uri, position)); } diff --git a/src/vs/languages/less/common/less.ts b/src/vs/languages/less/common/less.ts index 7efbfa8d827..ac077ada0a5 100644 --- a/src/vs/languages/less/common/less.ts +++ b/src/vs/languages/less/common/less.ts @@ -233,7 +233,6 @@ export class LESSMode extends AbstractMode { modes.SuggestRegistry.register(this.getId(), { triggerCharacters: [], - shouldAutotriggerSuggest: true, provideCompletionItems: (model, position, token): Thenable => { return wireCancellationToken(token, this._provideCompletionItems(model.uri, position)); } diff --git a/src/vs/languages/markdown/common/markdown.ts b/src/vs/languages/markdown/common/markdown.ts index 079c9b697bc..00642e2894d 100644 --- a/src/vs/languages/markdown/common/markdown.ts +++ b/src/vs/languages/markdown/common/markdown.ts @@ -239,7 +239,6 @@ export class MarkdownMode extends AbstractMode implements Modes.IEmitOutputSuppo Modes.SuggestRegistry.register(this.getId(), { triggerCharacters: [], - shouldAutotriggerSuggest: false, provideCompletionItems: (model, position, token) => { return wireCancellationToken(token, editorWorkerService.textualSuggest(model.uri, position)); } diff --git a/src/vs/languages/razor/common/razor.ts b/src/vs/languages/razor/common/razor.ts index c84e55c073c..75869ba42dd 100644 --- a/src/vs/languages/razor/common/razor.ts +++ b/src/vs/languages/razor/common/razor.ts @@ -80,7 +80,6 @@ export class RAZORMode extends htmlMode.HTMLMode { modes.SuggestRegistry.register(this.getId(), { triggerCharacters: ['.', ':', '<', '"', '=', '/'], - shouldAutotriggerSuggest: true, provideCompletionItems: (model, position, token): Thenable => { return wireCancellationToken(token, this._provideCompletionItems(model.uri, position)); } diff --git a/src/vs/languages/sass/common/sass.ts b/src/vs/languages/sass/common/sass.ts index 3957e40c6e4..f4a22a1cc37 100644 --- a/src/vs/languages/sass/common/sass.ts +++ b/src/vs/languages/sass/common/sass.ts @@ -334,7 +334,6 @@ export class SASSMode extends AbstractMode { modes.SuggestRegistry.register(this.getId(), { triggerCharacters: [], - shouldAutotriggerSuggest: true, provideCompletionItems: (model, position, token): Thenable => { return wireCancellationToken(token, this._provideCompletionItems(model.uri, position)); } diff --git a/src/vs/languages/typescript/common/languageFeatures.ts b/src/vs/languages/typescript/common/languageFeatures.ts index f77b2c5e154..d40f3bd80db 100644 --- a/src/vs/languages/typescript/common/languageFeatures.ts +++ b/src/vs/languages/typescript/common/languageFeatures.ts @@ -172,10 +172,6 @@ class SuggestAdapter extends Adapter implements modes.ISuggestSupport { return ['.']; } - public get shouldAutotriggerSuggest(): boolean { - return true; - } - provideCompletionItems(model:editorCommon.IReadOnlyModel, position:Position, token:CancellationToken): Thenable { const wordInfo = model.getWordUntilPosition(position); const resource = model.uri; diff --git a/src/vs/workbench/api/node/extHostLanguageFeatures.ts b/src/vs/workbench/api/node/extHostLanguageFeatures.ts index e57f93eeffd..528e1b60c1f 100644 --- a/src/vs/workbench/api/node/extHostLanguageFeatures.ts +++ b/src/vs/workbench/api/node/extHostLanguageFeatures.ts @@ -976,7 +976,6 @@ export class MainThreadLanguageFeatures { $registerSuggestSupport(handle: number, selector: vscode.DocumentSelector, triggerCharacters: string[]): TPromise { this._registrations[handle] = modes.SuggestRegistry.register(selector, { triggerCharacters: triggerCharacters, - shouldAutotriggerSuggest: true, provideCompletionItems: (model:IReadOnlyModel, position:EditorPosition, token:CancellationToken): Thenable => { return wireCancellationToken(token, this._proxy.$provideCompletionItems(handle, model.uri, position)); }, -- GitLab