yaml-language-server 1.19.1-fce910a.0 → 1.20.1-82d8808.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +27 -0
- package/Dockerfile +2 -2
- package/README.md +3 -3
- package/eslint-result.sarif +147 -172
- package/l10n/bundle.l10n.de.json +56 -0
- package/l10n/bundle.l10n.fr.json +56 -0
- package/l10n/bundle.l10n.ja.json +56 -0
- package/l10n/bundle.l10n.json +56 -0
- package/l10n/bundle.l10n.ko.json +56 -0
- package/l10n/bundle.l10n.zh-cn.json +56 -0
- package/l10n/bundle.l10n.zh-tw.json +56 -0
- package/lib/esm/languageservice/jsonASTTypes.d.ts +2 -2
- package/lib/esm/languageservice/jsonSchema.d.ts +1 -1
- package/lib/esm/languageservice/parser/ast-converter.d.ts +7 -2
- 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 +38 -45
- package/lib/esm/languageservice/parser/jsonParser07.js.map +1 -1
- package/lib/esm/languageservice/parser/yamlParser07.d.ts +1 -1
- package/lib/esm/languageservice/services/validation/unused-anchors.js +3 -2
- package/lib/esm/languageservice/services/validation/unused-anchors.js.map +1 -1
- package/lib/esm/languageservice/services/validation/yaml-style.js +3 -2
- package/lib/esm/languageservice/services/validation/yaml-style.js.map +1 -1
- package/lib/esm/languageservice/services/yamlCodeActions.js +8 -7
- package/lib/esm/languageservice/services/yamlCodeActions.js.map +1 -1
- package/lib/esm/languageservice/services/yamlCompletion.js +40 -38
- package/lib/esm/languageservice/services/yamlCompletion.js.map +1 -1
- package/lib/esm/languageservice/services/yamlHover.js +11 -4
- package/lib/esm/languageservice/services/yamlHover.js.map +1 -1
- package/lib/esm/languageservice/services/yamlSchemaService.js +31 -8
- package/lib/esm/languageservice/services/yamlSchemaService.js.map +1 -1
- package/lib/esm/languageservice/yamlTypes.d.ts +1 -1
- package/lib/esm/requestTypes.d.ts +1 -1
- package/lib/esm/server.js +0 -3
- package/lib/esm/server.js.map +1 -1
- package/lib/esm/yamlServerInit.d.ts +2 -1
- package/lib/esm/yamlServerInit.js +24 -2
- package/lib/esm/yamlServerInit.js.map +1 -1
- package/lib/esm/yamlSettings.d.ts +1 -1
- package/lib/esm/yamlSettings.js.map +1 -1
- package/lib/umd/languageservice/jsonASTTypes.d.ts +2 -2
- package/lib/umd/languageservice/jsonSchema.d.ts +1 -1
- package/lib/umd/languageservice/parser/ast-converter.d.ts +7 -2
- 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 +39 -46
- package/lib/umd/languageservice/parser/jsonParser07.js.map +1 -1
- package/lib/umd/languageservice/parser/yamlParser07.d.ts +1 -1
- package/lib/umd/languageservice/services/validation/unused-anchors.js +4 -3
- package/lib/umd/languageservice/services/validation/unused-anchors.js.map +1 -1
- package/lib/umd/languageservice/services/validation/yaml-style.js +4 -3
- package/lib/umd/languageservice/services/validation/yaml-style.js.map +1 -1
- package/lib/umd/languageservice/services/yamlCodeActions.js +9 -8
- package/lib/umd/languageservice/services/yamlCodeActions.js.map +1 -1
- package/lib/umd/languageservice/services/yamlCompletion.js +41 -39
- package/lib/umd/languageservice/services/yamlCompletion.js.map +1 -1
- package/lib/umd/languageservice/services/yamlHover.js +12 -5
- package/lib/umd/languageservice/services/yamlHover.js.map +1 -1
- package/lib/umd/languageservice/services/yamlSchemaService.js +32 -9
- package/lib/umd/languageservice/services/yamlSchemaService.js.map +1 -1
- package/lib/umd/languageservice/yamlTypes.d.ts +1 -1
- package/lib/umd/requestTypes.d.ts +1 -1
- package/lib/umd/server.js +1 -4
- package/lib/umd/server.js.map +1 -1
- package/lib/umd/yamlServerInit.d.ts +2 -1
- package/lib/umd/yamlServerInit.js +25 -3
- package/lib/umd/yamlServerInit.js.map +1 -1
- package/lib/umd/yamlSettings.d.ts +1 -1
- package/lib/umd/yamlSettings.js.map +1 -1
- package/out/server/src/languageservice/jsonASTTypes.d.ts +2 -2
- package/out/server/src/languageservice/jsonSchema.d.ts +1 -1
- package/out/server/src/languageservice/parser/ast-converter.d.ts +7 -2
- 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 +38 -45
- package/out/server/src/languageservice/parser/jsonParser07.js.map +1 -1
- package/out/server/src/languageservice/parser/yamlParser07.d.ts +1 -1
- package/out/server/src/languageservice/services/validation/unused-anchors.js +3 -2
- package/out/server/src/languageservice/services/validation/unused-anchors.js.map +1 -1
- package/out/server/src/languageservice/services/validation/yaml-style.js +3 -2
- package/out/server/src/languageservice/services/validation/yaml-style.js.map +1 -1
- package/out/server/src/languageservice/services/yamlCodeActions.js +8 -7
- package/out/server/src/languageservice/services/yamlCodeActions.js.map +1 -1
- package/out/server/src/languageservice/services/yamlCompletion.js +40 -38
- package/out/server/src/languageservice/services/yamlCompletion.js.map +1 -1
- package/out/server/src/languageservice/services/yamlHover.js +11 -4
- package/out/server/src/languageservice/services/yamlHover.js.map +1 -1
- package/out/server/src/languageservice/services/yamlSchemaService.js +31 -8
- package/out/server/src/languageservice/services/yamlSchemaService.js.map +1 -1
- package/out/server/src/languageservice/yamlTypes.d.ts +1 -1
- package/out/server/src/requestTypes.d.ts +1 -1
- package/out/server/src/server.js +0 -3
- package/out/server/src/server.js.map +1 -1
- package/out/server/src/yamlServerInit.d.ts +2 -1
- package/out/server/src/yamlServerInit.js +24 -2
- package/out/server/src/yamlServerInit.js.map +1 -1
- package/out/server/src/yamlSettings.d.ts +1 -1
- package/out/server/src/yamlSettings.js.map +1 -1
- package/out/server/test/autoCompletion.test.js +146 -76
- package/out/server/test/autoCompletion.test.js.map +1 -1
- package/out/server/test/bundlel10n.test.d.ts +1 -0
- package/out/server/test/bundlel10n.test.js +72 -0
- package/out/server/test/bundlel10n.test.js.map +1 -0
- package/out/server/test/hover.test.js +103 -0
- package/out/server/test/hover.test.js.map +1 -1
- package/out/server/test/utils/testHelper.js +5 -0
- package/out/server/test/utils/testHelper.js.map +1 -1
- package/out/server/test/utils/verifyError.d.ts +1 -1
- package/out/server/test/utils/verifyError.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/yamlSelectionRanges.test.js +1 -1
- package/package.json +10 -10
|
@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.YAMLStyleValidator = void 0;
|
|
4
4
|
const vscode_languageserver_types_1 = require("vscode-languageserver-types");
|
|
5
5
|
const yaml_1 = require("yaml");
|
|
6
|
+
const l10n = require("@vscode/l10n");
|
|
6
7
|
class YAMLStyleValidator {
|
|
7
8
|
constructor(settings) {
|
|
8
9
|
this.forbidMapping = settings.flowMapping === 'forbid';
|
|
@@ -12,10 +13,10 @@ class YAMLStyleValidator {
|
|
|
12
13
|
const result = [];
|
|
13
14
|
(0, yaml_1.visit)(yamlDoc.internalDocument, (key, node) => {
|
|
14
15
|
if (this.forbidMapping && (0, yaml_1.isMap)(node) && node.srcToken?.type === 'flow-collection') {
|
|
15
|
-
result.push(vscode_languageserver_types_1.Diagnostic.create(this.getRangeOf(document, node.srcToken), 'Flow style mapping is forbidden', vscode_languageserver_types_1.DiagnosticSeverity.Error, 'flowMap'));
|
|
16
|
+
result.push(vscode_languageserver_types_1.Diagnostic.create(this.getRangeOf(document, node.srcToken), l10n.t('flowStyleMapForbidden', 'Flow style mapping is forbidden'), vscode_languageserver_types_1.DiagnosticSeverity.Error, 'flowMap'));
|
|
16
17
|
}
|
|
17
18
|
if (this.forbidSequence && (0, yaml_1.isSeq)(node) && node.srcToken?.type === 'flow-collection') {
|
|
18
|
-
result.push(vscode_languageserver_types_1.Diagnostic.create(this.getRangeOf(document, node.srcToken), '
|
|
19
|
+
result.push(vscode_languageserver_types_1.Diagnostic.create(this.getRangeOf(document, node.srcToken), l10n.t('flowStyleSeqForbidden'), vscode_languageserver_types_1.DiagnosticSeverity.Error, 'flowSeq'));
|
|
19
20
|
}
|
|
20
21
|
});
|
|
21
22
|
return result;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"yaml-style.js","sourceRoot":"","sources":["../../../../../../src/languageservice/services/validation/yaml-style.ts"],"names":[],"mappings":";;;AACA,6EAAoF;AACpF,+BAA2C;
|
|
1
|
+
{"version":3,"file":"yaml-style.js","sourceRoot":"","sources":["../../../../../../src/languageservice/services/validation/yaml-style.ts"],"names":[],"mappings":";;;AACA,6EAAoF;AACpF,+BAA2C;AAK3C,qCAAqC;AAErC,MAAa,kBAAkB;IAI7B,YAAY,QAA0B;QACpC,IAAI,CAAC,aAAa,GAAG,QAAQ,CAAC,WAAW,KAAK,QAAQ,CAAC;QACvD,IAAI,CAAC,cAAc,GAAG,QAAQ,CAAC,YAAY,KAAK,QAAQ,CAAC;IAC3D,CAAC;IACD,QAAQ,CAAC,QAAsB,EAAE,OAA2B;QAC1D,MAAM,MAAM,GAAG,EAAE,CAAC;QAClB,IAAA,YAAK,EAAC,OAAO,CAAC,gBAAgB,EAAE,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE;YAC5C,IAAI,IAAI,CAAC,aAAa,IAAI,IAAA,YAAK,EAAC,IAAI,CAAC,IAAI,IAAI,CAAC,QAAQ,EAAE,IAAI,KAAK,iBAAiB,EAAE;gBAClF,MAAM,CAAC,IAAI,CACT,wCAAU,CAAC,MAAM,CACf,IAAI,CAAC,UAAU,CAAC,QAAQ,EAAE,IAAI,CAAC,QAAQ,CAAC,EACxC,IAAI,CAAC,CAAC,CAAC,uBAAuB,EAAE,iCAAiC,CAAC,EAClE,gDAAkB,CAAC,KAAK,EACxB,SAAS,CACV,CACF,CAAC;aACH;YACD,IAAI,IAAI,CAAC,cAAc,IAAI,IAAA,YAAK,EAAC,IAAI,CAAC,IAAI,IAAI,CAAC,QAAQ,EAAE,IAAI,KAAK,iBAAiB,EAAE;gBACnF,MAAM,CAAC,IAAI,CACT,wCAAU,CAAC,MAAM,CACf,IAAI,CAAC,UAAU,CAAC,QAAQ,EAAE,IAAI,CAAC,QAAQ,CAAC,EACxC,IAAI,CAAC,CAAC,CAAC,uBAAuB,CAAC,EAC/B,gDAAkB,CAAC,KAAK,EACxB,SAAS,CACV,CACF,CAAC;aACH;QACH,CAAC,CAAC,CAAC;QACH,OAAO,MAAM,CAAC;IAChB,CAAC;IAEO,UAAU,CAAC,QAAsB,EAAE,IAAoB;QAC7D,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC;QACrC,IAAI,WAAW,GAAG,QAAQ,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;QACjD,WAAW,GAAG,EAAE,SAAS,EAAE,WAAW,CAAC,SAAS,GAAG,CAAC,EAAE,IAAI,EAAE,WAAW,CAAC,IAAI,EAAE,CAAC;QAC/E,OAAO,mCAAK,CAAC,MAAM,CAAC,QAAQ,CAAC,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE,WAAW,CAAC,CAAC;IAC3E,CAAC;CACF;AAzCD,gDAyCC"}
|
|
@@ -17,6 +17,7 @@ const yaml_documents_1 = require("../parser/yaml-documents");
|
|
|
17
17
|
const flow_style_rewriter_1 = require("../utils/flow-style-rewriter");
|
|
18
18
|
const _ = require("lodash");
|
|
19
19
|
const vscode_json_languageservice_1 = require("vscode-json-languageservice");
|
|
20
|
+
const l10n = require("@vscode/l10n");
|
|
20
21
|
class YamlCodeActions {
|
|
21
22
|
constructor(clientCapabilities) {
|
|
22
23
|
this.clientCapabilities = clientCapabilities;
|
|
@@ -58,7 +59,7 @@ class YamlCodeActions {
|
|
|
58
59
|
}
|
|
59
60
|
const result = [];
|
|
60
61
|
for (const schemaUri of schemaUriToDiagnostic.keys()) {
|
|
61
|
-
const action = vscode_languageserver_types_1.CodeAction.create(
|
|
62
|
+
const action = vscode_languageserver_types_1.CodeAction.create(l10n.t('jumpToSchema', path.basename(schemaUri)), vscode_languageserver_types_1.Command.create('JumpToSchema', commands_1.YamlCommands.JUMP_TO_SCHEMA, schemaUri));
|
|
62
63
|
action.diagnostics = schemaUriToDiagnostic.get(schemaUri);
|
|
63
64
|
result.push(action);
|
|
64
65
|
}
|
|
@@ -89,7 +90,7 @@ class YamlCodeActions {
|
|
|
89
90
|
if (replacedTabs !== diag.range.end.character - diag.range.start.character) {
|
|
90
91
|
resultRange = vscode_languageserver_types_1.Range.create(diag.range.start, vscode_languageserver_types_1.Position.create(diag.range.end.line, diag.range.start.character + replacedTabs));
|
|
91
92
|
}
|
|
92
|
-
result.push(vscode_languageserver_types_1.CodeAction.create('
|
|
93
|
+
result.push(vscode_languageserver_types_1.CodeAction.create(l10n.t('convertToSpace'), createWorkspaceEdit(document.uri, [vscode_languageserver_types_1.TextEdit.replace(resultRange, newText)]), vscode_languageserver_types_1.CodeActionKind.QuickFix));
|
|
93
94
|
}
|
|
94
95
|
}
|
|
95
96
|
if (result.length !== 0) {
|
|
@@ -125,7 +126,7 @@ class YamlCodeActions {
|
|
|
125
126
|
}
|
|
126
127
|
}
|
|
127
128
|
if (replaceEdits.length > 0) {
|
|
128
|
-
result.push(vscode_languageserver_types_1.CodeAction.create('
|
|
129
|
+
result.push(vscode_languageserver_types_1.CodeAction.create(l10n.t('convertAllSpaceToTab'), createWorkspaceEdit(document.uri, replaceEdits), vscode_languageserver_types_1.CodeActionKind.QuickFix));
|
|
129
130
|
}
|
|
130
131
|
}
|
|
131
132
|
return result;
|
|
@@ -140,7 +141,7 @@ class YamlCodeActions {
|
|
|
140
141
|
const lineContent = buffer.getLineContent(range.end.line);
|
|
141
142
|
const lastWhitespaceChar = (0, strings_1.getFirstNonWhitespaceCharacterAfterOffset)(lineContent, range.end.character);
|
|
142
143
|
range.end.character = lastWhitespaceChar;
|
|
143
|
-
const action = vscode_languageserver_types_1.CodeAction.create(
|
|
144
|
+
const action = vscode_languageserver_types_1.CodeAction.create(l10n.t('deleteUnusedAnchor', actual), createWorkspaceEdit(document.uri, [vscode_languageserver_types_1.TextEdit.del(range)]), vscode_languageserver_types_1.CodeActionKind.QuickFix);
|
|
144
145
|
action.diagnostics = [diag];
|
|
145
146
|
result.push(action);
|
|
146
147
|
}
|
|
@@ -154,7 +155,7 @@ class YamlCodeActions {
|
|
|
154
155
|
const value = document.getText(diagnostic.range).toLocaleLowerCase();
|
|
155
156
|
if (value === '"true"' || value === '"false"' || value === "'true'" || value === "'false'") {
|
|
156
157
|
const newValue = value.includes('true') ? 'true' : 'false';
|
|
157
|
-
results.push(vscode_languageserver_types_1.CodeAction.create('
|
|
158
|
+
results.push(vscode_languageserver_types_1.CodeAction.create(l10n.t('convertToBoolean'), createWorkspaceEdit(document.uri, [vscode_languageserver_types_1.TextEdit.replace(diagnostic.range, newValue)]), vscode_languageserver_types_1.CodeActionKind.QuickFix));
|
|
158
159
|
}
|
|
159
160
|
}
|
|
160
161
|
}
|
|
@@ -168,7 +169,7 @@ class YamlCodeActions {
|
|
|
168
169
|
if ((0, yaml_1.isMap)(node.internalNode) || (0, yaml_1.isSeq)(node.internalNode)) {
|
|
169
170
|
const blockTypeDescription = (0, yaml_1.isMap)(node.internalNode) ? 'map' : 'sequence';
|
|
170
171
|
const rewriter = new flow_style_rewriter_1.FlowStyleRewriter(this.indentation);
|
|
171
|
-
results.push(vscode_languageserver_types_1.CodeAction.create(
|
|
172
|
+
results.push(vscode_languageserver_types_1.CodeAction.create(l10n.t('convertToBlockStyle', 'Convert to block style {0}', blockTypeDescription), createWorkspaceEdit(document.uri, [vscode_languageserver_types_1.TextEdit.replace(diagnostic.range, rewriter.write(node))]), vscode_languageserver_types_1.CodeActionKind.QuickFix));
|
|
172
173
|
}
|
|
173
174
|
}
|
|
174
175
|
}
|
|
@@ -233,7 +234,7 @@ class YamlCodeActions {
|
|
|
233
234
|
}
|
|
234
235
|
}
|
|
235
236
|
const replaceRange = vscode_languageserver_types_1.Range.create(document.positionAt(node.offset), document.positionAt(node.offset + node.length));
|
|
236
|
-
results.push(vscode_languageserver_types_1.CodeAction.create('
|
|
237
|
+
results.push(vscode_languageserver_types_1.CodeAction.create(l10n.t('fixKeyOrderToMap'), createWorkspaceEdit(document.uri, [vscode_languageserver_types_1.TextEdit.replace(replaceRange, yaml_1.CST.stringify(sorted.srcToken))]), vscode_languageserver_types_1.CodeActionKind.QuickFix));
|
|
237
238
|
}
|
|
238
239
|
}
|
|
239
240
|
}
|
|
@@ -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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"}
|
|
@@ -12,13 +12,12 @@ const indentationGuesser_1 = require("../utils/indentationGuesser");
|
|
|
12
12
|
const textBuffer_1 = require("../utils/textBuffer");
|
|
13
13
|
const json_1 = require("../utils/json");
|
|
14
14
|
const objects_1 = require("../utils/objects");
|
|
15
|
-
const nls = require("vscode-nls");
|
|
16
15
|
const isKubernetes_1 = require("../parser/isKubernetes");
|
|
17
16
|
const jsonParser07_1 = require("../parser/jsonParser07");
|
|
18
17
|
const astUtils_1 = require("../utils/astUtils");
|
|
19
18
|
const modelineUtil_1 = require("./modelineUtil");
|
|
20
19
|
const schemaUtils_1 = require("../utils/schemaUtils");
|
|
21
|
-
const
|
|
20
|
+
const l10n = require("@vscode/l10n");
|
|
22
21
|
const doubleQuotesEscapeRegExp = /[\\]+"/g;
|
|
23
22
|
const parentCompletionKind = vscode_languageserver_types_1.CompletionItemKind.Class;
|
|
24
23
|
const existingProposeItem = '__';
|
|
@@ -249,7 +248,7 @@ class YamlCompletion {
|
|
|
249
248
|
if (position.line === 0 && position.character === 0 && !(0, modelineUtil_1.isModeline)(lineContent)) {
|
|
250
249
|
const inlineSchemaCompletion = {
|
|
251
250
|
kind: vscode_languageserver_types_1.CompletionItemKind.Text,
|
|
252
|
-
label: 'Inline schema',
|
|
251
|
+
label: l10n.t('Inline schema'),
|
|
253
252
|
insertText: '# yaml-language-server: $schema=',
|
|
254
253
|
insertTextFormat: vscode_languageserver_types_1.InsertTextFormat.PlainText,
|
|
255
254
|
};
|
|
@@ -448,6 +447,9 @@ class YamlCompletion {
|
|
|
448
447
|
}
|
|
449
448
|
}
|
|
450
449
|
}
|
|
450
|
+
const ignoreScalars = textBuffer.getLineContent(overwriteRange.start.line).trim().length === 0 &&
|
|
451
|
+
originalNode &&
|
|
452
|
+
(((0, yaml_1.isScalar)(originalNode) && originalNode.value === null) || (0, yaml_1.isSeq)(originalNode));
|
|
451
453
|
// completion for object keys
|
|
452
454
|
if (node && (0, yaml_1.isMap)(node)) {
|
|
453
455
|
// don't suggest properties that are already present
|
|
@@ -459,7 +461,7 @@ class YamlCompletion {
|
|
|
459
461
|
}
|
|
460
462
|
}
|
|
461
463
|
}
|
|
462
|
-
this.addPropertyCompletions(schema, currentDoc, node, originalNode, '', collector, textBuffer, overwriteRange, doComplete);
|
|
464
|
+
this.addPropertyCompletions(schema, currentDoc, node, originalNode, '', collector, textBuffer, overwriteRange, doComplete, ignoreScalars);
|
|
463
465
|
if (!schema && currentWord.length > 0 && text.charAt(offset - currentWord.length - 1) !== '"') {
|
|
464
466
|
collector.add({
|
|
465
467
|
kind: vscode_languageserver_types_1.CompletionItemKind.Property,
|
|
@@ -471,7 +473,7 @@ class YamlCompletion {
|
|
|
471
473
|
}
|
|
472
474
|
// proposals for values
|
|
473
475
|
const types = {};
|
|
474
|
-
this.getValueCompletions(schema, currentDoc, node, offset, document, collector, types, doComplete);
|
|
476
|
+
this.getValueCompletions(schema, currentDoc, node, offset, document, collector, types, doComplete, ignoreScalars);
|
|
475
477
|
}
|
|
476
478
|
catch (err) {
|
|
477
479
|
this.telemetry?.sendError('yaml.completion.error', err);
|
|
@@ -585,7 +587,7 @@ class YamlCompletion {
|
|
|
585
587
|
map.items[0].value.range = node.range;
|
|
586
588
|
return map;
|
|
587
589
|
}
|
|
588
|
-
addPropertyCompletions(schema, doc, node, originalNode, separatorAfter, collector, textBuffer, overwriteRange, doComplete) {
|
|
590
|
+
addPropertyCompletions(schema, doc, node, originalNode, separatorAfter, collector, textBuffer, overwriteRange, doComplete, ignoreScalars) {
|
|
589
591
|
const matchingSchemas = doc.getMatchingSchemas(schema.schema, -1, null, doComplete);
|
|
590
592
|
const existingKey = textBuffer.getText(overwriteRange);
|
|
591
593
|
const lineContent = textBuffer.getLineContent(overwriteRange.start.line);
|
|
@@ -649,7 +651,7 @@ class YamlCompletion {
|
|
|
649
651
|
textBuffer.getPosition(it.key.range[2]).line === overwriteRange.end.line - 1)) &&
|
|
650
652
|
pair) {
|
|
651
653
|
if (Array.isArray(propertySchema.items)) {
|
|
652
|
-
this.addSchemaValueCompletions(propertySchema.items[0], separatorAfter, collector, {},
|
|
654
|
+
this.addSchemaValueCompletions(propertySchema.items[0], separatorAfter, collector, {}, ignoreScalars, true);
|
|
653
655
|
}
|
|
654
656
|
else if (typeof propertySchema.items === 'object' && propertySchema.items.type === 'object') {
|
|
655
657
|
this.addArrayItemValueCompletion(propertySchema.items, separatorAfter, collector);
|
|
@@ -695,7 +697,7 @@ class YamlCompletion {
|
|
|
695
697
|
// - item1
|
|
696
698
|
// it will treated as a property key since `:` has been appended
|
|
697
699
|
if (nodeParent && (0, yaml_1.isSeq)(nodeParent) && (0, schemaUtils_1.isPrimitiveType)(schema.schema)) {
|
|
698
|
-
this.addSchemaValueCompletions(schema.schema, separatorAfter, collector, {},
|
|
700
|
+
this.addSchemaValueCompletions(schema.schema, separatorAfter, collector, {}, ignoreScalars);
|
|
699
701
|
}
|
|
700
702
|
if (schema.schema.propertyNames && schema.schema.additionalProperties && schema.schema.type === 'object') {
|
|
701
703
|
const propertyNameSchema = (0, jsonParser07_1.asSchema)(schema.schema.propertyNames);
|
|
@@ -731,13 +733,13 @@ class YamlCompletion {
|
|
|
731
733
|
}
|
|
732
734
|
}
|
|
733
735
|
}
|
|
734
|
-
getValueCompletions(schema, doc, node, offset, document, collector, types, doComplete) {
|
|
736
|
+
getValueCompletions(schema, doc, node, offset, document, collector, types, doComplete, ignoreScalars) {
|
|
735
737
|
let parentKey = null;
|
|
736
738
|
if (node && (0, yaml_1.isScalar)(node)) {
|
|
737
739
|
node = doc.getParent(node);
|
|
738
740
|
}
|
|
739
741
|
if (!node) {
|
|
740
|
-
this.addSchemaValueCompletions(schema.schema, '', collector, types,
|
|
742
|
+
this.addSchemaValueCompletions(schema.schema, '', collector, types, false);
|
|
741
743
|
return;
|
|
742
744
|
}
|
|
743
745
|
if ((0, yaml_1.isPair)(node)) {
|
|
@@ -763,26 +765,23 @@ class YamlCompletion {
|
|
|
763
765
|
if (Array.isArray(s.schema.items)) {
|
|
764
766
|
const index = this.findItemAtOffset(node, document, offset);
|
|
765
767
|
if (index < s.schema.items.length) {
|
|
766
|
-
this.addSchemaValueCompletions(s.schema.items[index], separatorAfter, collector, types,
|
|
768
|
+
this.addSchemaValueCompletions(s.schema.items[index], separatorAfter, collector, types, false);
|
|
767
769
|
}
|
|
768
770
|
}
|
|
769
|
-
else if (typeof s.schema.items === 'object' &&
|
|
770
|
-
(s.schema.items.type === 'object' || (0, schemaUtils_1.isAnyOfAllOfOneOfType)(s.schema.items))) {
|
|
771
|
-
this.addSchemaValueCompletions(s.schema.items, separatorAfter, collector, types, 'value', true);
|
|
772
|
-
}
|
|
773
771
|
else {
|
|
774
|
-
this.addSchemaValueCompletions(s.schema.items, separatorAfter, collector, types, '
|
|
772
|
+
this.addSchemaValueCompletions(s.schema.items, separatorAfter, collector, types, ignoreScalars, typeof s.schema.items === 'object' &&
|
|
773
|
+
(s.schema.items.type === 'object' || (0, schemaUtils_1.isAnyOfAllOfOneOfType)(s.schema.items)));
|
|
775
774
|
}
|
|
776
775
|
}
|
|
777
776
|
}
|
|
778
777
|
if (s.schema.properties) {
|
|
779
778
|
const propertySchema = s.schema.properties[parentKey];
|
|
780
779
|
if (propertySchema) {
|
|
781
|
-
this.addSchemaValueCompletions(propertySchema, separatorAfter, collector, types,
|
|
780
|
+
this.addSchemaValueCompletions(propertySchema, separatorAfter, collector, types, ignoreScalars);
|
|
782
781
|
}
|
|
783
782
|
}
|
|
784
783
|
if (s.schema.additionalProperties) {
|
|
785
|
-
this.addSchemaValueCompletions(s.schema.additionalProperties, separatorAfter, collector, types,
|
|
784
|
+
this.addSchemaValueCompletions(s.schema.additionalProperties, separatorAfter, collector, types, ignoreScalars);
|
|
786
785
|
}
|
|
787
786
|
}
|
|
788
787
|
}
|
|
@@ -801,10 +800,10 @@ class YamlCompletion {
|
|
|
801
800
|
//append insertText to documentation
|
|
802
801
|
const schemaTypeTitle = schemaType ? ' type `' + schemaType + '`' : '';
|
|
803
802
|
const schemaDescription = schema.description ? ' (' + schema.description + ')' : '';
|
|
804
|
-
const documentation = this.getDocumentationWithMarkdownText(
|
|
803
|
+
const documentation = this.getDocumentationWithMarkdownText(l10n.t('create.item.array', schemaTypeTitle, schemaDescription), insertText);
|
|
805
804
|
collector.add({
|
|
806
805
|
kind: this.getSuggestionKind(schema.type),
|
|
807
|
-
label: '
|
|
806
|
+
label: l10n.t('array.item') + (schemaType || index),
|
|
808
807
|
documentation: documentation,
|
|
809
808
|
insertText: insertText,
|
|
810
809
|
insertTextFormat: vscode_languageserver_types_1.InsertTextFormat.Snippet,
|
|
@@ -1111,28 +1110,27 @@ class YamlCompletion {
|
|
|
1111
1110
|
}
|
|
1112
1111
|
return this.getInsertTextForPlainText(value + separatorAfter);
|
|
1113
1112
|
}
|
|
1114
|
-
addSchemaValueCompletions(schema, separatorAfter, collector, types,
|
|
1113
|
+
addSchemaValueCompletions(schema, separatorAfter, collector, types, ignoreScalars = false, addArrayItem = false) {
|
|
1115
1114
|
if (typeof schema === 'object') {
|
|
1116
|
-
this.addEnumValueCompletions(schema, separatorAfter, collector,
|
|
1115
|
+
this.addEnumValueCompletions(schema, separatorAfter, collector, ignoreScalars);
|
|
1117
1116
|
this.addDefaultValueCompletions(schema, separatorAfter, collector);
|
|
1118
1117
|
this.collectTypes(schema, types);
|
|
1119
|
-
if (
|
|
1120
|
-
// add array only for final types (no anyOf, allOf, oneOf)
|
|
1118
|
+
if (addArrayItem && !(0, schemaUtils_1.isAnyOfAllOfOneOfType)(schema)) {
|
|
1121
1119
|
this.addArrayItemValueCompletion(schema, separatorAfter, collector);
|
|
1122
1120
|
}
|
|
1123
1121
|
if (Array.isArray(schema.allOf)) {
|
|
1124
1122
|
schema.allOf.forEach((s) => {
|
|
1125
|
-
return this.addSchemaValueCompletions(s, separatorAfter, collector, types,
|
|
1123
|
+
return this.addSchemaValueCompletions(s, separatorAfter, collector, types, ignoreScalars, addArrayItem);
|
|
1126
1124
|
});
|
|
1127
1125
|
}
|
|
1128
1126
|
if (Array.isArray(schema.anyOf)) {
|
|
1129
1127
|
schema.anyOf.forEach((s) => {
|
|
1130
|
-
return this.addSchemaValueCompletions(s, separatorAfter, collector, types,
|
|
1128
|
+
return this.addSchemaValueCompletions(s, separatorAfter, collector, types, ignoreScalars, addArrayItem);
|
|
1131
1129
|
});
|
|
1132
1130
|
}
|
|
1133
1131
|
if (Array.isArray(schema.oneOf)) {
|
|
1134
1132
|
schema.oneOf.forEach((s) => {
|
|
1135
|
-
return this.addSchemaValueCompletions(s, separatorAfter, collector, types,
|
|
1133
|
+
return this.addSchemaValueCompletions(s, separatorAfter, collector, types, ignoreScalars, addArrayItem);
|
|
1136
1134
|
});
|
|
1137
1135
|
}
|
|
1138
1136
|
}
|
|
@@ -1162,7 +1160,7 @@ class YamlCompletion {
|
|
|
1162
1160
|
}
|
|
1163
1161
|
let label;
|
|
1164
1162
|
if (typeof value == 'object') {
|
|
1165
|
-
label = 'Default
|
|
1163
|
+
label = l10n.t('Default Value');
|
|
1166
1164
|
}
|
|
1167
1165
|
else {
|
|
1168
1166
|
label = value.toString().replace(doubleQuotesEscapeRegExp, '"');
|
|
@@ -1172,7 +1170,7 @@ class YamlCompletion {
|
|
|
1172
1170
|
label,
|
|
1173
1171
|
insertText: this.getInsertTextForValue(value, separatorAfter, type),
|
|
1174
1172
|
insertTextFormat: vscode_languageserver_types_1.InsertTextFormat.Snippet,
|
|
1175
|
-
detail:
|
|
1173
|
+
detail: l10n.t('Default Value'),
|
|
1176
1174
|
});
|
|
1177
1175
|
hasProposals = true;
|
|
1178
1176
|
}
|
|
@@ -1202,19 +1200,23 @@ class YamlCompletion {
|
|
|
1202
1200
|
this.addDefaultValueCompletions(schema.items, separatorAfter, collector, arrayDepth + 1);
|
|
1203
1201
|
}
|
|
1204
1202
|
}
|
|
1205
|
-
addEnumValueCompletions(schema, separatorAfter, collector,
|
|
1206
|
-
if ((0, objects_1.isDefined)(schema.const)
|
|
1207
|
-
|
|
1208
|
-
|
|
1209
|
-
|
|
1210
|
-
|
|
1211
|
-
|
|
1212
|
-
|
|
1213
|
-
|
|
1203
|
+
addEnumValueCompletions(schema, separatorAfter, collector, ignoreScalars) {
|
|
1204
|
+
if ((0, objects_1.isDefined)(schema.const)) {
|
|
1205
|
+
if (!ignoreScalars || typeof schema.const === 'object') {
|
|
1206
|
+
collector.add({
|
|
1207
|
+
kind: this.getSuggestionKind(schema.type),
|
|
1208
|
+
label: this.getLabelForValue(schema.const),
|
|
1209
|
+
insertText: this.getInsertTextForValue(schema.const, separatorAfter, schema.type),
|
|
1210
|
+
insertTextFormat: vscode_languageserver_types_1.InsertTextFormat.Snippet,
|
|
1211
|
+
documentation: this.fromMarkup(schema.markdownDescription) || schema.description,
|
|
1212
|
+
});
|
|
1213
|
+
}
|
|
1214
1214
|
}
|
|
1215
1215
|
if (Array.isArray(schema.enum)) {
|
|
1216
1216
|
for (let i = 0, length = schema.enum.length; i < length; i++) {
|
|
1217
1217
|
const enm = schema.enum[i];
|
|
1218
|
+
if (ignoreScalars && typeof enm !== 'object')
|
|
1219
|
+
continue;
|
|
1218
1220
|
let documentation = this.fromMarkup(schema.markdownDescription) || schema.description;
|
|
1219
1221
|
if (schema.markdownEnumDescriptions && i < schema.markdownEnumDescriptions.length && this.doesSupportMarkdown()) {
|
|
1220
1222
|
documentation = this.fromMarkup(schema.markdownEnumDescriptions[i]);
|