提交 71f93aa3 编写于 作者: A Alex Dima

Fixes #6380: Markdown does not disable autotrigger suggest

上级 13c5e4fb
...@@ -339,8 +339,6 @@ export interface ISuggestSupport { ...@@ -339,8 +339,6 @@ export interface ISuggestSupport {
triggerCharacters: string[]; triggerCharacters: string[];
shouldAutotriggerSuggest: boolean;
filter?: IFilter; filter?: IFilter;
provideCompletionItems(model:editorCommon.IReadOnlyModel, position:Position, token:CancellationToken): ISuggestResult[] | Thenable<ISuggestResult[]>; provideCompletionItems(model:editorCommon.IReadOnlyModel, position:Position, token:CancellationToken): ISuggestResult[] | Thenable<ISuggestResult[]>;
......
...@@ -35,10 +35,6 @@ export class TextualSuggestSupport implements ISuggestSupport { ...@@ -35,10 +35,6 @@ export class TextualSuggestSupport implements ISuggestSupport {
return []; return [];
} }
public get shouldAutotriggerSuggest(): boolean {
return true;
}
public get filter(): IFilter { public get filter(): IFilter {
return matchesStrictPrefix; return matchesStrictPrefix;
} }
......
...@@ -129,10 +129,6 @@ export class SuggestController implements IEditorContribution { ...@@ -129,10 +129,6 @@ export class SuggestController implements IEditorContribution {
} }
private triggerCharacterHandler(character: string, groups: ISuggestSupport[][]): void { private triggerCharacterHandler(character: string, groups: ISuggestSupport[][]): void {
groups = groups.map(supports => {
return supports.filter(support => support.shouldAutotriggerSuggest);
});
if (groups.length > 0) { if (groups.length > 0) {
this.triggerSuggest(character, groups).done(null, onUnexpectedError); this.triggerSuggest(character, groups).done(null, onUnexpectedError);
} }
......
...@@ -82,7 +82,7 @@ class Context { ...@@ -82,7 +82,7 @@ class Context {
} }
const supports = SuggestRegistry.all(model); const supports = SuggestRegistry.all(model);
this.isAutoTriggerEnabled = supports.some(s => s.shouldAutotriggerSuggest); this.isAutoTriggerEnabled = (supports.length > 0);
} }
public shouldAutoTrigger(): boolean { public shouldAutoTrigger(): boolean {
......
...@@ -359,7 +359,6 @@ export class CSSMode extends AbstractMode { ...@@ -359,7 +359,6 @@ export class CSSMode extends AbstractMode {
modes.SuggestRegistry.register(this.getId(), { modes.SuggestRegistry.register(this.getId(), {
triggerCharacters: [' ', ':'], triggerCharacters: [' ', ':'],
shouldAutotriggerSuggest: true,
provideCompletionItems: (model, position, token): Thenable<modes.ISuggestResult[]> => { provideCompletionItems: (model, position, token): Thenable<modes.ISuggestResult[]> => {
return wireCancellationToken(token, this._provideCompletionItems(model.uri, position)); return wireCancellationToken(token, this._provideCompletionItems(model.uri, position));
} }
......
...@@ -131,7 +131,6 @@ export class HandlebarsMode extends htmlMode.HTMLMode<htmlWorker.HTMLWorker> { ...@@ -131,7 +131,6 @@ export class HandlebarsMode extends htmlMode.HTMLMode<htmlWorker.HTMLWorker> {
modes.SuggestRegistry.register(this.getId(), { modes.SuggestRegistry.register(this.getId(), {
triggerCharacters: ['.', ':', '<', '"', '=', '/'], triggerCharacters: ['.', ':', '<', '"', '=', '/'],
shouldAutotriggerSuggest: true,
provideCompletionItems: (model, position, token): Thenable<modes.ISuggestResult[]> => { provideCompletionItems: (model, position, token): Thenable<modes.ISuggestResult[]> => {
return wireCancellationToken(token, this._provideCompletionItems(model.uri, position)); return wireCancellationToken(token, this._provideCompletionItems(model.uri, position));
} }
......
...@@ -339,7 +339,6 @@ export class HTMLMode<W extends htmlWorker.HTMLWorker> extends AbstractMode impl ...@@ -339,7 +339,6 @@ export class HTMLMode<W extends htmlWorker.HTMLWorker> extends AbstractMode impl
modes.SuggestRegistry.register(this.getId(), { modes.SuggestRegistry.register(this.getId(), {
triggerCharacters: ['.', ':', '<', '"', '=', '/'], triggerCharacters: ['.', ':', '<', '"', '=', '/'],
shouldAutotriggerSuggest: true,
provideCompletionItems: (model, position, token): Thenable<modes.ISuggestResult[]> => { provideCompletionItems: (model, position, token): Thenable<modes.ISuggestResult[]> => {
return wireCancellationToken(token, this._provideCompletionItems(model.uri, position)); return wireCancellationToken(token, this._provideCompletionItems(model.uri, position));
} }
......
...@@ -94,7 +94,6 @@ export class JSONMode extends AbstractMode { ...@@ -94,7 +94,6 @@ export class JSONMode extends AbstractMode {
modes.SuggestRegistry.register(this.getId(), { modes.SuggestRegistry.register(this.getId(), {
triggerCharacters: [], triggerCharacters: [],
shouldAutotriggerSuggest: true,
provideCompletionItems: (model, position, token): Thenable<modes.ISuggestResult[]> => { provideCompletionItems: (model, position, token): Thenable<modes.ISuggestResult[]> => {
return wireCancellationToken(token, this._provideCompletionItems(model.uri, position)); return wireCancellationToken(token, this._provideCompletionItems(model.uri, position));
} }
......
...@@ -233,7 +233,6 @@ export class LESSMode extends AbstractMode { ...@@ -233,7 +233,6 @@ export class LESSMode extends AbstractMode {
modes.SuggestRegistry.register(this.getId(), { modes.SuggestRegistry.register(this.getId(), {
triggerCharacters: [], triggerCharacters: [],
shouldAutotriggerSuggest: true,
provideCompletionItems: (model, position, token): Thenable<modes.ISuggestResult[]> => { provideCompletionItems: (model, position, token): Thenable<modes.ISuggestResult[]> => {
return wireCancellationToken(token, this._provideCompletionItems(model.uri, position)); return wireCancellationToken(token, this._provideCompletionItems(model.uri, position));
} }
......
...@@ -239,7 +239,6 @@ export class MarkdownMode extends AbstractMode implements Modes.IEmitOutputSuppo ...@@ -239,7 +239,6 @@ export class MarkdownMode extends AbstractMode implements Modes.IEmitOutputSuppo
Modes.SuggestRegistry.register(this.getId(), { Modes.SuggestRegistry.register(this.getId(), {
triggerCharacters: [], triggerCharacters: [],
shouldAutotriggerSuggest: false,
provideCompletionItems: (model, position, token) => { provideCompletionItems: (model, position, token) => {
return wireCancellationToken(token, editorWorkerService.textualSuggest(model.uri, position)); return wireCancellationToken(token, editorWorkerService.textualSuggest(model.uri, position));
} }
......
...@@ -80,7 +80,6 @@ export class RAZORMode extends htmlMode.HTMLMode<RAZORWorker> { ...@@ -80,7 +80,6 @@ export class RAZORMode extends htmlMode.HTMLMode<RAZORWorker> {
modes.SuggestRegistry.register(this.getId(), { modes.SuggestRegistry.register(this.getId(), {
triggerCharacters: ['.', ':', '<', '"', '=', '/'], triggerCharacters: ['.', ':', '<', '"', '=', '/'],
shouldAutotriggerSuggest: true,
provideCompletionItems: (model, position, token): Thenable<modes.ISuggestResult[]> => { provideCompletionItems: (model, position, token): Thenable<modes.ISuggestResult[]> => {
return wireCancellationToken(token, this._provideCompletionItems(model.uri, position)); return wireCancellationToken(token, this._provideCompletionItems(model.uri, position));
} }
......
...@@ -334,7 +334,6 @@ export class SASSMode extends AbstractMode { ...@@ -334,7 +334,6 @@ export class SASSMode extends AbstractMode {
modes.SuggestRegistry.register(this.getId(), { modes.SuggestRegistry.register(this.getId(), {
triggerCharacters: [], triggerCharacters: [],
shouldAutotriggerSuggest: true,
provideCompletionItems: (model, position, token): Thenable<modes.ISuggestResult[]> => { provideCompletionItems: (model, position, token): Thenable<modes.ISuggestResult[]> => {
return wireCancellationToken(token, this._provideCompletionItems(model.uri, position)); return wireCancellationToken(token, this._provideCompletionItems(model.uri, position));
} }
......
...@@ -172,10 +172,6 @@ class SuggestAdapter extends Adapter implements modes.ISuggestSupport { ...@@ -172,10 +172,6 @@ class SuggestAdapter extends Adapter implements modes.ISuggestSupport {
return ['.']; return ['.'];
} }
public get shouldAutotriggerSuggest(): boolean {
return true;
}
provideCompletionItems(model:editorCommon.IReadOnlyModel, position:Position, token:CancellationToken): Thenable<modes.ISuggestResult[]> { provideCompletionItems(model:editorCommon.IReadOnlyModel, position:Position, token:CancellationToken): Thenable<modes.ISuggestResult[]> {
const wordInfo = model.getWordUntilPosition(position); const wordInfo = model.getWordUntilPosition(position);
const resource = model.uri; const resource = model.uri;
......
...@@ -976,7 +976,6 @@ export class MainThreadLanguageFeatures { ...@@ -976,7 +976,6 @@ export class MainThreadLanguageFeatures {
$registerSuggestSupport(handle: number, selector: vscode.DocumentSelector, triggerCharacters: string[]): TPromise<any> { $registerSuggestSupport(handle: number, selector: vscode.DocumentSelector, triggerCharacters: string[]): TPromise<any> {
this._registrations[handle] = modes.SuggestRegistry.register(selector, <modes.ISuggestSupport>{ this._registrations[handle] = modes.SuggestRegistry.register(selector, <modes.ISuggestSupport>{
triggerCharacters: triggerCharacters, triggerCharacters: triggerCharacters,
shouldAutotriggerSuggest: true,
provideCompletionItems: (model:IReadOnlyModel, position:EditorPosition, token:CancellationToken): Thenable<modes.ISuggestResult[]> => { provideCompletionItems: (model:IReadOnlyModel, position:EditorPosition, token:CancellationToken): Thenable<modes.ISuggestResult[]> => {
return wireCancellationToken(token, this._proxy.$provideCompletionItems(handle, model.uri, position)); return wireCancellationToken(token, this._proxy.$provideCompletionItems(handle, model.uri, position));
}, },
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册