development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-08-28 05:19:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

add keepWhitespace-flag to completion item, #62057

Browse source
This commit is contained in:
Johannes Rieken 2018-11-16 10:59:37 +01:00
parent d7f82c11d6
commit 01d8ba6b8c
6 changed files with 10 additions and 54 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/vs/vscode.d.ts vendored
View file

@ -3249,6 +3249,13 @@ declare module 'vscode' {
*/
commitCharacters?: string[];
/**
* Keep whitespace of the [insertText](#CompletionItem.insertText) as is. By default, the editor adjusts leading
* whitespace of new lines so that they match the indentation of the line for which the item is accepeted - setting
* this to `true` will prevent that.
*/
keepWhitespace?: boolean;
/**
* @deprecated Use `CompletionItem.insertText` and `CompletionItem.range` instead.
*

27
src/vs/vscode.proposed.d.ts vendored
View file

@ -20,33 +20,6 @@ declare module 'vscode' {
export function sampleFunction(): Thenable<any>;
}
//#region Joh - https://github.com/Microsoft/vscode/issues/57093
/**
* An insert text rule defines how the [`insertText`](#CompletionItem.insertText) of a
* completion item should be modified.
*/
export enum CompletionItemInsertTextRule {
/**
* Keep whitespace as is. By default, the editor adjusts leading
* whitespace of new lines so that they match the indentation of
* the line for which the item is accepeted.
*/
KeepWhitespace = 0b01
}
export interface CompletionItem {
/**
* Rules about how/if the `insertText` should be modified by the
* editor. Can be a bit mask of many rules.
*/
insertTextRules?: CompletionItemInsertTextRule;
}
//#endregion
//#region Joh - read/write in chunks
export interface FileSystemProvider {

1
src/vs/workbench/api/node/extHost.api.impl.ts
View file

@ -744,7 +744,6 @@ export function createApiFactory(
CommentThreadCollapsibleState: extHostTypes.CommentThreadCollapsibleState,
CompletionItem: extHostTypes.CompletionItem,
CompletionItemKind: extHostTypes.CompletionItemKind,
CompletionItemInsertTextRule: extension.enableProposedApi ? extHostTypes.CompletionItemInsertTextRule : null,
CompletionList: extHostTypes.CompletionList,
CompletionTriggerKind: extHostTypes.CompletionTriggerKind,
ConfigurationTarget: extHostTypes.ConfigurationTarget,

2
src/vs/workbench/api/node/extHostLanguageFeatures.ts
View file

@ -685,7 +685,7 @@ class SuggestAdapter {
//
range: undefined,
insertText: undefined,
insertTextRules: typeConvert.CompletionItemInsertTextRule.from(item.insertTextRules),
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,

21
src/vs/workbench/api/node/extHostTypeConverters.ts
View file

@ -681,25 +681,6 @@ export namespace CompletionItemKind {
}
}
export namespace CompletionItemInsertTextRule {
export function from(rule: types.CompletionItemInsertTextRule): modes.CompletionItemInsertTextRule {
let result = 0;
if ((rule & types.CompletionItemInsertTextRule.KeepWhitespace)) {
result += modes.CompletionItemInsertTextRule.KeepWhitespace;
}
return result;
}
export function to(rule: modes.CompletionItemInsertTextRule): types.CompletionItemInsertTextRule {
let result = 0;
if ((rule & modes.CompletionItemInsertTextRule.KeepWhitespace)) {
result += types.CompletionItemInsertTextRule.KeepWhitespace;
}
return result;
}
}
export namespace CompletionItem {
export function to(suggestion: modes.CompletionItem): types.CompletionItem {
@ -713,7 +694,7 @@ export namespace CompletionItem {
result.preselect = suggestion.preselect;
result.commitCharacters = suggestion.commitCharacters;
result.range = Range.to(suggestion.range);
result.insertTextRules = CompletionItemInsertTextRule.to(suggestion.insertTextRules);
result.keepWhitespace = Boolean(suggestion.insertTextRules & modes.CompletionItemInsertTextRule.KeepWhitespace);
// 'inserText'-logic
if (suggestion.insertTextRules & modes.CompletionItemInsertTextRule.InsertAsSnippet) {
result.insertText = new types.SnippetString(suggestion.insertText);

6
src/vs/workbench/api/node/extHostTypes.ts
View file

@ -1163,10 +1163,6 @@ export enum CompletionItemKind {
TypeParameter = 24
}
export enum CompletionItemInsertTextRule {
KeepWhitespace = 0b1
}
export class CompletionItem implements vscode.CompletionItem {
label: string;
@ -1177,7 +1173,7 @@ export class CompletionItem implements vscode.CompletionItem {
filterText: string;
preselect: boolean;
insertText: string | SnippetString;
insertTextRules: CompletionItemInsertTextRule;
keepWhitespace?: boolean;
range: Range;
commitCharacters: string[];
textEdit: TextEdit;