Merge pull request #149722 from microsoft/joh/relaxed-gazelle

make `getWordAtText`-config configurable and use lower budget for speedy tests

Author: jrieken

src/vs/editor/common/core/wordHelper.ts

@@ -3,6 +3,10 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+import { Iterable } from 'vs/base/common/iterator';
+import { toDisposable } from 'vs/base/common/lifecycle';
+import { LinkedList } from 'vs/base/common/linkedList';
+
 export const USUAL_WORD_SEPARATORS = '`~!@#$%^&*()-=+[{]}\\|;:\'",.<>/?';
 
 /**
@@ -71,13 +75,31 @@ export function ensureValidWordDefinition(wordDefinition?: RegExp | null): RegEx
 	return result;
 }
 
-const _defaultConfig = {
+
+export interface IGetWordAtTextConfig {
+	maxLen: number;
+	windowSize: number;
+	timeBudget: number;
+}
+
+
+const _defaultConfig = new LinkedList<IGetWordAtTextConfig>();
+_defaultConfig.unshift({
 	maxLen: 1000,
 	windowSize: 15,
 	timeBudget: 150
-};
+});
 
-export function getWordAtText(column: number, wordDefinition: RegExp, text: string, textOffset: number, config = _defaultConfig): IWordAtPosition | null {
+export function setDefaultGetWordAtTextConfig(value: IGetWordAtTextConfig) {
+	const rm = _defaultConfig.unshift(value);
+	return toDisposable(rm);
+}
+
+export function getWordAtText(column: number, wordDefinition: RegExp, text: string, textOffset: number, config?: IGetWordAtTextConfig): IWordAtPosition | null {
+
+	if (!config) {
+		config = Iterable.first(_defaultConfig)!;
+	}
 
 	if (text.length > config.maxLen) {
 		// don't throw strings that long at the regexp

src/vs/workbench/api/test/browser/extHostDocumentData.test.ts

@@ -12,6 +12,7 @@ import { MainThreadDocumentsShape } from 'vs/workbench/api/common/extHost.protoc
 import { IModelChangedEvent } from 'vs/editor/common/model/mirrorTextModel';
 import { mock } from 'vs/base/test/common/mock';
 import * as perfData from './extHostDocumentData.test.perf-data';
+import { setDefaultGetWordAtTextConfig } from 'vs/editor/common/core/wordHelper';
 
 suite('ExtHostDocumentData', () => {
 
@@ -316,14 +317,22 @@ suite('ExtHostDocumentData', () => {
 			perfData._$_$_expensive
 		], '\n', 1, 'text', false);
 
-		let range = data.document.getWordRangeAtPosition(new Position(0, 1_177_170), regex)!;
-		assert.strictEqual(range, undefined);
-
-		const pos = new Position(0, 1177170);
-		range = data.document.getWordRangeAtPosition(pos)!;
-		assert.ok(range);
-		assert.ok(range.contains(pos));
-		assert.strictEqual(data.document.getText(range), 'TaskDefinition');
+		// this test only ensures that we eventually give and timeout (when searching "funny" words and long lines)
+		// for the sake of speedy tests we lower the timeBudget here
+		const config = setDefaultGetWordAtTextConfig({ maxLen: 1000, windowSize: 15, timeBudget: 30 });
+		try {
+			let range = data.document.getWordRangeAtPosition(new Position(0, 1_177_170), regex)!;
+			assert.strictEqual(range, undefined);
+
+			const pos = new Position(0, 1177170);
+			range = data.document.getWordRangeAtPosition(pos)!;
+			assert.ok(range);
+			assert.ok(range.contains(pos));
+			assert.strictEqual(data.document.getText(range), 'TaskDefinition');
+
+		} finally {
+			config.dispose();
+		}
 	});
 
 	test('Rename popup sometimes populates with text on the left side omitted #96013', function () {