Fix problem matcher error in array (microsoft#83766)

alexr00 · web-flow · commit 58f74cf05dd4 · 2019-11-01T15:26:33.000+01:00
Fixes microsoft#83702
diff --git a/src/vs/workbench/contrib/tasks/common/jsonSchemaCommon.ts b/src/vs/workbench/contrib/tasks/common/jsonSchemaCommon.ts
@@ -44,10 +44,10 @@ const schema: IJSONSchema = {
 					type: 'array',
 					items: {
 						anyOf: [
-							Schemas.LegacyProblemMatcher,
 							{
 								type: 'string',
-							}
+							},
+							Schemas.LegacyProblemMatcher
 						]
 					}
 				}
diff --git a/src/vs/workbench/contrib/tasks/common/jsonSchema_v2.ts b/src/vs/workbench/contrib/tasks/common/jsonSchema_v2.ts
@@ -569,7 +569,7 @@ export function updateProblemMatchers() {
 	try {
 		let matcherIds = ProblemMatcherRegistry.keys().map(key => '$' + key);
 		definitions.problemMatcherType2.oneOf![0].enum = matcherIds;
-		(definitions.problemMatcherType2.oneOf![2].items as IJSONSchema).anyOf![1].enum = matcherIds;
+		(definitions.problemMatcherType2.oneOf![2].items as IJSONSchema).anyOf![0].enum = matcherIds;
 	} catch (err) {
 		console.log('Installing problem matcher ids failed');
 	}

Original file line number	Diff line number	Diff line change
`@@ -44,10 +44,10 @@ const schema: IJSONSchema = {`
`44`	`44`	`type: 'array',`
`45`	`45`	`items: {`
`46`	`46`	`anyOf: [`
`47`		`- Schemas.LegacyProblemMatcher,`
`48`	`47`	`{`
`49`	`48`	`type: 'string',`
`50`		`- }`
	`49`	`+ },`
	`50`	`+ Schemas.LegacyProblemMatcher`
`51`	`51`	`]`
`52`	`52`	`}`
`53`	`53`	`}`
Original file line number	Diff line number	Diff line change
`@@ -569,7 +569,7 @@ export function updateProblemMatchers() {`
`569`	`569`	`try {`
`570`	`570`	`let matcherIds = ProblemMatcherRegistry.keys().map(key => '$' + key);`
`571`	`571`	`definitions.problemMatcherType2.oneOf![0].enum = matcherIds;`
`572`		`- (definitions.problemMatcherType2.oneOf![2].items as IJSONSchema).anyOf![1].enum = matcherIds;`
	`572`	`+ (definitions.problemMatcherType2.oneOf![2].items as IJSONSchema).anyOf![0].enum = matcherIds;`
`573`	`573`	`} catch (err) {`
`574`	`574`	`console.log('Installing problem matcher ids failed');`
`575`	`575`	`}`