Fix microsoft#172385 (microsoft#172476)

Author: sandy081

src/vs/workbench/contrib/codeEditor/browser/suggestEnabledInput/suggestEnabledInput.ts

@@ -37,6 +37,7 @@ import { IHistoryNavigationWidget } from 'vs/base/browser/history';
 import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection';
 import { ILanguageFeaturesService } from 'vs/editor/common/services/languageFeatures';
 import { IEditorConstructionOptions } from 'vs/editor/browser/config/editorConfiguration';
+import { ensureValidWordDefinition, getWordAtText } from 'vs/editor/common/core/wordHelper';
 
 export interface SuggestResultsProvider {
 	/**
@@ -54,6 +55,20 @@ export interface SuggestResultsProvider {
 	 */
 	triggerCharacters?: string[];
 
+	/**
+	 * Optional regular expression that describes what a word is
+	 *
+	 * Defaults to space separated words.
+	 */
+	wordDefinition?: RegExp;
+
+	/**
+	 * Show suggestions even if the trigger character is not present.
+	 *
+	 * Defaults to false.
+	 */
+	alwaysShowSuggestions?: boolean;
+
 	/**
 	 * Defines the sorting function used when showing results.
 	 *
@@ -199,7 +214,9 @@ export class SuggestEnabledInput extends Widget {
 		const validatedSuggestProvider = {
 			provideResults: suggestionProvider.provideResults,
 			sortKey: suggestionProvider.sortKey || (a => a),
-			triggerCharacters: suggestionProvider.triggerCharacters || []
+			triggerCharacters: suggestionProvider.triggerCharacters || [],
+			wordDefinition: suggestionProvider.wordDefinition ? ensureValidWordDefinition(suggestionProvider.wordDefinition) : undefined,
+			alwaysShowSuggestions: !!suggestionProvider.alwaysShowSuggestions,
 		};
 
 		this.setValue(options.value || '');
@@ -210,12 +227,19 @@ export class SuggestEnabledInput extends Widget {
 				const query = model.getValue();
 
 				const zeroIndexedColumn = position.column - 1;
-
-				const zeroIndexedWordStart = query.lastIndexOf(' ', zeroIndexedColumn - 1) + 1;
-				const alreadyTypedCount = zeroIndexedColumn - zeroIndexedWordStart;
+				let alreadyTypedCount = 0, zeroIndexedWordStart = 0;
+
+				if (validatedSuggestProvider.wordDefinition) {
+					const wordAtText = getWordAtText(position.column, validatedSuggestProvider.wordDefinition, query, 0);
+					alreadyTypedCount = wordAtText?.word.length ?? 0;
+					zeroIndexedWordStart = wordAtText ? wordAtText.startColumn - 1 : 0;
+				} else {
+					zeroIndexedWordStart = query.lastIndexOf(' ', zeroIndexedColumn - 1) + 1;
+					alreadyTypedCount = zeroIndexedColumn - zeroIndexedWordStart;
+				}
 
 				// dont show suggestions if the user has typed something, but hasn't used the trigger character
-				if (alreadyTypedCount > 0 && validatedSuggestProvider.triggerCharacters.indexOf(query[zeroIndexedWordStart]) === -1) {
+				if (!validatedSuggestProvider.alwaysShowSuggestions && alreadyTypedCount > 0 && validatedSuggestProvider.triggerCharacters?.indexOf(query[zeroIndexedWordStart]) === -1) {
 					return { suggestions: [] };
 				}
 

src/vs/workbench/contrib/preferences/browser/keybindingsEditor.ts

@@ -1061,7 +1061,9 @@ class WhenInputWidget extends Disposable {
 				}
 				return result;
 			},
-			triggerCharacters: ['!'],
+			triggerCharacters: ['!', ' '],
+			wordDefinition: /[a-zA-Z.]+/,
+			alwaysShowSuggestions: true,
 		}, '', `keyboardshortcutseditor#wheninput`, { focusContextKey, overflowWidgetsDomNode: keybindingsEditor.overflowWidgetsDomNode }));
 
 		this._register((DOM.addDisposableListener(this.input.element, DOM.EventType.DBLCLICK, e => DOM.EventHelper.stop(e))));