Merge branch 'release/1.48' into isidorn/bump-version

Author: isidorn

build/gulpfile.vscode.js

@@ -79,7 +79,7 @@ const vscodeResources = [
 	'out-build/vs/code/electron-browser/sharedProcess/sharedProcess.js',
 	'out-build/vs/code/electron-sandbox/issue/issueReporter.js',
 	'out-build/vs/code/electron-sandbox/processExplorer/processExplorer.js',
-	'out-build/vs/platform/auth/common/auth.css',
+	'out-build/vs/code/electron-sandbox/proxy/auth.js',
 	'!**/test/**'
 ];
 

extensions/npm/package.json

@@ -56,7 +56,6 @@
         {
           "id": "npm",
           "name": "%view.name%",
-          "when": "npm:showScriptExplorer",
           "icon": "images/code.svg",
           "visibility": "hidden"
         }
@@ -237,6 +236,7 @@
           "type": "boolean",
           "default": false,
           "scope": "resource",
+          "deprecationMessage": "The NPM Script Explorer is now available in the 'Views' menu in the Explorer in all folders.",
           "description": "%config.npm.enableScriptExplorer%"
         },
         "npm.enableRunFromFolder": {

extensions/npm/src/npmMain.ts

@@ -8,7 +8,7 @@ import * as vscode from 'vscode';
 import { addJSONProviders } from './features/jsonContributions';
 import { runSelectedScript, selectAndRunScriptFromFolder } from './commands';
 import { NpmScriptsTreeDataProvider } from './npmView';
-import { invalidateTasksCache, NpmTaskProvider, hasPackageJson } from './tasks';
+import { invalidateTasksCache, NpmTaskProvider } from './tasks';
 import { invalidateHoverScriptsCache, NpmScriptHoverProvider } from './scriptHover';
 
 let treeDataProvider: NpmScriptsTreeDataProvider | undefined;
@@ -44,11 +44,6 @@ export async function activate(context: vscode.ExtensionContext): Promise<void>
 	registerHoverProvider(context);
 
 	context.subscriptions.push(vscode.commands.registerCommand('npm.runSelectedScript', runSelectedScript));
-
-	if (await hasPackageJson()) {
-		vscode.commands.executeCommand('setContext', 'npm:showScriptExplorer', true);
-	}
-
 	context.subscriptions.push(vscode.commands.registerCommand('npm.runScriptFromFolder', selectAndRunScriptFromFolder));
 }
 

extensions/npm/src/tasks.ts

@@ -311,22 +311,6 @@ export function getPackageJsonUriFromTask(task: Task): Uri | null {
 	return null;
 }
 
-export async function hasPackageJson(): Promise<boolean> {
-	let folders = workspace.workspaceFolders;
-	if (!folders) {
-		return false;
-	}
-	for (const folder of folders) {
-		if (folder.uri.scheme === 'file') {
-			let packageJson = path.join(folder.uri.fsPath, 'package.json');
-			if (await exists(packageJson)) {
-				return true;
-			}
-		}
-	}
-	return false;
-}
-
 async function exists(file: string): Promise<boolean> {
 	return new Promise<boolean>((resolve, _reject) => {
 		fs.exists(file, (value) => {

package.json

@@ -1,7 +1,7 @@
 {
   "name": "code-oss-dev",
   "version": "1.48.1",
-  "distro": "db6c4e7925a5077a6e61690a057fa6cf139e0e49",
+  "distro": "ffb610b4929b3e94a5827ba9a35981961602fa6d",
   "author": {
     "name": "Microsoft Corporation"
   },

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

@@ -2606,7 +2606,7 @@ export abstract class AbstractTaskService extends Disposable implements ITaskSer
 			}
 			if (buildTasks.length === 1) {
 				this.tryResolveTask(buildTasks[0]).then(resolvedTask => {
-					this.run(resolvedTask).then(undefined, reason => {
+					this.run(resolvedTask, undefined, TaskRunSource.User).then(undefined, reason => {
 						// eat the error, it has already been surfaced to the user and we don't care about it here
 					});
 				});
@@ -2617,7 +2617,7 @@ export abstract class AbstractTaskService extends Disposable implements ITaskSer
 				if (tasks.length > 0) {
 					let { defaults, users } = this.splitPerGroupType(tasks);
 					if (defaults.length === 1) {
-						this.run(defaults[0]).then(undefined, reason => {
+						this.run(defaults[0], undefined, TaskRunSource.User).then(undefined, reason => {
 							// eat the error, it has already been surfaced to the user and we don't care about it here
 						});
 						return;
@@ -2641,7 +2641,7 @@ export abstract class AbstractTaskService extends Disposable implements ITaskSer
 								this.runConfigureDefaultBuildTask();
 								return;
 							}
-							this.run(task, { attachProblemMatcher: true }).then(undefined, reason => {
+							this.run(task, { attachProblemMatcher: true }, TaskRunSource.User).then(undefined, reason => {
 								// eat the error, it has already been surfaced to the user and we don't care about it here
 							});
 						});
@@ -2667,7 +2667,7 @@ export abstract class AbstractTaskService extends Disposable implements ITaskSer
 			if (tasks.length > 0) {
 				let { defaults, users } = this.splitPerGroupType(tasks);
 				if (defaults.length === 1) {
-					this.run(defaults[0]).then(undefined, reason => {
+					this.run(defaults[0], undefined, TaskRunSource.User).then(undefined, reason => {
 						// eat the error, it has already been surfaced to the user and we don't care about it here
 					});
 					return;
@@ -2691,7 +2691,7 @@ export abstract class AbstractTaskService extends Disposable implements ITaskSer
 						this.runConfigureTasks();
 						return;
 					}
-					this.run(task).then(undefined, reason => {
+					this.run(task, undefined, TaskRunSource.User).then(undefined, reason => {
 						// eat the error, it has already been surfaced to the user and we don't care about it here
 					});
 				});

src/vs/workbench/contrib/webview/browser/pre/main.js

@@ -514,7 +514,7 @@
 					}, 0);
 				}
 
-				if (host.fakeLoad) {
+				if (host.fakeLoad && false) {
 					// On Safari for iframes with scripts disabled, the `DOMContentLoaded` never seems to be fired.
 					// Use polling instead.
 					const interval = setInterval(() => {

src/vs/workbench/services/textfile/electron-browser/nativeTextFileService.ts

@@ -126,7 +126,7 @@ export class NativeTextFileService extends AbstractTextFileService {
 		}
 
 		try {
-			return super.write(resource, value, options);
+			return await super.write(resource, value, options);
 		} catch (error) {
 
 			// In case of permission denied, we need to check for readonly