add (skipped) tests for microsoft#90515

jrieken · jrieken · commit 05b445851611 · 2020-02-12T12:50:52.000+01:00
diff --git a/src/vs/editor/contrib/suggest/test/wordDistance.test.ts b/src/vs/editor/contrib/suggest/test/wordDistance.test.ts
@@ -0,0 +1,118 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as assert from 'assert';
+import { EditorSimpleWorker } from 'vs/editor/common/services/editorSimpleWorker';
+import { mock } from 'vs/editor/contrib/suggest/test/suggestModel.test';
+import { EditorWorkerHost, EditorWorkerServiceImpl } from 'vs/editor/common/services/editorWorkerServiceImpl';
+import { IModelService } from 'vs/editor/common/services/modelService';
+import { TextModel } from 'vs/editor/common/model/textModel';
+import { URI } from 'vs/base/common/uri';
+import { ITextResourceConfigurationService } from 'vs/editor/common/services/textResourceConfigurationService';
+import { NullLogService } from 'vs/platform/log/common/log';
+import { WordDistance } from 'vs/editor/contrib/suggest/wordDistance';
+import { createTestCodeEditor } from 'vs/editor/test/browser/testCodeEditor';
+import { IRange } from 'vs/editor/common/core/range';
+import { DEFAULT_WORD_REGEXP } from 'vs/editor/common/model/wordHelper';
+import { Event } from 'vs/base/common/event';
+import { CompletionItem } from 'vs/editor/contrib/suggest/suggest';
+import { IPosition } from 'vs/editor/common/core/position';
+import * as modes from 'vs/editor/common/modes';
+import { DisposableStore } from 'vs/base/common/lifecycle';
+import { LanguageConfigurationRegistry } from 'vs/editor/common/modes/languageConfigurationRegistry';
+import { MockMode } from 'vs/editor/test/common/mocks/mockMode';
+
+suite('suggest, word distance', function () {
+
+	class BracketMode extends MockMode {
+
+		private static readonly _id = new modes.LanguageIdentifier('bracketMode', 3);
+
+		constructor() {
+			super(BracketMode._id);
+			this._register(LanguageConfigurationRegistry.register(this.getLanguageIdentifier(), {
+				brackets: [
+					['{', '}'],
+					['[', ']'],
+					['(', ')'],
+				]
+			}));
+		}
+	}
+	let distance: WordDistance;
+	let disposables = new DisposableStore();
+
+	setup(async function () {
+
+		disposables.clear();
+		let mode = new BracketMode();
+		let model = TextModel.createFromString('function abc(aa, ab){\na\n}', undefined, mode.getLanguageIdentifier(), URI.parse('test:///some.path'));
+		let editor = createTestCodeEditor({ model: model });
+		editor.updateOptions({ suggest: { localityBonus: true } });
+		editor.setPosition({ lineNumber: 2, column: 2 });
+
+		let modelService = new class extends mock<IModelService>() {
+			onModelRemoved = Event.None;
+			getModel(uri: URI) {
+				return uri.toString() === model.uri.toString() ? model : null;
+			}
+		};
+
+		let service = new class extends EditorWorkerServiceImpl {
+
+			private _worker = new EditorSimpleWorker(new class extends mock<EditorWorkerHost>() { }, null);
+
+			constructor() {
+				super(modelService, new class extends mock<ITextResourceConfigurationService>() { }, new NullLogService());
+				this._worker.acceptNewModel({
+					url: model.uri.toString(),
+					lines: model.getLinesContent(),
+					EOL: model.getEOL(),
+					versionId: model.getVersionId()
+				});
+				model.onDidChangeContent(e => this._worker.acceptModelChanged(model.uri.toString(), e));
+			}
+			computeWordRanges(resource: URI, range: IRange): Promise<{ [word: string]: IRange[] } | null> {
+				return this._worker.computeWordRanges(resource.toString(), range, DEFAULT_WORD_REGEXP.source, DEFAULT_WORD_REGEXP.flags);
+			}
+		};
+
+		distance = await WordDistance.create(service, editor);
+
+		disposables.add(mode);
+		disposables.add(model);
+		disposables.add(editor);
+	});
+
+	function createSuggestItem(label: string, overwriteBefore: number, position: IPosition): CompletionItem {
+		const suggestion: modes.CompletionItem = {
+			label,
+			range: { startLineNumber: position.lineNumber, startColumn: position.column - overwriteBefore, endLineNumber: position.lineNumber, endColumn: position.column },
+			insertText: label,
+			kind: 0
+		};
+		const container: modes.CompletionList = {
+			suggestions: [suggestion]
+		};
+		const provider: modes.CompletionItemProvider = {
+			provideCompletionItems(): any {
+				return;
+			}
+		};
+		return new CompletionItem(position, suggestion, container, provider, undefined!);
+	}
+
+	test('Suggest locality bonus can boost current word #90515', function () {
+		this.skip();
+
+		const pos = { lineNumber: 2, column: 2 };
+		const d1 = distance.distance(pos, createSuggestItem('a', 1, pos).completion);
+		const d2 = distance.distance(pos, createSuggestItem('aa', 1, pos).completion);
+		const d3 = distance.distance(pos, createSuggestItem('ab', 1, pos).completion);
+
+		assert.ok(d1 > d2);
+		assert.ok(d2 === d3);
+	});
+});
