use bracket/block selection ranges provider, fixes #64272

src/vs/editor/contrib/suggest/suggestModel.ts

@@ -383,8 +383,6 @@ export class SuggestModel implements IDisposable {
 
 		this._requestToken = new CancellationTokenSource();
 
-		// TODO: Remove this workaround - https://github.com/Microsoft/vscode/issues/61917
-		// let wordDistance = Promise.resolve().then(() => WordDistance.create(this._editorWorker, this._editor));
 		let wordDistance = WordDistance.create(this._editorWorker, this._editor);
 
 		let items = provideSuggestionItems(

src/vs/editor/contrib/suggest/wordDistance.ts

@@ -8,9 +8,8 @@ import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
 import { IEditorWorkerService } from 'vs/editor/common/services/editorWorkerService';
 import { IPosition } from 'vs/editor/common/core/position';
 import { Range } from 'vs/editor/common/core/range';
-import * as tokenTree from 'vs/editor/contrib/smartSelect/tokenTree';
 import { CompletionItem, CompletionItemKind } from 'vs/editor/common/modes';
-
+import { BracketSelectionRangeProvider } from 'vs/editor/contrib/smartSelect/bracketSelections';
 
 export abstract class WordDistance {
 
@@ -35,51 +34,37 @@ export abstract class WordDistance {
 			return Promise.resolve(WordDistance.None);
 		}
 
-		// use token tree ranges
-		let node = tokenTree.find(tokenTree.build(model), position);
-		let ranges: Range[] = [];
-		while (node) {
-			if (!node.range.isEmpty()) {
-				ranges.push(node.range);
-			}
-			if (node.end.lineNumber - node.start.lineNumber >= 100) {
-				break;
+		return new BracketSelectionRangeProvider().provideSelectionRanges(model, position).then(ranges => {
+			if (!ranges || ranges.length === 0) {
+				return WordDistance.None;
 			}
-			node = node.parent;
-		}
-		ranges.reverse();
-
-		if (ranges.length === 0) {
-			return Promise.resolve(WordDistance.None);
-		}
-
-		return service.computeWordRanges(model.uri, ranges[0]).then(wordRanges => {
-
-			return new class extends WordDistance {
-				distance(anchor: IPosition, suggestion: CompletionItem) {
-					if (!wordRanges || !position.equals(editor.getPosition())) {
-						return 0;
-					}
-					if (suggestion.kind === CompletionItemKind.Keyword) {
-						return 2 << 20;
-					}
-					let word = suggestion.label;
-					let wordLines = wordRanges[word];
-					if (isFalsyOrEmpty(wordLines)) {
-						return 2 << 20;
-					}
-					let idx = binarySearch(wordLines, Range.fromPositions(anchor), Range.compareRangesUsingStarts);
-					let bestWordRange = idx >= 0 ? wordLines[idx] : wordLines[Math.max(0, ~idx - 1)];
-					let blockDistance = ranges.length;
-					for (const range of ranges) {
-						if (!Range.containsRange(range, bestWordRange)) {
-							break;
+			return service.computeWordRanges(model.uri, ranges[0]).then(wordRanges => {
+				return new class extends WordDistance {
+					distance(anchor: IPosition, suggestion: CompletionItem) {
+						if (!wordRanges || !position.equals(editor.getPosition())) {
+							return 0;
+						}
+						if (suggestion.kind === CompletionItemKind.Keyword) {
+							return 2 << 20;
+						}
+						let word = suggestion.label;
+						let wordLines = wordRanges[word];
+						if (isFalsyOrEmpty(wordLines)) {
+							return 2 << 20;
+						}
+						let idx = binarySearch(wordLines, Range.fromPositions(anchor), Range.compareRangesUsingStarts);
+						let bestWordRange = idx >= 0 ? wordLines[idx] : wordLines[Math.max(0, ~idx - 1)];
+						let blockDistance = ranges.length;
+						for (const range of ranges) {
+							if (!Range.containsRange(range, bestWordRange)) {
+								break;
+							}
+							blockDistance -= 1;
 						}
-						blockDistance -= 1;
+						return blockDistance;
 					}
-					return blockDistance;
-				}
-			};
+				};
+			});
 		});
 	}