From df094d1857a5fc637934580391a6419ea972f2bb Mon Sep 17 00:00:00 2001 From: Alex Ross Date: Fri, 5 Jun 2020 17:18:02 +0200 Subject: [PATCH 1/6] Fix already configured contributed tasks (#99455) Fixes #97134 --- .../tasks/browser/abstractTaskService.ts | 58 ++++++++++++------- 1 file changed, 36 insertions(+), 22 deletions(-) diff --git a/src/vs/workbench/contrib/tasks/browser/abstractTaskService.ts b/src/vs/workbench/contrib/tasks/browser/abstractTaskService.ts index 73068dbbc24..267e55e9c6d 100644 --- a/src/vs/workbench/contrib/tasks/browser/abstractTaskService.ts +++ b/src/vs/workbench/contrib/tasks/browser/abstractTaskService.ts @@ -1051,7 +1051,29 @@ export abstract class AbstractTaskService extends Disposable implements ITaskSer return false; } - private openEditorAtTask(resource: URI | undefined, task: TaskConfig.CustomTask | TaskConfig.ConfiguringTask | string | undefined): Promise { + private async formatTaskForJson(resource: URI, task: TaskConfig.CustomTask | TaskConfig.ConfiguringTask): Promise { + let reference: IReference | undefined; + let stringValue: string = ''; + try { + reference = await this.textModelResolverService.createModelReference(resource); + const model = reference.object.textEditorModel; + const { tabSize, insertSpaces } = model.getOptions(); + const eol = model.getEOL(); + const edits = format(JSON.stringify(task), undefined, { eol, tabSize, insertSpaces }); + let stringified = applyEdits(JSON.stringify(task), edits); + const regex = new RegExp(eol + '\\t', 'g'); + stringified = stringified.replace(regex, eol + '\t\t\t'); + const twoTabs = '\t\t'; + stringValue = twoTabs + stringified.slice(0, stringified.length - 1) + twoTabs + stringified.slice(stringified.length - 1); + } finally { + if (reference) { + reference.dispose(); + } + } + return stringValue; + } + + private openEditorAtTask(resource: URI | undefined, task: TaskConfig.CustomTask | TaskConfig.ConfiguringTask | string | undefined, configIndex: number = -1): Promise { if (resource === undefined) { return Promise.resolve(false); } @@ -1062,26 +1084,18 @@ export abstract class AbstractTaskService extends Disposable implements ITaskSer } if (task) { const contentValue = content.toString(); - let stringValue: string; - if (typeof task === 'string') { - stringValue = task; - } else { - let reference: IReference | undefined; - try { - reference = await this.textModelResolverService.createModelReference(resource); - const model = reference.object.textEditorModel; - const { tabSize, insertSpaces } = model.getOptions(); - const eol = model.getEOL(); - const edits = format(JSON.stringify(task), undefined, { eol, tabSize, insertSpaces }); - let stringified = applyEdits(JSON.stringify(task), edits); - const regex = new RegExp(eol + '\\t', 'g'); - stringified = stringified.replace(regex, eol + '\t\t\t'); - const twoTabs = '\t\t'; - stringValue = twoTabs + stringified.slice(0, stringified.length - 1) + twoTabs + stringified.slice(stringified.length - 1); - } finally { - if (reference) { - reference.dispose(); - } + let stringValue: string | undefined; + if (configIndex !== -1) { + const json: TaskConfig.ExternalTaskRunnerConfiguration = JSON.parse(contentValue); + if (json.tasks && (json.tasks.length > configIndex)) { + stringValue = await this.formatTaskForJson(resource, json.tasks[configIndex]); + } + } + if (!stringValue) { + if (typeof task === 'string') { + stringValue = task; + } else { + stringValue = await this.formatTaskForJson(resource, task); } } @@ -1287,7 +1301,7 @@ export abstract class AbstractTaskService extends Disposable implements ITaskSer } else { resource = (this._workspaceFolders && (this._workspaceFolders.length > 0)) ? this._workspaceFolders[0].toResource('.vscode/tasks.json') : undefined; } - return this.openEditorAtTask(resource, task ? task._label : undefined); + return this.openEditorAtTask(resource, task ? task._label : undefined, task ? task._source.config.index : -1); } private createRunnableTask(tasks: TaskMap, group: TaskGroup): { task: Task; resolver: ITaskResolver } | undefined { From 91de6114141c92ae44bfb56700aa2114f4ac7f6c Mon Sep 17 00:00:00 2001 From: Martin Aeschlimann Date: Fri, 5 Jun 2020 17:49:33 +0200 Subject: [PATCH 2/6] [html] update version, fixes #98053 --- extensions/html-language-features/server/package.json | 2 +- extensions/html-language-features/server/yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/extensions/html-language-features/server/package.json b/extensions/html-language-features/server/package.json index 3e153baa39d..70665bf8497 100644 --- a/extensions/html-language-features/server/package.json +++ b/extensions/html-language-features/server/package.json @@ -10,7 +10,7 @@ "main": "./out/htmlServerMain", "dependencies": { "vscode-css-languageservice": "^4.1.2", - "vscode-html-languageservice": "^3.1.0-next.1", + "vscode-html-languageservice": "^3.1.0-next.2", "vscode-languageserver": "^6.1.1", "vscode-nls": "^4.1.2", "vscode-uri": "^2.1.2" diff --git a/extensions/html-language-features/server/yarn.lock b/extensions/html-language-features/server/yarn.lock index 98240596462..41ff086ca26 100644 --- a/extensions/html-language-features/server/yarn.lock +++ b/extensions/html-language-features/server/yarn.lock @@ -736,10 +736,10 @@ vscode-css-languageservice@^4.1.2: vscode-nls "^4.1.2" vscode-uri "^2.1.1" -vscode-html-languageservice@^3.1.0-next.1: - version "3.1.0-next.1" - resolved "https://registry.yarnpkg.com/vscode-html-languageservice/-/vscode-html-languageservice-3.1.0-next.1.tgz#d981cf3026f24c674f749992a72f5c0aedb76e7a" - integrity sha512-p/R6yIt01rFL2wjlSOCYSVyELG6t2zOLyoVrJPXHFwuQ25Gi3NRHapE+2tXCqJjd2Ff2Bqu2Cs3+jf1DRS0/zA== +vscode-html-languageservice@^3.1.0-next.2: + version "3.1.0-next.2" + resolved "https://registry.yarnpkg.com/vscode-html-languageservice/-/vscode-html-languageservice-3.1.0-next.2.tgz#a6ad42ed0ad0adda9ad0c5d34b2ac0d05076190e" + integrity sha512-cohfk2Ez8MrnT/8upnKsOc2FK2T+lU2LsBgg0L2P2BHjVzq4LMCOiYcwNeq+u9y2L5ck9E6SFw1BTdyZ5377KQ== dependencies: vscode-languageserver-textdocument "^1.0.1" vscode-languageserver-types "^3.15.1" From a895d438a4d494d5e71231f59f8e9926e6ed5a44 Mon Sep 17 00:00:00 2001 From: Connor Peet Date: Fri, 5 Jun 2020 10:19:36 -0700 Subject: [PATCH 3/6] debug: use a stable build channel for js-debug --- package.json | 2 +- product.json | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 6ae1c27ecb5..b5d65356114 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "code-oss-dev", "version": "1.46.0", - "distro": "26783d64d76b2c2772a6fd49b00b230b75ec3385", + "distro": "358cb39074b493e73fc931ad744770a1f00c4ad4", "author": { "name": "Microsoft Corporation" }, diff --git a/product.json b/product.json index f163337f00b..492398546ed 100644 --- a/product.json +++ b/product.json @@ -89,8 +89,8 @@ } }, { - "name": "ms-vscode.js-debug-nightly", - "version": "2020.6.208", + "name": "ms-vscode.js-debug", + "version": "1.46.0", "repo": "https://github.com/Microsoft/vscode-js-debug", "metadata": { "id": "7acbb4ce-c85a-49d4-8d95-a8054406ae97", From 24ebced0aba496bd7bdacd432aa9e877181bcf63 Mon Sep 17 00:00:00 2001 From: Sana Ajani Date: Fri, 5 Jun 2020 14:36:44 -0400 Subject: [PATCH 4/6] Add playwright to workspace tags (#99476) Co-authored-by: Arjun Attam --- .../tags/electron-browser/workspaceTagsService.ts | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/src/vs/workbench/contrib/tags/electron-browser/workspaceTagsService.ts b/src/vs/workbench/contrib/tags/electron-browser/workspaceTagsService.ts index f0a1de61d5c..c921a5daa3c 100644 --- a/src/vs/workbench/contrib/tags/electron-browser/workspaceTagsService.ts +++ b/src/vs/workbench/contrib/tags/electron-browser/workspaceTagsService.ts @@ -61,7 +61,13 @@ const ModulesToLookFor = [ '@microsoft/rush', 'lerna', 'just-task', - 'beachball' + 'beachball', + // Playwright packages + 'playwright', + 'playwright-core', + 'playwright-chromium', + 'playwright-firefox', + 'playwright-webkit' ]; const PyModulesToLookFor = [ 'azure', @@ -200,6 +206,11 @@ export class WorkspaceTagsService implements IWorkspaceTagsService { "workspace.npm.just-task" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true }, "workspace.npm.beachball" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true }, "workspace.npm.electron" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true }, + "workspace.npm.playwright" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true }, + "workspace.npm.playwright-core" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true }, + "workspace.npm.playwright-chromium" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true }, + "workspace.npm.playwright-firefox" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true }, + "workspace.npm.playwright-webkit" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true }, "workspace.bower" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true }, "workspace.yeoman.code.ext" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true }, "workspace.cordova.high" : { "classification": "SystemMetaData", "purpose": "FeatureInsight", "isMeasurement": true }, From 416c37fe478f6824f30e554973229a7f5820226a Mon Sep 17 00:00:00 2001 From: Connor Peet Date: Sun, 7 Jun 2020 22:07:43 -0700 Subject: [PATCH 5/6] fixup! bump to 1.46.1 for codespaces incompatibility --- product.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/product.json b/product.json index 492398546ed..cc59b5bad18 100644 --- a/product.json +++ b/product.json @@ -90,7 +90,7 @@ }, { "name": "ms-vscode.js-debug", - "version": "1.46.0", + "version": "1.46.1", "repo": "https://github.com/Microsoft/vscode-js-debug", "metadata": { "id": "7acbb4ce-c85a-49d4-8d95-a8054406ae97", From 03963917cd9cf035a2ab519817c14ed30bf6f670 Mon Sep 17 00:00:00 2001 From: Martin Aeschlimann Date: Mon, 8 Jun 2020 10:52:53 +0200 Subject: [PATCH 6/6] update distro --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 6ae1c27ecb5..c8931febf7c 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "code-oss-dev", "version": "1.46.0", - "distro": "26783d64d76b2c2772a6fd49b00b230b75ec3385", + "distro": "95b7c739aef3fd30a65985ecc903fc89de37ec0f", "author": { "name": "Microsoft Corporation" },