mirror of
https://github.com/Microsoft/vscode
synced 2024-10-06 03:17:00 +00:00
debt - remove unsed 'shouldAutotriggerSuggest'
This commit is contained in:
parent
4d37b86195
commit
3c4ae57c99
|
@ -197,7 +197,6 @@ export function registerCompletionItemProvider(languageId:string, provider:Compl
|
|||
let adapter = new SuggestAdapter(provider);
|
||||
return modes.SuggestRegistry.register(languageId, {
|
||||
triggerCharacters: provider.triggerCharacters,
|
||||
shouldAutotriggerSuggest: true,
|
||||
provideCompletionItems: (model:editorCommon.IReadOnlyModel, position:Position, token:CancellationToken): Thenable<modes.ISuggestResult[]> => {
|
||||
return adapter.provideCompletionItems(model, position, token);
|
||||
},
|
||||
|
|
|
@ -397,8 +397,6 @@ export interface ISuggestSupport {
|
|||
|
||||
triggerCharacters: string[];
|
||||
|
||||
shouldAutotriggerSuggest: boolean;
|
||||
|
||||
filter?: IFilter;
|
||||
|
||||
provideCompletionItems(model:editorCommon.IReadOnlyModel, position:Position, token:CancellationToken): ISuggestResult[] | Thenable<ISuggestResult[]>;
|
||||
|
|
|
@ -19,10 +19,6 @@ export class TextualSuggestSupport implements ISuggestSupport {
|
|||
return [];
|
||||
}
|
||||
|
||||
public get shouldAutotriggerSuggest(): boolean {
|
||||
return true;
|
||||
}
|
||||
|
||||
public get filter(): IFilter {
|
||||
return matchesPrefix;
|
||||
}
|
||||
|
|
|
@ -119,21 +119,11 @@ export class SuggestController implements IEditorContribution {
|
|||
|
||||
Object.keys(triggerCharacters).forEach(ch => {
|
||||
this.triggerCharacterListeners.push(this.editor.addTypingListener(ch, () => {
|
||||
this.triggerCharacterHandler(ch, triggerCharacters[ch]);
|
||||
this.triggerSuggest(ch, triggerCharacters[ch]).done(null, onUnexpectedError);
|
||||
}));
|
||||
});
|
||||
}
|
||||
|
||||
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);
|
||||
}
|
||||
}
|
||||
|
||||
triggerSuggest(triggerCharacter?: string, groups?: ISuggestSupport[][]): TPromise<boolean> {
|
||||
this.model.trigger(false, triggerCharacter, false, groups);
|
||||
this.editor.focus();
|
||||
|
|
|
@ -45,7 +45,6 @@ class Context {
|
|||
column: number;
|
||||
isInEditableRange: boolean;
|
||||
|
||||
private isAutoTriggerEnabled: boolean;
|
||||
lineContentBefore: string;
|
||||
lineContentAfter: string;
|
||||
|
||||
|
@ -78,16 +77,9 @@ class Context {
|
|||
this.isInEditableRange = false;
|
||||
}
|
||||
}
|
||||
|
||||
const supports = SuggestRegistry.all(model);
|
||||
this.isAutoTriggerEnabled = supports.some(s => s.shouldAutotriggerSuggest);
|
||||
}
|
||||
|
||||
shouldAutoTrigger(): boolean {
|
||||
if (!this.isAutoTriggerEnabled) {
|
||||
// Support disallows it
|
||||
return false;
|
||||
}
|
||||
|
||||
if (this.wordBefore.length === 0) {
|
||||
// Word before position is empty
|
||||
|
|
|
@ -23,7 +23,6 @@ suite('Suggest', function () {
|
|||
model = Model.createFromString('FOO\nbar\BAR\nfoo', undefined, undefined, URI.parse('foo:bar/path'));
|
||||
registration = SuggestRegistry.register({ pattern: 'bar/path' }, {
|
||||
triggerCharacters: [],
|
||||
shouldAutotriggerSuggest: true,
|
||||
provideCompletionItems() {
|
||||
return [{
|
||||
currentWord: '',
|
||||
|
|
|
@ -164,7 +164,6 @@ export class HandlebarsMode extends htmlMode.HTMLMode<htmlWorker.HTMLWorker> {
|
|||
protected _registerSupports(): void {
|
||||
modes.SuggestRegistry.register(this.getId(), {
|
||||
triggerCharacters: ['.', ':', '<', '"', '=', '/'],
|
||||
shouldAutotriggerSuggest: true,
|
||||
provideCompletionItems: (model, position, token): Thenable<modes.ISuggestResult[]> => {
|
||||
return wireCancellationToken(token, this._provideCompletionItems(model.uri, position));
|
||||
}
|
||||
|
|
|
@ -358,7 +358,6 @@ export class HTMLMode<W extends htmlWorker.HTMLWorker> extends CompatMode implem
|
|||
|
||||
modes.SuggestRegistry.register(this.getId(), {
|
||||
triggerCharacters: ['.', ':', '<', '"', '=', '/'],
|
||||
shouldAutotriggerSuggest: true,
|
||||
provideCompletionItems: (model, position, token): Thenable<modes.ISuggestResult[]> => {
|
||||
return wireCancellationToken(token, this._provideCompletionItems(model.uri, position));
|
||||
}
|
||||
|
|
|
@ -112,7 +112,6 @@ export class RAZORMode extends htmlMode.HTMLMode<RAZORWorker> {
|
|||
protected _registerSupports(): void {
|
||||
modes.SuggestRegistry.register(this.getId(), {
|
||||
triggerCharacters: ['.', ':', '<', '"', '=', '/'],
|
||||
shouldAutotriggerSuggest: true,
|
||||
provideCompletionItems: (model, position, token): Thenable<modes.ISuggestResult[]> => {
|
||||
return wireCancellationToken(token, this._provideCompletionItems(model.uri, position));
|
||||
}
|
||||
|
|
|
@ -176,7 +176,6 @@ export class MainThreadLanguageFeatures extends MainThreadLanguageFeaturesShape
|
|||
$registerSuggestSupport(handle: number, selector: vscode.DocumentSelector, triggerCharacters: string[]): TPromise<any> {
|
||||
this._registrations[handle] = modes.SuggestRegistry.register(selector, <modes.ISuggestSupport>{
|
||||
triggerCharacters: triggerCharacters,
|
||||
shouldAutotriggerSuggest: true,
|
||||
provideCompletionItems: (model:IReadOnlyModel, position:EditorPosition, token:CancellationToken): Thenable<modes.ISuggestResult[]> => {
|
||||
return wireCancellationToken(token, this._proxy.$provideCompletionItems(handle, model.uri, position));
|
||||
},
|
||||
|
|
Loading…
Reference in a new issue