Skip to content

Commit 5148523

Browse files
jriekenjrieken
committed
debt - rename ISuggestions to ISuggestResult
1 parent e8a61ac commit 5148523

27 files changed

Lines changed: 95 additions & 95 deletions

File tree

‎src/vs/editor/common/modes.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ export interface IValidateParticipant extends IWorkerParticipant {
3030

3131
export interface ISuggestParticipant extends IWorkerParticipant {
3232
filter?:(word:string, suggestion:ISuggestion) => boolean;
33-
suggest?:(resource:URI, position:EditorCommon.IPosition, context?:any) => TPromise<ISuggestions>;
33+
suggest?:(resource:URI, position:EditorCommon.IPosition, context?:any) => TPromise<ISuggestResult>;
3434
}
3535

3636
export enum Bracket {
@@ -428,7 +428,7 @@ export function isISuggestion(obj:any):boolean {
428428
return true;
429429
}
430430

431-
export interface ISuggestions {
431+
export interface ISuggestResult {
432432
currentWord: string;
433433
suggestions:ISuggestion[];
434434
incomplete?: boolean;
@@ -453,7 +453,7 @@ export interface ISuggestSupport {
453453
/**
454454
* Compute all completions for the given resource at the given position.
455455
*/
456-
suggest(resource: URI, position: EditorCommon.IPosition, triggerCharacter?: string): TPromise<ISuggestions[]>;
456+
suggest(resource: URI, position: EditorCommon.IPosition, triggerCharacter?: string): TPromise<ISuggestResult[]>;
457457

458458
/**
459459
* Compute more details for the given suggestion.

‎src/vs/editor/common/modes/abstractMode.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ export class AbstractMode<W extends AbstractModeWorker> implements Modes.IMode {
162162
}
163163

164164
static $suggest = OneWorkerAttr(AbstractMode, AbstractMode.prototype.suggest);
165-
public suggest(resource:URI, position:EditorCommon.IPosition):TPromise<Modes.ISuggestions[]> {
165+
public suggest(resource:URI, position:EditorCommon.IPosition):TPromise<Modes.ISuggestResult[]> {
166166
return this._worker((w) => w.suggest(resource, position));
167167
}
168168

‎src/vs/editor/common/modes/abstractModeWorker.ts‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ export class AbstractModeWorker {
133133

134134
// ---- suggestion ---------------------------------------------------------------------------------------
135135

136-
public suggest(resource:URI, position:EditorCommon.IPosition):TPromise<Modes.ISuggestions[]> {
136+
public suggest(resource:URI, position:EditorCommon.IPosition):TPromise<Modes.ISuggestResult[]> {
137137

138138
return this._getSuggestContext(resource).then((context) => {
139139
var promises = [ this.doSuggest(resource, position) ];
@@ -143,14 +143,14 @@ export class AbstractModeWorker {
143143
}).then((values) => {
144144
// filter suggestions
145145
var accept = this.getSuggestionFilterMain(),
146-
result:Modes.ISuggestions[] = [];
146+
result:Modes.ISuggestResult[] = [];
147147

148148
for (var i = 0, len = values.length; i < len; i++) {
149149
var value = values[i];
150150
if(!value) {
151151
continue;
152152
}
153-
result.push(<Modes.ISuggestions> {
153+
result.push(<Modes.ISuggestResult> {
154154
currentWord: value.currentWord,
155155
suggestions: value.suggestions.filter((element) => accept(values[i].currentWord, element)),
156156
incomplete: value.incomplete,
@@ -161,14 +161,14 @@ export class AbstractModeWorker {
161161
return result;
162162

163163
}, (error) => {
164-
return <Modes.ISuggestions[]> [{
164+
return <Modes.ISuggestResult[]> [{
165165
currentWord: '',
166166
suggestions: []
167167
}];
168168
});
169169
}
170170

171-
public _participantSuggests(resource:URI, position:EditorCommon.IPosition, context:any):TPromise<Modes.ISuggestions>[] {
171+
public _participantSuggests(resource:URI, position:EditorCommon.IPosition, context:any):TPromise<Modes.ISuggestResult>[] {
172172
return this._suggestParticipants.map((participant) => {
173173
try {
174174
return participant.suggest(resource, position, context);
@@ -183,12 +183,12 @@ export class AbstractModeWorker {
183183
return TPromise.as(undefined);
184184
}
185185

186-
public doSuggest(resource:URI, position:EditorCommon.IPosition):TPromise<Modes.ISuggestions> {
186+
public doSuggest(resource:URI, position:EditorCommon.IPosition):TPromise<Modes.ISuggestResult> {
187187

188188
var model = this.resourceService.get(resource),
189189
currentWord = model.getWordUntilPosition(position).word;
190190

191-
var result:Modes.ISuggestions = {
191+
var result:Modes.ISuggestResult = {
192192
currentWord: currentWord,
193193
suggestions: []
194194
};

‎src/vs/editor/common/modes/modesRegistry.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -152,10 +152,10 @@ export function registerSnippets(modeId: string, path: string, snippets: Modes.I
152152
}
153153
snippetsByMode[path] = snippets;
154154
}
155-
export function getSnippets(model: EditorCommon.IModel, position: EditorCommon.IPosition): Modes.ISuggestions {
155+
export function getSnippets(model: EditorCommon.IModel, position: EditorCommon.IPosition): Modes.ISuggestResult {
156156
var word = model.getWordAtPosition(position);
157157
var currentPrefix = word ? word.word.substring(0, position.column - word.startColumn) : '';
158-
var result : Modes.ISuggestions = {
158+
var result : Modes.ISuggestResult = {
159159
currentWord: currentPrefix,
160160
suggestions: []
161161
}

‎src/vs/editor/common/modes/monarch/monarchDefinition.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ export function createCharacterPairContribution(lexer: MonarchCommonTypes.ILexer
4949
};
5050
}
5151

52-
function _addSuggestionsAtPosition(model: EditorCommon.IModel, position:EditorCommon.IPosition, lexer: MonarchCommonTypes.ILexer, superSuggestions:Modes.ISuggestions[]): Modes.ISuggestions[] {
52+
function _addSuggestionsAtPosition(model: EditorCommon.IModel, position:EditorCommon.IPosition, lexer: MonarchCommonTypes.ILexer, superSuggestions:Modes.ISuggestResult[]): Modes.ISuggestResult[] {
5353
var extra = lexer.suggestSupport.snippets;
5454
if (!extra || extra.length === 0) {
5555
return superSuggestions;

‎src/vs/editor/common/modes/supports.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -714,7 +714,7 @@ export interface ISuggestContribution {
714714

715715
sortBy?: ISortingTypeAndSeparator[];
716716

717-
suggest: (resource: URI, position: EditorCommon.IPosition) => TPromise<Modes.ISuggestions[]>;
717+
suggest: (resource: URI, position: EditorCommon.IPosition) => TPromise<Modes.ISuggestResult[]>;
718718
getSuggestionDetails? : (resource:URI, position:EditorCommon.IPosition, suggestion:Modes.ISuggestion) => TPromise<Modes.ISuggestion>;
719719
}
720720

@@ -729,7 +729,7 @@ export class SuggestSupport extends AbstractSupport implements Modes.ISuggestSup
729729
private sortByType: string[];
730730
private separatorForType: string[]; // Must have identical size to the above
731731

732-
public suggest : (resource:URI, position:EditorCommon.IPosition) => TPromise<Modes.ISuggestions[]>;
732+
public suggest : (resource:URI, position:EditorCommon.IPosition) => TPromise<Modes.ISuggestResult[]>;
733733
public getSuggestionDetails : (resource:URI, position:EditorCommon.IPosition, suggestion:Modes.ISuggestion) => TPromise<Modes.ISuggestion>;
734734

735735
constructor(mode: Modes.IMode, contribution : ISuggestContribution){
@@ -842,7 +842,7 @@ export class SuggestSupport extends AbstractSupport implements Modes.ISuggestSup
842842
}
843843

844844
export interface IComposableSuggestContribution extends ISuggestContribution {
845-
composeSuggest(resource:URI, position:EditorCommon.IPosition, superSuggestions:Modes.ISuggestions[]): TPromise<Modes.ISuggestions[]>;
845+
composeSuggest(resource:URI, position:EditorCommon.IPosition, superSuggestions:Modes.ISuggestResult[]): TPromise<Modes.ISuggestResult[]>;
846846
}
847847

848848
export class ComposableSuggestSupport extends SuggestSupport {

‎src/vs/editor/contrib/suggest/browser/suggestModel.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import URI from 'vs/base/common/uri';
1414
import timer = require('vs/base/common/timer');
1515
import { getSnippets } from 'vs/editor/common/modes/modesRegistry';
1616
import EditorCommon = require('vs/editor/common/editorCommon');
17-
import { ISuggestSupport, ISuggestions, ISuggestion, ISorter } from 'vs/editor/common/modes';
17+
import { ISuggestSupport, ISuggestResult, ISuggestion, ISorter } from 'vs/editor/common/modes';
1818
import {DefaultFilter} from 'vs/editor/common/modes/modesFilters';
1919
import { CodeSnippet } from 'vs/editor/contrib/snippet/common/snippet';
2020
import { IDisposable, disposeAll } from 'vs/base/common/lifecycle';
@@ -38,10 +38,10 @@ export class CompletionItem {
3838
public id: string;
3939
public support: ISuggestSupport;
4040
public suggestion: ISuggestion;
41-
public container: ISuggestions;
41+
public container: ISuggestResult;
4242
private _resolveDetails:TPromise<CompletionItem>
4343

44-
constructor(support: ISuggestSupport, suggestion: ISuggestion, container:ISuggestions) {
44+
constructor(support: ISuggestSupport, suggestion: ISuggestion, container:ISuggestResult) {
4545
this.id = '_completion_item_#' + CompletionItem._idPool++;
4646
this.support = support;
4747
this.suggestion = suggestion;

‎src/vs/editor/contrib/suggest/common/suggest.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import {IModel, IPosition} from 'vs/editor/common/editorCommon';
99
import {TPromise} from 'vs/base/common/winjs.base';
1010
import {mixin} from 'vs/base/common/objects';
1111
import {onUnexpectedError, illegalArgument} from 'vs/base/common/errors';
12-
import {ISuggestSupport, ISuggestions} from 'vs/editor/common/modes';
12+
import {ISuggestSupport, ISuggestResult} from 'vs/editor/common/modes';
1313
import LanguageFeatureRegistry from 'vs/editor/common/modes/languageFeatureRegistry';
1414
import {CommonEditorRegistry} from 'vs/editor/common/editorCommonExtensions';
1515

@@ -19,7 +19,7 @@ export var ACCEPT_SELECTED_SUGGESTION_CMD = 'acceptSelectedSuggestion';
1919

2020
export var SuggestRegistry = new LanguageFeatureRegistry<ISuggestSupport>('suggestSupport');
2121

22-
export interface ISuggestions2 extends ISuggestions {
22+
export interface ISuggestions2 extends ISuggestResult {
2323
support?: ISuggestSupport;
2424
}
2525

@@ -30,7 +30,7 @@ export function suggest(model: IModel, position: IPosition, triggerCharacter: st
3030
}
3131

3232
const resource = model.getAssociatedResource();
33-
const suggestions: ISuggestions[][] = [];
33+
const suggestions: ISuggestResult[][] = [];
3434

3535
const factory = groups.map((supports, index) => {
3636
return () => {

‎src/vs/languages/css/common/cssWorker.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ export class CSSWorker extends AbstractModeWorker {
116116
return new cssIntellisense.CSSIntellisense();
117117
}
118118

119-
public doSuggest(resource:URI, position:EditorCommon.IPosition):winjs.TPromise<Modes.ISuggestions> {
119+
public doSuggest(resource:URI, position:EditorCommon.IPosition):winjs.TPromise<Modes.ISuggestResult> {
120120

121121
return this.languageService.join().then(() => {
122122

‎src/vs/languages/css/common/services/intelliSense.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ export class CSSIntellisense {
4545
}
4646

4747

48-
public getCompletionsAtPosition(languageService:service.ILanguageService, model: EditorCommon.IMirrorModel, resource:URI, position:EditorCommon.IPosition):Modes.ISuggestions {
48+
public getCompletionsAtPosition(languageService:service.ILanguageService, model: EditorCommon.IMirrorModel, resource:URI, position:EditorCommon.IPosition):Modes.ISuggestResult {
4949
this.offset = model.getOffsetFromPosition(position);
5050
this.position = position;
5151
this.currentWord = model.getWordUntilPosition(position).word;

0 commit comments

Comments
 (0)