revert wordBasedSuggestions-settings to boolean

microsoft · Mar 16, 2017 · b209232 · b209232
1 parent b976bcd
commit b209232
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 55 deletions.
diff --git a/src/vs/editor/common/config/commonEditorConfig.ts b/src/vs/editor/common/config/commonEditorConfig.ts
@@ -780,26 +780,7 @@ const editorConfiguration: IConfigurationNode = {
 			'description': nls.localize('emptySelectionClipboard', "Controls whether copying without a selection copies the current line.")
 		},
 		'editor.wordBasedSuggestions': {
-			'anyOf': [
-				'boolean',
-				{
-					type: 'object',
-					properties: {
-						strings: {
-							type: 'boolean',
-							description: nls.localize('wordBasedSuggestions.strings', "Enable word based suggestions inside strings.")
-						},
-						comments: {
-							type: 'boolean',
-							description: nls.localize('wordBasedSuggestions.comments', "Enable word based suggestions inside comments.")
-						},
-						other: {
-							type: 'boolean',
-							description: nls.localize('wordBasedSuggestions.other', "Enable word based suggestions outside of strings and comments.")
-						},
-					}
-				}
-			],
+			'type': 'boolean',
 			'default': DefaultConfig.editor.wordBasedSuggestions,
 			'description': nls.localize('wordBasedSuggestions', "Controls whether completions should be computed based on words in the document.")
 		},

diff --git a/src/vs/editor/common/config/defaultConfig.ts b/src/vs/editor/common/config/defaultConfig.ts
@@ -98,7 +98,7 @@ class ConfigClass implements IConfiguration {
 			acceptSuggestionOnCommitCharacter: true,
 			snippetSuggestions: 'bottom',
 			emptySelectionClipboard: true,
-			wordBasedSuggestions: { other: true, strings: false, comments: false },
+			wordBasedSuggestions: true,
 			suggestFontSize: 0,
 			suggestLineHeight: 0,
 			selectionHighlight: true,

diff --git a/src/vs/editor/common/editorCommon.ts b/src/vs/editor/common/editorCommon.ts
@@ -482,7 +482,7 @@ export interface IEditorOptions {
 	/**
 	 * Enable word based suggestions. Defaults to 'true'
 	 */
-	wordBasedSuggestions?: boolean | { strings?: boolean, comments?: boolean, other?: boolean };
+	wordBasedSuggestions?: boolean;
 	/**
 	 * The font size for the suggest widget.
 	 * Defaults to the editor font size.
@@ -1016,7 +1016,7 @@ export class EditorContribOptions {
 	readonly acceptSuggestionOnCommitCharacter: boolean;
 	readonly snippetSuggestions: 'top' | 'bottom' | 'inline' | 'none';
 	readonly emptySelectionClipboard: boolean;
-	readonly wordBasedSuggestions: boolean | { strings?: boolean, comments?: boolean, default?: boolean };
+	readonly wordBasedSuggestions: boolean;
 	readonly suggestFontSize: number;
 	readonly suggestLineHeight: number;
 	readonly selectionHighlight: boolean;
@@ -1043,7 +1043,7 @@ export class EditorContribOptions {
 		acceptSuggestionOnCommitCharacter: boolean;
 		snippetSuggestions: 'top' | 'bottom' | 'inline' | 'none';
 		emptySelectionClipboard: boolean;
-		wordBasedSuggestions: boolean | { strings?: boolean, comments?: boolean, default?: boolean };
+		wordBasedSuggestions: boolean;
 		suggestFontSize: number;
 		suggestLineHeight: number;
 		selectionHighlight: boolean;

diff --git a/src/vs/editor/common/services/editorWorkerServiceImpl.ts b/src/vs/editor/common/services/editorWorkerServiceImpl.ts
@@ -90,29 +90,10 @@ class WordBasedCompletionItemProvider implements modes.ISuggestSupport {
 	provideCompletionItems(model: editorCommon.IModel, position: Position): TPromise<modes.ISuggestResult> {
 
 		const { wordBasedSuggestions } = this._configurationService.getConfiguration<editorCommon.IEditorOptions>('editor');
-
-		if (wordBasedSuggestions === false) {
-			// simple -> disabled everywhere
+		if (!wordBasedSuggestions) {
 			return undefined;
-
-		} else if (wordBasedSuggestions === true) {
-			// simple -> enabled for all tokens
-			return this._workerManager.withWorker().then(client => client.textualSuggest(model.uri, position));
-
-		} else {
-			// check with token type and config
-			const tokens = model.getLineTokens(position.lineNumber);
-			const { tokenType } = tokens.findTokenAtOffset(position.column - 1);
-			const shoudSuggestHere = (tokenType === modes.StandardTokenType.Comment && wordBasedSuggestions.comments)
-				|| (tokenType === modes.StandardTokenType.String && wordBasedSuggestions.strings)
-				|| (tokenType === modes.StandardTokenType.Other && wordBasedSuggestions.other);
-
-			if (shoudSuggestHere) {
-				return this._workerManager.withWorker().then(client => client.textualSuggest(model.uri, position));
-			} else {
-				return undefined;
-			}
 		}
+		return this._workerManager.withWorker().then(client => client.textualSuggest(model.uri, position));
 	}
 }
 

diff --git a/src/vs/monaco.d.ts b/src/vs/monaco.d.ts
@@ -1397,11 +1397,7 @@ declare module monaco.editor {
         /**
          * Enable word based suggestions. Defaults to 'true'
          */
-        wordBasedSuggestions?: boolean | {
-            strings?: boolean;
-            comments?: boolean;
-            other?: boolean;
-        };
+        wordBasedSuggestions?: boolean;
         /**
          * The font size for the suggest widget.
          * Defaults to the editor font size.
@@ -1623,11 +1619,7 @@ declare module monaco.editor {
         readonly acceptSuggestionOnCommitCharacter: boolean;
         readonly snippetSuggestions: 'top' | 'bottom' | 'inline' | 'none';
         readonly emptySelectionClipboard: boolean;
-        readonly wordBasedSuggestions: boolean | {
-            strings?: boolean;
-            comments?: boolean;
-            default?: boolean;
-        };
+        readonly wordBasedSuggestions: boolean;
         readonly suggestFontSize: number;
         readonly suggestLineHeight: number;
         readonly selectionHighlight: boolean;