yaml-language-server 1.20.1-1758417.0 → 1.20.1-1dc7e48.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/bin/yaml-language-server +24 -0
- package/eslint-result.sarif +93 -88
- package/lib/esm/languageservice/services/yamlCodeActions.js +3 -1
- package/lib/esm/languageservice/services/yamlCodeActions.js.map +1 -1
- package/lib/esm/languageservice/services/yamlCompletion.d.ts +1 -2
- package/lib/esm/languageservice/services/yamlCompletion.js +79 -74
- package/lib/esm/languageservice/services/yamlCompletion.js.map +1 -1
- package/lib/esm/languageservice/services/yamlHover.js +3 -4
- package/lib/esm/languageservice/services/yamlHover.js.map +1 -1
- package/lib/esm/languageservice/utils/objects.js +3 -2
- package/lib/esm/languageservice/utils/objects.js.map +1 -1
- package/lib/esm/languageservice/utils/yamlScalar.d.ts +1 -0
- package/lib/esm/languageservice/utils/yamlScalar.js +69 -0
- package/lib/esm/languageservice/utils/yamlScalar.js.map +1 -0
- package/lib/esm/yamlServerInit.js +4 -0
- package/lib/esm/yamlServerInit.js.map +1 -1
- package/lib/umd/languageservice/services/yamlCodeActions.js +4 -2
- package/lib/umd/languageservice/services/yamlCodeActions.js.map +1 -1
- package/lib/umd/languageservice/services/yamlCompletion.d.ts +1 -2
- package/lib/umd/languageservice/services/yamlCompletion.js +80 -75
- package/lib/umd/languageservice/services/yamlCompletion.js.map +1 -1
- package/lib/umd/languageservice/services/yamlHover.js +4 -5
- package/lib/umd/languageservice/services/yamlHover.js.map +1 -1
- package/lib/umd/languageservice/utils/objects.js +4 -3
- package/lib/umd/languageservice/utils/objects.js.map +1 -1
- package/lib/umd/languageservice/utils/yamlScalar.d.ts +1 -0
- package/lib/umd/languageservice/utils/yamlScalar.js +83 -0
- package/lib/umd/languageservice/utils/yamlScalar.js.map +1 -0
- package/lib/umd/yamlServerInit.js +4 -0
- package/lib/umd/yamlServerInit.js.map +1 -1
- package/out/server/src/languageservice/services/yamlCodeActions.js +3 -1
- package/out/server/src/languageservice/services/yamlCodeActions.js.map +1 -1
- package/out/server/src/languageservice/services/yamlCompletion.d.ts +1 -2
- package/out/server/src/languageservice/services/yamlCompletion.js +79 -74
- package/out/server/src/languageservice/services/yamlCompletion.js.map +1 -1
- package/out/server/src/languageservice/services/yamlHover.js +3 -4
- package/out/server/src/languageservice/services/yamlHover.js.map +1 -1
- package/out/server/src/languageservice/utils/objects.js +3 -2
- package/out/server/src/languageservice/utils/objects.js.map +1 -1
- package/out/server/src/languageservice/utils/yamlScalar.d.ts +1 -0
- package/out/server/src/languageservice/utils/yamlScalar.js +73 -0
- package/out/server/src/languageservice/utils/yamlScalar.js.map +1 -0
- package/out/server/src/yamlServerInit.js +4 -0
- package/out/server/src/yamlServerInit.js.map +1 -1
- package/out/server/test/autoCompletion.test.js +3 -3
- package/out/server/test/autoCompletion.test.js.map +1 -1
- package/out/server/test/autoCompletionFix.test.js +206 -14
- package/out/server/test/autoCompletionFix.test.js.map +1 -1
- package/out/server/test/hover.test.js +191 -7
- package/out/server/test/hover.test.js.map +1 -1
- package/out/server/test/schemaValidation.test.js +62 -0
- package/out/server/test/schemaValidation.test.js.map +1 -1
- package/out/server/test/utils/serviceSetup.d.ts +2 -0
- package/out/server/test/utils/serviceSetup.js +4 -0
- package/out/server/test/utils/serviceSetup.js.map +1 -1
- package/out/server/test/yamlCodeActions.test.js +15 -0
- package/out/server/test/yamlCodeActions.test.js.map +1 -1
- package/out/server/test/yamlLanguageService.test.js +1 -1
- package/out/server/test/yamlLanguageService.test.js.map +1 -1
- package/package.json +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"yamlHover.js","sourceRoot":"","sources":["../../../../src/languageservice/services/yamlHover.ts"],"names":[],"mappings":"AAAA;;;;gGAIgG;;;;;;;;;;;;;IAEhG,6EAAgG;IAChG,gDAA0D;IAG1D,yDAAmE;IAEnE,6DAA8D;IAE9D,yDAAyE;IAEzE,2CAAiC;IACjC,6BAA6B;IAC7B,qCAAqC;IAGrC,+BAAkD;
|
|
1
|
+
{"version":3,"file":"yamlHover.js","sourceRoot":"","sources":["../../../../src/languageservice/services/yamlHover.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,16 +8,17 @@
|
|
|
8
8
|
if (v !== undefined) module.exports = v;
|
|
9
9
|
}
|
|
10
10
|
else if (typeof define === "function" && define.amd) {
|
|
11
|
-
define(["require", "exports"], factory);
|
|
11
|
+
define(["require", "exports", "../parser/scalar-type"], factory);
|
|
12
12
|
}
|
|
13
13
|
})(function (require, exports) {
|
|
14
14
|
"use strict";
|
|
15
15
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
16
16
|
exports.convertErrorToTelemetryMsg = exports.isIterable = exports.isString = exports.isBoolean = exports.isDefined = exports.isNumber = exports.equals = void 0;
|
|
17
|
+
const scalar_type_1 = require("../parser/scalar-type");
|
|
17
18
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/explicit-module-boundary-types
|
|
18
19
|
function equals(one, other, type) {
|
|
19
|
-
if (type === 'boolean') {
|
|
20
|
-
one =
|
|
20
|
+
if (type === 'boolean' && typeof one === 'string') {
|
|
21
|
+
one = (0, scalar_type_1.parseYamlBoolean)(one);
|
|
21
22
|
}
|
|
22
23
|
if (one === other) {
|
|
23
24
|
return true;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"objects.js","sourceRoot":"","sources":["../../../../src/languageservice/utils/objects.ts"],"names":[],"mappings":"AAAA;;;gGAGgG;;;;;;;;;;;;;IAEhG,iHAAiH;IACjH,SAAgB,MAAM,CAAC,GAAQ,EAAE,KAAU,EAAE,IAAU;QACrD,IAAI,IAAI,KAAK,SAAS,EAAE;
|
|
1
|
+
{"version":3,"file":"objects.js","sourceRoot":"","sources":["../../../../src/languageservice/utils/objects.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export declare function toYamlStringScalar(s: string, preferSingleQuote?: boolean): string;
|
|
@@ -0,0 +1,83 @@
|
|
|
1
|
+
/*---------------------------------------------------------------------------------------------
|
|
2
|
+
* Copyright (c) IBM Corporation. All rights reserved.
|
|
3
|
+
* Licensed under the MIT License. See License.txt in the project root for license information.
|
|
4
|
+
*--------------------------------------------------------------------------------------------*/
|
|
5
|
+
(function (factory) {
|
|
6
|
+
if (typeof module === "object" && typeof module.exports === "object") {
|
|
7
|
+
var v = factory(require, exports);
|
|
8
|
+
if (v !== undefined) module.exports = v;
|
|
9
|
+
}
|
|
10
|
+
else if (typeof define === "function" && define.amd) {
|
|
11
|
+
define(["require", "exports"], factory);
|
|
12
|
+
}
|
|
13
|
+
})(function (require, exports) {
|
|
14
|
+
"use strict";
|
|
15
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
16
|
+
exports.toYamlStringScalar = void 0;
|
|
17
|
+
function toYamlStringScalar(s, preferSingleQuote = false) {
|
|
18
|
+
const quote = preferSingleQuote ? "'" : '"';
|
|
19
|
+
// empty string
|
|
20
|
+
if (s.length === 0) {
|
|
21
|
+
return `${quote}${quote}`;
|
|
22
|
+
}
|
|
23
|
+
// single quote character
|
|
24
|
+
if (s.length === 1 && s === '"') {
|
|
25
|
+
return '"\\""';
|
|
26
|
+
}
|
|
27
|
+
// literal quote strings like "" or ''
|
|
28
|
+
if (s.length === 2 && ((s[0] === '"' && s[1] === '"') || (s[0] === "'" && s[1] === "'"))) {
|
|
29
|
+
return s[0] === '"' ? '"\\"\\""' : `"''"`;
|
|
30
|
+
}
|
|
31
|
+
// check if the string is already a properly quoted YAML string
|
|
32
|
+
if (s.length >= 2) {
|
|
33
|
+
const firstChar = s[0];
|
|
34
|
+
const lastChar = s[s.length - 1];
|
|
35
|
+
if ((firstChar === '"' && lastChar === '"') || (firstChar === "'" && lastChar === "'")) {
|
|
36
|
+
return s;
|
|
37
|
+
}
|
|
38
|
+
}
|
|
39
|
+
// strings containing quotes or backslashes
|
|
40
|
+
if (/["\\]/.test(s)) {
|
|
41
|
+
return JSON.stringify(s);
|
|
42
|
+
}
|
|
43
|
+
// support YAML spec 1.1 boolean values and null
|
|
44
|
+
if (/^(?:on|off|true|false|yes|no|null|~)$/i.test(s)) {
|
|
45
|
+
return `${quote}${s}${quote}`;
|
|
46
|
+
}
|
|
47
|
+
// numeric values: integer/float, hex (0x), and octal (0o or YAML 1.1 style 0[0-7]+)
|
|
48
|
+
if (/^-?(?:0|[1-9]\d*)(?:\.\d+)?(?:[eE][+-]?\d+)?$/.test(s) ||
|
|
49
|
+
/^0x[0-9a-fA-F]+$/.test(s) ||
|
|
50
|
+
/^0o[0-7]+$/.test(s) ||
|
|
51
|
+
/^0[0-7]+$/.test(s)) {
|
|
52
|
+
return `"${s}"`;
|
|
53
|
+
}
|
|
54
|
+
// leading/trailing whitespaces need quoting
|
|
55
|
+
if (/^\s|\s$/.test(s)) {
|
|
56
|
+
return preferSingleQuote ? `'${s.replace(/'/g, "''")}'` : JSON.stringify(s);
|
|
57
|
+
}
|
|
58
|
+
// comment indicator
|
|
59
|
+
if (/(?:^|\s)#/.test(s)) {
|
|
60
|
+
return preferSingleQuote ? `'${s.replace(/'/g, "''")}'` : JSON.stringify(s);
|
|
61
|
+
}
|
|
62
|
+
// reserved indicators that cannot start a plain scalar
|
|
63
|
+
if (/^[\][{}#&*!|>'"%@`]/.test(s)) {
|
|
64
|
+
return preferSingleQuote ? `'${s.replace(/'/g, "''")}'` : JSON.stringify(s);
|
|
65
|
+
}
|
|
66
|
+
// -, ?, or : followed by space or end
|
|
67
|
+
if (/^[-?:](\s|$)/.test(s)) {
|
|
68
|
+
return preferSingleQuote ? `'${s.replace(/'/g, "''")}'` : JSON.stringify(s);
|
|
69
|
+
}
|
|
70
|
+
// colon in middle (mapping key indicator)
|
|
71
|
+
// e.g. `foo: bar` or `foo : bar` needs quoting, but `foo:bar` does not
|
|
72
|
+
if (/(?:^|[^:]):(?:\s|$)/.test(s)) {
|
|
73
|
+
return preferSingleQuote ? `'${s.replace(/'/g, "''")}'` : JSON.stringify(s);
|
|
74
|
+
}
|
|
75
|
+
// newlines, tabs, or carriage return
|
|
76
|
+
if (/[\n\t\r]/.test(s)) {
|
|
77
|
+
return JSON.stringify(s);
|
|
78
|
+
}
|
|
79
|
+
return s;
|
|
80
|
+
}
|
|
81
|
+
exports.toYamlStringScalar = toYamlStringScalar;
|
|
82
|
+
});
|
|
83
|
+
//# sourceMappingURL=yamlScalar.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"yamlScalar.js","sourceRoot":"","sources":["../../../../src/languageservice/utils/yamlScalar.ts"],"names":[],"mappings":"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"}
|
|
@@ -102,6 +102,10 @@
|
|
|
102
102
|
(0, yamlCommands_1.registerCommands)(commandExecutor_1.commandExecutor, this.connection);
|
|
103
103
|
await this.setupl10nBundle(params);
|
|
104
104
|
return {
|
|
105
|
+
serverInfo: {
|
|
106
|
+
name: 'yaml-language-server',
|
|
107
|
+
version: process.env.YAML_LANGUAGE_SERVER_VERSION || 'unknown',
|
|
108
|
+
},
|
|
105
109
|
capabilities: {
|
|
106
110
|
textDocumentSync: vscode_languageserver_1.TextDocumentSyncKind.Incremental,
|
|
107
111
|
completionProvider: { resolveProvider: false },
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"yamlServerInit.js","sourceRoot":"","sources":["../../src/yamlServerInit.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"yamlServerInit.js","sourceRoot":"","sources":["../../src/yamlServerInit.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,6 +9,7 @@ const vscode_languageserver_types_1 = require("vscode-languageserver-types");
|
|
|
9
9
|
const commands_1 = require("../../commands");
|
|
10
10
|
const path = require("path");
|
|
11
11
|
const textBuffer_1 = require("../utils/textBuffer");
|
|
12
|
+
const yamlScalar_1 = require("../utils/yamlScalar");
|
|
12
13
|
const jsonParser07_1 = require("../parser/jsonParser07");
|
|
13
14
|
const strings_1 = require("../utils/strings");
|
|
14
15
|
const arrUtils_1 = require("../utils/arrUtils");
|
|
@@ -267,7 +268,8 @@ class YamlCodeActions {
|
|
|
267
268
|
continue;
|
|
268
269
|
}
|
|
269
270
|
for (const value of values) {
|
|
270
|
-
|
|
271
|
+
const scalar = typeof value === 'string' ? (0, yamlScalar_1.toYamlStringScalar)(value) : String(value);
|
|
272
|
+
results.push(vscode_languageserver_types_1.CodeAction.create(scalar, createWorkspaceEdit(document.uri, [vscode_languageserver_types_1.TextEdit.replace(diagnostic.range, scalar)]), vscode_languageserver_types_1.CodeActionKind.QuickFix));
|
|
271
273
|
}
|
|
272
274
|
}
|
|
273
275
|
return results;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"yamlCodeActions.js","sourceRoot":"","sources":["../../../../../src/languageservice/services/yamlCodeActions.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"yamlCodeActions.js","sourceRoot":"","sources":["../../../../../src/languageservice/services/yamlCodeActions.ts"],"names":[],"mappings":"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"}
|
|
@@ -66,8 +66,7 @@ export declare class YamlCompletion {
|
|
|
66
66
|
private fromMarkup;
|
|
67
67
|
private doesSupportMarkdown;
|
|
68
68
|
private findItemAtOffset;
|
|
69
|
-
|
|
70
|
-
convertToStringValue(param: unknown): string;
|
|
69
|
+
private getPropertyNamesCandidates;
|
|
71
70
|
getQuote(): string;
|
|
72
71
|
/**
|
|
73
72
|
* simplify `{$1:value}` to `value`
|
|
@@ -17,8 +17,8 @@ const jsonParser07_1 = require("../parser/jsonParser07");
|
|
|
17
17
|
const astUtils_1 = require("../utils/astUtils");
|
|
18
18
|
const modelineUtil_1 = require("./modelineUtil");
|
|
19
19
|
const schemaUtils_1 = require("../utils/schemaUtils");
|
|
20
|
+
const yamlScalar_1 = require("../utils/yamlScalar");
|
|
20
21
|
const l10n = require("@vscode/l10n");
|
|
21
|
-
const doubleQuotesEscapeRegExp = /[\\]+"/g;
|
|
22
22
|
const parentCompletionKind = vscode_languageserver_types_1.CompletionItemKind.Class;
|
|
23
23
|
const existingProposeItem = '__';
|
|
24
24
|
class YamlCompletion {
|
|
@@ -29,7 +29,6 @@ class YamlCompletion {
|
|
|
29
29
|
this.telemetry = telemetry;
|
|
30
30
|
this.completionEnabled = true;
|
|
31
31
|
this.arrayPrefixIndentation = '';
|
|
32
|
-
this.isNumberExp = /^\d+$/;
|
|
33
32
|
}
|
|
34
33
|
configure(languageSettings, yamlSettings) {
|
|
35
34
|
if (languageSettings) {
|
|
@@ -162,7 +161,7 @@ class YamlCompletion {
|
|
|
162
161
|
if (!(0, objects_1.isString)(label)) {
|
|
163
162
|
label = String(label);
|
|
164
163
|
}
|
|
165
|
-
label = label.replace(
|
|
164
|
+
label = label.replace(/\n|\\n/g, '↵');
|
|
166
165
|
if (label.length > 60) {
|
|
167
166
|
const shortendedLabel = label.substr(0, 57).trim() + '...';
|
|
168
167
|
if (!proposed[shortendedLabel]) {
|
|
@@ -178,13 +177,13 @@ class YamlCompletion {
|
|
|
178
177
|
completionItem.textEdit = vscode_languageserver_types_1.TextEdit.replace(overwriteRange, label);
|
|
179
178
|
}
|
|
180
179
|
else {
|
|
181
|
-
|
|
182
|
-
|
|
183
|
-
|
|
184
|
-
if (
|
|
185
|
-
|
|
186
|
-
|
|
187
|
-
completionItem.insertText =
|
|
180
|
+
const mdText = completionItem.insertText.replace(/\${[0-9]+[:|](.*)}/g, (s, arg) => arg).replace(/\$([0-9]+)/g, '');
|
|
181
|
+
// handle single special characters that need escaping: ', ", \
|
|
182
|
+
const singleCharMatch = mdText.match(/^([^:"]+):\s*(['\\"\\])$/);
|
|
183
|
+
if (singleCharMatch) {
|
|
184
|
+
const key = singleCharMatch[1];
|
|
185
|
+
const char = singleCharMatch[2];
|
|
186
|
+
completionItem.insertText = `${key}: ${this.getQuote()}\\${char}${this.getQuote()}`;
|
|
188
187
|
}
|
|
189
188
|
// trim $1 from end of completion
|
|
190
189
|
if (completionItem.insertText.endsWith('$1') && !isForParentCompletion) {
|
|
@@ -703,17 +702,36 @@ class YamlCompletion {
|
|
|
703
702
|
if (nodeParent && (0, yaml_1.isSeq)(nodeParent) && (0, schemaUtils_1.isPrimitiveType)(schema.schema)) {
|
|
704
703
|
this.addSchemaValueCompletions(schema.schema, separatorAfter, collector, {}, ignoreScalars);
|
|
705
704
|
}
|
|
706
|
-
if (schema.schema.
|
|
705
|
+
if (schema.schema.type === 'object' && schema.schema.propertyNames && schema.schema.additionalProperties !== false) {
|
|
707
706
|
const propertyNameSchema = (0, jsonParser07_1.asSchema)(schema.schema.propertyNames);
|
|
708
707
|
if (!propertyNameSchema.deprecationMessage && !propertyNameSchema.doNotSuggest) {
|
|
709
|
-
const
|
|
710
|
-
|
|
711
|
-
|
|
712
|
-
|
|
713
|
-
|
|
714
|
-
|
|
715
|
-
|
|
716
|
-
|
|
708
|
+
const doc = this.fromMarkup((propertyNameSchema.markdownDescription || propertyNameSchema.description || '') +
|
|
709
|
+
(propertyNameSchema.pattern ? `\n\n**Pattern:** \`${propertyNameSchema.pattern}\`` : ''));
|
|
710
|
+
const { candidates, impossible } = this.getPropertyNamesCandidates(propertyNameSchema);
|
|
711
|
+
if (impossible) {
|
|
712
|
+
// suggest nothing
|
|
713
|
+
}
|
|
714
|
+
else if (candidates.length) {
|
|
715
|
+
for (const key of candidates) {
|
|
716
|
+
collector.add({
|
|
717
|
+
kind: vscode_languageserver_types_1.CompletionItemKind.Property,
|
|
718
|
+
label: key,
|
|
719
|
+
insertText: `${key}: `,
|
|
720
|
+
insertTextFormat: vscode_languageserver_types_1.InsertTextFormat.PlainText,
|
|
721
|
+
documentation: doc,
|
|
722
|
+
});
|
|
723
|
+
}
|
|
724
|
+
}
|
|
725
|
+
else {
|
|
726
|
+
const label = propertyNameSchema.title || 'property';
|
|
727
|
+
collector.add({
|
|
728
|
+
kind: vscode_languageserver_types_1.CompletionItemKind.Property,
|
|
729
|
+
label,
|
|
730
|
+
insertText: '$' + `{1:${label}}: `,
|
|
731
|
+
insertTextFormat: vscode_languageserver_types_1.InsertTextFormat.Snippet,
|
|
732
|
+
documentation: doc,
|
|
733
|
+
});
|
|
734
|
+
}
|
|
717
735
|
}
|
|
718
736
|
}
|
|
719
737
|
}
|
|
@@ -855,7 +873,7 @@ class YamlCompletion {
|
|
|
855
873
|
}
|
|
856
874
|
nValueProposals += propertySchema.enum.length;
|
|
857
875
|
}
|
|
858
|
-
if (propertySchema.const) {
|
|
876
|
+
if ((0, objects_1.isDefined)(propertySchema.const)) {
|
|
859
877
|
if (!value) {
|
|
860
878
|
value = this.getInsertTextForGuessedValue(propertySchema.const, '', type);
|
|
861
879
|
value = this.evaluateTab1Symbol(value); // prevent const being selected after snippet insert
|
|
@@ -945,7 +963,7 @@ class YamlCompletion {
|
|
|
945
963
|
let value = propertySchema.default || propertySchema.const;
|
|
946
964
|
if (value) {
|
|
947
965
|
if (type === 'string') {
|
|
948
|
-
value =
|
|
966
|
+
value = (0, yamlScalar_1.toYamlStringScalar)(value);
|
|
949
967
|
}
|
|
950
968
|
insertText += `${indent}${key}: \${${insertIndex++}:${value}}\n`;
|
|
951
969
|
}
|
|
@@ -989,7 +1007,7 @@ class YamlCompletion {
|
|
|
989
1007
|
key === 'null' ? this.getInsertTextForValue(key, '', 'string') : key}: \${${insertIndex++}:${propertySchema.default}}\n`;
|
|
990
1008
|
break;
|
|
991
1009
|
case 'string':
|
|
992
|
-
insertText += `${indent}${key}: \${${insertIndex++}:${
|
|
1010
|
+
insertText += `${indent}${key}: \${${insertIndex++}:${(0, yamlScalar_1.toYamlStringScalar)(propertySchema.default)}}\n`;
|
|
993
1011
|
break;
|
|
994
1012
|
case 'array':
|
|
995
1013
|
case 'object':
|
|
@@ -1050,12 +1068,10 @@ class YamlCompletion {
|
|
|
1050
1068
|
}
|
|
1051
1069
|
return this.getInsertTextForValue(value, separatorAfter, type);
|
|
1052
1070
|
case 'string': {
|
|
1053
|
-
|
|
1054
|
-
|
|
1055
|
-
snippetValue = this.getInsertTextForPlainText(snippetValue); // escape \ and }
|
|
1056
|
-
if (type === 'string') {
|
|
1057
|
-
snippetValue = this.convertToStringValue(snippetValue);
|
|
1071
|
+
if (type === 'number' || type === 'integer') {
|
|
1072
|
+
return '${1:' + value + '}' + separatorAfter;
|
|
1058
1073
|
}
|
|
1074
|
+
const snippetValue = this.getInsertTextForPlainText((0, yamlScalar_1.toYamlStringScalar)(value));
|
|
1059
1075
|
return '${1:' + snippetValue + '}' + separatorAfter;
|
|
1060
1076
|
}
|
|
1061
1077
|
case 'number':
|
|
@@ -1065,7 +1081,7 @@ class YamlCompletion {
|
|
|
1065
1081
|
return this.getInsertTextForValue(value, separatorAfter, type);
|
|
1066
1082
|
}
|
|
1067
1083
|
getInsertTextForPlainText(text) {
|
|
1068
|
-
return text.replace(/[
|
|
1084
|
+
return text.replace(/\\(?=[$}\\])/g, '\\\\').replace(/[$}]/g, '\\$&');
|
|
1069
1085
|
}
|
|
1070
1086
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
1071
1087
|
getInsertTextForValue(value, separatorAfter, type) {
|
|
@@ -1083,7 +1099,7 @@ class YamlCompletion {
|
|
|
1083
1099
|
}
|
|
1084
1100
|
type = Array.isArray(type) ? type[0] : type;
|
|
1085
1101
|
if (type === 'string') {
|
|
1086
|
-
value =
|
|
1102
|
+
value = (0, yamlScalar_1.toYamlStringScalar)(String(value), this.isSingleQuote);
|
|
1087
1103
|
}
|
|
1088
1104
|
return this.getInsertTextForPlainText(value + separatorAfter);
|
|
1089
1105
|
}
|
|
@@ -1164,11 +1180,11 @@ class YamlCompletion {
|
|
|
1164
1180
|
type = 'array';
|
|
1165
1181
|
}
|
|
1166
1182
|
let label;
|
|
1167
|
-
if (typeof value
|
|
1183
|
+
if (typeof value === 'object') {
|
|
1168
1184
|
label = l10n.t('Default Value');
|
|
1169
1185
|
}
|
|
1170
1186
|
else {
|
|
1171
|
-
label =
|
|
1187
|
+
label = this.getLabelForValue(value);
|
|
1172
1188
|
}
|
|
1173
1189
|
collector.add({
|
|
1174
1190
|
kind: this.getSuggestionKind(type),
|
|
@@ -1246,7 +1262,10 @@ class YamlCompletion {
|
|
|
1246
1262
|
if (Array.isArray(value)) {
|
|
1247
1263
|
return JSON.stringify(value);
|
|
1248
1264
|
}
|
|
1249
|
-
|
|
1265
|
+
if (typeof value === 'string') {
|
|
1266
|
+
return (0, yamlScalar_1.toYamlStringScalar)(value, this.isSingleQuote);
|
|
1267
|
+
}
|
|
1268
|
+
return String(value);
|
|
1250
1269
|
}
|
|
1251
1270
|
collectDefaultSnippets(schema, separatorAfter, collector, settings, arrayDepth = 0) {
|
|
1252
1271
|
if (Array.isArray(schema.defaultSnippets)) {
|
|
@@ -1435,50 +1454,36 @@ class YamlCompletion {
|
|
|
1435
1454
|
}
|
|
1436
1455
|
return 0;
|
|
1437
1456
|
}
|
|
1438
|
-
|
|
1439
|
-
let
|
|
1440
|
-
|
|
1441
|
-
|
|
1442
|
-
|
|
1443
|
-
|
|
1444
|
-
|
|
1445
|
-
|
|
1446
|
-
|
|
1447
|
-
|
|
1448
|
-
|
|
1449
|
-
|
|
1450
|
-
|
|
1451
|
-
|
|
1452
|
-
|
|
1453
|
-
|
|
1454
|
-
}
|
|
1455
|
-
if (value.indexOf('"') !== -1) {
|
|
1456
|
-
value = value.replace(doubleQuotesEscapeRegExp, '"');
|
|
1457
|
-
}
|
|
1458
|
-
let doQuote = !isNaN(parseInt(value)) || value.charAt(0) === '@';
|
|
1459
|
-
if (!doQuote) {
|
|
1460
|
-
// need to quote value if in `foo: bar`, `foo : bar` (mapping) or `foo:` (partial map) format
|
|
1461
|
-
// but `foo:bar` and `:bar` (colon without white-space after it) are just plain string
|
|
1462
|
-
let idx = value.indexOf(':', 0);
|
|
1463
|
-
for (; idx > 0 && idx < value.length; idx = value.indexOf(':', idx + 1)) {
|
|
1464
|
-
if (idx === value.length - 1) {
|
|
1465
|
-
// `foo:` (partial map) format
|
|
1466
|
-
doQuote = true;
|
|
1467
|
-
break;
|
|
1468
|
-
}
|
|
1469
|
-
// there are only two valid kinds of white-space in yaml: space or tab
|
|
1470
|
-
// ref: https://yaml.org/spec/1.2.1/#id2775170
|
|
1471
|
-
const nextChar = value.charAt(idx + 1);
|
|
1472
|
-
if (nextChar === '\t' || nextChar === ' ') {
|
|
1473
|
-
doQuote = true;
|
|
1474
|
-
break;
|
|
1457
|
+
getPropertyNamesCandidates(schema) {
|
|
1458
|
+
let impossible = false;
|
|
1459
|
+
const collect = (node) => {
|
|
1460
|
+
if (!node || typeof node !== 'object')
|
|
1461
|
+
return null;
|
|
1462
|
+
if (Array.isArray(node.allOf) && node.allOf.length) {
|
|
1463
|
+
let intersection = null;
|
|
1464
|
+
for (const part of node.allOf) {
|
|
1465
|
+
const partSet = collect(part);
|
|
1466
|
+
if (!partSet)
|
|
1467
|
+
continue;
|
|
1468
|
+
intersection = intersection ? new Set([...intersection].filter((v) => partSet.has(v))) : new Set(partSet);
|
|
1469
|
+
if (intersection.size === 0) {
|
|
1470
|
+
impossible = true;
|
|
1471
|
+
return new Set();
|
|
1472
|
+
}
|
|
1475
1473
|
}
|
|
1474
|
+
if (intersection)
|
|
1475
|
+
return intersection;
|
|
1476
1476
|
}
|
|
1477
|
-
|
|
1478
|
-
|
|
1479
|
-
|
|
1480
|
-
|
|
1481
|
-
|
|
1477
|
+
const result = new Set();
|
|
1478
|
+
if (typeof node.const === 'string')
|
|
1479
|
+
result.add(node.const);
|
|
1480
|
+
node.enum?.forEach((val) => typeof val === 'string' && result.add(val));
|
|
1481
|
+
node.anyOf?.forEach((branch) => collect(branch)?.forEach((val) => result.add(val)));
|
|
1482
|
+
node.oneOf?.forEach((branch) => collect(branch)?.forEach((val) => result.add(val)));
|
|
1483
|
+
return result.size ? result : null;
|
|
1484
|
+
};
|
|
1485
|
+
const set = collect(schema);
|
|
1486
|
+
return { candidates: set ? [...set] : [], impossible };
|
|
1482
1487
|
}
|
|
1483
1488
|
getQuote() {
|
|
1484
1489
|
return this.isSingleQuote ? `'` : `"`;
|