Merge from vscode 2cd495805cf99b31b6926f08ff4348124b2cf73d

src/vs/editor/test/browser/controller/inputRecorder.html

@@ -31,14 +31,14 @@ var RECORDED_EVENTS = [];
 
 var input = document.getElementById('input');
 
-var blackListedProps = [
+var blockedProperties = [
 	'currentTarget',
 	'path',
 	'srcElement',
 	'target',
 	'view'
 ];
-blackListedProps = blackListedProps.concat([
+blockedProperties = blockedProperties.concat([
 	'AT_TARGET',
 	'BLUR',
 	'BUBBLING_PHASE',
@@ -68,7 +68,7 @@ blackListedProps = blackListedProps.concat([
 function toSerializable(e) {
 	var r = {};
 	for (var k in e) {
-		if (blackListedProps.indexOf(k) >= 0) {
+		if (blockedProperties.indexOf(k) >= 0) {
 			continue;
 		}
 		if (typeof e[k] === 'function') {
@@ -112,4 +112,4 @@ document.getElementById('stop').onclick = function() {
 
 </script>
 </body>
-</html>
+</html>

src/vs/editor/test/common/model/textModelSearch.test.ts

@@ -781,4 +781,29 @@ suite('TextModelSearch', () => {
 
 		model.dispose();
 	});
+
+	test('issue #100134. Zero-length matches should properly step over surrogate pairs', () => {
+		// 1[Laptop]1 - there shoud be no matches inside of [Laptop] emoji
+		assertFindMatches('1\uD83D\uDCBB1', '()', true, false, null,
+			[
+				[1, 1, 1, 1],
+				[1, 2, 1, 2],
+				[1, 4, 1, 4],
+				[1, 5, 1, 5],
+
+			]
+		);
+		// 1[Hacker Cat]1 = 1[Cat Face][ZWJ][Laptop]1 - there shoud be matches between emoji and ZWJ
+		// there shoud be no matches inside of [Cat Face] and [Laptop] emoji
+		assertFindMatches('1\uD83D\uDC31\u200D\uD83D\uDCBB1', '()', true, false, null,
+			[
+				[1, 1, 1, 1],
+				[1, 2, 1, 2],
+				[1, 4, 1, 4],
+				[1, 5, 1, 5],
+				[1, 7, 1, 7],
+				[1, 8, 1, 8]
+			]
+		);
+	});
 });

src/vs/editor/test/common/modes/languageSelector.test.ts

@@ -104,4 +104,15 @@ suite('LanguageSelector', function () {
 		let value = score(selector, URI.parse('file:///C:/Users/zlhe/Desktop/test.interface.json'), 'json', true);
 		assert.equal(value, 10);
 	});
+
+	test('Document selector match - platform paths #99938', function () {
+		let selector = {
+			pattern: {
+				base: '/home/user/Desktop',
+				pattern: '*.json'
+			}
+		};
+		let value = score(selector, URI.file('/home/user/Desktop/test.json'), 'json', true);
+		assert.equal(value, 10);
+	});
 });

src/vs/editor/test/common/modes/linkComputer.test.ts

@@ -223,4 +223,11 @@ suite('Editor Modes - Link Computer', () => {
 			'    https://foo.bar/[this is foo site]    '
 		);
 	});
+
+	test('issue #100353: Link detection stops at ＆(double-byte)', () => {
+		assertLink(
+			'aa  http://tree-mark.chips.jp/レーズン＆ベリーミックス  aa',
+			'    http://tree-mark.chips.jp/レーズン＆ベリーミックス    '
+		);
+	});
 });