yaml-language-server 1.14.1-6eda5f6.0 → 1.14.1-b2b129a.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/eslint-result.sarif +60 -60
- package/lib/esm/languageservice/services/yamlHover.js +1 -1
- package/lib/esm/languageservice/services/yamlHover.js.map +1 -1
- package/lib/esm/languageservice/services/yamlSchemaService.js +3 -13
- package/lib/esm/languageservice/services/yamlSchemaService.js.map +1 -1
- package/lib/umd/languageservice/services/yamlHover.js +1 -1
- package/lib/umd/languageservice/services/yamlHover.js.map +1 -1
- package/lib/umd/languageservice/services/yamlSchemaService.js +3 -13
- package/lib/umd/languageservice/services/yamlSchemaService.js.map +1 -1
- package/out/server/src/languageservice/services/yamlHover.js +1 -1
- package/out/server/src/languageservice/services/yamlHover.js.map +1 -1
- package/out/server/src/languageservice/services/yamlSchemaService.js +3 -13
- package/out/server/src/languageservice/services/yamlSchemaService.js.map +1 -1
- package/out/server/test/autoCompletion.test.js +109 -107
- package/out/server/test/autoCompletion.test.js.map +1 -1
- package/out/server/test/autoCompletionFix.test.js +49 -47
- package/out/server/test/autoCompletionFix.test.js.map +1 -1
- package/out/server/test/code-action-schema.test.js +6 -6
- package/out/server/test/code-action-schema.test.js.map +1 -1
- package/out/server/test/hover.test.js +25 -25
- package/out/server/test/hover.test.js.map +1 -1
- package/out/server/test/schemaValidation.test.js +86 -80
- package/out/server/test/schemaValidation.test.js.map +1 -1
- package/out/server/test/utils/testHelper.d.ts +46 -0
- package/out/server/test/utils/testHelper.js +100 -1
- package/out/server/test/utils/testHelper.js.map +1 -1
- package/package.json +1 -1
package/eslint-result.sarif
CHANGED
|
@@ -1588,9 +1588,9 @@
|
|
|
1588
1588
|
"index": 37
|
|
1589
1589
|
},
|
|
1590
1590
|
"region": {
|
|
1591
|
-
"startLine":
|
|
1591
|
+
"startLine": 602,
|
|
1592
1592
|
"startColumn": 31,
|
|
1593
|
-
"endLine":
|
|
1593
|
+
"endLine": 602,
|
|
1594
1594
|
"endColumn": 34
|
|
1595
1595
|
}
|
|
1596
1596
|
}
|
|
@@ -1618,9 +1618,9 @@
|
|
|
1618
1618
|
"index": 37
|
|
1619
1619
|
},
|
|
1620
1620
|
"region": {
|
|
1621
|
-
"startLine":
|
|
1621
|
+
"startLine": 602,
|
|
1622
1622
|
"startColumn": 43,
|
|
1623
|
-
"endLine":
|
|
1623
|
+
"endLine": 602,
|
|
1624
1624
|
"endColumn": 46
|
|
1625
1625
|
}
|
|
1626
1626
|
}
|
|
@@ -1648,9 +1648,9 @@
|
|
|
1648
1648
|
"index": 37
|
|
1649
1649
|
},
|
|
1650
1650
|
"region": {
|
|
1651
|
-
"startLine":
|
|
1651
|
+
"startLine": 665,
|
|
1652
1652
|
"startColumn": 19,
|
|
1653
|
-
"endLine":
|
|
1653
|
+
"endLine": 665,
|
|
1654
1654
|
"endColumn": 22
|
|
1655
1655
|
}
|
|
1656
1656
|
}
|
|
@@ -1678,9 +1678,9 @@
|
|
|
1678
1678
|
"index": 37
|
|
1679
1679
|
},
|
|
1680
1680
|
"region": {
|
|
1681
|
-
"startLine":
|
|
1681
|
+
"startLine": 710,
|
|
1682
1682
|
"startColumn": 44,
|
|
1683
|
-
"endLine":
|
|
1683
|
+
"endLine": 710,
|
|
1684
1684
|
"endColumn": 47
|
|
1685
1685
|
}
|
|
1686
1686
|
}
|
|
@@ -2128,9 +2128,9 @@
|
|
|
2128
2128
|
"index": 64
|
|
2129
2129
|
},
|
|
2130
2130
|
"region": {
|
|
2131
|
-
"startLine":
|
|
2131
|
+
"startLine": 789,
|
|
2132
2132
|
"startColumn": 24,
|
|
2133
|
-
"endLine":
|
|
2133
|
+
"endLine": 789,
|
|
2134
2134
|
"endColumn": 95
|
|
2135
2135
|
}
|
|
2136
2136
|
}
|
|
@@ -2158,9 +2158,9 @@
|
|
|
2158
2158
|
"index": 64
|
|
2159
2159
|
},
|
|
2160
2160
|
"region": {
|
|
2161
|
-
"startLine":
|
|
2161
|
+
"startLine": 807,
|
|
2162
2162
|
"startColumn": 24,
|
|
2163
|
-
"endLine":
|
|
2163
|
+
"endLine": 807,
|
|
2164
2164
|
"endColumn": 95
|
|
2165
2165
|
}
|
|
2166
2166
|
}
|
|
@@ -2188,9 +2188,9 @@
|
|
|
2188
2188
|
"index": 64
|
|
2189
2189
|
},
|
|
2190
2190
|
"region": {
|
|
2191
|
-
"startLine":
|
|
2191
|
+
"startLine": 825,
|
|
2192
2192
|
"startColumn": 24,
|
|
2193
|
-
"endLine":
|
|
2193
|
+
"endLine": 825,
|
|
2194
2194
|
"endColumn": 95
|
|
2195
2195
|
}
|
|
2196
2196
|
}
|
|
@@ -2218,9 +2218,9 @@
|
|
|
2218
2218
|
"index": 64
|
|
2219
2219
|
},
|
|
2220
2220
|
"region": {
|
|
2221
|
-
"startLine":
|
|
2221
|
+
"startLine": 855,
|
|
2222
2222
|
"startColumn": 24,
|
|
2223
|
-
"endLine":
|
|
2223
|
+
"endLine": 855,
|
|
2224
2224
|
"endColumn": 95
|
|
2225
2225
|
}
|
|
2226
2226
|
}
|
|
@@ -2248,9 +2248,9 @@
|
|
|
2248
2248
|
"index": 64
|
|
2249
2249
|
},
|
|
2250
2250
|
"region": {
|
|
2251
|
-
"startLine":
|
|
2251
|
+
"startLine": 879,
|
|
2252
2252
|
"startColumn": 24,
|
|
2253
|
-
"endLine":
|
|
2253
|
+
"endLine": 879,
|
|
2254
2254
|
"endColumn": 95
|
|
2255
2255
|
}
|
|
2256
2256
|
}
|
|
@@ -2278,9 +2278,9 @@
|
|
|
2278
2278
|
"index": 64
|
|
2279
2279
|
},
|
|
2280
2280
|
"region": {
|
|
2281
|
-
"startLine":
|
|
2281
|
+
"startLine": 903,
|
|
2282
2282
|
"startColumn": 24,
|
|
2283
|
-
"endLine":
|
|
2283
|
+
"endLine": 903,
|
|
2284
2284
|
"endColumn": 95
|
|
2285
2285
|
}
|
|
2286
2286
|
}
|
|
@@ -2308,9 +2308,9 @@
|
|
|
2308
2308
|
"index": 64
|
|
2309
2309
|
},
|
|
2310
2310
|
"region": {
|
|
2311
|
-
"startLine":
|
|
2311
|
+
"startLine": 1044,
|
|
2312
2312
|
"startColumn": 24,
|
|
2313
|
-
"endLine":
|
|
2313
|
+
"endLine": 1044,
|
|
2314
2314
|
"endColumn": 88
|
|
2315
2315
|
}
|
|
2316
2316
|
}
|
|
@@ -2338,9 +2338,9 @@
|
|
|
2338
2338
|
"index": 64
|
|
2339
2339
|
},
|
|
2340
2340
|
"region": {
|
|
2341
|
-
"startLine":
|
|
2341
|
+
"startLine": 1845,
|
|
2342
2342
|
"startColumn": 22,
|
|
2343
|
-
"endLine":
|
|
2343
|
+
"endLine": 1845,
|
|
2344
2344
|
"endColumn": 86
|
|
2345
2345
|
}
|
|
2346
2346
|
}
|
|
@@ -2368,9 +2368,9 @@
|
|
|
2368
2368
|
"index": 64
|
|
2369
2369
|
},
|
|
2370
2370
|
"region": {
|
|
2371
|
-
"startLine":
|
|
2371
|
+
"startLine": 1863,
|
|
2372
2372
|
"startColumn": 22,
|
|
2373
|
-
"endLine":
|
|
2373
|
+
"endLine": 1863,
|
|
2374
2374
|
"endColumn": 86
|
|
2375
2375
|
}
|
|
2376
2376
|
}
|
|
@@ -2398,9 +2398,9 @@
|
|
|
2398
2398
|
"index": 64
|
|
2399
2399
|
},
|
|
2400
2400
|
"region": {
|
|
2401
|
-
"startLine":
|
|
2401
|
+
"startLine": 1881,
|
|
2402
2402
|
"startColumn": 22,
|
|
2403
|
-
"endLine":
|
|
2403
|
+
"endLine": 1881,
|
|
2404
2404
|
"endColumn": 86
|
|
2405
2405
|
}
|
|
2406
2406
|
}
|
|
@@ -2428,9 +2428,9 @@
|
|
|
2428
2428
|
"index": 64
|
|
2429
2429
|
},
|
|
2430
2430
|
"region": {
|
|
2431
|
-
"startLine":
|
|
2431
|
+
"startLine": 2604,
|
|
2432
2432
|
"startColumn": 22,
|
|
2433
|
-
"endLine":
|
|
2433
|
+
"endLine": 2604,
|
|
2434
2434
|
"endColumn": 96
|
|
2435
2435
|
}
|
|
2436
2436
|
}
|
|
@@ -2458,9 +2458,9 @@
|
|
|
2458
2458
|
"index": 64
|
|
2459
2459
|
},
|
|
2460
2460
|
"region": {
|
|
2461
|
-
"startLine":
|
|
2461
|
+
"startLine": 2618,
|
|
2462
2462
|
"startColumn": 22,
|
|
2463
|
-
"endLine":
|
|
2463
|
+
"endLine": 2618,
|
|
2464
2464
|
"endColumn": 96
|
|
2465
2465
|
}
|
|
2466
2466
|
}
|
|
@@ -2488,9 +2488,9 @@
|
|
|
2488
2488
|
"index": 64
|
|
2489
2489
|
},
|
|
2490
2490
|
"region": {
|
|
2491
|
-
"startLine":
|
|
2491
|
+
"startLine": 2631,
|
|
2492
2492
|
"startColumn": 22,
|
|
2493
|
-
"endLine":
|
|
2493
|
+
"endLine": 2631,
|
|
2494
2494
|
"endColumn": 96
|
|
2495
2495
|
}
|
|
2496
2496
|
}
|
|
@@ -2518,9 +2518,9 @@
|
|
|
2518
2518
|
"index": 64
|
|
2519
2519
|
},
|
|
2520
2520
|
"region": {
|
|
2521
|
-
"startLine":
|
|
2521
|
+
"startLine": 2645,
|
|
2522
2522
|
"startColumn": 22,
|
|
2523
|
-
"endLine":
|
|
2523
|
+
"endLine": 2645,
|
|
2524
2524
|
"endColumn": 96
|
|
2525
2525
|
}
|
|
2526
2526
|
}
|
|
@@ -2548,9 +2548,9 @@
|
|
|
2548
2548
|
"index": 64
|
|
2549
2549
|
},
|
|
2550
2550
|
"region": {
|
|
2551
|
-
"startLine":
|
|
2551
|
+
"startLine": 2661,
|
|
2552
2552
|
"startColumn": 22,
|
|
2553
|
-
"endLine":
|
|
2553
|
+
"endLine": 2661,
|
|
2554
2554
|
"endColumn": 96
|
|
2555
2555
|
}
|
|
2556
2556
|
}
|
|
@@ -2578,9 +2578,9 @@
|
|
|
2578
2578
|
"index": 64
|
|
2579
2579
|
},
|
|
2580
2580
|
"region": {
|
|
2581
|
-
"startLine":
|
|
2581
|
+
"startLine": 2675,
|
|
2582
2582
|
"startColumn": 22,
|
|
2583
|
-
"endLine":
|
|
2583
|
+
"endLine": 2675,
|
|
2584
2584
|
"endColumn": 96
|
|
2585
2585
|
}
|
|
2586
2586
|
}
|
|
@@ -2608,9 +2608,9 @@
|
|
|
2608
2608
|
"index": 64
|
|
2609
2609
|
},
|
|
2610
2610
|
"region": {
|
|
2611
|
-
"startLine":
|
|
2611
|
+
"startLine": 2688,
|
|
2612
2612
|
"startColumn": 22,
|
|
2613
|
-
"endLine":
|
|
2613
|
+
"endLine": 2688,
|
|
2614
2614
|
"endColumn": 96
|
|
2615
2615
|
}
|
|
2616
2616
|
}
|
|
@@ -2638,9 +2638,9 @@
|
|
|
2638
2638
|
"index": 64
|
|
2639
2639
|
},
|
|
2640
2640
|
"region": {
|
|
2641
|
-
"startLine":
|
|
2641
|
+
"startLine": 2700,
|
|
2642
2642
|
"startColumn": 22,
|
|
2643
|
-
"endLine":
|
|
2643
|
+
"endLine": 2700,
|
|
2644
2644
|
"endColumn": 96
|
|
2645
2645
|
}
|
|
2646
2646
|
}
|
|
@@ -2668,9 +2668,9 @@
|
|
|
2668
2668
|
"index": 64
|
|
2669
2669
|
},
|
|
2670
2670
|
"region": {
|
|
2671
|
-
"startLine":
|
|
2671
|
+
"startLine": 2712,
|
|
2672
2672
|
"startColumn": 22,
|
|
2673
|
-
"endLine":
|
|
2673
|
+
"endLine": 2712,
|
|
2674
2674
|
"endColumn": 96
|
|
2675
2675
|
}
|
|
2676
2676
|
}
|
|
@@ -2698,9 +2698,9 @@
|
|
|
2698
2698
|
"index": 64
|
|
2699
2699
|
},
|
|
2700
2700
|
"region": {
|
|
2701
|
-
"startLine":
|
|
2701
|
+
"startLine": 2726,
|
|
2702
2702
|
"startColumn": 22,
|
|
2703
|
-
"endLine":
|
|
2703
|
+
"endLine": 2726,
|
|
2704
2704
|
"endColumn": 96
|
|
2705
2705
|
}
|
|
2706
2706
|
}
|
|
@@ -2728,9 +2728,9 @@
|
|
|
2728
2728
|
"index": 65
|
|
2729
2729
|
},
|
|
2730
2730
|
"region": {
|
|
2731
|
-
"startLine":
|
|
2731
|
+
"startLine": 203,
|
|
2732
2732
|
"startColumn": 20,
|
|
2733
|
-
"endLine":
|
|
2733
|
+
"endLine": 203,
|
|
2734
2734
|
"endColumn": 93
|
|
2735
2735
|
}
|
|
2736
2736
|
}
|
|
@@ -2758,9 +2758,9 @@
|
|
|
2758
2758
|
"index": 65
|
|
2759
2759
|
},
|
|
2760
2760
|
"region": {
|
|
2761
|
-
"startLine":
|
|
2761
|
+
"startLine": 218,
|
|
2762
2762
|
"startColumn": 20,
|
|
2763
|
-
"endLine":
|
|
2763
|
+
"endLine": 218,
|
|
2764
2764
|
"endColumn": 90
|
|
2765
2765
|
}
|
|
2766
2766
|
}
|
|
@@ -2938,9 +2938,9 @@
|
|
|
2938
2938
|
"index": 83
|
|
2939
2939
|
},
|
|
2940
2940
|
"region": {
|
|
2941
|
-
"startLine":
|
|
2941
|
+
"startLine": 1489,
|
|
2942
2942
|
"startColumn": 22,
|
|
2943
|
-
"endLine":
|
|
2943
|
+
"endLine": 1489,
|
|
2944
2944
|
"endColumn": 96
|
|
2945
2945
|
}
|
|
2946
2946
|
}
|
|
@@ -2968,9 +2968,9 @@
|
|
|
2968
2968
|
"index": 83
|
|
2969
2969
|
},
|
|
2970
2970
|
"region": {
|
|
2971
|
-
"startLine":
|
|
2971
|
+
"startLine": 1505,
|
|
2972
2972
|
"startColumn": 22,
|
|
2973
|
-
"endLine":
|
|
2973
|
+
"endLine": 1505,
|
|
2974
2974
|
"endColumn": 96
|
|
2975
2975
|
}
|
|
2976
2976
|
}
|
|
@@ -2998,9 +2998,9 @@
|
|
|
2998
2998
|
"index": 83
|
|
2999
2999
|
},
|
|
3000
3000
|
"region": {
|
|
3001
|
-
"startLine":
|
|
3001
|
+
"startLine": 1518,
|
|
3002
3002
|
"startColumn": 22,
|
|
3003
|
-
"endLine":
|
|
3003
|
+
"endLine": 1518,
|
|
3004
3004
|
"endColumn": 96
|
|
3005
3005
|
}
|
|
3006
3006
|
}
|
|
@@ -3028,9 +3028,9 @@
|
|
|
3028
3028
|
"index": 83
|
|
3029
3029
|
},
|
|
3030
3030
|
"region": {
|
|
3031
|
-
"startLine":
|
|
3031
|
+
"startLine": 1531,
|
|
3032
3032
|
"startColumn": 22,
|
|
3033
|
-
"endLine":
|
|
3033
|
+
"endLine": 1531,
|
|
3034
3034
|
"endColumn": 96
|
|
3035
3035
|
}
|
|
3036
3036
|
}
|
|
@@ -66,7 +66,7 @@ export class YAMLHover {
|
|
|
66
66
|
const hoverRange = Range.create(document.positionAt(hoverRangeNode.offset), document.positionAt(hoverRangeNode.offset + hoverRangeNode.length));
|
|
67
67
|
const createHover = (contents) => {
|
|
68
68
|
if (this.indentation !== undefined) {
|
|
69
|
-
const indentationMatchRegex = new RegExp(this.indentation
|
|
69
|
+
const indentationMatchRegex = new RegExp(` {${this.indentation.length}}`, 'g');
|
|
70
70
|
contents = contents.replace(indentationMatchRegex, ' ');
|
|
71
71
|
}
|
|
72
72
|
const markupContent = {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"yamlHover.js","sourceRoot":"","sources":["../../../../src/languageservice/services/yamlHover.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"yamlHover.js","sourceRoot":"","sources":["../../../../src/languageservice/services/yamlHover.ts"],"names":[],"mappings":"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"}
|
|
@@ -290,16 +290,6 @@ export class YAMLSchemaService extends JSONSchemaService {
|
|
|
290
290
|
}
|
|
291
291
|
}
|
|
292
292
|
}
|
|
293
|
-
/**
|
|
294
|
-
* If this resource matches a schemaID directly then use that schema.
|
|
295
|
-
* This will be used in the case where the yaml language server is being used as a library
|
|
296
|
-
* and clients want to save a schema with a particular ID and also use that schema
|
|
297
|
-
* in language features
|
|
298
|
-
*/
|
|
299
|
-
const normalizedResourceID = this.normalizeId(resource);
|
|
300
|
-
if (this.schemasById[normalizedResourceID]) {
|
|
301
|
-
schemas.push(normalizedResourceID);
|
|
302
|
-
}
|
|
303
293
|
if (schemas.length > 0) {
|
|
304
294
|
// Join all schemas with the highest priority.
|
|
305
295
|
const highestPrioSchemas = this.highestPrioritySchemas(schemas);
|
|
@@ -324,7 +314,7 @@ export class YAMLSchemaService extends JSONSchemaService {
|
|
|
324
314
|
return {
|
|
325
315
|
errors: [],
|
|
326
316
|
schema: {
|
|
327
|
-
|
|
317
|
+
allOf: schemas.map((schemaObj) => {
|
|
328
318
|
return schemaObj.schema;
|
|
329
319
|
}),
|
|
330
320
|
},
|
|
@@ -388,11 +378,11 @@ export class YAMLSchemaService extends JSONSchemaService {
|
|
|
388
378
|
async resolveCustomSchema(schemaUri, doc) {
|
|
389
379
|
const unresolvedSchema = await this.loadSchema(schemaUri);
|
|
390
380
|
const schema = await this.resolveSchemaContent(unresolvedSchema, schemaUri, []);
|
|
391
|
-
if (schema.schema) {
|
|
381
|
+
if (schema.schema && typeof schema.schema === 'object') {
|
|
392
382
|
schema.schema.url = schemaUri;
|
|
393
383
|
}
|
|
394
384
|
if (schema.schema && schema.schema.schemaSequence && schema.schema.schemaSequence[doc.currentDocIndex]) {
|
|
395
|
-
return new ResolvedSchema(schema.schema.schemaSequence[doc.currentDocIndex]);
|
|
385
|
+
return new ResolvedSchema(schema.schema.schemaSequence[doc.currentDocIndex], schema.errors);
|
|
396
386
|
}
|
|
397
387
|
return schema;
|
|
398
388
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"yamlSchemaService.js","sourceRoot":"","sources":["../../../../src/languageservice/services/yamlSchemaService.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"yamlSchemaService.js","sourceRoot":"","sources":["../../../../src/languageservice/services/yamlSchemaService.ts"],"names":[],"mappings":"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"}
|
|
@@ -77,7 +77,7 @@
|
|
|
77
77
|
const hoverRange = vscode_languageserver_types_1.Range.create(document.positionAt(hoverRangeNode.offset), document.positionAt(hoverRangeNode.offset + hoverRangeNode.length));
|
|
78
78
|
const createHover = (contents) => {
|
|
79
79
|
if (this.indentation !== undefined) {
|
|
80
|
-
const indentationMatchRegex = new RegExp(this.indentation
|
|
80
|
+
const indentationMatchRegex = new RegExp(` {${this.indentation.length}}`, 'g');
|
|
81
81
|
contents = contents.replace(indentationMatchRegex, ' ');
|
|
82
82
|
}
|
|
83
83
|
const markupContent = {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"yamlHover.js","sourceRoot":"","sources":["../../../../src/languageservice/services/yamlHover.ts"],"names":[],"mappings":";;;;;;;;;IAAA;;;;oGAIgG;IAChG,YAAY,CAAC;;;IAEb,6EAAgG;IAChG,gDAA0D;IAG1D,yDAAmE;IAEnE,6DAA8D;IAE9D,yDAAyE;IAEzE,2CAAiC;IACjC,6BAA6B;IAE7B,8CAA8D;IAG9D,MAAa,SAAS;QAKpB,YAAY,aAAgC,EAAmB,SAAqB;YAArB,cAAS,GAAT,SAAS,CAAY;YAClF,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC;YACxB,IAAI,CAAC,aAAa,GAAG,aAAa,CAAC;QACrC,CAAC;QAED,SAAS,CAAC,gBAAkC;YAC1C,IAAI,gBAAgB,EAAE;gBACpB,IAAI,CAAC,WAAW,GAAG,gBAAgB,CAAC,KAAK,CAAC;gBAC1C,IAAI,CAAC,WAAW,GAAG,gBAAgB,CAAC,WAAW,CAAC;aACjD;QACH,CAAC;QAED,OAAO,CAAC,QAAsB,EAAE,QAAkB,EAAE,YAAY,GAAG,KAAK;YACtE,IAAI;gBACF,IAAI,CAAC,IAAI,CAAC,WAAW,IAAI,CAAC,QAAQ,EAAE;oBAClC,OAAO,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;iBACnC;gBACD,MAAM,GAAG,GAAG,mCAAkB,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAC;gBACzD,MAAM,MAAM,GAAG,QAAQ,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;gBAC3C,MAAM,UAAU,GAAG,IAAA,gCAAqB,EAAC,MAAM,EAAE,GAAG,CAAC,CAAC;gBACtD,IAAI,UAAU,KAAK,IAAI,EAAE;oBACvB,OAAO,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;iBACnC;gBAED,IAAA,wCAAyB,EAAC,GAAG,CAAC,SAAS,EAAE,YAAY,CAAC,CAAC;gBACvD,MAAM,eAAe,GAAG,GAAG,CAAC,SAAS,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;gBAC1D,UAAU,CAAC,eAAe,GAAG,eAAe,CAAC;gBAC7C,OAAO,IAAI,CAAC,QAAQ,CAAC,QAAQ,EAAE,QAAQ,EAAE,UAAU,CAAC,CAAC;aACtD;YAAC,OAAO,KAAK,EAAE;gBACd,IAAI,CAAC,SAAS,EAAE,SAAS,CAAC,kBAAkB,EAAE,EAAE,KAAK,EAAE,IAAA,oCAA0B,EAAC,KAAK,CAAC,EAAE,CAAC,CAAC;aAC7F;QACH,CAAC;QAED,0JAA0J;QAClJ,QAAQ,CAAC,QAAsB,EAAE,QAAkB,EAAE,GAAuB;YAClF,MAAM,MAAM,GAAG,QAAQ,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;YAC3C,IAAI,IAAI,GAAG,GAAG,CAAC,iBAAiB,CAAC,MAAM,CAAC,CAAC;YACzC,IACE,CAAC,IAAI;gBACL,CAAC,CAAC,IAAI,CAAC,IAAI,KAAK,QAAQ,IAAI,IAAI,CAAC,IAAI,KAAK,OAAO,CAAC,IAAI,MAAM,GAAG,IAAI,CAAC,MAAM,GAAG,CAAC,IAAI,MAAM,GAAG,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,EACzH;gBACA,OAAO,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;aAC9B;YACD,MAAM,cAAc,GAAG,IAAI,CAAC;YAE5B,gEAAgE;YAChE,IAAI,IAAI,CAAC,IAAI,KAAK,QAAQ,EAAE;gBAC1B,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;gBAC3B,IAAI,MAAM,IAAI,MAAM,CAAC,IAAI,KAAK,UAAU,IAAI,MAAM,CAAC,OAAO,KAAK,IAAI,EAAE;oBACnE,IAAI,GAAG,MAAM,CAAC,SAAS,CAAC;oBACxB,IAAI,CAAC,IAAI,EAAE;wBACT,OAAO,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;qBAC9B;iBACF;aACF;YAED,MAAM,UAAU,GAAG,mCAAK,CAAC,MAAM,CAC7B,QAAQ,CAAC,UAAU,CAAC,cAAc,CAAC,MAAM,CAAC,EAC1C,QAAQ,CAAC,UAAU,CAAC,cAAc,CAAC,MAAM,GAAG,cAAc,CAAC,MAAM,CAAC,CACnE,CAAC;YAEF,MAAM,WAAW,GAAG,CAAC,QAAgB,EAAS,EAAE;gBAC9C,IAAI,IAAI,CAAC,WAAW,KAAK,SAAS,EAAE;oBAClC,MAAM,qBAAqB,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,WAAW,EAAE,GAAG,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"yamlHover.js","sourceRoot":"","sources":["../../../../src/languageservice/services/yamlHover.ts"],"names":[],"mappings":"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"}
|
|
@@ -302,16 +302,6 @@
|
|
|
302
302
|
}
|
|
303
303
|
}
|
|
304
304
|
}
|
|
305
|
-
/**
|
|
306
|
-
* If this resource matches a schemaID directly then use that schema.
|
|
307
|
-
* This will be used in the case where the yaml language server is being used as a library
|
|
308
|
-
* and clients want to save a schema with a particular ID and also use that schema
|
|
309
|
-
* in language features
|
|
310
|
-
*/
|
|
311
|
-
const normalizedResourceID = this.normalizeId(resource);
|
|
312
|
-
if (this.schemasById[normalizedResourceID]) {
|
|
313
|
-
schemas.push(normalizedResourceID);
|
|
314
|
-
}
|
|
315
305
|
if (schemas.length > 0) {
|
|
316
306
|
// Join all schemas with the highest priority.
|
|
317
307
|
const highestPrioSchemas = this.highestPrioritySchemas(schemas);
|
|
@@ -336,7 +326,7 @@
|
|
|
336
326
|
return {
|
|
337
327
|
errors: [],
|
|
338
328
|
schema: {
|
|
339
|
-
|
|
329
|
+
allOf: schemas.map((schemaObj) => {
|
|
340
330
|
return schemaObj.schema;
|
|
341
331
|
}),
|
|
342
332
|
},
|
|
@@ -400,11 +390,11 @@
|
|
|
400
390
|
async resolveCustomSchema(schemaUri, doc) {
|
|
401
391
|
const unresolvedSchema = await this.loadSchema(schemaUri);
|
|
402
392
|
const schema = await this.resolveSchemaContent(unresolvedSchema, schemaUri, []);
|
|
403
|
-
if (schema.schema) {
|
|
393
|
+
if (schema.schema && typeof schema.schema === 'object') {
|
|
404
394
|
schema.schema.url = schemaUri;
|
|
405
395
|
}
|
|
406
396
|
if (schema.schema && schema.schema.schemaSequence && schema.schema.schemaSequence[doc.currentDocIndex]) {
|
|
407
|
-
return new jsonSchemaService_1.ResolvedSchema(schema.schema.schemaSequence[doc.currentDocIndex]);
|
|
397
|
+
return new jsonSchemaService_1.ResolvedSchema(schema.schema.schemaSequence[doc.currentDocIndex], schema.errors);
|
|
408
398
|
}
|
|
409
399
|
return schema;
|
|
410
400
|
}
|