yaml-language-server 1.20.1-1758417.0 → 1.20.1-23a2e61.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 +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 +0 -2
- package/lib/esm/languageservice/services/yamlCompletion.js +23 -68
- package/lib/esm/languageservice/services/yamlCompletion.js.map +1 -1
- package/lib/esm/languageservice/services/yamlHover.js +2 -3
- 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/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 +0 -2
- package/lib/umd/languageservice/services/yamlCompletion.js +24 -69
- package/lib/umd/languageservice/services/yamlCompletion.js.map +1 -1
- package/lib/umd/languageservice/services/yamlHover.js +3 -4
- 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/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 +0 -2
- package/out/server/src/languageservice/services/yamlCompletion.js +23 -68
- package/out/server/src/languageservice/services/yamlCompletion.js.map +1 -1
- package/out/server/src/languageservice/services/yamlHover.js +2 -3
- 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/test/autoCompletion.test.js +3 -3
- package/out/server/test/autoCompletion.test.js.map +1 -1
- package/out/server/test/autoCompletionFix.test.js +120 -18
- package/out/server/test/autoCompletionFix.test.js.map +1 -1
- package/out/server/test/hover.test.js +120 -0
- 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/package.json +1 -1
|
@@ -2,10 +2,11 @@
|
|
|
2
2
|
* Copyright (c) Microsoft Corporation. All rights reserved.
|
|
3
3
|
* Licensed under the MIT License. See License.txt in the project root for license information.
|
|
4
4
|
*--------------------------------------------------------------------------------------------*/
|
|
5
|
+
import { parseYamlBoolean } from '../parser/scalar-type';
|
|
5
6
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/explicit-module-boundary-types
|
|
6
7
|
export function equals(one, other, type) {
|
|
7
|
-
if (type === 'boolean') {
|
|
8
|
-
one =
|
|
8
|
+
if (type === 'boolean' && typeof one === 'string') {
|
|
9
|
+
one = parseYamlBoolean(one);
|
|
9
10
|
}
|
|
10
11
|
if (one === other) {
|
|
11
12
|
return true;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"objects.js","sourceRoot":"","sources":["../../../../src/languageservice/utils/objects.ts"],"names":[],"mappings":"AAAA;;;gGAGgG;AAEhG,iHAAiH;AACjH,MAAM,UAAU,MAAM,CAAC,GAAQ,EAAE,KAAU,EAAE,IAAU;IACrD,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,69 @@
|
|
|
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
|
+
export function toYamlStringScalar(s, preferSingleQuote = false) {
|
|
6
|
+
const quote = preferSingleQuote ? "'" : '"';
|
|
7
|
+
// empty string
|
|
8
|
+
if (s.length === 0) {
|
|
9
|
+
return `${quote}${quote}`;
|
|
10
|
+
}
|
|
11
|
+
// single quote character
|
|
12
|
+
if (s.length === 1 && s === '"') {
|
|
13
|
+
return '"\\""';
|
|
14
|
+
}
|
|
15
|
+
// literal quote strings like "" or ''
|
|
16
|
+
if (s.length === 2 && ((s[0] === '"' && s[1] === '"') || (s[0] === "'" && s[1] === "'"))) {
|
|
17
|
+
return s[0] === '"' ? '"\\"\\""' : `"''"`;
|
|
18
|
+
}
|
|
19
|
+
// check if the string is already a properly quoted YAML string
|
|
20
|
+
if (s.length >= 2) {
|
|
21
|
+
const firstChar = s[0];
|
|
22
|
+
const lastChar = s[s.length - 1];
|
|
23
|
+
if ((firstChar === '"' && lastChar === '"') || (firstChar === "'" && lastChar === "'")) {
|
|
24
|
+
return s;
|
|
25
|
+
}
|
|
26
|
+
}
|
|
27
|
+
// strings containing quotes or backslashes
|
|
28
|
+
if (/["\\]/.test(s)) {
|
|
29
|
+
return JSON.stringify(s);
|
|
30
|
+
}
|
|
31
|
+
// support YAML spec 1.1 boolean values and null
|
|
32
|
+
if (/^(?:on|off|true|false|yes|no|null|~)$/i.test(s)) {
|
|
33
|
+
return `${quote}${s}${quote}`;
|
|
34
|
+
}
|
|
35
|
+
// numeric values: integer/float, hex (0x), and octal (0o or YAML 1.1 style 0[0-7]+)
|
|
36
|
+
if (/^-?(?:0|[1-9]\d*)(?:\.\d+)?(?:[eE][+-]?\d+)?$/.test(s) ||
|
|
37
|
+
/^0x[0-9a-fA-F]+$/.test(s) ||
|
|
38
|
+
/^0o[0-7]+$/.test(s) ||
|
|
39
|
+
/^0[0-7]+$/.test(s)) {
|
|
40
|
+
return `"${s}"`;
|
|
41
|
+
}
|
|
42
|
+
// leading/trailing whitespaces need quoting
|
|
43
|
+
if (/^\s|\s$/.test(s)) {
|
|
44
|
+
return preferSingleQuote ? `'${s.replace(/'/g, "''")}'` : JSON.stringify(s);
|
|
45
|
+
}
|
|
46
|
+
// comment indicator
|
|
47
|
+
if (/(?:^|\s)#/.test(s)) {
|
|
48
|
+
return preferSingleQuote ? `'${s.replace(/'/g, "''")}'` : JSON.stringify(s);
|
|
49
|
+
}
|
|
50
|
+
// reserved indicators that cannot start a plain scalar
|
|
51
|
+
if (/^[\][{}#&*!|>'"%@`]/.test(s)) {
|
|
52
|
+
return preferSingleQuote ? `'${s.replace(/'/g, "''")}'` : JSON.stringify(s);
|
|
53
|
+
}
|
|
54
|
+
// -, ?, or : followed by space or end
|
|
55
|
+
if (/^[-?:](\s|$)/.test(s)) {
|
|
56
|
+
return preferSingleQuote ? `'${s.replace(/'/g, "''")}'` : JSON.stringify(s);
|
|
57
|
+
}
|
|
58
|
+
// colon in middle (mapping key indicator)
|
|
59
|
+
// e.g. `foo: bar` or `foo : bar` needs quoting, but `foo:bar` does not
|
|
60
|
+
if (/(?:^|[^:]):(?:\s|$)/.test(s)) {
|
|
61
|
+
return preferSingleQuote ? `'${s.replace(/'/g, "''")}'` : JSON.stringify(s);
|
|
62
|
+
}
|
|
63
|
+
// newlines, tabs, or carriage return
|
|
64
|
+
if (/[\n\t\r]/.test(s)) {
|
|
65
|
+
return JSON.stringify(s);
|
|
66
|
+
}
|
|
67
|
+
return s;
|
|
68
|
+
}
|
|
69
|
+
//# 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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"}
|
|
@@ -8,7 +8,7 @@
|
|
|
8
8
|
if (v !== undefined) module.exports = v;
|
|
9
9
|
}
|
|
10
10
|
else if (typeof define === "function" && define.amd) {
|
|
11
|
-
define(["require", "exports", "vscode-languageserver-types", "../../commands", "path", "../utils/textBuffer", "../parser/jsonParser07", "../utils/strings", "../utils/arrUtils", "yaml", "../parser/yaml-documents", "../utils/flow-style-rewriter", "lodash", "vscode-json-languageservice", "@vscode/l10n"], factory);
|
|
11
|
+
define(["require", "exports", "vscode-languageserver-types", "../../commands", "path", "../utils/textBuffer", "../utils/yamlScalar", "../parser/jsonParser07", "../utils/strings", "../utils/arrUtils", "yaml", "../parser/yaml-documents", "../utils/flow-style-rewriter", "lodash", "vscode-json-languageservice", "@vscode/l10n"], factory);
|
|
12
12
|
}
|
|
13
13
|
})(function (require, exports) {
|
|
14
14
|
"use strict";
|
|
@@ -18,6 +18,7 @@
|
|
|
18
18
|
const commands_1 = require("../../commands");
|
|
19
19
|
const path = require("path");
|
|
20
20
|
const textBuffer_1 = require("../utils/textBuffer");
|
|
21
|
+
const yamlScalar_1 = require("../utils/yamlScalar");
|
|
21
22
|
const jsonParser07_1 = require("../parser/jsonParser07");
|
|
22
23
|
const strings_1 = require("../utils/strings");
|
|
23
24
|
const arrUtils_1 = require("../utils/arrUtils");
|
|
@@ -276,7 +277,8 @@
|
|
|
276
277
|
continue;
|
|
277
278
|
}
|
|
278
279
|
for (const value of values) {
|
|
279
|
-
|
|
280
|
+
const scalar = typeof value === 'string' ? (0, yamlScalar_1.toYamlStringScalar)(value) : String(value);
|
|
281
|
+
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));
|
|
280
282
|
}
|
|
281
283
|
}
|
|
282
284
|
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":"AAAA;;;gGAGgG;;;;;;;;;;;;;IAGhG,6EASqC;IAErC,6CAA8C;IAC9C,6BAA6B;IAC7B,oDAAiD;IACjD,oDAAyD;IAEzD,yDAAqD;IACrD,8CAA6E;IAC7E,gDAA0D;IAC1D,+BAAkD;IAClD,6DAA8D;IAC9D,sEAAiE;IAEjE,4BAA4B;IAE5B,6EAAwD;IACxD,qCAAqC;IAOrC,MAAa,eAAe;QAG1B,YAA6B,kBAAsC;YAAtC,uBAAkB,GAAlB,kBAAkB,CAAoB;YAF3D,gBAAW,GAAG,IAAI,CAAC;QAE2C,CAAC;QAEvE,SAAS,CAAC,QAA0B;YAClC,IAAI,CAAC,WAAW,GAAG,QAAQ,CAAC,WAAW,CAAC;QAC1C,CAAC;QAED,aAAa,CAAC,QAAsB,EAAE,MAAwB;YAC5D,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,WAAW,EAAE;gBAC/B,OAAO;aACR;YAED,MAAM,MAAM,GAAG,EAAE,CAAC;YAElB,MAAM,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,0BAA0B,CAAC,MAAM,CAAC,OAAO,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAC,CAAC;YACtF,MAAM,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,sBAAsB,CAAC,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC;YACxE,MAAM,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,uBAAuB,CAAC,MAAM,CAAC,OAAO,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAC,CAAC;YACnF,MAAM,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,sBAAsB,CAAC,MAAM,CAAC,OAAO,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAC,CAAC;YAClF,MAAM,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,6BAA6B,CAAC,MAAM,CAAC,OAAO,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAC,CAAC;YACzF,MAAM,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,kBAAkB,CAAC,MAAM,CAAC,OAAO,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAC,CAAC;YAC9E,MAAM,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,qCAAqC,CAAC,MAAM,CAAC,OAAO,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAC,CAAC;YAEjG,OAAO,MAAM,CAAC;QAChB,CAAC;QAEO,sBAAsB,CAAC,WAAyB;YACtD,MAAM,yBAAyB,GAAG,IAAI,CAAC,kBAAkB,EAAE,MAAM,EAAE,YAAY,EAAE,OAAO,IAAI,KAAK,CAAC;YAClG,IAAI,CAAC,yBAAyB,EAAE;gBAC9B,OAAO,EAAE,CAAC;aACX;YACD,MAAM,qBAAqB,GAAG,IAAI,GAAG,EAAwB,CAAC;YAC9D,KAAK,MAAM,UAAU,IAAI,WAAW,EAAE;gBACpC,MAAM,SAAS,GAAI,UAAU,CAAC,IAA2B,EAAE,SAAS,IAAI,EAAE,CAAC;gBAC3E,KAAK,MAAM,YAAY,IAAI,SAAS,EAAE;oBACpC,IAAI,YAAY,EAAE;wBAChB,IAAI,CAAC,qBAAqB,CAAC,GAAG,CAAC,YAAY,CAAC,EAAE;4BAC5C,qBAAqB,CAAC,GAAG,CAAC,YAAY,EAAE,EAAE,CAAC,CAAC;yBAC7C;wBACD,qBAAqB,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;qBAC1D;iBACF;aACF;YACD,MAAM,MAAM,GAAG,EAAE,CAAC;YAClB,KAAK,MAAM,SAAS,IAAI,qBAAqB,CAAC,IAAI,EAAE,EAAE;gBACpD,MAAM,MAAM,GAAG,wCAAU,CAAC,MAAM,CAC9B,IAAI,CAAC,CAAC,CAAC,cAAc,EAAE,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC,EAChD,qCAAO,CAAC,MAAM,CAAC,cAAc,EAAE,uBAAY,CAAC,cAAc,EAAE,SAAS,CAAC,CACvE,CAAC;gBACF,MAAM,CAAC,WAAW,GAAG,qBAAqB,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;gBAC1D,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;aACrB;YAED,OAAO,MAAM,CAAC;QAChB,CAAC;QAEO,uBAAuB,CAAC,WAAyB,EAAE,QAAsB;YAC/E,MAAM,MAAM,GAAiB,EAAE,CAAC;YAChC,MAAM,QAAQ,GAAG,IAAI,uBAAU,CAAC,QAAQ,CAAC,CAAC;YAC1C,MAAM,aAAa,GAAa,EAAE,CAAC;YACnC,KAAK,MAAM,IAAI,IAAI,WAAW,EAAE;gBAC9B,IAAI,IAAI,CAAC,OAAO,KAAK,qCAAqC,EAAE;oBAC1D,IAAI,aAAa,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE;wBACjD,SAAS;qBACV;oBACD,MAAM,WAAW,GAAG,QAAQ,CAAC,cAAc,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;oBACnE,IAAI,YAAY,GAAG,CAAC,CAAC;oBACrB,IAAI,OAAO,GAAG,EAAE,CAAC;oBACjB,KAAK,IAAI,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,SAAS,EAAE,CAAC,IAAI,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,SAAS,EAAE,CAAC,EAAE,EAAE;wBAC3E,MAAM,IAAI,GAAG,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;wBACnC,IAAI,IAAI,KAAK,IAAI,EAAE;4BACjB,MAAM;yBACP;wBACD,YAAY,EAAE,CAAC;wBACf,OAAO,IAAI,IAAI,CAAC,WAAW,CAAC;qBAC7B;oBACD,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;oBAE1C,IAAI,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC;oBAC7B,IAAI,YAAY,KAAK,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,SAAS,EAAE;wBAC1E,WAAW,GAAG,mCAAK,CAAC,MAAM,CACxB,IAAI,CAAC,KAAK,CAAC,KAAK,EAChB,sCAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,SAAS,GAAG,YAAY,CAAC,CAChF,CAAC;qBACH;oBACD,MAAM,CAAC,IAAI,CACT,wCAAU,CAAC,MAAM,CACf,IAAI,CAAC,CAAC,CAAC,gBAAgB,CAAC,EACxB,mBAAmB,CAAC,QAAQ,CAAC,GAAG,EAAE,CAAC,sCAAQ,CAAC,OAAO,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC,CAAC,EAC3E,4CAAc,CAAC,QAAQ,CACxB,CACF,CAAC;iBACH;aACF;YAED,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE;gBACvB,MAAM,YAAY,GAAe,EAAE,CAAC;gBACpC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,QAAQ,CAAC,YAAY,EAAE,EAAE,CAAC,EAAE,EAAE;oBACjD,MAAM,WAAW,GAAG,QAAQ,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC;oBAC/C,IAAI,YAAY,GAAG,CAAC,CAAC;oBACrB,IAAI,OAAO,GAAG,EAAE,CAAC;oBACjB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,WAAW,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;wBAC3C,MAAM,IAAI,GAAG,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;wBAEnC,IAAI,IAAI,KAAK,GAAG,IAAI,IAAI,KAAK,IAAI,EAAE;4BACjC,IAAI,YAAY,KAAK,CAAC,EAAE;gCACtB,YAAY,CAAC,IAAI,CAAC,sCAAQ,CAAC,OAAO,CAAC,mCAAK,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,GAAG,YAAY,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC;gCACtF,YAAY,GAAG,CAAC,CAAC;gCACjB,OAAO,GAAG,EAAE,CAAC;6BACd;4BACD,MAAM;yBACP;wBAED,IAAI,IAAI,KAAK,GAAG,IAAI,YAAY,KAAK,CAAC,EAAE;4BACtC,YAAY,CAAC,IAAI,CAAC,sCAAQ,CAAC,OAAO,CAAC,mCAAK,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,GAAG,YAAY,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC;4BACtF,YAAY,GAAG,CAAC,CAAC;4BACjB,OAAO,GAAG,EAAE,CAAC;4BACb,SAAS;yBACV;wBACD,IAAI,IAAI,KAAK,IAAI,EAAE;4BACjB,OAAO,IAAI,IAAI,CAAC,WAAW,CAAC;4BAC5B,YAAY,EAAE,CAAC;yBAChB;qBACF;oBACD,0BAA0B;oBAC1B,IAAI,YAAY,KAAK,CAAC,EAAE;wBACtB,YAAY,CAAC,IAAI,CAAC,sCAAQ,CAAC,OAAO,CAAC,mCAAK,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,QAAQ,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC;qBAChG;iBACF;gBACD,IAAI,YAAY,CAAC,MAAM,GAAG,CAAC,EAAE;oBAC3B,MAAM,CAAC,IAAI,CACT,wCAAU,CAAC,MAAM,CACf,IAAI,CAAC,CAAC,CAAC,sBAAsB,CAAC,EAC9B,mBAAmB,CAAC,QAAQ,CAAC,GAAG,EAAE,YAAY,CAAC,EAC/C,4CAAc,CAAC,QAAQ,CACxB,CACF,CAAC;iBACH;aACF;YAED,OAAO,MAAM,CAAC;QAChB,CAAC;QAEO,sBAAsB,CAAC,WAAyB,EAAE,QAAsB;YAC9E,MAAM,MAAM,GAAG,EAAE,CAAC;YAClB,MAAM,MAAM,GAAG,IAAI,uBAAU,CAAC,QAAQ,CAAC,CAAC;YACxC,KAAK,MAAM,IAAI,IAAI,WAAW,EAAE;gBAC9B,IAAI,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,eAAe,CAAC,IAAI,IAAI,CAAC,MAAM,KAAK,0BAAW,EAAE;oBAC3E,MAAM,KAAK,GAAG,mCAAK,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;oBAC7D,MAAM,MAAM,GAAG,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;oBACrC,MAAM,WAAW,GAAG,MAAM,CAAC,cAAc,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;oBAC1D,MAAM,kBAAkB,GAAG,IAAA,mDAAyC,EAAC,WAAW,EAAE,KAAK,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;oBACvG,KAAK,CAAC,GAAG,CAAC,SAAS,GAAG,kBAAkB,CAAC;oBACzC,MAAM,MAAM,GAAG,wCAAU,CAAC,MAAM,CAC9B,IAAI,CAAC,CAAC,CAAC,oBAAoB,EAAE,MAAM,CAAC,EACpC,mBAAmB,CAAC,QAAQ,CAAC,GAAG,EAAE,CAAC,sCAAQ,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,EACxD,4CAAc,CAAC,QAAQ,CACxB,CAAC;oBACF,MAAM,CAAC,WAAW,GAAG,CAAC,IAAI,CAAC,CAAC;oBAC5B,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;iBACrB;aACF;YACD,OAAO,MAAM,CAAC;QAChB,CAAC;QAEO,0BAA0B,CAAC,WAAyB,EAAE,QAAsB;YAClF,MAAM,OAAO,GAAiB,EAAE,CAAC;YACjC,KAAK,MAAM,UAAU,IAAI,WAAW,EAAE;gBACpC,IAAI,UAAU,CAAC,OAAO,KAAK,qCAAqC,EAAE;oBAChE,MAAM,KAAK,GAAG,QAAQ,CAAC,OAAO,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,iBAAiB,EAAE,CAAC;oBACrE,IAAI,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,SAAS,IAAI,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,SAAS,EAAE;wBAC1F,MAAM,QAAQ,GAAG,KAAK,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC;wBAC3D,OAAO,CAAC,IAAI,CACV,wCAAU,CAAC,MAAM,CACf,IAAI,CAAC,CAAC,CAAC,kBAAkB,CAAC,EAC1B,mBAAmB,CAAC,QAAQ,CAAC,GAAG,EAAE,CAAC,sCAAQ,CAAC,OAAO,CAAC,UAAU,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC,CAAC,EACjF,4CAAc,CAAC,QAAQ,CACxB,CACF,CAAC;qBACH;iBACF;aACF;YACD,OAAO,OAAO,CAAC;QACjB,CAAC;QAEO,6BAA6B,CAAC,WAAyB,EAAE,QAAsB;YACrF,MAAM,OAAO,GAAiB,EAAE,CAAC;YACjC,KAAK,MAAM,UAAU,IAAI,WAAW,EAAE;gBACpC,IAAI,UAAU,CAAC,IAAI,KAAK,SAAS,IAAI,UAAU,CAAC,IAAI,KAAK,SAAS,EAAE;oBAClE,MAAM,IAAI,GAAG,oBAAoB,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAC;oBACxD,IAAI,IAAA,YAAK,EAAC,IAAI,CAAC,YAAY,CAAC,IAAI,IAAA,YAAK,EAAC,IAAI,CAAC,YAAY,CAAC,EAAE;wBACxD,MAAM,oBAAoB,GAAG,IAAA,YAAK,EAAC,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,UAAU,CAAC;wBAC3E,MAAM,QAAQ,GAAG,IAAI,uCAAiB,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;wBACzD,OAAO,CAAC,IAAI,CACV,wCAAU,CAAC,MAAM,CACf,IAAI,CAAC,CAAC,CAAC,qBAAqB,EAAE,4BAA4B,EAAE,oBAAoB,CAAC,EACjF,mBAAmB,CAAC,QAAQ,CAAC,GAAG,EAAE,CAAC,sCAAQ,CAAC,OAAO,CAAC,UAAU,CAAC,KAAK,EAAE,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,EAC7F,4CAAc,CAAC,QAAQ,CACxB,CACF,CAAC;qBACH;iBACF;aACF;YACD,OAAO,OAAO,CAAC;QACjB,CAAC;QAEO,kBAAkB,CAAC,WAAyB,EAAE,QAAsB;YAC1E,MAAM,OAAO,GAAiB,EAAE,CAAC;YACjC,KAAK,MAAM,UAAU,IAAI,WAAW,EAAE;gBACpC,IAAI,UAAU,EAAE,IAAI,KAAK,aAAa,EAAE;oBACtC,IAAI,IAAI,GAAG,oBAAoB,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAC;oBACtD,OAAO,IAAI,IAAI,IAAI,CAAC,IAAI,KAAK,QAAQ,EAAE;wBACrC,IAAI,GAAG,IAAI,CAAC,MAAM,CAAC;qBACpB;oBACD,IAAI,IAAI,IAAI,IAAA,YAAK,EAAC,IAAI,CAAC,YAAY,CAAC,EAAE;wBACpC,MAAM,MAAM,GAAY,CAAC,CAAC,SAAS,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;wBACvD,IACE,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,KAAK,WAAW,IAAI,MAAM,CAAC,QAAQ,CAAC,IAAI,KAAK,iBAAiB,CAAC;4BACpF,CAAC,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,IAAI,KAAK,WAAW,IAAI,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,IAAI,KAAK,iBAAiB,CAAC,EAC1G;4BACA,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;gCAClC,IAAI,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC,GAAG,IAAI,UAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,UAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE;oCAChE,OAAO,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;iCACjD;gCACD,IAAI,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC,GAAG,EAAE;oCACnB,OAAO,CAAC,CAAC,CAAC;iCACX;gCACD,IAAI,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC,GAAG,EAAE;oCACnB,OAAO,CAAC,CAAC;iCACV;gCACD,IAAI,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC,GAAG,EAAE;oCACpB,OAAO,CAAC,CAAC;iCACV;4BACH,CAAC,CAAC,CAAC;4BAEH,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;gCACrD,MAAM,IAAI,GAAG,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;gCACtC,MAAM,KAAK,GAAG,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;gCAClD,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC;gCACzB,IACE,IAAI,CAAC,KAAK,EAAE,IAAI,KAAK,OAAO;oCAC5B,IAAI,CAAC,KAAK,EAAE,IAAI,KAAK,QAAQ;oCAC7B,IAAI,CAAC,KAAK,EAAE,IAAI,KAAK,sBAAsB;oCAC3C,IAAI,CAAC,KAAK,EAAE,IAAI,KAAK,sBAAsB,EAC3C;oCACA,MAAM,YAAY,GAAG,IAAI,CAAC,KAAK,EAAE,GAAG,EAAE,SAAS,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC;oCACnF,IAAI,YAAY,GAAG,IAAI,CAAC;oCACxB,IAAI,KAAK,CAAC,KAAK,EAAE,IAAI,KAAK,cAAc,EAAE;wCACxC,YAAY,GAAG,KAAK,CAAC,KAAK,EAAE,KAAK,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC;qCACtE;yCAAM,IAAI,UAAG,CAAC,QAAQ,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE;wCACpC,YAAY,GAAG,KAAK,CAAC,KAAK,EAAE,GAAG,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC;qCACpE;oCACD,IAAI,YAAY,IAAI,YAAY,GAAG,CAAC,EAAE;wCACpC,IAAI,CAAC,KAAK,CAAC,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,IAAI,EAAE,CAAC;wCACtC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,YAA2B,CAAC,CAAC;qCAClD;oCACD,IAAI,CAAC,YAAY,IAAI,YAAY,GAAG,CAAC,CAAC,EAAE;wCACtC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,MAAM,CAAC,YAAY,EAAE,CAAC,CAAC,CAAC;qCACxC;iCACF;qCAAM,IAAI,IAAI,CAAC,KAAK,EAAE,IAAI,KAAK,cAAc,EAAE;oCAC9C,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC;oCACnE,IAAI,CAAC,OAAO,EAAE;wCACZ,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,EAAE,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAiB,CAAC,CAAC;qCAC/G;iCACF;6BACF;yBACF;wBACD,MAAM,YAAY,GAAG,mCAAK,CAAC,MAAM,CAAC,QAAQ,CAAC,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,QAAQ,CAAC,UAAU,CAAC,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;wBACpH,OAAO,CAAC,IAAI,CACV,wCAAU,CAAC,MAAM,CACf,IAAI,CAAC,CAAC,CAAC,kBAAkB,CAAC,EAC1B,mBAAmB,CAAC,QAAQ,CAAC,GAAG,EAAE,CAAC,sCAAQ,CAAC,OAAO,CAAC,YAAY,EAAE,UAAG,CAAC,SAAS,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,EACnG,4CAAc,CAAC,QAAQ,CACxB,CACF,CAAC;qBACH;iBACF;aACF;YACD,OAAO,OAAO,CAAC;QACjB,CAAC;QAED;;;WAGG;QACK,yBAAyB,CAAC,UAAsB;YACtD,IAAI,OAAO,UAAU,CAAC,IAAI,KAAK,QAAQ,EAAE;gBACvC,OAAO;aACR;YACD,IACE,UAAU,CAAC,IAAI,KAAK,uCAAS,CAAC,iBAAiB;gBAC/C,QAAQ,IAAI,UAAU,CAAC,IAAI;gBAC3B,KAAK,CAAC,OAAO,CAAE,UAAU,CAAC,IAA2B,CAAC,MAAM,CAAC,EAC7D;gBACA,OAAQ,UAAU,CAAC,IAA2B,CAAC,MAAM,CAAC;aACvD;iBAAM,IACL,UAAU,CAAC,IAAI,KAAK,uCAAS,CAAC,gBAAgB;gBAC9C,YAAY,IAAI,UAAU,CAAC,IAAI;gBAC/B,KAAK,CAAC,OAAO,CAAE,UAAU,CAAC,IAA2B,CAAC,UAAU,CAAC,EACjE;gBACA,OAAQ,UAAU,CAAC,IAA2B,CAAC,UAAU,CAAC;aAC3D;QACH,CAAC;QAEO,qCAAqC,CAAC,WAAyB,EAAE,QAAsB;YAC7F,MAAM,OAAO,GAAiB,EAAE,CAAC;YACjC,KAAK,MAAM,UAAU,IAAI,WAAW,EAAE;gBACpC,MAAM,MAAM,GAAG,IAAI,CAAC,yBAAyB,CAAC,UAAU,CAAC,CAAC;gBAC1D,IAAI,CAAC,MAAM,EAAE,MAAM,EAAE;oBACnB,SAAS;iBACV;gBACD,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE;oBAC1B,MAAM,MAAM,GAAG,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAA,+BAAkB,EAAC,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;oBACrF,OAAO,CAAC,IAAI,CACV,wCAAU,CAAC,MAAM,CACf,MAAM,EACN,mBAAmB,CAAC,QAAQ,CAAC,GAAG,EAAE,CAAC,sCAAQ,CAAC,OAAO,CAAC,UAAU,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC,EAC/E,4CAAc,CAAC,QAAQ,CACxB,CACF,CAAC;iBACH;aACF;YACD,OAAO,OAAO,CAAC;QACjB,CAAC;KACF;IArUD,0CAqUC;IAED,SAAS,oBAAoB,CAAC,QAAsB,EAAE,UAAsB;QAC1E,MAAM,aAAa,GAAG,mCAAkB,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAC;QACnE,MAAM,WAAW,GAAG,QAAQ,CAAC,QAAQ,CAAC,UAAU,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QAC9D,MAAM,OAAO,GAAG,IAAA,gCAAqB,EAAC,WAAW,EAAE,aAAa,CAAC,CAAC;QAClE,MAAM,IAAI,GAAG,OAAO,CAAC,iBAAiB,CAAC,WAAW,CAAC,CAAC;QACpD,OAAO,IAAI,CAAC;IACd,CAAC;IAED,SAAS,mBAAmB,CAAC,GAAW,EAAE,KAAiB;QACzD,MAAM,OAAO,GAAG,EAAE,CAAC;QACnB,OAAO,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;QACrB,MAAM,IAAI,GAAkB;YAC1B,OAAO;SACR,CAAC;QAEF,OAAO,IAAI,CAAC;IACd,CAAC"}
|
|
@@ -66,8 +66,6 @@ export declare class YamlCompletion {
|
|
|
66
66
|
private fromMarkup;
|
|
67
67
|
private doesSupportMarkdown;
|
|
68
68
|
private findItemAtOffset;
|
|
69
|
-
isNumberExp: RegExp;
|
|
70
|
-
convertToStringValue(param: unknown): string;
|
|
71
69
|
getQuote(): string;
|
|
72
70
|
/**
|
|
73
71
|
* simplify `{$1:value}` to `value`
|
|
@@ -8,7 +8,7 @@
|
|
|
8
8
|
if (v !== undefined) module.exports = v;
|
|
9
9
|
}
|
|
10
10
|
else if (typeof define === "function" && define.amd) {
|
|
11
|
-
define(["require", "exports", "vscode-languageserver-types", "yaml", "../utils/arrUtils", "../utils/indentationGuesser", "../utils/textBuffer", "../utils/json", "../utils/objects", "../parser/isKubernetes", "../parser/jsonParser07", "../utils/astUtils", "./modelineUtil", "../utils/schemaUtils", "@vscode/l10n"], factory);
|
|
11
|
+
define(["require", "exports", "vscode-languageserver-types", "yaml", "../utils/arrUtils", "../utils/indentationGuesser", "../utils/textBuffer", "../utils/json", "../utils/objects", "../parser/isKubernetes", "../parser/jsonParser07", "../utils/astUtils", "./modelineUtil", "../utils/schemaUtils", "../utils/yamlScalar", "@vscode/l10n"], factory);
|
|
12
12
|
}
|
|
13
13
|
})(function (require, exports) {
|
|
14
14
|
"use strict";
|
|
@@ -26,8 +26,8 @@
|
|
|
26
26
|
const astUtils_1 = require("../utils/astUtils");
|
|
27
27
|
const modelineUtil_1 = require("./modelineUtil");
|
|
28
28
|
const schemaUtils_1 = require("../utils/schemaUtils");
|
|
29
|
+
const yamlScalar_1 = require("../utils/yamlScalar");
|
|
29
30
|
const l10n = require("@vscode/l10n");
|
|
30
|
-
const doubleQuotesEscapeRegExp = /[\\]+"/g;
|
|
31
31
|
const parentCompletionKind = vscode_languageserver_types_1.CompletionItemKind.Class;
|
|
32
32
|
const existingProposeItem = '__';
|
|
33
33
|
class YamlCompletion {
|
|
@@ -38,7 +38,6 @@
|
|
|
38
38
|
this.telemetry = telemetry;
|
|
39
39
|
this.completionEnabled = true;
|
|
40
40
|
this.arrayPrefixIndentation = '';
|
|
41
|
-
this.isNumberExp = /^\d+$/;
|
|
42
41
|
}
|
|
43
42
|
configure(languageSettings, yamlSettings) {
|
|
44
43
|
if (languageSettings) {
|
|
@@ -171,7 +170,7 @@
|
|
|
171
170
|
if (!(0, objects_1.isString)(label)) {
|
|
172
171
|
label = String(label);
|
|
173
172
|
}
|
|
174
|
-
label = label.replace(
|
|
173
|
+
label = label.replace(/\n|\\n/g, '↵');
|
|
175
174
|
if (label.length > 60) {
|
|
176
175
|
const shortendedLabel = label.substr(0, 57).trim() + '...';
|
|
177
176
|
if (!proposed[shortendedLabel]) {
|
|
@@ -187,13 +186,13 @@
|
|
|
187
186
|
completionItem.textEdit = vscode_languageserver_types_1.TextEdit.replace(overwriteRange, label);
|
|
188
187
|
}
|
|
189
188
|
else {
|
|
190
|
-
|
|
191
|
-
|
|
192
|
-
|
|
193
|
-
if (
|
|
194
|
-
|
|
195
|
-
|
|
196
|
-
completionItem.insertText =
|
|
189
|
+
const mdText = completionItem.insertText.replace(/\${[0-9]+[:|](.*)}/g, (s, arg) => arg).replace(/\$([0-9]+)/g, '');
|
|
190
|
+
// handle single special characters that need escaping: ', ", \
|
|
191
|
+
const singleCharMatch = mdText.match(/^([^:"]+):\s*(['\\"\\])$/);
|
|
192
|
+
if (singleCharMatch) {
|
|
193
|
+
const key = singleCharMatch[1];
|
|
194
|
+
const char = singleCharMatch[2];
|
|
195
|
+
completionItem.insertText = `${key}: ${this.getQuote()}\\${char}${this.getQuote()}`;
|
|
197
196
|
}
|
|
198
197
|
// trim $1 from end of completion
|
|
199
198
|
if (completionItem.insertText.endsWith('$1') && !isForParentCompletion) {
|
|
@@ -864,7 +863,7 @@
|
|
|
864
863
|
}
|
|
865
864
|
nValueProposals += propertySchema.enum.length;
|
|
866
865
|
}
|
|
867
|
-
if (propertySchema.const) {
|
|
866
|
+
if ((0, objects_1.isDefined)(propertySchema.const)) {
|
|
868
867
|
if (!value) {
|
|
869
868
|
value = this.getInsertTextForGuessedValue(propertySchema.const, '', type);
|
|
870
869
|
value = this.evaluateTab1Symbol(value); // prevent const being selected after snippet insert
|
|
@@ -954,7 +953,7 @@
|
|
|
954
953
|
let value = propertySchema.default || propertySchema.const;
|
|
955
954
|
if (value) {
|
|
956
955
|
if (type === 'string') {
|
|
957
|
-
value =
|
|
956
|
+
value = (0, yamlScalar_1.toYamlStringScalar)(value);
|
|
958
957
|
}
|
|
959
958
|
insertText += `${indent}${key}: \${${insertIndex++}:${value}}\n`;
|
|
960
959
|
}
|
|
@@ -998,7 +997,7 @@
|
|
|
998
997
|
key === 'null' ? this.getInsertTextForValue(key, '', 'string') : key}: \${${insertIndex++}:${propertySchema.default}}\n`;
|
|
999
998
|
break;
|
|
1000
999
|
case 'string':
|
|
1001
|
-
insertText += `${indent}${key}: \${${insertIndex++}:${
|
|
1000
|
+
insertText += `${indent}${key}: \${${insertIndex++}:${(0, yamlScalar_1.toYamlStringScalar)(propertySchema.default)}}\n`;
|
|
1002
1001
|
break;
|
|
1003
1002
|
case 'array':
|
|
1004
1003
|
case 'object':
|
|
@@ -1059,12 +1058,10 @@
|
|
|
1059
1058
|
}
|
|
1060
1059
|
return this.getInsertTextForValue(value, separatorAfter, type);
|
|
1061
1060
|
case 'string': {
|
|
1062
|
-
|
|
1063
|
-
|
|
1064
|
-
snippetValue = this.getInsertTextForPlainText(snippetValue); // escape \ and }
|
|
1065
|
-
if (type === 'string') {
|
|
1066
|
-
snippetValue = this.convertToStringValue(snippetValue);
|
|
1061
|
+
if (type === 'number' || type === 'integer') {
|
|
1062
|
+
return '${1:' + value + '}' + separatorAfter;
|
|
1067
1063
|
}
|
|
1064
|
+
const snippetValue = this.getInsertTextForPlainText((0, yamlScalar_1.toYamlStringScalar)(value));
|
|
1068
1065
|
return '${1:' + snippetValue + '}' + separatorAfter;
|
|
1069
1066
|
}
|
|
1070
1067
|
case 'number':
|
|
@@ -1074,7 +1071,7 @@
|
|
|
1074
1071
|
return this.getInsertTextForValue(value, separatorAfter, type);
|
|
1075
1072
|
}
|
|
1076
1073
|
getInsertTextForPlainText(text) {
|
|
1077
|
-
return text.replace(/[
|
|
1074
|
+
return text.replace(/\\(?=[$}\\])/g, '\\\\').replace(/[$}]/g, '\\$&');
|
|
1078
1075
|
}
|
|
1079
1076
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
1080
1077
|
getInsertTextForValue(value, separatorAfter, type) {
|
|
@@ -1092,7 +1089,7 @@
|
|
|
1092
1089
|
}
|
|
1093
1090
|
type = Array.isArray(type) ? type[0] : type;
|
|
1094
1091
|
if (type === 'string') {
|
|
1095
|
-
value =
|
|
1092
|
+
value = (0, yamlScalar_1.toYamlStringScalar)(String(value), this.isSingleQuote);
|
|
1096
1093
|
}
|
|
1097
1094
|
return this.getInsertTextForPlainText(value + separatorAfter);
|
|
1098
1095
|
}
|
|
@@ -1173,11 +1170,11 @@
|
|
|
1173
1170
|
type = 'array';
|
|
1174
1171
|
}
|
|
1175
1172
|
let label;
|
|
1176
|
-
if (typeof value
|
|
1173
|
+
if (typeof value === 'object') {
|
|
1177
1174
|
label = l10n.t('Default Value');
|
|
1178
1175
|
}
|
|
1179
1176
|
else {
|
|
1180
|
-
label =
|
|
1177
|
+
label = this.getLabelForValue(value);
|
|
1181
1178
|
}
|
|
1182
1179
|
collector.add({
|
|
1183
1180
|
kind: this.getSuggestionKind(type),
|
|
@@ -1255,7 +1252,10 @@
|
|
|
1255
1252
|
if (Array.isArray(value)) {
|
|
1256
1253
|
return JSON.stringify(value);
|
|
1257
1254
|
}
|
|
1258
|
-
|
|
1255
|
+
if (typeof value === 'string') {
|
|
1256
|
+
return (0, yamlScalar_1.toYamlStringScalar)(value, this.isSingleQuote);
|
|
1257
|
+
}
|
|
1258
|
+
return String(value);
|
|
1259
1259
|
}
|
|
1260
1260
|
collectDefaultSnippets(schema, separatorAfter, collector, settings, arrayDepth = 0) {
|
|
1261
1261
|
if (Array.isArray(schema.defaultSnippets)) {
|
|
@@ -1444,51 +1444,6 @@
|
|
|
1444
1444
|
}
|
|
1445
1445
|
return 0;
|
|
1446
1446
|
}
|
|
1447
|
-
convertToStringValue(param) {
|
|
1448
|
-
let value;
|
|
1449
|
-
if (typeof param === 'string') {
|
|
1450
|
-
//support YAML spec 1.1 boolean values
|
|
1451
|
-
value = ['on', 'off', 'true', 'false', 'yes', 'no'].includes(param.toLowerCase())
|
|
1452
|
-
? `${this.getQuote()}${param}${this.getQuote()}`
|
|
1453
|
-
: param;
|
|
1454
|
-
}
|
|
1455
|
-
else {
|
|
1456
|
-
value = '' + param;
|
|
1457
|
-
}
|
|
1458
|
-
if (value.length === 0) {
|
|
1459
|
-
return value;
|
|
1460
|
-
}
|
|
1461
|
-
if (value === 'true' || value === 'false' || value === 'null' || this.isNumberExp.test(value)) {
|
|
1462
|
-
return `"${value}"`;
|
|
1463
|
-
}
|
|
1464
|
-
if (value.indexOf('"') !== -1) {
|
|
1465
|
-
value = value.replace(doubleQuotesEscapeRegExp, '"');
|
|
1466
|
-
}
|
|
1467
|
-
let doQuote = !isNaN(parseInt(value)) || value.charAt(0) === '@';
|
|
1468
|
-
if (!doQuote) {
|
|
1469
|
-
// need to quote value if in `foo: bar`, `foo : bar` (mapping) or `foo:` (partial map) format
|
|
1470
|
-
// but `foo:bar` and `:bar` (colon without white-space after it) are just plain string
|
|
1471
|
-
let idx = value.indexOf(':', 0);
|
|
1472
|
-
for (; idx > 0 && idx < value.length; idx = value.indexOf(':', idx + 1)) {
|
|
1473
|
-
if (idx === value.length - 1) {
|
|
1474
|
-
// `foo:` (partial map) format
|
|
1475
|
-
doQuote = true;
|
|
1476
|
-
break;
|
|
1477
|
-
}
|
|
1478
|
-
// there are only two valid kinds of white-space in yaml: space or tab
|
|
1479
|
-
// ref: https://yaml.org/spec/1.2.1/#id2775170
|
|
1480
|
-
const nextChar = value.charAt(idx + 1);
|
|
1481
|
-
if (nextChar === '\t' || nextChar === ' ') {
|
|
1482
|
-
doQuote = true;
|
|
1483
|
-
break;
|
|
1484
|
-
}
|
|
1485
|
-
}
|
|
1486
|
-
}
|
|
1487
|
-
if (doQuote) {
|
|
1488
|
-
value = `"${value}"`;
|
|
1489
|
-
}
|
|
1490
|
-
return value;
|
|
1491
|
-
}
|
|
1492
1447
|
getQuote() {
|
|
1493
1448
|
return this.isSingleQuote ? `'` : `"`;
|
|
1494
1449
|
}
|