From 56c98b8d0d1d278fffd9c870cd8ed21c3317482d Mon Sep 17 00:00:00 2001 From: wangpenglong Date: Wed, 27 Sep 2023 17:36:01 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E9=99=A4=E4=BB=BB=E5=8A=A1task?= =?UTF-8?q?=E8=8F=9C=E5=8D=95=E4=B8=AD'msbuild,donet,ms=E7=BC=96=E8=AF=91?= =?UTF-8?q?=E5=99=A8=E9=97=AE=E9=A2=98'=E7=AD=89=E8=8F=9C=E5=8D=95.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../contrib/tasks/common/problemMatcher.ts | 34 +++++++++---------- .../contrib/tasks/common/taskTemplates.ts | 5 +-- 2 files changed, 20 insertions(+), 19 deletions(-) diff --git a/src/vs/workbench/contrib/tasks/common/problemMatcher.ts b/src/vs/workbench/contrib/tasks/common/problemMatcher.ts index 296d268d..fc4ec5bc 100644 --- a/src/vs/workbench/contrib/tasks/common/problemMatcher.ts +++ b/src/vs/workbench/contrib/tasks/common/problemMatcher.ts @@ -1205,15 +1205,15 @@ class ProblemPatternRegistryImpl implements IProblemPatternRegistry { } private fillDefaults(): void { - this.add('msCompile', { - regexp: /^(?:\s+\d+>)?(\S.*)\((\d+|\d+,\d+|\d+,\d+,\d+,\d+)\)\s*:\s+(error|warning|info)\s+(\w+\d+)\s*:\s*(.*)$/, - kind: ProblemLocationKind.Location, - file: 1, - location: 2, - severity: 3, - code: 4, - message: 5 - }); + // this.add('msCompile', { + // regexp: /^(?:\s+\d+>)?(\S.*)\((\d+|\d+,\d+|\d+,\d+,\d+,\d+)\)\s*:\s+(error|warning|info)\s+(\w+\d+)\s*:\s*(.*)$/, + // kind: ProblemLocationKind.Location, + // file: 1, + // location: 2, + // severity: 3, + // code: 4, + // message: 5 + // }); this.add('gulp-tsc', { regexp: /^([^\s].*)\((\d+|\d+,\d+|\d+,\d+,\d+,\d+)\):\s+(\d+)\s+(.*)$/, kind: ProblemLocationKind.Location, @@ -1784,14 +1784,14 @@ class ProblemMatcherRegistryImpl implements IProblemMatcherRegistry { } private fillDefaults(): void { - this.add({ - name: 'msCompile', - label: localize('msCompile', 'Microsoft compiler problems'), - owner: 'msCompile', - applyTo: ApplyToKind.allDocuments, - fileLocation: FileLocationKind.Absolute, - pattern: ProblemPatternRegistry.get('msCompile') - }); + // this.add({ + // name: 'msCompile', + // label: localize('msCompile', 'Microsoft compiler problems'), + // owner: 'msCompile', + // applyTo: ApplyToKind.allDocuments, + // fileLocation: FileLocationKind.Absolute, + // pattern: ProblemPatternRegistry.get('msCompile') + // }); this.add({ name: 'lessCompile', diff --git a/src/vs/workbench/contrib/tasks/common/taskTemplates.ts b/src/vs/workbench/contrib/tasks/common/taskTemplates.ts index c367ede9..36c4bddc 100644 --- a/src/vs/workbench/contrib/tasks/common/taskTemplates.ts +++ b/src/vs/workbench/contrib/tasks/common/taskTemplates.ts @@ -12,7 +12,7 @@ export interface TaskEntry extends IQuickPickItem { autoDetect: boolean; content: string; } - +/* const dotnetBuild: TaskEntry = { id: 'dotnetCore', label: '.NET Core', @@ -81,6 +81,7 @@ const msbuild: TaskEntry = { '}' ].join('\n') }; +*/ const command: TaskEntry = { id: 'externalCommand', @@ -135,7 +136,7 @@ const maven: TaskEntry = { let _templates: TaskEntry[] | null = null; export function getTemplates(): TaskEntry[] { if (!_templates) { - _templates = [dotnetBuild, msbuild, maven].sort((a, b) => { + _templates = [maven].sort((a, b) => { return (a.sort || a.label).localeCompare(b.sort || b.label); }); _templates.push(command);