maxmustermann/vscode
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse source
This commit is contained in:
Alex Dima 2016-08-15 17:30:24 +02:00
parent 101ad8c222 d61ce7d521
commit c923075943
2 changed files with 3 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/vs/editor/contrib/suggest/common/suggest.ts
View file

@ -31,7 +31,7 @@ export interface ISuggestionItem {
resolve(): TPromise<void>;
}
export type SnippetConfig = 'top' | 'bottom' | 'inline' | 'none' | 'only';
export type SnippetConfig = 'top' | 'bottom' | 'inline' | 'none';
export interface ISuggestOptions {
groups?: ISuggestSupport[][];
@ -122,12 +122,10 @@ function createSuggestionResolver(provider: ISuggestSupport, suggestion: ISugges
}
function createSuggesionFilter(options: ISuggestOptions): (candidate: ISuggestion) => boolean {
if (options.snippetConfig === 'only') {
return suggestion => suggestion.type === 'snippet';
} else if (options.snippetConfig === 'none') {
if (options.snippetConfig === 'none') {
return suggestion => suggestion.type !== 'snippet';
} else {
return _ => true;
return () => true;
}
}

9
src/vs/editor/contrib/suggest/test/common/suggest.test.ts
View file

@ -83,13 +83,4 @@ suite('Suggest', function () {
assert.equal(items[0].suggestion.label, 'fff');
});
});
test('sort - snippet top', function () {
return provideSuggestionItems(model, new Position(1, 1), { snippetConfig: 'only' }).then(items => {
assert.equal(items.length, 2);
assert.equal(items[0].suggestion.label, 'aaa');
assert.equal(items[1].suggestion.label, 'zzz');
});
});
});