Skip to content

Commit 58a6a64

Browse files
committed
Make cmake.ctest.failurePatterns match FailurePatternsConfig
The package.json schema for `cmake.ctest.failurePattens` was more lenient in some ways than the corresponding `FailurePatternsConfig` TypeScript type. Bring them in line with each other.
1 parent 1f3c8ef commit 58a6a64

File tree

1 file changed

+49
-32
lines changed

1 file changed

+49
-32
lines changed

package.json

Lines changed: 49 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -2272,45 +2272,62 @@
22722272
"scope": "machine-overridable"
22732273
},
22742274
"cmake.ctest.failurePatterns": {
2275-
"type": ["string", "array"],
2276-
"items": {
2277-
"type": ["string", "object"],
2278-
"properties": {
2279-
"regexp": {
2280-
"type": "string",
2281-
"description": "%cmake-tools.configuration.cmake.ctest.failurePatterns.regexp%"
2282-
},
2283-
"file": {
2284-
"type": "integer",
2285-
"description": "%cmake-tools.configuration.cmake.ctest.failurePatterns.file%",
2286-
"default": 1
2287-
},
2288-
"line": {
2289-
"type": "integer",
2290-
"description": "%cmake-tools.configuration.cmake.ctest.failurePatterns.line%",
2291-
"default": 2
2292-
},
2293-
"message": {
2294-
"type": "integer",
2295-
"description": "%cmake-tools.configuration.cmake.ctest.failurePatterns.message%",
2296-
"default": 3
2297-
},
2298-
"actual": {
2299-
"type": ["integer" ],
2300-
"description": "%cmake-tools.configuration.cmake.ctest.failurePatterns.actual%"
2301-
},
2302-
"expected": {
2303-
"type": "integer",
2304-
"description": "%cmake-tools.configuration.cmake.ctest.failurePatterns.expected%"
2275+
"oneOf": [
2276+
{
2277+
"type": "array",
2278+
"items": {
2279+
"oneOf": [
2280+
{
2281+
"type": "object",
2282+
"required": [
2283+
"regexp"
2284+
],
2285+
"properties": {
2286+
"regexp": {
2287+
"type": "string",
2288+
"description": "%cmake-tools.configuration.cmake.ctest.failurePatterns.regexp%"
2289+
},
2290+
"file": {
2291+
"type": "integer",
2292+
"description": "%cmake-tools.configuration.cmake.ctest.failurePatterns.file%",
2293+
"default": 1
2294+
},
2295+
"line": {
2296+
"type": "integer",
2297+
"description": "%cmake-tools.configuration.cmake.ctest.failurePatterns.line%",
2298+
"default": 2
2299+
},
2300+
"message": {
2301+
"type": "integer",
2302+
"description": "%cmake-tools.configuration.cmake.ctest.failurePatterns.message%",
2303+
"default": 3
2304+
},
2305+
"actual": {
2306+
"type": "integer",
2307+
"description": "%cmake-tools.configuration.cmake.ctest.failurePatterns.actual%"
2308+
},
2309+
"expected": {
2310+
"type": "integer",
2311+
"description": "%cmake-tools.configuration.cmake.ctest.failurePatterns.expected%"
2312+
}
2313+
}
2314+
},
2315+
{
2316+
"type": "string"
2317+
}
2318+
]
23052319
}
2320+
},
2321+
{
2322+
"type": "string"
23062323
}
2307-
},
2324+
],
23082325
"default": [
23092326
{
23102327
"regexp": "(.*?):(\\d+): *(?:error: *)(.*)"
23112328
},
23122329
{
2313-
"regexp": "(.*?)\\((\\d+)\\): *(?:error: *)(.*)"
2330+
"regexp": "(.*?)\\((\\d+)\\): *(?:error: *)(.*)"
23142331
}
23152332
],
23162333
"markdownDescription": "%cmake-tools.configuration.cmake.ctest.failurePatterns.markdownDescription%",

0 commit comments

Comments
 (0)