yaml-language-server 1.11.1-1e76107.0 → 1.11.1-220519d.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/lib/esm/languageservice/services/yamlHover.js +40 -0
- package/lib/esm/languageservice/services/yamlHover.js.map +1 -1
- package/lib/esm/languageservice/services/yamlValidation.js +1 -1
- package/lib/esm/languageservice/services/yamlValidation.js.map +1 -1
- package/lib/umd/languageservice/services/yamlHover.js +40 -0
- package/lib/umd/languageservice/services/yamlHover.js.map +1 -1
- package/lib/umd/languageservice/services/yamlValidation.js +1 -1
- package/lib/umd/languageservice/services/yamlValidation.js.map +1 -1
- package/out/server/src/languageservice/services/yamlHover.js +40 -0
- package/out/server/src/languageservice/services/yamlHover.js.map +1 -1
- package/out/server/src/languageservice/services/yamlValidation.js +1 -1
- package/out/server/src/languageservice/services/yamlValidation.js.map +1 -1
- package/out/server/test/hover.test.js +79 -0
- package/out/server/test/hover.test.js.map +1 -1
- package/out/server/test/schemaValidation.test.js +1 -1
- package/package.json +1 -1
|
@@ -74,6 +74,9 @@ export class YAMLHover {
|
|
|
74
74
|
};
|
|
75
75
|
return result;
|
|
76
76
|
};
|
|
77
|
+
const removePipe = (value) => {
|
|
78
|
+
return value.replace(/\|\|\s*$/, '');
|
|
79
|
+
};
|
|
77
80
|
return this.schemaService.getSchemaForResource(document.uri, doc).then((schema) => {
|
|
78
81
|
if (schema && node && !schema.errors.length) {
|
|
79
82
|
const matchingSchemas = doc.getMatchingSchemas(schema.schema, node.offset);
|
|
@@ -101,6 +104,21 @@ export class YAMLHover {
|
|
|
101
104
|
}
|
|
102
105
|
}
|
|
103
106
|
}
|
|
107
|
+
if (s.schema.anyOf && isAllSchemasMatched(node, matchingSchemas, s.schema)) {
|
|
108
|
+
//if append title and description of all matched schemas on hover
|
|
109
|
+
title = '';
|
|
110
|
+
markdownDescription = '';
|
|
111
|
+
s.schema.anyOf.forEach((childSchema, index) => {
|
|
112
|
+
title += childSchema.title || s.schema.closestTitle || '';
|
|
113
|
+
markdownDescription += childSchema.markdownDescription || toMarkdown(childSchema.description) || '';
|
|
114
|
+
if (index !== s.schema.anyOf.length - 1) {
|
|
115
|
+
title += ' || ';
|
|
116
|
+
markdownDescription += ' || ';
|
|
117
|
+
}
|
|
118
|
+
});
|
|
119
|
+
title = removePipe(title);
|
|
120
|
+
markdownDescription = removePipe(markdownDescription);
|
|
121
|
+
}
|
|
104
122
|
if (s.schema.examples) {
|
|
105
123
|
s.schema.examples.forEach((example) => {
|
|
106
124
|
markdownExamples.push(JSON.stringify(example));
|
|
@@ -170,4 +188,26 @@ function toMarkdownCodeBlock(content) {
|
|
|
170
188
|
}
|
|
171
189
|
return content;
|
|
172
190
|
}
|
|
191
|
+
/**
|
|
192
|
+
* check all the schemas which is inside anyOf presented or not in matching schema.
|
|
193
|
+
* @param node node
|
|
194
|
+
* @param matchingSchemas all matching schema
|
|
195
|
+
* @param schema scheam which is having anyOf
|
|
196
|
+
* @returns true if all the schemas which inside anyOf presents in matching schema
|
|
197
|
+
*/
|
|
198
|
+
function isAllSchemasMatched(node, matchingSchemas, schema) {
|
|
199
|
+
let count = 0;
|
|
200
|
+
for (const matchSchema of matchingSchemas) {
|
|
201
|
+
if (node === matchSchema.node && matchSchema.schema !== schema) {
|
|
202
|
+
schema.anyOf.forEach((childSchema) => {
|
|
203
|
+
if (matchSchema.schema.title === childSchema.title &&
|
|
204
|
+
matchSchema.schema.description === childSchema.description &&
|
|
205
|
+
matchSchema.schema.properties === childSchema.properties) {
|
|
206
|
+
count++;
|
|
207
|
+
}
|
|
208
|
+
});
|
|
209
|
+
}
|
|
210
|
+
}
|
|
211
|
+
return count === schema.anyOf.length;
|
|
212
|
+
}
|
|
173
213
|
//# sourceMappingURL=yamlHover.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"yamlHover.js","sourceRoot":"","sources":["../../../../src/languageservice/services/yamlHover.ts"],"names":[],"mappings":"AAAA;;;;gGAIgG;AAChG,YAAY,CAAC;AAEb,OAAO,EAAkC,KAAK,EAAE,MAAM,6BAA6B,CAAC;AACpF,OAAO,EAAE,qBAAqB,EAAE,MAAM,mBAAmB,CAAC;AAG1D,OAAO,EAAE,yBAAyB,EAAE,MAAM,wBAAwB,CAAC;AAEnE,OAAO,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AAE9D,OAAO,EAAE,YAAY,
|
|
1
|
+
{"version":3,"file":"yamlHover.js","sourceRoot":"","sources":["../../../../src/languageservice/services/yamlHover.ts"],"names":[],"mappings":"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"}
|
|
@@ -86,7 +86,7 @@ export class YAMLValidation {
|
|
|
86
86
|
}
|
|
87
87
|
}
|
|
88
88
|
catch (err) {
|
|
89
|
-
this.telemetry.sendError('yaml.validation.error', convertErrorToTelemetryMsg(err));
|
|
89
|
+
this.telemetry.sendError('yaml.validation.error', { error: convertErrorToTelemetryMsg(err) });
|
|
90
90
|
}
|
|
91
91
|
let previousErr;
|
|
92
92
|
const foundSignatures = new Set();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"yamlValidation.js","sourceRoot":"","sources":["../../../../src/languageservice/services/yamlValidation.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"yamlValidation.js","sourceRoot":"","sources":["../../../../src/languageservice/services/yamlValidation.ts"],"names":[],"mappings":"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"}
|
|
@@ -85,6 +85,9 @@
|
|
|
85
85
|
};
|
|
86
86
|
return result;
|
|
87
87
|
};
|
|
88
|
+
const removePipe = (value) => {
|
|
89
|
+
return value.replace(/\|\|\s*$/, '');
|
|
90
|
+
};
|
|
88
91
|
return this.schemaService.getSchemaForResource(document.uri, doc).then((schema) => {
|
|
89
92
|
if (schema && node && !schema.errors.length) {
|
|
90
93
|
const matchingSchemas = doc.getMatchingSchemas(schema.schema, node.offset);
|
|
@@ -112,6 +115,21 @@
|
|
|
112
115
|
}
|
|
113
116
|
}
|
|
114
117
|
}
|
|
118
|
+
if (s.schema.anyOf && isAllSchemasMatched(node, matchingSchemas, s.schema)) {
|
|
119
|
+
//if append title and description of all matched schemas on hover
|
|
120
|
+
title = '';
|
|
121
|
+
markdownDescription = '';
|
|
122
|
+
s.schema.anyOf.forEach((childSchema, index) => {
|
|
123
|
+
title += childSchema.title || s.schema.closestTitle || '';
|
|
124
|
+
markdownDescription += childSchema.markdownDescription || toMarkdown(childSchema.description) || '';
|
|
125
|
+
if (index !== s.schema.anyOf.length - 1) {
|
|
126
|
+
title += ' || ';
|
|
127
|
+
markdownDescription += ' || ';
|
|
128
|
+
}
|
|
129
|
+
});
|
|
130
|
+
title = removePipe(title);
|
|
131
|
+
markdownDescription = removePipe(markdownDescription);
|
|
132
|
+
}
|
|
115
133
|
if (s.schema.examples) {
|
|
116
134
|
s.schema.examples.forEach((example) => {
|
|
117
135
|
markdownExamples.push(JSON.stringify(example));
|
|
@@ -182,5 +200,27 @@
|
|
|
182
200
|
}
|
|
183
201
|
return content;
|
|
184
202
|
}
|
|
203
|
+
/**
|
|
204
|
+
* check all the schemas which is inside anyOf presented or not in matching schema.
|
|
205
|
+
* @param node node
|
|
206
|
+
* @param matchingSchemas all matching schema
|
|
207
|
+
* @param schema scheam which is having anyOf
|
|
208
|
+
* @returns true if all the schemas which inside anyOf presents in matching schema
|
|
209
|
+
*/
|
|
210
|
+
function isAllSchemasMatched(node, matchingSchemas, schema) {
|
|
211
|
+
let count = 0;
|
|
212
|
+
for (const matchSchema of matchingSchemas) {
|
|
213
|
+
if (node === matchSchema.node && matchSchema.schema !== schema) {
|
|
214
|
+
schema.anyOf.forEach((childSchema) => {
|
|
215
|
+
if (matchSchema.schema.title === childSchema.title &&
|
|
216
|
+
matchSchema.schema.description === childSchema.description &&
|
|
217
|
+
matchSchema.schema.properties === childSchema.properties) {
|
|
218
|
+
count++;
|
|
219
|
+
}
|
|
220
|
+
});
|
|
221
|
+
}
|
|
222
|
+
}
|
|
223
|
+
return count === schema.anyOf.length;
|
|
224
|
+
}
|
|
185
225
|
});
|
|
186
226
|
//# sourceMappingURL=yamlHover.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"yamlHover.js","sourceRoot":"","sources":["../../../../src/languageservice/services/yamlHover.ts"],"names":[],"mappings":";;;;;;;;;IAAA;;;;oGAIgG;IAChG,YAAY,CAAC;;;IAEb,6EAAoF;IACpF,gDAA0D;IAG1D,yDAAmE;IAEnE,6DAA8D;IAE9D,
|
|
1
|
+
{"version":3,"file":"yamlHover.js","sourceRoot":"","sources":["../../../../src/languageservice/services/yamlHover.ts"],"names":[],"mappings":"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"}
|
|
@@ -98,7 +98,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
98
98
|
}
|
|
99
99
|
}
|
|
100
100
|
catch (err) {
|
|
101
|
-
this.telemetry.sendError('yaml.validation.error', (0, objects_1.convertErrorToTelemetryMsg)(err));
|
|
101
|
+
this.telemetry.sendError('yaml.validation.error', { error: (0, objects_1.convertErrorToTelemetryMsg)(err) });
|
|
102
102
|
}
|
|
103
103
|
let previousErr;
|
|
104
104
|
const foundSignatures = new Set();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"yamlValidation.js","sourceRoot":"","sources":["../../../../src/languageservice/services/yamlValidation.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"yamlValidation.js","sourceRoot":"","sources":["../../../../src/languageservice/services/yamlValidation.ts"],"names":[],"mappings":"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"}
|
|
@@ -76,6 +76,9 @@ class YAMLHover {
|
|
|
76
76
|
};
|
|
77
77
|
return result;
|
|
78
78
|
};
|
|
79
|
+
const removePipe = (value) => {
|
|
80
|
+
return value.replace(/\|\|\s*$/, '');
|
|
81
|
+
};
|
|
79
82
|
return this.schemaService.getSchemaForResource(document.uri, doc).then((schema) => {
|
|
80
83
|
if (schema && node && !schema.errors.length) {
|
|
81
84
|
const matchingSchemas = doc.getMatchingSchemas(schema.schema, node.offset);
|
|
@@ -103,6 +106,21 @@ class YAMLHover {
|
|
|
103
106
|
}
|
|
104
107
|
}
|
|
105
108
|
}
|
|
109
|
+
if (s.schema.anyOf && isAllSchemasMatched(node, matchingSchemas, s.schema)) {
|
|
110
|
+
//if append title and description of all matched schemas on hover
|
|
111
|
+
title = '';
|
|
112
|
+
markdownDescription = '';
|
|
113
|
+
s.schema.anyOf.forEach((childSchema, index) => {
|
|
114
|
+
title += childSchema.title || s.schema.closestTitle || '';
|
|
115
|
+
markdownDescription += childSchema.markdownDescription || toMarkdown(childSchema.description) || '';
|
|
116
|
+
if (index !== s.schema.anyOf.length - 1) {
|
|
117
|
+
title += ' || ';
|
|
118
|
+
markdownDescription += ' || ';
|
|
119
|
+
}
|
|
120
|
+
});
|
|
121
|
+
title = removePipe(title);
|
|
122
|
+
markdownDescription = removePipe(markdownDescription);
|
|
123
|
+
}
|
|
106
124
|
if (s.schema.examples) {
|
|
107
125
|
s.schema.examples.forEach((example) => {
|
|
108
126
|
markdownExamples.push(JSON.stringify(example));
|
|
@@ -173,4 +191,26 @@ function toMarkdownCodeBlock(content) {
|
|
|
173
191
|
}
|
|
174
192
|
return content;
|
|
175
193
|
}
|
|
194
|
+
/**
|
|
195
|
+
* check all the schemas which is inside anyOf presented or not in matching schema.
|
|
196
|
+
* @param node node
|
|
197
|
+
* @param matchingSchemas all matching schema
|
|
198
|
+
* @param schema scheam which is having anyOf
|
|
199
|
+
* @returns true if all the schemas which inside anyOf presents in matching schema
|
|
200
|
+
*/
|
|
201
|
+
function isAllSchemasMatched(node, matchingSchemas, schema) {
|
|
202
|
+
let count = 0;
|
|
203
|
+
for (const matchSchema of matchingSchemas) {
|
|
204
|
+
if (node === matchSchema.node && matchSchema.schema !== schema) {
|
|
205
|
+
schema.anyOf.forEach((childSchema) => {
|
|
206
|
+
if (matchSchema.schema.title === childSchema.title &&
|
|
207
|
+
matchSchema.schema.description === childSchema.description &&
|
|
208
|
+
matchSchema.schema.properties === childSchema.properties) {
|
|
209
|
+
count++;
|
|
210
|
+
}
|
|
211
|
+
});
|
|
212
|
+
}
|
|
213
|
+
}
|
|
214
|
+
return count === schema.anyOf.length;
|
|
215
|
+
}
|
|
176
216
|
//# sourceMappingURL=yamlHover.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"yamlHover.js","sourceRoot":"","sources":["../../../../../src/languageservice/services/yamlHover.ts"],"names":[],"mappings":"AAAA;;;;gGAIgG;AAChG,YAAY,CAAC;;;AAEb,6EAAoF;AACpF,gDAA0D;AAG1D,yDAAmE;AAEnE,6DAA8D;AAE9D,
|
|
1
|
+
{"version":3,"file":"yamlHover.js","sourceRoot":"","sources":["../../../../../src/languageservice/services/yamlHover.ts"],"names":[],"mappings":"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"}
|
|
@@ -89,7 +89,7 @@ class YAMLValidation {
|
|
|
89
89
|
}
|
|
90
90
|
}
|
|
91
91
|
catch (err) {
|
|
92
|
-
this.telemetry.sendError('yaml.validation.error', (0, objects_1.convertErrorToTelemetryMsg)(err));
|
|
92
|
+
this.telemetry.sendError('yaml.validation.error', { error: (0, objects_1.convertErrorToTelemetryMsg)(err) });
|
|
93
93
|
}
|
|
94
94
|
let previousErr;
|
|
95
95
|
const foundSignatures = new Set();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"yamlValidation.js","sourceRoot":"","sources":["../../../../../src/languageservice/services/yamlValidation.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"yamlValidation.js","sourceRoot":"","sources":["../../../../../src/languageservice/services/yamlValidation.ts"],"names":[],"mappings":"AAAA;;;;gGAIgG;AAChG,YAAY,CAAC;;;;;;;;;;;;AAEb,6EAAmE;AAMnE,gGAA6F;AAC7F,yDAAqD;AACrD,oDAAiD;AACjD,6DAA8D;AAC9D,8CAA8D;AAG9D,gEAAqE;AACrE,wDAA6D;AAE7D;;;;GAIG;AACI,MAAM,gBAAgB,GAAG,CAAC,QAA2B,EAAE,YAA0B,EAAc,EAAE;IACtG,MAAM,KAAK,GAAG,YAAY,CAAC,UAAU,CAAC,QAAQ,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;IAC/D,MAAM,KAAK,GAAG;QACZ,KAAK;QACL,GAAG,EAAE,QAAQ,CAAC,QAAQ,CAAC,SAAS;YAC9B,CAAC,CAAC,sCAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,EAAE,IAAI,uBAAU,CAAC,YAAY,CAAC,CAAC,aAAa,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;YACrF,CAAC,CAAC,YAAY,CAAC,UAAU,CAAC,QAAQ,CAAC,QAAQ,CAAC,GAAG,CAAC;KACnD,CAAC;IAEF,OAAO,wCAAU,CAAC,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,OAAO,EAAE,QAAQ,CAAC,QAAQ,EAAE,QAAQ,CAAC,IAAI,EAAE,0BAAW,CAAC,CAAC;AACnG,CAAC,CAAC;AAVW,QAAA,gBAAgB,oBAU3B;AAEF,MAAa,cAAc;IAUzB,YAAY,aAAgC,EAAmB,SAAoB;QAApB,cAAS,GAAT,SAAS,CAAW;QAJ3E,eAAU,GAA0B,EAAE,CAAC;QAEvC,qBAAgB,GAAG,uDAAuD,CAAC;QAGjF,IAAI,CAAC,iBAAiB,GAAG,IAAI,CAAC;QAC9B,IAAI,CAAC,cAAc,GAAG,IAAI,+BAAc,CAAC,aAAa,EAAE,OAAO,CAAC,CAAC;IACnE,CAAC;IAEM,SAAS,CAAC,QAA0B;QACzC,IAAI,CAAC,UAAU,GAAG,EAAE,CAAC;QACrB,IAAI,QAAQ,EAAE;YACZ,IAAI,CAAC,iBAAiB,GAAG,QAAQ,CAAC,QAAQ,CAAC;YAC3C,IAAI,CAAC,UAAU,GAAG,QAAQ,CAAC,UAAU,CAAC;YACtC,IAAI,CAAC,2BAA2B,GAAG,QAAQ,CAAC,2BAA2B,CAAC;YACxE,IAAI,CAAC,WAAW,GAAG,QAAQ,CAAC,WAAW,CAAC;YACxC,2DAA2D;YAC3D,IAAI,QAAQ,CAAC,WAAW,KAAK,QAAQ,IAAI,QAAQ,CAAC,YAAY,KAAK,QAAQ,EAAE;gBAC3E,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,+BAAkB,CAAC,QAAQ,CAAC,CAAC,CAAC;aACxD;SACF;QACD,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,uCAAsB,EAAE,CAAC,CAAC;IACrD,CAAC;IAEY,YAAY,CAAC,YAA0B,EAAE,YAAY,GAAG,KAAK;;YACxE,IAAI,CAAC,IAAI,CAAC,iBAAiB,EAAE;gBAC3B,OAAO,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;aAC5B;YAED,MAAM,gBAAgB,GAAG,EAAE,CAAC;YAC5B,IAAI;gBACF,MAAM,YAAY,GAAiB,mCAAkB,CAAC,eAAe,CACnE,YAAY,EACZ,EAAE,UAAU,EAAE,IAAI,CAAC,UAAU,EAAE,WAAW,EAAE,IAAI,CAAC,WAAW,EAAE,EAC9D,IAAI,CACL,CAAC;gBAEF,IAAI,KAAK,GAAG,CAAC,CAAC;gBACd,KAAK,MAAM,cAAc,IAAI,YAAY,CAAC,SAAS,EAAE;oBACnD,cAAc,CAAC,YAAY,GAAG,YAAY,CAAC;oBAC3C,cAAc,CAAC,eAAe,GAAG,KAAK,CAAC;oBACvC,cAAc,CAAC,2BAA2B,GAAG,IAAI,CAAC,2BAA2B,CAAC;oBAE9E,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,YAAY,CAAC,YAAY,EAAE,cAAc,CAAC,CAAC;oBAExF,MAAM,GAAG,GAAI,cAAgD,CAAC;oBAC9D,IAAI,GAAG,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE;wBACzB,+DAA+D;wBAC/D,gBAAgB,CAAC,IAAI,CAAC,GAAG,GAAG,CAAC,MAAM,CAAC,CAAC;qBACtC;oBACD,IAAI,GAAG,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE;wBAC3B,gBAAgB,CAAC,IAAI,CAAC,GAAG,GAAG,CAAC,QAAQ,CAAC,CAAC;qBACxC;oBAED,gBAAgB,CAAC,IAAI,CAAC,GAAG,UAAU,CAAC,CAAC;oBACrC,gBAAgB,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,uBAAuB,CAAC,YAAY,EAAE,cAAc,CAAC,CAAC,CAAC;oBACrF,KAAK,EAAE,CAAC;iBACT;aACF;YAAC,OAAO,GAAG,EAAE;gBACZ,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,uBAAuB,EAAE,EAAE,KAAK,EAAE,IAAA,oCAA0B,EAAC,GAAG,CAAC,EAAE,CAAC,CAAC;aAC/F;YAED,IAAI,WAAuB,CAAC;YAC5B,MAAM,eAAe,GAAG,IAAI,GAAG,EAAE,CAAC;YAClC,MAAM,wBAAwB,GAAiB,EAAE,CAAC;YAClD,KAAK,IAAI,GAAG,IAAI,gBAAgB,EAAE;gBAChC;;;;mBAIG;gBACH,IAAI,YAAY,IAAI,GAAG,CAAC,OAAO,KAAK,IAAI,CAAC,gBAAgB,EAAE;oBACzD,SAAS;iBACV;gBAED,IAAI,MAAM,CAAC,SAAS,CAAC,cAAc,CAAC,IAAI,CAAC,GAAG,EAAE,UAAU,CAAC,EAAE;oBACzD,GAAG,GAAG,IAAA,wBAAgB,EAAC,GAAG,EAAE,YAAY,CAAC,CAAC;iBAC3C;gBAED,IAAI,CAAC,GAAG,CAAC,MAAM,EAAE;oBACf,GAAG,CAAC,MAAM,GAAG,0BAAW,CAAC;iBAC1B;gBAED,IACE,WAAW;oBACX,WAAW,CAAC,OAAO,KAAK,GAAG,CAAC,OAAO;oBACnC,WAAW,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,KAAK,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI;oBACnD,IAAI,CAAC,GAAG,CAAC,WAAW,CAAC,KAAK,CAAC,GAAG,CAAC,SAAS,GAAG,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,SAAS,CAAC,IAAI,CAAC,EACxE;oBACA,WAAW,CAAC,KAAK,CAAC,GAAG,GAAG,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC;oBACtC,SAAS;iBACV;qBAAM;oBACL,WAAW,GAAG,GAAG,CAAC;iBACnB;gBAED,MAAM,MAAM,GAAG,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,GAAG,GAAG,GAAG,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,SAAS,GAAG,GAAG,GAAG,GAAG,CAAC,OAAO,CAAC;gBAC1F,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE;oBAChC,wBAAwB,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;oBACnC,eAAe,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;iBAC7B;aACF;YAED,OAAO,wBAAwB,CAAC;QAClC,CAAC;KAAA;IACO,uBAAuB,CAAC,QAAsB,EAAE,OAA2B;QACjF,MAAM,MAAM,GAAG,EAAE,CAAC;QAElB,KAAK,MAAM,SAAS,IAAI,IAAI,CAAC,UAAU,EAAE;YACvC,MAAM,CAAC,IAAI,CAAC,GAAG,SAAS,CAAC,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC,CAAC;SACvD;QACD,OAAO,MAAM,CAAC;IAChB,CAAC;CACF;AAtHD,wCAsHC"}
|
|
@@ -488,6 +488,85 @@ Source: [${testHelper_1.SCHEMA_ID}](file:///${testHelper_1.SCHEMA_ID})`);
|
|
|
488
488
|
(0, chai_1.expect)(result).to.be.null;
|
|
489
489
|
}));
|
|
490
490
|
});
|
|
491
|
+
describe('Hover on anyOf', () => {
|
|
492
|
+
it('should show all matched schemas in anyOf', () => __awaiter(void 0, void 0, void 0, function* () {
|
|
493
|
+
languageService.addSchema(testHelper_1.SCHEMA_ID, {
|
|
494
|
+
title: 'The Root',
|
|
495
|
+
description: 'Root Object',
|
|
496
|
+
type: 'object',
|
|
497
|
+
properties: {
|
|
498
|
+
child: {
|
|
499
|
+
title: 'Child',
|
|
500
|
+
anyOf: [
|
|
501
|
+
{
|
|
502
|
+
$ref: '#/definitions/FirstChoice',
|
|
503
|
+
},
|
|
504
|
+
{
|
|
505
|
+
$ref: '#/definitions/SecondChoice',
|
|
506
|
+
},
|
|
507
|
+
],
|
|
508
|
+
},
|
|
509
|
+
},
|
|
510
|
+
required: ['child'],
|
|
511
|
+
additionalProperties: false,
|
|
512
|
+
definitions: {
|
|
513
|
+
FirstChoice: {
|
|
514
|
+
title: 'FirstChoice',
|
|
515
|
+
description: 'The first choice',
|
|
516
|
+
type: 'object',
|
|
517
|
+
properties: {
|
|
518
|
+
choice: {
|
|
519
|
+
title: 'Choice',
|
|
520
|
+
default: 'first',
|
|
521
|
+
enum: ['first'],
|
|
522
|
+
type: 'string',
|
|
523
|
+
},
|
|
524
|
+
property_a: {
|
|
525
|
+
title: 'Property A',
|
|
526
|
+
type: 'string',
|
|
527
|
+
},
|
|
528
|
+
},
|
|
529
|
+
required: ['property_a'],
|
|
530
|
+
},
|
|
531
|
+
SecondChoice: {
|
|
532
|
+
title: 'SecondChoice',
|
|
533
|
+
description: 'The second choice',
|
|
534
|
+
type: 'object',
|
|
535
|
+
properties: {
|
|
536
|
+
choice: {
|
|
537
|
+
title: 'Choice',
|
|
538
|
+
default: 'second',
|
|
539
|
+
enum: ['second'],
|
|
540
|
+
type: 'string',
|
|
541
|
+
},
|
|
542
|
+
property_b: {
|
|
543
|
+
title: 'Property B',
|
|
544
|
+
type: 'string',
|
|
545
|
+
},
|
|
546
|
+
},
|
|
547
|
+
required: ['property_b'],
|
|
548
|
+
},
|
|
549
|
+
},
|
|
550
|
+
});
|
|
551
|
+
let content = 'ch|i|ld:';
|
|
552
|
+
let result = yield parseSetup(content);
|
|
553
|
+
assert.strictEqual(vscode_languageserver_types_1.MarkupContent.is(result.contents), true);
|
|
554
|
+
assert.strictEqual(result.contents.value, `#### FirstChoice || SecondChoice\n\nThe first choice || The second choice\n\nSource: [${testHelper_1.SCHEMA_ID}](file:///${testHelper_1.SCHEMA_ID})`);
|
|
555
|
+
(0, chai_1.expect)(telemetry.messages).to.be.empty;
|
|
556
|
+
//use case 1:
|
|
557
|
+
content = 'ch|i|ld: \n property_a: test';
|
|
558
|
+
result = yield parseSetup(content);
|
|
559
|
+
assert.strictEqual(vscode_languageserver_types_1.MarkupContent.is(result.contents), true);
|
|
560
|
+
assert.strictEqual(result.contents.value, `#### FirstChoice\n\nThe first choice\n\nSource: [${testHelper_1.SCHEMA_ID}](file:///${testHelper_1.SCHEMA_ID})`);
|
|
561
|
+
(0, chai_1.expect)(telemetry.messages).to.be.empty;
|
|
562
|
+
//use case 2:
|
|
563
|
+
content = 'ch|i|ld: \n property_b: test';
|
|
564
|
+
result = yield parseSetup(content);
|
|
565
|
+
assert.strictEqual(vscode_languageserver_types_1.MarkupContent.is(result.contents), true);
|
|
566
|
+
assert.strictEqual(result.contents.value, `#### SecondChoice\n\nThe second choice\n\nSource: [${testHelper_1.SCHEMA_ID}](file:///${testHelper_1.SCHEMA_ID})`);
|
|
567
|
+
(0, chai_1.expect)(telemetry.messages).to.be.empty;
|
|
568
|
+
}));
|
|
569
|
+
});
|
|
491
570
|
describe('Bug fixes', () => {
|
|
492
571
|
it('should convert binary data correctly', () => __awaiter(void 0, void 0, void 0, function* () {
|
|
493
572
|
const content = 'foo: [ !!binary R0lG|O|DlhDAAMAIQAAP//9/X17unp5WZmZgAAAOfn515eXvPz7Y6OjuDg4J+fn5OTk6enp56enmleECcgggoBADs= ]\n'; // len: 107, pos: 20
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"hover.test.js","sourceRoot":"","sources":["../../../test/hover.test.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"hover.test.js","sourceRoot":"","sources":["../../../test/hover.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1333,7 +1333,7 @@ obj:
|
|
|
1333
1333
|
(0, chai_1.expect)(result).to.be.not.empty;
|
|
1334
1334
|
(0, chai_1.expect)(telemetry.messages).to.be.empty;
|
|
1335
1335
|
(0, chai_1.expect)(result.length).to.eq(1);
|
|
1336
|
-
assert.deepStrictEqual(result[0].message, 'String does not match the pattern of "^\\$\\{\\{\\s*
|
|
1336
|
+
assert.deepStrictEqual(result[0].message, 'String does not match the pattern of "^\\$\\{\\{\\s*(secrets|inputs)\\s*\\}\\}$".');
|
|
1337
1337
|
}));
|
|
1338
1338
|
it('should handle not valid schema object', () => __awaiter(void 0, void 0, void 0, function* () {
|
|
1339
1339
|
const schema = 'Foo';
|