Revert vscode-textmate on stable

build/gulpfile.hygiene.js

@@ -219,6 +219,10 @@ function checkPackageJSON(actualPath) {
 			// missing in root is allowed
 			continue;
 		}
+		if (depName === 'vscode-textmate') {
+			// allow vscode-textmate to diverge for now
+			continue;
+		}
 		if (depVersion !== rootDepVersion) {
 			this.emit('error', `The dependency ${depName} in '${actualPath}' (${depVersion}) is different than in the root package.json (${rootDepVersion})`);
 		}

extensions/json-language-features/server/yarn.lock

@@ -80,10 +80,10 @@ request-light@^0.2.5:
     https-proxy-agent "^2.2.3"
     vscode-nls "^4.1.1"
 
-vscode-json-languageservice@^3.4.1:
-  version "3.4.1"
-  resolved "https://registry.yarnpkg.com/vscode-json-languageservice/-/vscode-json-languageservice-3.4.1.tgz#e051f3bb2de5d23995763deac108622a5e93604a"
-  integrity sha512-IWJreQ9HtBSyveqaC3UUEArUqCnt5zYLgHewSJ0CvxlIJfvY7yD8GDbLuLxGeHMWwSudYlODit1IfwNzvjZjEg==
+vscode-json-languageservice@^3.4.3:
+  version "3.4.3"
+  resolved "https://registry.yarnpkg.com/vscode-json-languageservice/-/vscode-json-languageservice-3.4.3.tgz#e0792619ec3f8730194c93ef74474d4429606cd6"
+  integrity sha512-SRIy75K4/6H1vmMYVsxYwynFUNMOEzIhTy+Pm6D24JHTquwMe7rx/35X75u2sw65e46ZP67izyrJ6ahaAi8UjQ==
   dependencies:
     jsonc-parser "^2.2.0"
     vscode-languageserver-types "^3.15.0-next.5"
@@ -126,12 +126,12 @@ vscode-textbuffer@^1.0.0:
   resolved "https://registry.yarnpkg.com/vscode-textbuffer/-/vscode-textbuffer-1.0.0.tgz#1faee638c8e0e4131c8d5c353993a1874acda086"
   integrity sha512-zPaHo4urgpwsm+PrJWfNakolRpryNja18SUip/qIIsfhuEqEIPEXMxHOlFPjvDC4JgTaimkncNW7UMXRJTY6ow==
 
-vscode-uri@^2.0.3:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/vscode-uri/-/vscode-uri-2.0.3.tgz#25e5f37f552fbee3cec7e5f80cef8469cefc6543"
-  integrity sha512-4D3DI3F4uRy09WNtDGD93H9q034OHImxiIcSq664Hq1Y1AScehlP3qqZyTkX/RWxeu0MRMHGkrxYqm2qlDF/aw==
-
 vscode-uri@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/vscode-uri/-/vscode-uri-2.1.0.tgz#475a4269e63edbc13914b40c84bc1416e3398156"
   integrity sha512-3voe44nOhb6OdKlpZShVsmVvY2vFQHMe6REP3Ky9RVJuPyM/XidsjH6HncCIDdSmbcF5YQHrTC/Q+Q2loJGkOw==
+
+vscode-uri@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/vscode-uri/-/vscode-uri-2.1.1.tgz#5aa1803391b6ebdd17d047f51365cf62c38f6e90"
+  integrity sha512-eY9jmGoEnVf8VE8xr5znSah7Qt1P/xsCdErz+g8HYZtJ7bZqKH5E3d+6oVNm1AC/c6IHUDokbmVXKOi4qPAC9A==

package.json

@@ -1,7 +1,7 @@
 {
   "name": "code-oss-dev",
   "version": "1.40.0",
-  "distro": "d17c0d0353511f30b7f251bcb29f400b294bec36",
+  "distro": "be174eeecd6d4208440a9d339583746231264048",
   "author": {
     "name": "Microsoft Corporation"
   },
@@ -52,8 +52,8 @@
     "vscode-proxy-agent": "^0.5.1",
     "vscode-ripgrep": "^1.5.7",
     "vscode-sqlite3": "4.0.8",
-    "vscode-textmate": "^4.3.0",
-    "xterm": "4.2.0",
+    "vscode-textmate": "4.2.2",
+    "xterm": "4.2.0-vscode1",
     "xterm-addon-search": "0.3.0",
     "xterm-addon-web-links": "0.2.1",
     "yauzl": "^2.9.2",

remote/package.json

@@ -20,7 +20,7 @@
     "vscode-proxy-agent": "^0.5.1",
     "vscode-ripgrep": "^1.5.7",
     "vscode-textmate": "^4.3.0",
-    "xterm": "4.2.0",
+    "xterm": "4.2.0-vscode1",
     "xterm-addon-search": "0.3.0",
     "xterm-addon-web-links": "0.2.1",
     "yauzl": "^2.9.2",

remote/web/package.json

@@ -5,7 +5,7 @@
 		"onigasm-umd": "^2.2.2",
 		"semver-umd": "^5.5.3",
 		"vscode-textmate": "^4.3.0",
-		"xterm": "4.2.0",
+		"xterm": "4.2.0-vscode1",
 		"xterm-addon-search": "0.3.0",
 		"xterm-addon-web-links": "0.2.1"
 	}

remote/web/yarn.lock

@@ -41,7 +41,7 @@ xterm-addon-web-links@0.2.1:
   resolved "https://registry.yarnpkg.com/xterm-addon-web-links/-/xterm-addon-web-links-0.2.1.tgz#6d1f2ce613e09870badf17615e7a1170a31542b2"
   integrity sha512-2KnHtiq0IG7hfwv3jw2/jQeH1RBk2d5CH4zvgwQe00rLofSJqSfgnJ7gwowxxpGHrpbPr6Lv4AmH/joaNw2+HQ==
 
-xterm@4.2.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/xterm/-/xterm-4.2.0.tgz#b9980b2ae18c64ed31bcc95eace3bcecffebbbd9"
-  integrity sha512-oNfLqt+LmghLPOt5UcskP5Km1fXpTBHsTZ99nxJKY2N0MNFXBKIVXUcNNhHCa74JGZFMGhLT58A/UN3HcPXSfg==
+xterm@4.2.0-vscode1:
+  version "4.2.0-vscode1"
+  resolved "https://registry.yarnpkg.com/xterm/-/xterm-4.2.0-vscode1.tgz#dbd67e52536578ea6b772d69a97da1487acf29e3"
+  integrity sha512-frw5Kprzkko8+G0vp4jOcwTeOpYFbSb2+QShpeQGJ7l3Hg3MTM7kt1G+nLxBPKnkFAmei/JcJTUGJdp/lldAfA==

remote/yarn.lock

@@ -428,10 +428,10 @@ xterm-addon-web-links@0.2.1:
   resolved "https://registry.yarnpkg.com/xterm-addon-web-links/-/xterm-addon-web-links-0.2.1.tgz#6d1f2ce613e09870badf17615e7a1170a31542b2"
   integrity sha512-2KnHtiq0IG7hfwv3jw2/jQeH1RBk2d5CH4zvgwQe00rLofSJqSfgnJ7gwowxxpGHrpbPr6Lv4AmH/joaNw2+HQ==
 
-xterm@4.2.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/xterm/-/xterm-4.2.0.tgz#b9980b2ae18c64ed31bcc95eace3bcecffebbbd9"
-  integrity sha512-oNfLqt+LmghLPOt5UcskP5Km1fXpTBHsTZ99nxJKY2N0MNFXBKIVXUcNNhHCa74JGZFMGhLT58A/UN3HcPXSfg==
+xterm@4.2.0-vscode1:
+  version "4.2.0-vscode1"
+  resolved "https://registry.yarnpkg.com/xterm/-/xterm-4.2.0-vscode1.tgz#dbd67e52536578ea6b772d69a97da1487acf29e3"
+  integrity sha512-frw5Kprzkko8+G0vp4jOcwTeOpYFbSb2+QShpeQGJ7l3Hg3MTM7kt1G+nLxBPKnkFAmei/JcJTUGJdp/lldAfA==
 
 yauzl@^2.9.2:
   version "2.10.0"

src/vs/editor/contrib/hover/hover.ts

@@ -259,19 +259,19 @@ class ShowHoverAction extends EditorAction {
 	}
 }
 
-class ShowCtrlHoverAction extends EditorAction {
+class ShowDefinitionPreviewHoverAction extends EditorAction {
 
 	constructor() {
 		super({
-			id: 'editor.action.showCtrlHover',
+			id: 'editor.action.showDefinitionPreviewHover',
 			label: nls.localize({
-				key: 'showCtrlHover',
+				key: 'showDefinitionPreviewHover',
 				comment: [
-					'Label for action that will trigger the showing of a ctrl+hover in the editor.',
-					'This allows for users to show the ctrl+hover without using the mouse.'
+					'Label for action that will trigger the showing of definition preview hover in the editor.',
+					'This allows for users to show the definition preview hover without using the mouse.'
 				]
-			}, "Show Control Hover"),
-			alias: 'Show Control Hover',
+			}, "Show Definition Preview Hover"),
+			alias: 'Show Definition Preview Hover',
 			precondition: undefined
 		});
 	}
@@ -302,7 +302,7 @@ class ShowCtrlHoverAction extends EditorAction {
 
 registerEditorContribution(ModesHoverController.ID, ModesHoverController);
 registerEditorAction(ShowHoverAction);
-registerEditorAction(ShowCtrlHoverAction);
+registerEditorAction(ShowDefinitionPreviewHoverAction);
 
 // theming
 registerThemingParticipant((theme, collector) => {

src/vs/workbench/contrib/debug/browser/breakpointsView.ts

@@ -711,11 +711,18 @@ export function getBreakpointMessageAndClassName(debugService: IDebugService, br
 	if (focusedThread) {
 		const callStack = focusedThread ? focusedThread.getCallStack() : undefined;
 		const topStackFrame = callStack ? callStack[0] : undefined;
-		if (topStackFrame && topStackFrame.source.uri.toString() === breakpoint.uri.toString() && topStackFrame.range.startLineNumber === breakpoint.lineNumber && topStackFrame.range.startColumn === breakpoint.column) {
-			return {
-				className: 'debug-breakpoint-and-top-stack-frame',
-				message: breakpoint.message || nls.localize('breakpoint', "Breakpoint")
-			};
+		if (topStackFrame && topStackFrame.source.uri.toString() === breakpoint.uri.toString() && topStackFrame.range.startLineNumber === breakpoint.lineNumber) {
+			if (topStackFrame.range.startColumn === breakpoint.column) {
+				return {
+					className: 'debug-breakpoint-and-top-stack-frame-at-column',
+					message: breakpoint.message || nls.localize('breakpoint', "Breakpoint")
+				};
+			} else if (breakpoint.column === undefined) {
+				return {
+					className: 'debug-breakpoint-and-top-stack-frame',
+					message: breakpoint.message || nls.localize('breakpoint', "Breakpoint")
+				};
+			}
 		}
 	}
 

src/vs/workbench/contrib/debug/browser/media/debug.contribution.css

@@ -119,7 +119,8 @@
 	background: url('breakpoint-unsupported.svg') center center no-repeat;
 }
 
-.monaco-editor .inline-breakpoint-widget.debug-breakpoint-and-top-stack-frame {
+.monaco-editor .debug-top-stack-frame.debug-breakpoint-and-top-stack-frame,
+.monaco-editor .inline-breakpoint-widget.debug-breakpoint-and-top-stack-frame-at-column {
 	background: url('current-and-breakpoint.svg') center center no-repeat;
 }
 

src/vs/workbench/contrib/tasks/browser/abstractTaskService.ts

@@ -90,6 +90,8 @@ export namespace ConfigureTaskAction {
 	export const TEXT = nls.localize('ConfigureTaskRunnerAction.label', "Configure Task");
 }
 
+type TaskQuickPickEntryType = (IQuickPickItem & { task: Task; }) | (IQuickPickItem & { folder: IWorkspaceFolder; });
+
 class ProblemReporter implements TaskConfig.IProblemReporter {
 
 	private _validationStatus: ValidationStatus;
@@ -2461,6 +2463,31 @@ export abstract class AbstractTaskService extends Disposable implements ITaskSer
 		});
 	}
 
+	private isTaskEntry(value: IQuickPickItem): value is IQuickPickItem & { task: Task } {
+		let candidate: IQuickPickItem & { task: Task } = value as any;
+		return candidate && !!candidate.task;
+	}
+
+	private configureTask(task: Task) {
+		if (ContributedTask.is(task)) {
+			this.customize(task, undefined, true);
+		} else if (CustomTask.is(task)) {
+			this.openConfig(task);
+		} else if (ConfiguringTask.is(task)) {
+			// Do nothing.
+		}
+	}
+
+	private handleSelection(selection: TaskQuickPickEntryType) {
+		if (!selection) {
+			return;
+		}
+		if (this.isTaskEntry(selection)) {
+			this.configureTask(selection.task);
+		} else {
+			this.openTaskFile(selection.folder.toResource('.vscode/tasks.json'));
+		}
+	}
 
 	private async runConfigureTasks(): Promise<void> {
 		if (!this.canRunCommand()) {
@@ -2473,44 +2500,17 @@ export abstract class AbstractTaskService extends Disposable implements ITaskSer
 			taskPromise = Promise.resolve(new TaskMap());
 		}
 
-		let configureTask = (task: Task): void => {
-			if (ContributedTask.is(task)) {
-				this.customize(task, undefined, true);
-			} else if (CustomTask.is(task)) {
-				this.openConfig(task);
-			} else if (ConfiguringTask.is(task)) {
-				// Do nothing.
-			}
-		};
-
-		function isTaskEntry(value: IQuickPickItem): value is IQuickPickItem & { task: Task } {
-			let candidate: IQuickPickItem & { task: Task } = value as any;
-			return candidate && !!candidate.task;
-		}
-
 		let stats = this.contextService.getWorkspace().folders.map<Promise<IFileStat | undefined>>((folder) => {
 			return this.fileService.resolve(folder.toResource('.vscode/tasks.json')).then(stat => stat, () => undefined);
 		});
 
-		type EntryType = (IQuickPickItem & { task: Task; }) | (IQuickPickItem & { folder: IWorkspaceFolder; });
-		function handleSelection(this: any, selection: EntryType) {
-			if (!selection) {
-				return;
-			}
-			if (isTaskEntry(selection)) {
-				configureTask(selection.task);
-			} else {
-				this.openTaskFile(selection.folder.toResource('.vscode/tasks.json'));
-			}
-		}
-
 		let createLabel = nls.localize('TaskService.createJsonFile', 'Create tasks.json file from template');
 		let openLabel = nls.localize('TaskService.openJsonFile', 'Open tasks.json file');
 		const tokenSource = new CancellationTokenSource();
 		const cancellationToken: CancellationToken = tokenSource.token;
 		let entries = Promise.all(stats).then((stats) => {
 			return taskPromise.then((taskMap) => {
-				let entries: QuickPickInput<EntryType>[] = [];
+				let entries: QuickPickInput<TaskQuickPickEntryType>[] = [];
 				let needsCreateOrOpen: boolean = true;
 				if (this.contextService.getWorkbenchState() !== WorkbenchState.EMPTY) {
 					let tasks = taskMap.all();
@@ -2538,15 +2538,15 @@ export abstract class AbstractTaskService extends Disposable implements ITaskSer
 						if (tasks.length > 0) {
 							tasks = tasks.slice().sort((a, b) => a._label.localeCompare(b._label));
 							for (let i = 0; i < tasks.length; i++) {
-								let entry: EntryType = { label: tasks[i]._label, task: tasks[i], description: folder.name };
+								let entry: TaskQuickPickEntryType = { label: tasks[i]._label, task: tasks[i], description: folder.name };
 								if (i === 0) {
 									entries.push({ type: 'separator', label: folder.name });
 								}
 								entries.push(entry);
 							}
 						} else {
 							let label = stats[index] !== undefined ? openLabel : createLabel;
-							let entry: EntryType = { label, folder: folder };
+							let entry: TaskQuickPickEntryType = { label, folder: folder };
 							entries.push({ type: 'separator', label: folder.name });
 							entries.push(entry);
 						}
@@ -2573,7 +2573,7 @@ export abstract class AbstractTaskService extends Disposable implements ITaskSer
 		if (!timeout && ((await entries).length === 1) && this.configurationService.getValue<boolean>(QUICKOPEN_SKIP_CONFIG)) {
 			const entry: any = <any>((await entries)[0]);
 			if (entry.task) {
-				handleSelection(entry);
+				this.handleSelection(entry);
 				return;
 			}
 		}
@@ -2585,10 +2585,10 @@ export abstract class AbstractTaskService extends Disposable implements ITaskSer
 					// canceled when there's only one task
 					const task = (await entries)[0];
 					if ((<any>task).task) {
-						selection = <EntryType>task;
+						selection = <TaskQuickPickEntryType>task;
 					}
 				}
-				handleSelection(selection);
+				this.handleSelection(selection);
 			});
 	}
 

src/vs/workbench/contrib/welcome/page/browser/vs_code_welcome_page.ts

@@ -4,13 +4,14 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { escape } from 'vs/base/common/strings';
+import { isWeb } from 'vs/base/common/platform';
 import { localize } from 'vs/nls';
 
 export default () => `
 <div class="welcomePageContainer">
 	<div class="welcomePage">
 		<div class="title">
-			<h1 class="caption">${escape(localize('welcomePage.vscode', "Visual Studio Code"))}</h1>
+			<h1 class="caption">${escape(isWeb ? localize('welcomePage.vsonline', "Visual Studio Online") : localize('welcomePage.vscode', "Visual Studio Code"))}</h1>
 			<p class="subtitle detail">${escape(localize({ key: 'welcomePage.editingEvolved', comment: ['Shown as subtitle on the Welcome page.'] }, "Editing evolved"))}</p>
 		</div>
 		<div class="row">

src/vs/workbench/services/telemetry/browser/telemetryService.ts

@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { ITelemetryService, ITelemetryInfo, ITelemetryData } from 'vs/platform/telemetry/common/telemetry';
-import { NullTelemetryService, combinedAppender, LogAppender, ITelemetryAppender, validateTelemetryData } from 'vs/platform/telemetry/common/telemetryUtils';
+import { NullTelemetryService, combinedAppender, LogAppender, ITelemetryAppender } from 'vs/platform/telemetry/common/telemetryUtils';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { Disposable } from 'vs/base/common/lifecycle';
 import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
@@ -22,13 +22,8 @@ export class WebTelemetryAppender implements ITelemetryAppender {
 	constructor(private _logService: ILogService, private _appender: IRemoteAgentService) { }
 
 	log(eventName: string, data: any): void {
-		data = validateTelemetryData(data);
 		this._logService.trace(`telemetry/${eventName}`, data);
-
-		this._appender.logTelemetry('/monacoworkbench/' + eventName, {
-			properties: data.properties,
-			measurements: data.measurements
-		});
+		this._appender.logTelemetry(eventName, data);
 	}
 
 	flush(): Promise<void> {

yarn.lock

@@ -9007,10 +9007,10 @@ vscode-sqlite3@4.0.8:
   dependencies:
     nan "^2.14.0"
 
-vscode-textmate@^4.3.0:
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/vscode-textmate/-/vscode-textmate-4.3.0.tgz#6e1f0f273d84148cfa1e9c7ed85bd16c974f9f61"
-  integrity sha512-MhEZ3hvxOVuYGsrRzW/PZLDR2VdtG2+V6TIKPvmE9JT+RAq/OtPlrFd1+ZQwBefoHEhjRNuRJ0OktcFezuxPmg==
+vscode-textmate@4.2.2:
+  version "4.2.2"
+  resolved "https://registry.yarnpkg.com/vscode-textmate/-/vscode-textmate-4.2.2.tgz#0b4dabc69a6fba79a065cb6b615f66eac07c8f4c"
+  integrity sha512-1U4ih0E/KP1zNK/EbpUqyYtI7PY+Ccd2nDGTtiMR/UalLFnmaYkwoWhN1oI7B91ptBN8NdVwWuvyUnvJAulCUw==
   dependencies:
     oniguruma "^7.2.0"
 
@@ -9304,10 +9304,10 @@ xterm-addon-web-links@0.2.1:
   resolved "https://registry.yarnpkg.com/xterm-addon-web-links/-/xterm-addon-web-links-0.2.1.tgz#6d1f2ce613e09870badf17615e7a1170a31542b2"
   integrity sha512-2KnHtiq0IG7hfwv3jw2/jQeH1RBk2d5CH4zvgwQe00rLofSJqSfgnJ7gwowxxpGHrpbPr6Lv4AmH/joaNw2+HQ==
 
-xterm@4.2.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/xterm/-/xterm-4.2.0.tgz#b9980b2ae18c64ed31bcc95eace3bcecffebbbd9"
-  integrity sha512-oNfLqt+LmghLPOt5UcskP5Km1fXpTBHsTZ99nxJKY2N0MNFXBKIVXUcNNhHCa74JGZFMGhLT58A/UN3HcPXSfg==
+xterm@4.2.0-vscode1:
+  version "4.2.0-vscode1"
+  resolved "https://registry.yarnpkg.com/xterm/-/xterm-4.2.0-vscode1.tgz#dbd67e52536578ea6b772d69a97da1487acf29e3"
+  integrity sha512-frw5Kprzkko8+G0vp4jOcwTeOpYFbSb2+QShpeQGJ7l3Hg3MTM7kt1G+nLxBPKnkFAmei/JcJTUGJdp/lldAfA==
 
 y18n@^3.2.1:
   version "3.2.1"