Merge branch 'master' of https://github.com/microsoft/vscode

extensions/merge-conflict/package.json

@@ -17,7 +17,7 @@
     "*"
   ],
   "main": "./out/mergeConflictMain",
-  "browser": "./dist/mergeConflictBrowserMain",
+  "browser": "./dist/browser/mergeConflictMain",
   "scripts": {
     "compile": "gulp compile-extension:merge-conflict",
     "watch": "gulp watch-extension:merge-conflict"

package.json

@@ -162,9 +162,9 @@
     "vsce": "1.48.0",
     "vscode-debugprotocol": "1.41.0",
     "vscode-nls-dev": "^3.3.1",
-    "webpack": "^4.16.5",
-    "webpack-cli": "^3.3.8",
-    "webpack-stream": "^5.1.1",
+    "webpack": "^4.43.0",
+    "webpack-cli": "^3.3.12",
+    "webpack-stream": "^5.2.1",
     "yaserver": "^0.2.0"
   },
   "repository": {

src/vs/workbench/services/workspaces/browser/abstractWorkspaceEditingService.ts

@@ -200,8 +200,11 @@ export abstract class AbstractWorkspaceEditingService implements IWorkspaceEditi
 		const remoteAuthority = this.environmentService.configuration.remoteAuthority;
 		const untitledWorkspace = await this.workspacesService.createUntitledWorkspace(folders, remoteAuthority);
 		if (path) {
-			await this.saveWorkspaceAs(untitledWorkspace, path);
-			await this.workspacesService.deleteUntitledWorkspace(untitledWorkspace); // https://github.com/microsoft/vscode/issues/100276
+			try {
+				await this.saveWorkspaceAs(untitledWorkspace, path);
+			} finally {
+				await this.workspacesService.deleteUntitledWorkspace(untitledWorkspace); // https://github.com/microsoft/vscode/issues/100276
+			}
 		} else {
 			path = untitledWorkspace.configPath;
 		}