yaml-language-server 1.19.1-85b0582.0 → 1.19.1-cd20ba6.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 +96 -36
- package/lib/esm/languageserver/handlers/settingsHandlers.js +6 -1
- package/lib/esm/languageserver/handlers/settingsHandlers.js.map +1 -1
- package/lib/esm/languageservice/parser/ast-converter.d.ts +6 -1
- package/lib/esm/languageservice/parser/ast-converter.js +20 -12
- package/lib/esm/languageservice/parser/ast-converter.js.map +1 -1
- package/lib/esm/languageservice/parser/jsonParser07.js +2 -2
- package/lib/esm/languageservice/parser/jsonParser07.js.map +1 -1
- package/lib/esm/languageservice/services/validation/yaml-style.js +4 -1
- package/lib/esm/languageservice/services/validation/yaml-style.js.map +1 -1
- package/lib/esm/languageservice/services/yamlHover.js +6 -0
- package/lib/esm/languageservice/services/yamlHover.js.map +1 -1
- package/lib/esm/languageservice/services/yamlSchemaService.js +15 -3
- package/lib/esm/languageservice/services/yamlSchemaService.js.map +1 -1
- package/lib/esm/languageservice/utils/objects.d.ts +1 -1
- package/lib/esm/languageservice/utils/objects.js +4 -1
- package/lib/esm/languageservice/utils/objects.js.map +1 -1
- package/lib/umd/languageserver/handlers/settingsHandlers.js +6 -1
- package/lib/umd/languageserver/handlers/settingsHandlers.js.map +1 -1
- package/lib/umd/languageservice/parser/ast-converter.d.ts +6 -1
- package/lib/umd/languageservice/parser/ast-converter.js +21 -13
- package/lib/umd/languageservice/parser/ast-converter.js.map +1 -1
- package/lib/umd/languageservice/parser/jsonParser07.js +2 -2
- package/lib/umd/languageservice/parser/jsonParser07.js.map +1 -1
- package/lib/umd/languageservice/services/validation/yaml-style.js +4 -1
- package/lib/umd/languageservice/services/validation/yaml-style.js.map +1 -1
- package/lib/umd/languageservice/services/yamlHover.js +7 -1
- package/lib/umd/languageservice/services/yamlHover.js.map +1 -1
- package/lib/umd/languageservice/services/yamlSchemaService.js +16 -4
- package/lib/umd/languageservice/services/yamlSchemaService.js.map +1 -1
- package/lib/umd/languageservice/utils/objects.d.ts +1 -1
- package/lib/umd/languageservice/utils/objects.js +4 -1
- package/lib/umd/languageservice/utils/objects.js.map +1 -1
- package/out/server/src/languageserver/handlers/settingsHandlers.js +6 -1
- package/out/server/src/languageserver/handlers/settingsHandlers.js.map +1 -1
- package/out/server/src/languageservice/parser/ast-converter.d.ts +6 -1
- package/out/server/src/languageservice/parser/ast-converter.js +21 -13
- package/out/server/src/languageservice/parser/ast-converter.js.map +1 -1
- package/out/server/src/languageservice/parser/jsonParser07.js +2 -2
- package/out/server/src/languageservice/parser/jsonParser07.js.map +1 -1
- package/out/server/src/languageservice/services/validation/yaml-style.js +4 -1
- package/out/server/src/languageservice/services/validation/yaml-style.js.map +1 -1
- package/out/server/src/languageservice/services/yamlHover.js +6 -0
- package/out/server/src/languageservice/services/yamlHover.js.map +1 -1
- package/out/server/src/languageservice/services/yamlSchemaService.js +15 -3
- 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/src/languageservice/utils/objects.js +4 -1
- package/out/server/src/languageservice/utils/objects.js.map +1 -1
- package/out/server/test/hover.test.js +1 -1
- package/out/server/test/schemaValidation.test.js +112 -0
- package/out/server/test/schemaValidation.test.js.map +1 -1
- package/out/server/test/yamlParser.test.js +61 -0
- package/out/server/test/yamlParser.test.js.map +1 -1
- package/out/server/test/yamlSchema.test.js +9 -8
- package/out/server/test/yamlSchema.test.js.map +1 -1
- package/out/server/test/yamlValidation.test.js +4 -4
- package/out/server/test/yamlValidation.test.js.map +1 -1
- package/package.json +3 -2
package/eslint-result.sarif
CHANGED
|
@@ -603,9 +603,9 @@
|
|
|
603
603
|
"index": 7
|
|
604
604
|
},
|
|
605
605
|
"region": {
|
|
606
|
-
"startLine":
|
|
606
|
+
"startLine": 213,
|
|
607
607
|
"startColumn": 91,
|
|
608
|
-
"endLine":
|
|
608
|
+
"endLine": 213,
|
|
609
609
|
"endColumn": 94
|
|
610
610
|
}
|
|
611
611
|
}
|
|
@@ -1323,9 +1323,9 @@
|
|
|
1323
1323
|
"index": 37
|
|
1324
1324
|
},
|
|
1325
1325
|
"region": {
|
|
1326
|
-
"startLine":
|
|
1326
|
+
"startLine": 41,
|
|
1327
1327
|
"startColumn": 22,
|
|
1328
|
-
"endLine":
|
|
1328
|
+
"endLine": 41,
|
|
1329
1329
|
"endColumn": 72
|
|
1330
1330
|
}
|
|
1331
1331
|
}
|
|
@@ -1340,6 +1340,36 @@
|
|
|
1340
1340
|
}
|
|
1341
1341
|
]
|
|
1342
1342
|
},
|
|
1343
|
+
{
|
|
1344
|
+
"level": "error",
|
|
1345
|
+
"message": {
|
|
1346
|
+
"text": "Require statement not part of import statement."
|
|
1347
|
+
},
|
|
1348
|
+
"locations": [
|
|
1349
|
+
{
|
|
1350
|
+
"physicalLocation": {
|
|
1351
|
+
"artifactLocation": {
|
|
1352
|
+
"uri": "file:///home/runner/work/yaml-language-server/yaml-language-server/src/languageservice/services/yamlSchemaService.ts",
|
|
1353
|
+
"index": 37
|
|
1354
|
+
},
|
|
1355
|
+
"region": {
|
|
1356
|
+
"startLine": 45,
|
|
1357
|
+
"startColumn": 22,
|
|
1358
|
+
"endLine": 45,
|
|
1359
|
+
"endColumn": 81
|
|
1360
|
+
}
|
|
1361
|
+
}
|
|
1362
|
+
}
|
|
1363
|
+
],
|
|
1364
|
+
"ruleId": "@typescript-eslint/no-var-requires",
|
|
1365
|
+
"ruleIndex": 2,
|
|
1366
|
+
"suppressions": [
|
|
1367
|
+
{
|
|
1368
|
+
"kind": "inSource",
|
|
1369
|
+
"justification": ""
|
|
1370
|
+
}
|
|
1371
|
+
]
|
|
1372
|
+
},
|
|
1343
1373
|
{
|
|
1344
1374
|
"level": "warning",
|
|
1345
1375
|
"message": {
|
|
@@ -1353,9 +1383,9 @@
|
|
|
1353
1383
|
"index": 37
|
|
1354
1384
|
},
|
|
1355
1385
|
"region": {
|
|
1356
|
-
"startLine":
|
|
1386
|
+
"startLine": 63,
|
|
1357
1387
|
"startColumn": 12,
|
|
1358
|
-
"endLine":
|
|
1388
|
+
"endLine": 63,
|
|
1359
1389
|
"endColumn": 15
|
|
1360
1390
|
}
|
|
1361
1391
|
}
|
|
@@ -1383,9 +1413,9 @@
|
|
|
1383
1413
|
"index": 37
|
|
1384
1414
|
},
|
|
1385
1415
|
"region": {
|
|
1386
|
-
"startLine":
|
|
1416
|
+
"startLine": 112,
|
|
1387
1417
|
"startColumn": 16,
|
|
1388
|
-
"endLine":
|
|
1418
|
+
"endLine": 112,
|
|
1389
1419
|
"endColumn": 19
|
|
1390
1420
|
}
|
|
1391
1421
|
}
|
|
@@ -1413,9 +1443,9 @@
|
|
|
1413
1443
|
"index": 37
|
|
1414
1444
|
},
|
|
1415
1445
|
"region": {
|
|
1416
|
-
"startLine":
|
|
1446
|
+
"startLine": 191,
|
|
1417
1447
|
"startColumn": 20,
|
|
1418
|
-
"endLine":
|
|
1448
|
+
"endLine": 191,
|
|
1419
1449
|
"endColumn": 23
|
|
1420
1450
|
}
|
|
1421
1451
|
}
|
|
@@ -1443,9 +1473,9 @@
|
|
|
1443
1473
|
"index": 37
|
|
1444
1474
|
},
|
|
1445
1475
|
"region": {
|
|
1446
|
-
"startLine":
|
|
1476
|
+
"startLine": 222,
|
|
1447
1477
|
"startColumn": 16,
|
|
1448
|
-
"endLine":
|
|
1478
|
+
"endLine": 222,
|
|
1449
1479
|
"endColumn": 19
|
|
1450
1480
|
}
|
|
1451
1481
|
}
|
|
@@ -1473,9 +1503,9 @@
|
|
|
1473
1503
|
"index": 37
|
|
1474
1504
|
},
|
|
1475
1505
|
"region": {
|
|
1476
|
-
"startLine":
|
|
1506
|
+
"startLine": 239,
|
|
1477
1507
|
"startColumn": 16,
|
|
1478
|
-
"endLine":
|
|
1508
|
+
"endLine": 239,
|
|
1479
1509
|
"endColumn": 27
|
|
1480
1510
|
}
|
|
1481
1511
|
}
|
|
@@ -1503,9 +1533,9 @@
|
|
|
1503
1533
|
"index": 37
|
|
1504
1534
|
},
|
|
1505
1535
|
"region": {
|
|
1506
|
-
"startLine":
|
|
1536
|
+
"startLine": 249,
|
|
1507
1537
|
"startColumn": 16,
|
|
1508
|
-
"endLine":
|
|
1538
|
+
"endLine": 249,
|
|
1509
1539
|
"endColumn": 19
|
|
1510
1540
|
}
|
|
1511
1541
|
}
|
|
@@ -1533,9 +1563,9 @@
|
|
|
1533
1563
|
"index": 37
|
|
1534
1564
|
},
|
|
1535
1565
|
"region": {
|
|
1536
|
-
"startLine":
|
|
1566
|
+
"startLine": 258,
|
|
1537
1567
|
"startColumn": 35,
|
|
1538
|
-
"endLine":
|
|
1568
|
+
"endLine": 258,
|
|
1539
1569
|
"endColumn": 38
|
|
1540
1570
|
}
|
|
1541
1571
|
}
|
|
@@ -1563,9 +1593,9 @@
|
|
|
1563
1593
|
"index": 37
|
|
1564
1594
|
},
|
|
1565
1595
|
"region": {
|
|
1566
|
-
"startLine":
|
|
1596
|
+
"startLine": 403,
|
|
1567
1597
|
"startColumn": 31,
|
|
1568
|
-
"endLine":
|
|
1598
|
+
"endLine": 403,
|
|
1569
1599
|
"endColumn": 34
|
|
1570
1600
|
}
|
|
1571
1601
|
}
|
|
@@ -1593,9 +1623,9 @@
|
|
|
1593
1623
|
"index": 37
|
|
1594
1624
|
},
|
|
1595
1625
|
"region": {
|
|
1596
|
-
"startLine":
|
|
1626
|
+
"startLine": 612,
|
|
1597
1627
|
"startColumn": 31,
|
|
1598
|
-
"endLine":
|
|
1628
|
+
"endLine": 612,
|
|
1599
1629
|
"endColumn": 34
|
|
1600
1630
|
}
|
|
1601
1631
|
}
|
|
@@ -1623,9 +1653,9 @@
|
|
|
1623
1653
|
"index": 37
|
|
1624
1654
|
},
|
|
1625
1655
|
"region": {
|
|
1626
|
-
"startLine":
|
|
1656
|
+
"startLine": 612,
|
|
1627
1657
|
"startColumn": 43,
|
|
1628
|
-
"endLine":
|
|
1658
|
+
"endLine": 612,
|
|
1629
1659
|
"endColumn": 46
|
|
1630
1660
|
}
|
|
1631
1661
|
}
|
|
@@ -1653,9 +1683,9 @@
|
|
|
1653
1683
|
"index": 37
|
|
1654
1684
|
},
|
|
1655
1685
|
"region": {
|
|
1656
|
-
"startLine":
|
|
1686
|
+
"startLine": 680,
|
|
1657
1687
|
"startColumn": 19,
|
|
1658
|
-
"endLine":
|
|
1688
|
+
"endLine": 680,
|
|
1659
1689
|
"endColumn": 22
|
|
1660
1690
|
}
|
|
1661
1691
|
}
|
|
@@ -1683,9 +1713,9 @@
|
|
|
1683
1713
|
"index": 37
|
|
1684
1714
|
},
|
|
1685
1715
|
"region": {
|
|
1686
|
-
"startLine":
|
|
1716
|
+
"startLine": 725,
|
|
1687
1717
|
"startColumn": 44,
|
|
1688
|
-
"endLine":
|
|
1718
|
+
"endLine": 725,
|
|
1689
1719
|
"endColumn": 47
|
|
1690
1720
|
}
|
|
1691
1721
|
}
|
|
@@ -1760,6 +1790,36 @@
|
|
|
1760
1790
|
}
|
|
1761
1791
|
]
|
|
1762
1792
|
},
|
|
1793
|
+
{
|
|
1794
|
+
"level": "warning",
|
|
1795
|
+
"message": {
|
|
1796
|
+
"text": "Unexpected any. Specify a different type."
|
|
1797
|
+
},
|
|
1798
|
+
"locations": [
|
|
1799
|
+
{
|
|
1800
|
+
"physicalLocation": {
|
|
1801
|
+
"artifactLocation": {
|
|
1802
|
+
"uri": "file:///home/runner/work/yaml-language-server/yaml-language-server/src/languageservice/utils/objects.ts",
|
|
1803
|
+
"index": 49
|
|
1804
|
+
},
|
|
1805
|
+
"region": {
|
|
1806
|
+
"startLine": 7,
|
|
1807
|
+
"startColumn": 53,
|
|
1808
|
+
"endLine": 7,
|
|
1809
|
+
"endColumn": 56
|
|
1810
|
+
}
|
|
1811
|
+
}
|
|
1812
|
+
}
|
|
1813
|
+
],
|
|
1814
|
+
"ruleId": "@typescript-eslint/no-explicit-any",
|
|
1815
|
+
"ruleIndex": 0,
|
|
1816
|
+
"suppressions": [
|
|
1817
|
+
{
|
|
1818
|
+
"kind": "inSource",
|
|
1819
|
+
"justification": ""
|
|
1820
|
+
}
|
|
1821
|
+
]
|
|
1822
|
+
},
|
|
1763
1823
|
{
|
|
1764
1824
|
"level": "error",
|
|
1765
1825
|
"message": {
|
|
@@ -2943,9 +3003,9 @@
|
|
|
2943
3003
|
"index": 84
|
|
2944
3004
|
},
|
|
2945
3005
|
"region": {
|
|
2946
|
-
"startLine":
|
|
3006
|
+
"startLine": 1528,
|
|
2947
3007
|
"startColumn": 22,
|
|
2948
|
-
"endLine":
|
|
3008
|
+
"endLine": 1528,
|
|
2949
3009
|
"endColumn": 96
|
|
2950
3010
|
}
|
|
2951
3011
|
}
|
|
@@ -2973,9 +3033,9 @@
|
|
|
2973
3033
|
"index": 84
|
|
2974
3034
|
},
|
|
2975
3035
|
"region": {
|
|
2976
|
-
"startLine":
|
|
3036
|
+
"startLine": 1544,
|
|
2977
3037
|
"startColumn": 22,
|
|
2978
|
-
"endLine":
|
|
3038
|
+
"endLine": 1544,
|
|
2979
3039
|
"endColumn": 96
|
|
2980
3040
|
}
|
|
2981
3041
|
}
|
|
@@ -3003,9 +3063,9 @@
|
|
|
3003
3063
|
"index": 84
|
|
3004
3064
|
},
|
|
3005
3065
|
"region": {
|
|
3006
|
-
"startLine":
|
|
3066
|
+
"startLine": 1557,
|
|
3007
3067
|
"startColumn": 22,
|
|
3008
|
-
"endLine":
|
|
3068
|
+
"endLine": 1557,
|
|
3009
3069
|
"endColumn": 96
|
|
3010
3070
|
}
|
|
3011
3071
|
}
|
|
@@ -3033,9 +3093,9 @@
|
|
|
3033
3093
|
"index": 84
|
|
3034
3094
|
},
|
|
3035
3095
|
"region": {
|
|
3036
|
-
"startLine":
|
|
3096
|
+
"startLine": 1570,
|
|
3037
3097
|
"startColumn": 22,
|
|
3038
|
-
"endLine":
|
|
3098
|
+
"endLine": 1570,
|
|
3039
3099
|
"endColumn": 96
|
|
3040
3100
|
}
|
|
3041
3101
|
}
|
|
@@ -140,7 +140,12 @@ export class SettingsHandler {
|
|
|
140
140
|
if (enableFormatter) {
|
|
141
141
|
if (!this.yamlSettings.formatterRegistration) {
|
|
142
142
|
this.yamlSettings.formatterRegistration = this.connection.client.register(DocumentFormattingRequest.type, {
|
|
143
|
-
documentSelector: [
|
|
143
|
+
documentSelector: [
|
|
144
|
+
{ language: 'yaml' },
|
|
145
|
+
{ language: 'dockercompose' },
|
|
146
|
+
{ language: 'github-actions-workflow' },
|
|
147
|
+
{ pattern: '*.y(a)ml' },
|
|
148
|
+
],
|
|
144
149
|
});
|
|
145
150
|
}
|
|
146
151
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"settingsHandlers.js","sourceRoot":"","sources":["../../../../src/languageserver/handlers/settingsHandlers.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"settingsHandlers.js","sourceRoot":"","sources":["../../../../src/languageserver/handlers/settingsHandlers.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,11 @@
|
|
|
1
|
-
import { Document, LineCounter } from 'yaml';
|
|
1
|
+
import { Alias, Document, LineCounter } from 'yaml';
|
|
2
2
|
import { ASTNode, YamlNode } from '../jsonASTTypes';
|
|
3
3
|
declare type NodeRange = [number, number, number];
|
|
4
|
+
export declare const aliasDepth: {
|
|
5
|
+
maxRefCount: number;
|
|
6
|
+
currentRefDepth: number;
|
|
7
|
+
aliasResolutionCache: Map<Alias, ASTNode>;
|
|
8
|
+
};
|
|
4
9
|
export declare function convertAST(parent: ASTNode, node: YamlNode, doc: Document, lineCounter: LineCounter): ASTNode | undefined;
|
|
5
10
|
export declare function toOffsetLength(range: NodeRange): [number, number];
|
|
6
11
|
export {};
|
|
@@ -4,13 +4,17 @@
|
|
|
4
4
|
*--------------------------------------------------------------------------------------------*/
|
|
5
5
|
import { isScalar, isMap, isPair, isSeq, isNode, isAlias, } from 'yaml';
|
|
6
6
|
import { NullASTNodeImpl, PropertyASTNodeImpl, StringASTNodeImpl, ObjectASTNodeImpl, NumberASTNodeImpl, ArrayASTNodeImpl, BooleanASTNodeImpl, } from './jsonParser07';
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
7
|
+
// Exported for tests
|
|
8
|
+
export const aliasDepth = {
|
|
9
|
+
maxRefCount: 1000,
|
|
10
|
+
currentRefDepth: 0,
|
|
11
|
+
aliasResolutionCache: new Map(),
|
|
12
|
+
};
|
|
10
13
|
export function convertAST(parent, node, doc, lineCounter) {
|
|
11
14
|
if (!parent) {
|
|
12
15
|
// first invocation
|
|
13
|
-
|
|
16
|
+
aliasDepth.currentRefDepth = 0;
|
|
17
|
+
aliasDepth.aliasResolutionCache = new Map();
|
|
14
18
|
}
|
|
15
19
|
if (!node) {
|
|
16
20
|
return null;
|
|
@@ -27,11 +31,8 @@ export function convertAST(parent, node, doc, lineCounter) {
|
|
|
27
31
|
if (isScalar(node)) {
|
|
28
32
|
return convertScalar(node, parent);
|
|
29
33
|
}
|
|
30
|
-
if (isAlias(node) &&
|
|
31
|
-
|
|
32
|
-
const converted = convertAlias(node, parent, doc, lineCounter);
|
|
33
|
-
seenAlias.delete(node);
|
|
34
|
-
return converted;
|
|
34
|
+
if (isAlias(node) && aliasDepth.currentRefDepth < aliasDepth.maxRefCount) {
|
|
35
|
+
return convertAlias(node, parent, doc, lineCounter);
|
|
35
36
|
}
|
|
36
37
|
else {
|
|
37
38
|
return;
|
|
@@ -116,16 +117,23 @@ function convertScalar(node, parent) {
|
|
|
116
117
|
}
|
|
117
118
|
}
|
|
118
119
|
function convertAlias(node, parent, doc, lineCounter) {
|
|
119
|
-
|
|
120
|
+
if (aliasDepth.aliasResolutionCache.has(node)) {
|
|
121
|
+
return aliasDepth.aliasResolutionCache.get(node);
|
|
122
|
+
}
|
|
123
|
+
aliasDepth.currentRefDepth++;
|
|
120
124
|
const resolvedNode = node.resolve(doc);
|
|
125
|
+
let ans;
|
|
121
126
|
if (resolvedNode) {
|
|
122
|
-
|
|
127
|
+
ans = convertAST(parent, resolvedNode, doc, lineCounter);
|
|
123
128
|
}
|
|
124
129
|
else {
|
|
125
130
|
const resultNode = new StringASTNodeImpl(parent, node, ...toOffsetLength(node.range));
|
|
126
131
|
resultNode.value = node.source;
|
|
127
|
-
|
|
132
|
+
ans = resultNode;
|
|
128
133
|
}
|
|
134
|
+
aliasDepth.currentRefDepth--;
|
|
135
|
+
aliasDepth.aliasResolutionCache.set(node, ans);
|
|
136
|
+
return ans;
|
|
129
137
|
}
|
|
130
138
|
export function toOffsetLength(range) {
|
|
131
139
|
return [range[0], range[1] - range[0]];
|
|
@@ -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,
|
|
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,qBAAqB;AACrB,MAAM,CAAC,MAAM,UAAU,GAAG;IACxB,WAAW,EAAE,IAAI;IACjB,eAAe,EAAE,CAAC;IAClB,oBAAoB,EAAE,IAAI,GAAG,EAAkB;CAChD,CAAC;AAEF,MAAM,UAAU,UAAU,CAAC,MAAe,EAAE,IAAc,EAAE,GAAa,EAAE,WAAwB;IACjG,IAAI,CAAC,MAAM,EAAE;QACX,mBAAmB;QACnB,UAAU,CAAC,eAAe,GAAG,CAAC,CAAC;QAC/B,UAAU,CAAC,oBAAoB,GAAG,IAAI,GAAG,EAAE,CAAC;KAC7C;IAED,IAAI,CAAC,IAAI,EAAE;QACT,OAAO,IAAI,CAAC;KACb;IACD,IAAI,KAAK,CAAC,IAAI,CAAC,EAAE;QACf,OAAO,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,WAAW,CAAC,CAAC;KACnD;IACD,IAAI,MAAM,CAAC,IAAI,CAAC,EAAE;QAChB,OAAO,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,WAAW,CAAC,CAAC;KACpD;IACD,IAAI,KAAK,CAAC,IAAI,CAAC,EAAE;QACf,OAAO,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,WAAW,CAAC,CAAC;KACnD;IACD,IAAI,QAAQ,CAAC,IAAI,CAAC,EAAE;QAClB,OAAO,aAAa,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;KACpC;IACD,IAAI,OAAO,CAAC,IAAI,CAAC,IAAI,UAAU,CAAC,eAAe,GAAG,UAAU,CAAC,WAAW,EAAE;QACxE,OAAO,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,WAAW,CAAC,CAAC;KACrD;SAAM;QACL,OAAO;KACR;AACH,CAAC;AAED,SAAS,UAAU,CAAC,IAA+B,EAAE,MAAe,EAAE,GAAa,EAAE,WAAwB;IAC3G,IAAI,KAAgB,CAAC;IACrB,IAAI,IAAI,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE;QAC5B,KAAK,GAAG,mBAAmB,CAAC,IAAI,CAAC,CAAC;KACnC;SAAM;QACL,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC;KACpB;IACD,MAAM,MAAM,GAAG,IAAI,iBAAiB,CAAC,MAAM,EAAE,IAAI,EAAE,GAAG,mBAAmB,CAAC,KAAK,EAAE,WAAW,CAAC,CAAC,CAAC;IAC/F,KAAK,MAAM,EAAE,IAAI,IAAI,CAAC,KAAK,EAAE;QAC3B,IAAI,MAAM,CAAC,EAAE,CAAC,EAAE;YACd,MAAM,CAAC,UAAU,CAAC,IAAI,CAAsB,UAAU,CAAC,MAAM,EAAE,EAAE,EAAE,GAAG,EAAE,WAAW,CAAC,CAAC,CAAC;SACvF;KACF;IACD,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,SAAS,WAAW,CAAC,IAAU,EAAE,MAAe,EAAE,GAAa,EAAE,WAAwB;IACvF,MAAM,OAAO,GAAS,IAAI,CAAC,GAAG,CAAC;IAC/B,MAAM,SAAS,GAAS,IAAI,CAAC,KAAK,CAAC;IACnC,MAAM,UAAU,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;IACpC,IAAI,QAAQ,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;IAChC,IAAI,OAAO,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;IAC/B,IAAI,SAAS,EAAE;QACb,QAAQ,GAAG,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QAC9B,OAAO,GAAG,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;KAC9B;IAED,uEAAuE;IACvE,MAAM,MAAM,GAAG,IAAI,mBAAmB,CACpC,MAA2B,EAC3B,IAAI,EACJ,GAAG,mBAAmB,CAAC,CAAC,UAAU,EAAE,QAAQ,EAAE,OAAO,CAAC,EAAE,WAAW,CAAC,CACrE,CAAC;IACF,IAAI,OAAO,CAAC,OAAO,CAAC,EAAE;QACpB,MAAM,QAAQ,GAAG,IAAI,iBAAiB,CAAC,MAAM,EAAE,OAAO,EAAE,GAAG,cAAc,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC;QAC1F,QAAQ,CAAC,KAAK,GAAG,OAAO,CAAC,MAAM,CAAC;QAChC,MAAM,CAAC,OAAO,GAAG,QAAQ,CAAC;KAC3B;SAAM;QACL,MAAM,CAAC,OAAO,GAAsB,UAAU,CAAC,MAAM,EAAE,OAAO,EAAE,GAAG,EAAE,WAAW,CAAC,CAAC;KACnF;IACD,MAAM,CAAC,SAAS,GAAG,UAAU,CAAC,MAAM,EAAE,SAAS,EAAE,GAAG,EAAE,WAAW,CAAC,CAAC;IACnE,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,SAAS,UAAU,CAAC,IAAa,EAAE,MAAe,EAAE,GAAa,EAAE,WAAwB;IACzF,MAAM,MAAM,GAAG,IAAI,gBAAgB,CAAC,MAAM,EAAE,IAAI,EAAE,GAAG,cAAc,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC;IACjF,KAAK,MAAM,EAAE,IAAI,IAAI,CAAC,KAAK,EAAE;QAC3B,IAAI,MAAM,CAAC,EAAE,CAAC,EAAE;YACd,MAAM,aAAa,GAAG,UAAU,CAAC,MAAM,EAAE,EAAE,EAAE,GAAG,EAAE,WAAW,CAAC,CAAC;YAC/D,+DAA+D;YAC/D,IAAI,aAAa,EAAE;gBACjB,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;aACrC;SACF;KACF;IACD,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,SAAS,aAAa,CAAC,IAAY,EAAE,MAAe;IAClD,IAAI,IAAI,CAAC,KAAK,KAAK,IAAI,EAAE;QACvB,OAAO,IAAI,eAAe,CAAC,MAAM,EAAE,IAAI,EAAE,GAAG,cAAc,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC;KACzE;IAED,QAAQ,OAAO,IAAI,CAAC,KAAK,EAAE;QACzB,KAAK,QAAQ,CAAC,CAAC;YACb,MAAM,MAAM,GAAG,IAAI,iBAAiB,CAAC,MAAM,EAAE,IAAI,EAAE,GAAG,cAAc,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC;YAClF,MAAM,CAAC,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC;YAC1B,OAAO,MAAM,CAAC;SACf;QACD,KAAK,SAAS;YACZ,OAAO,IAAI,kBAAkB,CAAC,MAAM,EAAE,IAAI,EAAE,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,MAAM,EAAE,GAAG,cAAc,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC;QACtG,KAAK,QAAQ,CAAC,CAAC;YACb,MAAM,MAAM,GAAG,IAAI,iBAAiB,CAAC,MAAM,EAAE,IAAI,EAAE,GAAG,cAAc,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC;YAClF,MAAM,CAAC,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC;YAC1B,MAAM,CAAC,SAAS,GAAG,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;YAClD,OAAO,MAAM,CAAC;SACf;QACD,OAAO,CAAC,CAAC;YACP,2DAA2D;YAC3D,MAAM,MAAM,GAAG,IAAI,iBAAiB,CAAC,MAAM,EAAE,IAAI,EAAE,GAAG,cAAc,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC;YAClF,MAAM,CAAC,KAAK,GAAG,IAAI,CAAC,MAAM,CAAC;YAC3B,OAAO,MAAM,CAAC;SACf;KACF;AACH,CAAC;AAED,SAAS,YAAY,CAAC,IAAW,EAAE,MAAe,EAAE,GAAa,EAAE,WAAwB;IACzF,IAAI,UAAU,CAAC,oBAAoB,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE;QAC7C,OAAO,UAAU,CAAC,oBAAoB,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;KAClD;IAED,UAAU,CAAC,eAAe,EAAE,CAAC;IAC7B,MAAM,YAAY,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;IACvC,IAAI,GAAY,CAAC;IACjB,IAAI,YAAY,EAAE;QAChB,GAAG,GAAG,UAAU,CAAC,MAAM,EAAE,YAAY,EAAE,GAAG,EAAE,WAAW,CAAC,CAAC;KAC1D;SAAM;QACL,MAAM,UAAU,GAAG,IAAI,iBAAiB,CAAC,MAAM,EAAE,IAAI,EAAE,GAAG,cAAc,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC;QACtF,UAAU,CAAC,KAAK,GAAG,IAAI,CAAC,MAAM,CAAC;QAC/B,GAAG,GAAG,UAAU,CAAC;KAClB;IACD,UAAU,CAAC,eAAe,EAAE,CAAC;IAC7B,UAAU,CAAC,oBAAoB,CAAC,GAAG,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;IAC/C,OAAO,GAAG,CAAC;AACb,CAAC;AAED,MAAM,UAAU,cAAc,CAAC,KAAgB;IAC7C,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;AACzC,CAAC;AAED;;;;;GAKG;AACH,SAAS,mBAAmB,CAAC,KAAgB,EAAE,WAAwB;IACrE,MAAM,KAAK,GAAG,WAAW,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;IAC5C,MAAM,GAAG,GAAG,WAAW,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;IAE1C,MAAM,MAAM,GAAqB,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;IACjE,+BAA+B;IAC/B,IAAI,KAAK,CAAC,IAAI,KAAK,GAAG,CAAC,IAAI,IAAI,CAAC,WAAW,CAAC,UAAU,CAAC,MAAM,KAAK,GAAG,CAAC,IAAI,IAAI,GAAG,CAAC,GAAG,KAAK,CAAC,CAAC,EAAE;QAC5F,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC;KACb;IAED,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,SAAS,mBAAmB,CAAC,IAAa;IACxC,IAAI,KAAK,GAAG,MAAM,CAAC,gBAAgB,CAAC;IACpC,IAAI,GAAG,GAAG,CAAC,CAAC;IACZ,KAAK,MAAM,EAAE,IAAI,IAAI,CAAC,KAAK,EAAE;QAC3B,IAAI,MAAM,CAAC,EAAE,CAAC,EAAE;YACd,IAAI,MAAM,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE;gBAClB,IAAI,EAAE,CAAC,GAAG,CAAC,KAAK,IAAI,EAAE,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,KAAK,EAAE;oBAC5C,KAAK,GAAG,EAAE,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;iBACzB;aACF;YAED,IAAI,MAAM,CAAC,EAAE,CAAC,KAAK,CAAC,EAAE;gBACpB,IAAI,EAAE,CAAC,KAAK,CAAC,KAAK,IAAI,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,GAAG,EAAE;oBAC9C,GAAG,GAAG,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;iBACzB;aACF;SACF;KACF;IAED,OAAO,CAAC,KAAK,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;AAC3B,CAAC"}
|
|
@@ -673,7 +673,7 @@ function validate(node, schema, originalSchema, validationResult, matchingSchema
|
|
|
673
673
|
const val = getNodeValue(node);
|
|
674
674
|
let enumValueMatch = false;
|
|
675
675
|
for (const e of schema.enum) {
|
|
676
|
-
if (val
|
|
676
|
+
if (equals(val, e, node.type) || isAutoCompleteEqualMaybe(callFromAutoComplete, node, val, e)) {
|
|
677
677
|
enumValueMatch = true;
|
|
678
678
|
break;
|
|
679
679
|
}
|
|
@@ -699,7 +699,7 @@ function validate(node, schema, originalSchema, validationResult, matchingSchema
|
|
|
699
699
|
}
|
|
700
700
|
if (isDefined(schema.const)) {
|
|
701
701
|
const val = getNodeValue(node);
|
|
702
|
-
if (!equals(val, schema.const) && !isAutoCompleteEqualMaybe(callFromAutoComplete, node, val, schema.const)) {
|
|
702
|
+
if (!equals(val, schema.const, node.type) && !isAutoCompleteEqualMaybe(callFromAutoComplete, node, val, schema.const)) {
|
|
703
703
|
validationResult.problems.push({
|
|
704
704
|
location: { offset: node.offset, length: node.length },
|
|
705
705
|
severity: DiagnosticSeverity.Warning,
|