Initial VS Code 1.19 source merge (#571)

* Initial 1.19 xcopy

* Fix yarn build

* Fix numerous build breaks

* Next batch of build break fixes

* More build break fixes

* Runtime breaks

* Additional post merge fixes

* Fix windows setup file

* Fix test failures.

* Update license header blocks to refer to source eula

src/vs/editor/contrib/suggest/test/completionModel.test.ts

@@ -6,8 +6,8 @@
 
 import * as assert from 'assert';
 import { ISuggestion, ISuggestResult, ISuggestSupport, SuggestionType } from 'vs/editor/common/modes';
-import { ISuggestionItem, getSuggestionComparator } from 'vs/editor/contrib/suggest/browser/suggest';
-import { CompletionModel } from 'vs/editor/contrib/suggest/browser/completionModel';
+import { ISuggestionItem, getSuggestionComparator } from 'vs/editor/contrib/suggest/suggest';
+import { CompletionModel } from 'vs/editor/contrib/suggest/completionModel';
 import { IPosition } from 'vs/editor/common/core/position';
 import { TPromise } from 'vs/base/common/winjs.base';
 
@@ -225,7 +225,74 @@ suite('CompletionModel', function () {
 		const [first, second] = model.items;
 		assert.equal(first.suggestion.label, 'source');
 		assert.equal(second.suggestion.label, '<- groups');
-
 	});
 
+	test('Score only filtered items when typing more, score all when typing less', function () {
+		model = new CompletionModel([
+			createSuggestItem('console', 0, 'property'),
+			createSuggestItem('co_new', 0, 'property'),
+			createSuggestItem('bar', 0, 'property'),
+			createSuggestItem('car', 0, 'property'),
+			createSuggestItem('foo', 0, 'property'),
+		], 1, {
+				leadingLineContent: '',
+				characterCountDelta: 0
+			}, 'inline');
+
+		assert.equal(model.items.length, 5);
+
+		// narrow down once
+		model.lineContext = { leadingLineContent: 'c', characterCountDelta: 1 };
+		assert.equal(model.items.length, 3);
+
+		// query gets longer, narrow down the narrow-down'ed-set from before
+		model.lineContext = { leadingLineContent: 'cn', characterCountDelta: 2 };
+		assert.equal(model.items.length, 2);
+
+		// query gets shorter, refilter everything
+		model.lineContext = { leadingLineContent: '', characterCountDelta: 0 };
+		assert.equal(model.items.length, 5);
+	});
+
+	test('Have more relaxed suggest matching algorithm #15419', function () {
+		model = new CompletionModel([
+			createSuggestItem('result', 0, 'property'),
+			createSuggestItem('replyToUser', 0, 'property'),
+			createSuggestItem('randomLolut', 0, 'property'),
+			createSuggestItem('car', 0, 'property'),
+			createSuggestItem('foo', 0, 'property'),
+		], 1, {
+				leadingLineContent: '',
+				characterCountDelta: 0
+			}, 'inline');
+
+		// query gets longer, narrow down the narrow-down'ed-set from before
+		model.lineContext = { leadingLineContent: 'rlut', characterCountDelta: 4 };
+		assert.equal(model.items.length, 3);
+
+		const [first, second, third] = model.items;
+		assert.equal(first.suggestion.label, 'result'); // best with `rult`
+		assert.equal(second.suggestion.label, 'replyToUser');  // best with `rltu`
+		assert.equal(third.suggestion.label, 'randomLolut');  // best with `rlut`
+	});
+
+	test('Emmet suggestion not appearing at the top of the list in jsx files, #39518', function () {
+		model = new CompletionModel([
+			createSuggestItem('from', 0, 'property'),
+			createSuggestItem('form', 0, 'property'),
+			createSuggestItem('form:get', 0, 'property'),
+			createSuggestItem('testForeignMeasure', 0, 'property'),
+			createSuggestItem('fooRoom', 0, 'property'),
+		], 1, {
+				leadingLineContent: '',
+				characterCountDelta: 0
+			}, 'inline');
+
+		model.lineContext = { leadingLineContent: 'form', characterCountDelta: 4 };
+		assert.equal(model.items.length, 5);
+		const [first, second, third] = model.items;
+		assert.equal(first.suggestion.label, 'form'); // best with `form`
+		assert.equal(second.suggestion.label, 'form:get');  // best with `form`
+		assert.equal(third.suggestion.label, 'from');  // best with `from`
+	});
 });

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

@@ -8,7 +8,7 @@ import * as assert from 'assert';
 import URI from 'vs/base/common/uri';
 import { IDisposable } from 'vs/base/common/lifecycle';
 import { SuggestRegistry } from 'vs/editor/common/modes';
-import { provideSuggestionItems } from 'vs/editor/contrib/suggest/browser/suggest';
+import { provideSuggestionItems } from 'vs/editor/contrib/suggest/suggest';
 import { Position } from 'vs/editor/common/core/position';
 import { Model } from 'vs/editor/common/model/model';
 

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

@@ -10,10 +10,10 @@ import URI from 'vs/base/common/uri';
 import { IDisposable, dispose } from 'vs/base/common/lifecycle';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { Model } from 'vs/editor/common/model/model';
-import { ICommonCodeEditor, Handler } from 'vs/editor/common/editorCommon';
+import { Handler } from 'vs/editor/common/editorCommon';
 import { ISuggestSupport, ISuggestResult, SuggestRegistry, SuggestTriggerKind } from 'vs/editor/common/modes';
-import { SuggestModel, LineContext } from 'vs/editor/contrib/suggest/browser/suggestModel';
-import { MockCodeEditor, MockScopeLocation } from 'vs/editor/test/common/mocks/mockCodeEditor';
+import { SuggestModel, LineContext } from 'vs/editor/contrib/suggest/suggestModel';
+import { TestCodeEditor, MockScopeLocation } from 'vs/editor/test/browser/testCodeEditor';
 import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection';
 import { InstantiationService } from 'vs/platform/instantiation/common/instantiationService';
 import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
@@ -22,8 +22,10 @@ import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { NullTelemetryService } from 'vs/platform/telemetry/common/telemetryUtils';
 import { EditOperation } from 'vs/editor/common/core/editOperation';
 import { Range } from 'vs/editor/common/core/range';
+import { ICodeEditor } from 'vs/editor/browser/editorBrowser';
+import { CoreEditingCommands } from 'vs/editor/browser/controller/coreCommands';
 
-function createMockEditor(model: Model): MockCodeEditor {
+function createMockEditor(model: Model): TestCodeEditor {
 	const contextKeyService = new MockContextKeyService();
 	const telemetryService = NullTelemetryService;
 	const instantiationService = new InstantiationService(new ServiceCollection(
@@ -31,7 +33,7 @@ function createMockEditor(model: Model): MockCodeEditor {
 		[ITelemetryService, telemetryService]
 	));
 
-	const editor = new MockCodeEditor(new MockScopeLocation(), {}, instantiationService, contextKeyService);
+	const editor = new TestCodeEditor(new MockScopeLocation(), {}, instantiationService, contextKeyService);
 	editor.setModel(model);
 	return editor;
 }
@@ -70,8 +72,8 @@ suite('SuggestModel - TriggerAndCancelOracle', function () {
 
 
 	const alwaysEmptySupport: ISuggestSupport = {
-		provideCompletionItems(doc, pos) {
-			return <ISuggestResult>{
+		provideCompletionItems(doc, pos): ISuggestResult {
+			return {
 				incomplete: false,
 				suggestions: []
 			};
@@ -79,8 +81,8 @@ suite('SuggestModel - TriggerAndCancelOracle', function () {
 	};
 
 	const alwaysSomethingSupport: ISuggestSupport = {
-		provideCompletionItems(doc, pos) {
-			return <ISuggestResult>{
+		provideCompletionItems(doc, pos): ISuggestResult {
+			return {
 				incomplete: false,
 				suggestions: [{
 					label: doc.getWordUntilPosition(pos).word,
@@ -100,7 +102,7 @@ suite('SuggestModel - TriggerAndCancelOracle', function () {
 		disposables.push(model);
 	});
 
-	function withOracle(callback: (model: SuggestModel, editor: ICommonCodeEditor) => any): TPromise<any> {
+	function withOracle(callback: (model: SuggestModel, editor: ICodeEditor) => any): TPromise<any> {
 
 		return new TPromise((resolve, reject) => {
 			const editor = createMockEditor(model);
@@ -222,9 +224,8 @@ suite('SuggestModel - TriggerAndCancelOracle', function () {
 	test('#17400: Keep filtering suggestModel.ts after space', function () {
 
 		disposables.push(SuggestRegistry.register({ scheme: 'test' }, {
-			provideCompletionItems(doc, pos) {
-				return <ISuggestResult>{
-					currentWord: '',
+			provideCompletionItems(doc, pos): ISuggestResult {
+				return {
 					incomplete: false,
 					suggestions: [{
 						label: 'My Table',
@@ -272,9 +273,8 @@ suite('SuggestModel - TriggerAndCancelOracle', function () {
 	test('#21484: Trigger character always force a new completion session', function () {
 
 		disposables.push(SuggestRegistry.register({ scheme: 'test' }, {
-			provideCompletionItems(doc, pos) {
-				return <ISuggestResult>{
-					currentWord: '',
+			provideCompletionItems(doc, pos): ISuggestResult {
+				return {
 					incomplete: false,
 					suggestions: [{
 						label: 'foo.bar',
@@ -288,9 +288,8 @@ suite('SuggestModel - TriggerAndCancelOracle', function () {
 
 		disposables.push(SuggestRegistry.register({ scheme: 'test' }, {
 			triggerCharacters: ['.'],
-			provideCompletionItems(doc, pos) {
-				return <ISuggestResult>{
-					currentWord: '',
+			provideCompletionItems(doc, pos): ISuggestResult {
+				return {
 					incomplete: false,
 					suggestions: [{
 						label: 'boom',
@@ -383,8 +382,8 @@ suite('SuggestModel - TriggerAndCancelOracle', function () {
 	test('Incomplete suggestion results cause re-triggering when typing w/o further context, #28400 (1/2)', function () {
 
 		disposables.push(SuggestRegistry.register({ scheme: 'test' }, {
-			provideCompletionItems(doc, pos) {
-				return <ISuggestResult>{
+			provideCompletionItems(doc, pos): ISuggestResult {
+				return {
 					incomplete: true,
 					suggestions: [{
 						label: 'foo',
@@ -420,8 +419,8 @@ suite('SuggestModel - TriggerAndCancelOracle', function () {
 	test('Incomplete suggestion results cause re-triggering when typing w/o further context, #28400 (2/2)', function () {
 
 		disposables.push(SuggestRegistry.register({ scheme: 'test' }, {
-			provideCompletionItems(doc, pos) {
-				return <ISuggestResult>{
+			provideCompletionItems(doc, pos): ISuggestResult {
+				return {
 					incomplete: true,
 					suggestions: [{
 						label: 'foo;',
@@ -464,11 +463,10 @@ suite('SuggestModel - TriggerAndCancelOracle', function () {
 		let triggerCharacter = '';
 		disposables.push(SuggestRegistry.register({ scheme: 'test' }, {
 			triggerCharacters: ['.'],
-			provideCompletionItems(doc, pos, context) {
+			provideCompletionItems(doc, pos, context): ISuggestResult {
 				assert.equal(context.triggerKind, SuggestTriggerKind.TriggerCharacter);
 				triggerCharacter = context.triggerCharacter;
-				return <ISuggestResult>{
-					currentWord: '',
+				return {
 					incomplete: false,
 					suggestions: [
 						{
@@ -497,8 +495,8 @@ suite('SuggestModel - TriggerAndCancelOracle', function () {
 
 	test('Mac press and hold accent character insertion does not update suggestions, #35269', function () {
 		disposables.push(SuggestRegistry.register({ scheme: 'test' }, {
-			provideCompletionItems(doc, pos) {
-				return <ISuggestResult>{
+			provideCompletionItems(doc, pos): ISuggestResult {
+				return {
 					incomplete: true,
 					suggestions: [{
 						label: 'abc',
@@ -537,4 +535,33 @@ suite('SuggestModel - TriggerAndCancelOracle', function () {
 			});
 		});
 	});
+
+	test('Backspace should not always cancel code completion, #36491', function () {
+		disposables.push(SuggestRegistry.register({ scheme: 'test' }, alwaysSomethingSupport));
+
+		return withOracle(async (model, editor) => {
+			await assertEvent(model.onDidSuggest, () => {
+				editor.setPosition({ lineNumber: 1, column: 4 });
+				editor.trigger('keyboard', Handler.Type, { text: 'd' });
+
+			}, event => {
+				assert.equal(event.auto, true);
+				assert.equal(event.completionModel.items.length, 1);
+				const [first] = event.completionModel.items;
+
+				assert.equal(first.support, alwaysSomethingSupport);
+			});
+
+			await assertEvent(model.onDidSuggest, () => {
+				CoreEditingCommands.DeleteLeft.runEditorCommand(null, editor, null);
+
+			}, event => {
+				assert.equal(event.auto, true);
+				assert.equal(event.completionModel.items.length, 1);
+				const [first] = event.completionModel.items;
+
+				assert.equal(first.support, alwaysSomethingSupport);
+			});
+		});
+	});
 });