yaml-language-server 1.14.1-c5f138f.0 → 1.15.1-3a74bdc.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/CHANGELOG.md +10 -0
- package/eslint-result.sarif +66 -66
- package/lib/esm/languageservice/parser/ast-converter.js +9 -6
- package/lib/esm/languageservice/parser/ast-converter.js.map +1 -1
- package/lib/esm/languageservice/parser/jsonParser07.js +6 -1
- package/lib/esm/languageservice/parser/jsonParser07.js.map +1 -1
- 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/esm/languageservice/utils/objects.d.ts +1 -1
- package/lib/umd/languageservice/parser/ast-converter.js +9 -6
- package/lib/umd/languageservice/parser/ast-converter.js.map +1 -1
- package/lib/umd/languageservice/parser/jsonParser07.js +6 -1
- package/lib/umd/languageservice/parser/jsonParser07.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/lib/umd/languageservice/utils/objects.d.ts +1 -1
- package/out/server/src/languageservice/parser/ast-converter.js +9 -6
- package/out/server/src/languageservice/parser/ast-converter.js.map +1 -1
- package/out/server/src/languageservice/parser/jsonParser07.js +6 -1
- package/out/server/src/languageservice/parser/jsonParser07.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/src/languageservice/utils/objects.d.ts +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 +134 -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/out/server/test/yamlParser.test.js +6 -0
- package/out/server/test/yamlParser.test.js.map +1 -1
- package/package.json +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -1,3 +1,13 @@
|
|
|
1
|
+
### 1.14.0
|
|
2
|
+
- Fix: Request textDocument/hover failed with message: Invalid regular expression: /(?s).*/: Invalid group [#874](https://github.com/redhat-developer/yaml-language-server/issues/874)
|
|
3
|
+
- Fix: nested anyof const [#888](https://github.com/redhat-developer/yaml-language-server/pull/888)
|
|
4
|
+
- Fix: Parsing example object as plain string [#889](https://github.com/redhat-developer/yaml-language-server/issues/889)
|
|
5
|
+
- Fix: Improve smart select [#307](https://github.com/redhat-developer/vscode-yaml/issues/307)
|
|
6
|
+
- Fix: Local YAML schema applied to schema file itself [#894](https://github.com/redhat-developer/vscode-yaml/issues/894)
|
|
7
|
+
- Fix: Recursive anchors crash extension [#897](https://github.com/redhat-developer/yaml-language-server/issues/897)
|
|
8
|
+
|
|
9
|
+
Thanks to [Tony](https://github.com/Legend-Master),[Ace](https://github.com/AceTheCreator) and [PetrSpacek](https://github.com/p-spacek) for your contributions.
|
|
10
|
+
|
|
1
11
|
### 1.13.0
|
|
2
12
|
- Fix: The default value for keyorder [#859](https://github.com/redhat-developer/yaml-language-server/pull/859)
|
|
3
13
|
- Fix: older changelog heading levels [#861](https://github.com/redhat-developer/yaml-language-server/pull/861)
|
package/eslint-result.sarif
CHANGED
|
@@ -988,9 +988,9 @@
|
|
|
988
988
|
"index": 16
|
|
989
989
|
},
|
|
990
990
|
"region": {
|
|
991
|
-
"startLine":
|
|
991
|
+
"startLine": 1119,
|
|
992
992
|
"startColumn": 38,
|
|
993
|
-
"endLine":
|
|
993
|
+
"endLine": 1119,
|
|
994
994
|
"endColumn": 41
|
|
995
995
|
}
|
|
996
996
|
}
|
|
@@ -1018,9 +1018,9 @@
|
|
|
1018
1018
|
"index": 16
|
|
1019
1019
|
},
|
|
1020
1020
|
"region": {
|
|
1021
|
-
"startLine":
|
|
1021
|
+
"startLine": 1358,
|
|
1022
1022
|
"startColumn": 28,
|
|
1023
|
-
"endLine":
|
|
1023
|
+
"endLine": 1358,
|
|
1024
1024
|
"endColumn": 31
|
|
1025
1025
|
}
|
|
1026
1026
|
}
|
|
@@ -1048,9 +1048,9 @@
|
|
|
1048
1048
|
"index": 16
|
|
1049
1049
|
},
|
|
1050
1050
|
"region": {
|
|
1051
|
-
"startLine":
|
|
1051
|
+
"startLine": 1479,
|
|
1052
1052
|
"startColumn": 98,
|
|
1053
|
-
"endLine":
|
|
1053
|
+
"endLine": 1479,
|
|
1054
1054
|
"endColumn": 101
|
|
1055
1055
|
}
|
|
1056
1056
|
}
|
|
@@ -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
|
}
|
|
@@ -6,6 +6,7 @@ import { isScalar, isMap, isPair, isSeq, isNode, isAlias, } from 'yaml';
|
|
|
6
6
|
import { NullASTNodeImpl, PropertyASTNodeImpl, StringASTNodeImpl, ObjectASTNodeImpl, NumberASTNodeImpl, ArrayASTNodeImpl, BooleanASTNodeImpl, } from './jsonParser07';
|
|
7
7
|
const maxRefCount = 1000;
|
|
8
8
|
let refDepth = 0;
|
|
9
|
+
const seenAlias = new Set();
|
|
9
10
|
export function convertAST(parent, node, doc, lineCounter) {
|
|
10
11
|
if (!parent) {
|
|
11
12
|
// first invocation
|
|
@@ -26,12 +27,14 @@ export function convertAST(parent, node, doc, lineCounter) {
|
|
|
26
27
|
if (isScalar(node)) {
|
|
27
28
|
return convertScalar(node, parent);
|
|
28
29
|
}
|
|
29
|
-
if (isAlias(node)) {
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
30
|
+
if (isAlias(node) && !seenAlias.has(node) && refDepth < maxRefCount) {
|
|
31
|
+
seenAlias.add(node);
|
|
32
|
+
const converted = convertAlias(node, parent, doc, lineCounter);
|
|
33
|
+
seenAlias.delete(node);
|
|
34
|
+
return converted;
|
|
35
|
+
}
|
|
36
|
+
else {
|
|
37
|
+
return;
|
|
35
38
|
}
|
|
36
39
|
}
|
|
37
40
|
function convertMap(node, parent, doc, lineCounter) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ast-converter.js","sourceRoot":"","sources":["../../../../src/languageservice/parser/ast-converter.ts"],"names":[],"mappings":"AAAA;;;gGAGgG;AAEhG,OAAO,EAEL,QAAQ,EAER,KAAK,EAEL,MAAM,EAEN,KAAK,EAEL,MAAM,EACN,OAAO,GAIR,MAAM,MAAM,CAAC;AAEd,OAAO,EACL,eAAe,EACf,mBAAmB,EACnB,iBAAiB,EACjB,iBAAiB,EACjB,iBAAiB,EACjB,gBAAgB,EAChB,kBAAkB,GACnB,MAAM,gBAAgB,CAAC;AAIxB,MAAM,WAAW,GAAG,IAAI,CAAC;AACzB,IAAI,QAAQ,GAAG,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"ast-converter.js","sourceRoot":"","sources":["../../../../src/languageservice/parser/ast-converter.ts"],"names":[],"mappings":"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"}
|
|
@@ -609,6 +609,10 @@ function validate(node, schema, originalSchema, validationResult, matchingSchema
|
|
|
609
609
|
validationResult.merge(bestMatch.validationResult);
|
|
610
610
|
validationResult.propertiesMatches += bestMatch.validationResult.propertiesMatches;
|
|
611
611
|
validationResult.propertiesValueMatches += bestMatch.validationResult.propertiesValueMatches;
|
|
612
|
+
validationResult.enumValueMatch = validationResult.enumValueMatch || bestMatch.validationResult.enumValueMatch;
|
|
613
|
+
if (bestMatch.validationResult.enumValues?.length) {
|
|
614
|
+
validationResult.enumValues = (validationResult.enumValues || []).concat(bestMatch.validationResult.enumValues);
|
|
615
|
+
}
|
|
612
616
|
matchingSchemas.merge(bestMatch.matchingSchemas);
|
|
613
617
|
}
|
|
614
618
|
return matches.length;
|
|
@@ -691,7 +695,8 @@ function validate(node, schema, originalSchema, validationResult, matchingSchema
|
|
|
691
695
|
}
|
|
692
696
|
if (isDefined(schema.const)) {
|
|
693
697
|
const val = getNodeValue(node);
|
|
694
|
-
if (!equals(val, schema.const)
|
|
698
|
+
if (!equals(val, schema.const) &&
|
|
699
|
+
!(callFromAutoComplete && isString(val) && isString(schema.const) && schema.const.startsWith(val))) {
|
|
695
700
|
validationResult.problems.push({
|
|
696
701
|
location: { offset: node.offset, length: node.length },
|
|
697
702
|
severity: DiagnosticSeverity.Warning,
|