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

Fixing backet completion items not shown for cases such as this.xy|

Browse source
This commit is contained in:
Matt Bierner 2020-02-04 16:15:45 -08:00
parent 7b754d7d95
commit b4a835f5b9
2 changed files with 59 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
extensions/typescript-language-features/src/features/completions.ts
View file

@ -66,17 +66,37 @@ class MyCompletionItem extends vscode.CompletionItem {
this.useCodeSnippet = useCodeSnippetsOnMethodSuggest && (this.kind === vscode.CompletionItemKind.Function || this.kind === vscode.CompletionItemKind.Method);
if (tsEntry.replacementSpan) {
this.range = typeConverters.Range.fromTextSpan(tsEntry.replacementSpan);
let replaceRange = typeConverters.Range.fromTextSpan(tsEntry.replacementSpan);
// Make sure we only replace a single line at most
if (!this.range.isSingleLine) {
this.range = new vscode.Range(this.range.start.line, this.range.start.character, this.range.start.line, line.length);
if (!replaceRange.isSingleLine) {
replaceRange = new vscode.Range(replaceRange.start.line, replaceRange.start.character, replaceRange.start.line, line.length);
}
this.range = {
inserting: new vscode.Range(replaceRange.start, position),
replacing: replaceRange,
};
}
this.insertText = tsEntry.insertText;
// Set filterText for intelliCode and bracket accessors , but not for `this.` completions since it results in
// them being overly prioritized. #74164
this.filterText = tsEntry.insertText && !/^this\./.test(tsEntry.insertText) ? tsEntry.insertText : undefined;
if (tsEntry.insertText) {
this.insertText = tsEntry.insertText;
// Set filterText for intelliCode and bracket accessors , but not for `this.` completions since it results in
// them being overly prioritized. #74164
this.filterText = !(/^this\./).test(tsEntry.insertText) ? tsEntry.insertText : undefined;
// Handle the case:
//
// ```
// const xyz = { 'ab c': 1 };
// xyz.ab|
// ```
//
// In which case we want to insert a bracket accessor but should use `.abc` as the filter text instead of
// the bracketed insert text.
if (tsEntry.insertText[0] === '[') {
this.filterText = tsEntry.insertText.replace(/^\[['"](.+)[['"]\]$/, '.$1');
}
}
if (completionContext.isMemberCompletion && completionContext.dotAccessorContext) {
this.filterText = completionContext.dotAccessorContext.text + (this.insertText || this.label);

38
extensions/typescript-language-features/src/test/completions.test.ts
View file

@ -293,7 +293,7 @@ suite('TypeScript Completions', () => {
});
});
test('Member completions for string properties should insert `this.` and use brackets', async () => {
test('Member completions for string property name should insert `this.` and use brackets', async () => {
await enumerateConfig(Config.insertMode, insertModes, async config => {
await createTestEditor(testDocumentUri,
`class A {`,
@ -319,7 +319,33 @@ suite('TypeScript Completions', () => {
});
});
test('Accepting a completion in word using insert mode should insert', async () => {
test('Member completions for string property name already using `this.` should add brackets', async () => {
await enumerateConfig(Config.insertMode, insertModes, async config => {
await createTestEditor(testDocumentUri,
`class A {`,
` ['xyz 123'] = 1`,
` foo() {`,
` this.xyz$0`,
` }`,
`}`,
);
const document = await acceptFirstSuggestion(testDocumentUri, _disposables);
assert.strictEqual(
document.getText(),
joinLines(
`class A {`,
` ['xyz 123'] = 1`,
` foo() {`,
` this["xyz 123"]`,
` }`,
`}`,
),
`Config: ${config}`);
});
});
test('Accepting a completion in word using `insert` mode should insert', async () => {
await updateConfig({ [Config.insertMode]: 'insert' });
await createTestEditor(testDocumentUri,
@ -336,7 +362,7 @@ suite('TypeScript Completions', () => {
));
});
test('Accepting a completion in word using replace mode should replace', async () => {
test('Accepting a completion in word using `replace` mode should replace', async () => {
await updateConfig({ [Config.insertMode]: 'replace' });
await createTestEditor(testDocumentUri,
@ -353,7 +379,7 @@ suite('TypeScript Completions', () => {
));
});
test('Accepting a member completion in word using insert mode add `this.` and insert', async () => {
test('Accepting a member completion in word using `insert` mode add `this.` and insert', async () => {
await updateConfig({ [Config.insertMode]: 'insert' });
await createTestEditor(testDocumentUri,
@ -378,7 +404,7 @@ suite('TypeScript Completions', () => {
));
});
test('Accepting a member completion in word using replace mode should add `this.` and replace', async () => {
test('Accepting a member completion in word using `replace` mode should add `this.` and replace', async () => {
await updateConfig({ [Config.insertMode]: 'replace' });
await createTestEditor(testDocumentUri,
@ -403,7 +429,7 @@ suite('TypeScript Completions', () => {
));
});
test('Accepting string completion inside string using insert mode should insert', async () => {
test('Accepting string completion inside string using `insert` mode should insert', async () => {
await updateConfig({ [Config.insertMode]: 'insert' });
await createTestEditor(testDocumentUri,