add ISuggestion#noWhitespaceAdjust to internal suggest api, #57093

microsoft · Aug 24, 2018 · 9d2f309 · 9d2f309
1 parent 35b36b7
commit 9d2f309
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 26 deletions.
diff --git a/src/vs/editor/common/modes.ts b/src/vs/editor/common/modes.ts
@@ -4,21 +4,21 @@
  *--------------------------------------------------------------------------------------------*/
 'use strict';
 
+import { CancellationToken } from 'vs/base/common/cancellation';
+import { Color } from 'vs/base/common/color';
+import { Event } from 'vs/base/common/event';
 import { IMarkdownString } from 'vs/base/common/htmlContent';
 import { IDisposable } from 'vs/base/common/lifecycle';
+import { isObject } from 'vs/base/common/types';
 import URI from 'vs/base/common/uri';
+import { Position } from 'vs/editor/common/core/position';
+import { IRange, Range } from 'vs/editor/common/core/range';
+import { Selection } from 'vs/editor/common/core/selection';
 import { TokenizationResult, TokenizationResult2 } from 'vs/editor/common/core/token';
+import * as model from 'vs/editor/common/model';
 import LanguageFeatureRegistry from 'vs/editor/common/modes/languageFeatureRegistry';
-import { CancellationToken } from 'vs/base/common/cancellation';
-import { Position } from 'vs/editor/common/core/position';
-import { Range, IRange } from 'vs/editor/common/core/range';
-import { Event } from 'vs/base/common/event';
 import { TokenizationRegistryImpl } from 'vs/editor/common/modes/tokenizationRegistry';
-import { Color } from 'vs/base/common/color';
 import { IMarkerData } from 'vs/platform/markers/common/markers';
-import * as model from 'vs/editor/common/model';
-import { isObject } from 'vs/base/common/types';
-import { Selection } from 'vs/editor/common/core/selection';
 
 /**
  * Open ended enum at runtime
@@ -301,6 +301,7 @@ export interface ISuggestion {
 	additionalTextEdits?: model.ISingleEditOperation[];
 	command?: Command;
 	snippetType?: SnippetType;
+	noWhitespaceAdjust?: boolean;
 }
 
 /**

diff --git a/src/vs/editor/contrib/suggest/suggestController.ts b/src/vs/editor/contrib/suggest/suggestController.ts
@@ -4,30 +4,30 @@
  *--------------------------------------------------------------------------------------------*/
 'use strict';
 
-import * as nls from 'vs/nls';
-import { KeyCode, KeyMod } from 'vs/base/common/keyCodes';
-import { onUnexpectedError } from 'vs/base/common/errors';
+import { alert } from 'vs/base/browser/ui/aria/aria';
 import { isFalsyOrEmpty } from 'vs/base/common/arrays';
-import { IDisposable, dispose } from 'vs/base/common/lifecycle';
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { ContextKeyExpr, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
-import { ICommandService } from 'vs/platform/commands/common/commands';
-import { IEditorContribution, ScrollType } from 'vs/editor/common/editorCommon';
-import { EditorContextKeys } from 'vs/editor/common/editorContextKeys';
-import { registerEditorAction, registerEditorContribution, ServicesAccessor, EditorAction, EditorCommand, registerEditorCommand } from 'vs/editor/browser/editorExtensions';
+import { onUnexpectedError } from 'vs/base/common/errors';
+import { KeyCode, KeyMod } from 'vs/base/common/keyCodes';
+import { dispose, IDisposable } from 'vs/base/common/lifecycle';
 import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
-import { alert } from 'vs/base/browser/ui/aria/aria';
+import { EditorAction, EditorCommand, registerEditorAction, registerEditorCommand, registerEditorContribution, ServicesAccessor } from 'vs/editor/browser/editorExtensions';
 import { EditOperation } from 'vs/editor/common/core/editOperation';
 import { Range } from 'vs/editor/common/core/range';
+import { IEditorContribution, ScrollType } from 'vs/editor/common/editorCommon';
+import { EditorContextKeys } from 'vs/editor/common/editorContextKeys';
 import { ISuggestSupport } from 'vs/editor/common/modes';
-import { SnippetParser } from 'vs/editor/contrib/snippet/snippetParser';
 import { SnippetController2 } from 'vs/editor/contrib/snippet/snippetController2';
-import { Context as SuggestContext } from './suggest';
-import { SuggestModel, State } from './suggestModel';
-import { ICompletionItem } from './completionModel';
-import { SuggestWidget, ISelectedSuggestion } from './suggestWidget';
-import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
+import { SnippetParser } from 'vs/editor/contrib/snippet/snippetParser';
 import { SuggestMemories } from 'vs/editor/contrib/suggest/suggestMemory';
+import * as nls from 'vs/nls';
+import { ICommandService } from 'vs/platform/commands/common/commands';
+import { ContextKeyExpr, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
+import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
+import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
+import { ICompletionItem } from './completionModel';
+import { Context as SuggestContext } from './suggest';
+import { State, SuggestModel } from './suggestModel';
+import { ISelectedSuggestion, SuggestWidget } from './suggestWidget';
 
 class AcceptOnCharacterOracle {
 
@@ -223,7 +223,8 @@ export class SuggestController implements IEditorContribution {
 			insertText,
 			suggestion.overwriteBefore + columnDelta,
 			suggestion.overwriteAfter,
-			false, false
+			false, false,
+			!suggestion.noWhitespaceAdjust
 		);
 
 		this._editor.pushUndoStop();