Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-25 02:58:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

Revert extract and use null supressions as requested

Browse Source
This commit is contained in:
Matt Bierner
2019-03-11 08:33:13 -07:00
parent 9d503a5481
commit d37e38b6c3
1 changed files with 26 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
src/vs/workbench/api/node/extHostLanguageFeatures.ts
View File

@@ -720,14 +720,7 @@ class SuggestAdapter {
return undefined;
}
// 'overwrite[Before|After]'-logic
const range = this.getRange(item, defaultRange);
if (!range.isSingleLine || range.start.line !== position.line) {
console.warn('INVALID text edit -> must be single line and on the same line');
return undefined;
}
return {
const result: SuggestionDto = {
//
_id,
_parentId,
@@ -740,46 +733,46 @@ class SuggestAdapter {
sortText: item.sortText,
preselect: item.preselect,
//
range: typeConvert.Range.from(range),
insertText: this.getInsertText(item),
insertTextRules: this.getInsertTextRules(item),
range: undefined!, // populated below
insertText: undefined!, // populated below
insertTextRules: item.keepWhitespace ? modes.CompletionItemInsertTextRule.KeepWhitespace : 0,
additionalTextEdits: item.additionalTextEdits && item.additionalTextEdits.map(typeConvert.TextEdit.from),
command: this._commands.toInternal(item.command),
commitCharacters: item.commitCharacters
};
}
private getInsertText(item: vscode.CompletionItem): string {
// 'insertText'-logic
if (item.textEdit) {
return item.textEdit.newText;
result.insertText = item.textEdit.newText;
} else if (typeof item.insertText === 'string') {
return item.insertText;
result.insertText = item.insertText;
} else if (item.insertText instanceof SnippetString) {
return item.insertText.value;
result.insertText = item.insertText.value;
result.insertTextRules |= modes.CompletionItemInsertTextRule.InsertAsSnippet;
} else {
return item.label;
result.insertText = item.label;
}
}
private getInsertTextRules(item: vscode.CompletionItem): modes.CompletionItemInsertTextRule {
let rules: modes.CompletionItemInsertTextRule = 0;
if (item.keepWhitespace) {
rules |= modes.CompletionItemInsertTextRule.KeepWhitespace;
}
if (item.insertText instanceof SnippetString) {
rules |= modes.CompletionItemInsertTextRule.InsertAsSnippet;
}
return rules;
}
private getRange(item: vscode.CompletionItem, defaultRange: vscode.Range) {
// 'overwrite[Before|After]'-logic
let range: vscode.Range;
if (item.textEdit) {
return item.textEdit.range;
range = item.textEdit.range;
} else if (item.range) {
return item.range;
range = item.range;
} else {
return defaultRange;
range = defaultRange;
}
result.range = typeConvert.Range.from(range);
if (!range.isSingleLine || range.start.line !== position.line) {
console.warn('INVALID text edit -> must be single line and on the same line');
return undefined;
}
return result;
}
}