yaml-language-server 1.20.1-86a61da.0 → 1.20.1-a38caf0.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 +9 -0
- package/bin/yaml-language-server +24 -0
- package/eslint-result.sarif +140 -125
- package/lib/esm/languageserver/handlers/languageHandlers.d.ts +4 -2
- package/lib/esm/languageserver/handlers/languageHandlers.js +16 -0
- package/lib/esm/languageserver/handlers/languageHandlers.js.map +1 -1
- package/lib/esm/languageserver/handlers/settingsHandlers.js +2 -2
- package/lib/esm/languageserver/handlers/settingsHandlers.js.map +1 -1
- package/lib/esm/languageservice/parser/jsonParser07.js +1 -1
- package/lib/esm/languageservice/parser/jsonParser07.js.map +1 -1
- 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 +95 -85
- 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/services/yamlRename.d.ts +18 -0
- package/lib/esm/languageservice/services/yamlRename.js +184 -0
- package/lib/esm/languageservice/services/yamlRename.js.map +1 -0
- 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/languageservice/yamlLanguageService.d.ts +4 -2
- package/lib/esm/languageservice/yamlLanguageService.js +4 -0
- package/lib/esm/languageservice/yamlLanguageService.js.map +1 -1
- package/lib/esm/yamlServerInit.js +5 -0
- package/lib/esm/yamlServerInit.js.map +1 -1
- package/lib/umd/languageserver/handlers/languageHandlers.d.ts +4 -2
- package/lib/umd/languageserver/handlers/languageHandlers.js +16 -0
- package/lib/umd/languageserver/handlers/languageHandlers.js.map +1 -1
- package/lib/umd/languageserver/handlers/settingsHandlers.js +2 -2
- package/lib/umd/languageserver/handlers/settingsHandlers.js.map +1 -1
- package/lib/umd/languageservice/parser/jsonParser07.js +1 -1
- package/lib/umd/languageservice/parser/jsonParser07.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 +96 -86
- 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/services/yamlRename.d.ts +18 -0
- package/lib/umd/languageservice/services/yamlRename.js +198 -0
- package/lib/umd/languageservice/services/yamlRename.js.map +1 -0
- 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/languageservice/yamlLanguageService.d.ts +4 -2
- package/lib/umd/languageservice/yamlLanguageService.js +5 -1
- package/lib/umd/languageservice/yamlLanguageService.js.map +1 -1
- package/lib/umd/yamlServerInit.js +5 -0
- package/lib/umd/yamlServerInit.js.map +1 -1
- package/out/server/src/languageserver/handlers/languageHandlers.d.ts +4 -2
- package/out/server/src/languageserver/handlers/languageHandlers.js +16 -0
- package/out/server/src/languageserver/handlers/languageHandlers.js.map +1 -1
- package/out/server/src/languageserver/handlers/settingsHandlers.js +2 -2
- package/out/server/src/languageserver/handlers/settingsHandlers.js.map +1 -1
- package/out/server/src/languageservice/parser/jsonParser07.js +1 -1
- package/out/server/src/languageservice/parser/jsonParser07.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 +95 -85
- 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/services/yamlRename.d.ts +18 -0
- package/out/server/src/languageservice/services/yamlRename.js +188 -0
- package/out/server/src/languageservice/services/yamlRename.js.map +1 -0
- 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/languageservice/yamlLanguageService.d.ts +4 -2
- package/out/server/src/languageservice/yamlLanguageService.js +4 -0
- package/out/server/src/languageservice/yamlLanguageService.js.map +1 -1
- package/out/server/src/yamlServerInit.js +5 -0
- package/out/server/src/yamlServerInit.js.map +1 -1
- package/out/server/test/autoCompletion.test.js +45 -4
- 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 +102 -0
- package/out/server/test/schemaValidation.test.js.map +1 -1
- package/out/server/test/settingsHandlers.test.js +2 -2
- package/out/server/test/settingsHandlers.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/out/server/test/yamlRename.test.d.ts +1 -0
- package/out/server/test/yamlRename.test.js +106 -0
- package/out/server/test/yamlRename.test.js.map +1 -0
- package/package.json +1 -1
|
@@ -15,6 +15,7 @@ const vscode_uri_1 = require("vscode-uri");
|
|
|
15
15
|
const path = require("path");
|
|
16
16
|
const l10n = require("@vscode/l10n");
|
|
17
17
|
const yaml_1 = require("yaml");
|
|
18
|
+
const yamlScalar_1 = require("../utils/yamlScalar");
|
|
18
19
|
class YAMLHover {
|
|
19
20
|
constructor(schemaService, telemetry) {
|
|
20
21
|
this.telemetry = telemetry;
|
|
@@ -107,9 +108,7 @@ class YAMLHover {
|
|
|
107
108
|
}
|
|
108
109
|
s.schema.enum.forEach((enumValue, idx) => {
|
|
109
110
|
var _a;
|
|
110
|
-
|
|
111
|
-
enumValue = JSON.stringify(enumValue);
|
|
112
|
-
}
|
|
111
|
+
enumValue = typeof enumValue === 'string' ? (0, yamlScalar_1.toYamlStringScalar)(enumValue, false) : JSON.stringify(enumValue);
|
|
113
112
|
//insert only if the value is not present yet (avoiding duplicates)
|
|
114
113
|
//but it also adds or keeps the description of the enum value
|
|
115
114
|
const foundIdx = markdownEnums.findIndex((me) => me.value === enumValue);
|
|
@@ -190,7 +189,7 @@ class YAMLHover {
|
|
|
190
189
|
toMarkdown(plain) {
|
|
191
190
|
if (plain) {
|
|
192
191
|
let escaped = plain.replace(/([^\n\r])(\r?\n)([^\n\r])/gm, '$1\n\n$3'); // single new lines to \n\n (Markdown paragraph)
|
|
193
|
-
escaped = escaped.replace(/[\\`*_{}[\]
|
|
192
|
+
escaped = escaped.replace(/[\\`*_{}[\]#+\-!]/g, '\\$&'); // escape some of the markdown syntax tokens http://daringfireball.net/projects/markdown/syntax#backslash to avoid unintended formatting
|
|
194
193
|
if (this.indentation !== undefined) {
|
|
195
194
|
// escape indentation whitespace to prevent it from being converted to markdown code blocks.
|
|
196
195
|
const indentationMatchRegex = new RegExp(` {${this.indentation.length}}`, 'g');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"yamlHover.js","sourceRoot":"","sources":["../../../../../src/languageservice/services/yamlHover.ts"],"names":[],"mappings":";AAAA;;;;gGAIgG;;;AAEhG,6EAAgG;AAChG,gDAA0D;AAG1D,yDAAmE;AAEnE,6DAA8D;AAE9D,yDAAyE;AAEzE,2CAAiC;AACjC,6BAA6B;AAC7B,qCAAqC;AAGrC,+BAAkD;
|
|
1
|
+
{"version":3,"file":"yamlHover.js","sourceRoot":"","sources":["../../../../../src/languageservice/services/yamlHover.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,18 @@
|
|
|
1
|
+
import { TextDocument } from 'vscode-languageserver-textdocument';
|
|
2
|
+
import { Range, WorkspaceEdit } from 'vscode-languageserver-types';
|
|
3
|
+
import { Telemetry } from '../telemetry';
|
|
4
|
+
import { PrepareRenameParams, RenameParams } from 'vscode-languageserver-protocol';
|
|
5
|
+
export declare class YamlRename {
|
|
6
|
+
private readonly telemetry?;
|
|
7
|
+
constructor(telemetry?: Telemetry);
|
|
8
|
+
prepareRename(document: TextDocument, params: PrepareRenameParams): Range | null;
|
|
9
|
+
doRename(document: TextDocument, params: RenameParams): WorkspaceEdit | null;
|
|
10
|
+
private findTarget;
|
|
11
|
+
private findByToken;
|
|
12
|
+
private findAnchorToken;
|
|
13
|
+
private getAnchorFromToken;
|
|
14
|
+
private getAnchorFromCollectionItem;
|
|
15
|
+
private getNameRange;
|
|
16
|
+
private isOffsetInsideToken;
|
|
17
|
+
private findInvalidAnchorChar;
|
|
18
|
+
}
|
|
@@ -0,0 +1,188 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
/*---------------------------------------------------------------------------------------------
|
|
3
|
+
* Copyright (c) Red Hat, Inc. All rights reserved.
|
|
4
|
+
* Licensed under the MIT License. See License.txt in the project root for license information.
|
|
5
|
+
*--------------------------------------------------------------------------------------------*/
|
|
6
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
7
|
+
exports.YamlRename = void 0;
|
|
8
|
+
const vscode_languageserver_types_1 = require("vscode-languageserver-types");
|
|
9
|
+
const yaml_documents_1 = require("../parser/yaml-documents");
|
|
10
|
+
const arrUtils_1 = require("../utils/arrUtils");
|
|
11
|
+
const textBuffer_1 = require("../utils/textBuffer");
|
|
12
|
+
const yaml_1 = require("yaml");
|
|
13
|
+
const astUtils_1 = require("../utils/astUtils");
|
|
14
|
+
const vscode_languageserver_protocol_1 = require("vscode-languageserver-protocol");
|
|
15
|
+
class YamlRename {
|
|
16
|
+
constructor(telemetry) {
|
|
17
|
+
this.telemetry = telemetry;
|
|
18
|
+
}
|
|
19
|
+
prepareRename(document, params) {
|
|
20
|
+
try {
|
|
21
|
+
const target = this.findTarget(document, params.position);
|
|
22
|
+
if (!target) {
|
|
23
|
+
return null;
|
|
24
|
+
}
|
|
25
|
+
if (!this.findAnchorToken(target.yamlDoc, target.anchorNode)) {
|
|
26
|
+
return null;
|
|
27
|
+
}
|
|
28
|
+
return this.getNameRange(document, target.token);
|
|
29
|
+
}
|
|
30
|
+
catch (err) {
|
|
31
|
+
this.telemetry?.sendError('yaml.prepareRename.error', err);
|
|
32
|
+
return null;
|
|
33
|
+
}
|
|
34
|
+
}
|
|
35
|
+
doRename(document, params) {
|
|
36
|
+
try {
|
|
37
|
+
const target = this.findTarget(document, params.position);
|
|
38
|
+
if (!target) {
|
|
39
|
+
return null;
|
|
40
|
+
}
|
|
41
|
+
const anchorToken = this.findAnchorToken(target.yamlDoc, target.anchorNode);
|
|
42
|
+
if (!anchorToken) {
|
|
43
|
+
return null;
|
|
44
|
+
}
|
|
45
|
+
const newName = params.newName;
|
|
46
|
+
const invalidChar = this.findInvalidAnchorChar(newName);
|
|
47
|
+
if (invalidChar !== null) {
|
|
48
|
+
throw new vscode_languageserver_protocol_1.ResponseError(vscode_languageserver_protocol_1.ErrorCodes.InvalidParams, `Anchor name cannot contain '${invalidChar}'`);
|
|
49
|
+
}
|
|
50
|
+
const edits = [];
|
|
51
|
+
edits.push(vscode_languageserver_types_1.TextEdit.replace(this.getNameRange(document, anchorToken), newName));
|
|
52
|
+
(0, yaml_1.visit)(target.yamlDoc.internalDocument, (key, node) => {
|
|
53
|
+
if ((0, yaml_1.isAlias)(node) && node.srcToken && node.resolve(target.yamlDoc.internalDocument) === target.anchorNode) {
|
|
54
|
+
edits.push(vscode_languageserver_types_1.TextEdit.replace(this.getNameRange(document, node.srcToken), newName));
|
|
55
|
+
}
|
|
56
|
+
});
|
|
57
|
+
return {
|
|
58
|
+
changes: {
|
|
59
|
+
[document.uri]: edits,
|
|
60
|
+
},
|
|
61
|
+
};
|
|
62
|
+
}
|
|
63
|
+
catch (err) {
|
|
64
|
+
if (err instanceof vscode_languageserver_protocol_1.ResponseError) {
|
|
65
|
+
throw err;
|
|
66
|
+
}
|
|
67
|
+
this.telemetry?.sendError('yaml.rename.error', err);
|
|
68
|
+
return null;
|
|
69
|
+
}
|
|
70
|
+
}
|
|
71
|
+
findTarget(document, position) {
|
|
72
|
+
const yamlDocuments = yaml_documents_1.yamlDocumentsCache.getYamlDocument(document);
|
|
73
|
+
const offset = document.offsetAt(position);
|
|
74
|
+
const yamlDoc = (0, arrUtils_1.matchOffsetToDocument)(offset, yamlDocuments);
|
|
75
|
+
if (!yamlDoc) {
|
|
76
|
+
return null;
|
|
77
|
+
}
|
|
78
|
+
const [node] = yamlDoc.getNodeFromPosition(offset, new textBuffer_1.TextBuffer(document));
|
|
79
|
+
if (!node) {
|
|
80
|
+
return this.findByToken(yamlDoc, offset);
|
|
81
|
+
}
|
|
82
|
+
if ((0, yaml_1.isAlias)(node) && node.srcToken && this.isOffsetInsideToken(node.srcToken, offset)) {
|
|
83
|
+
const anchorNode = node.resolve(yamlDoc.internalDocument);
|
|
84
|
+
if (!anchorNode) {
|
|
85
|
+
return null;
|
|
86
|
+
}
|
|
87
|
+
return { anchorNode, token: node.srcToken, yamlDoc };
|
|
88
|
+
}
|
|
89
|
+
if (((0, yaml_1.isCollection)(node) || (0, yaml_1.isScalar)(node)) && node.anchor) {
|
|
90
|
+
const anchorToken = this.findAnchorToken(yamlDoc, node);
|
|
91
|
+
if (anchorToken && this.isOffsetInsideToken(anchorToken, offset)) {
|
|
92
|
+
return { anchorNode: node, token: anchorToken, yamlDoc };
|
|
93
|
+
}
|
|
94
|
+
}
|
|
95
|
+
return this.findByToken(yamlDoc, offset);
|
|
96
|
+
}
|
|
97
|
+
findByToken(yamlDoc, offset) {
|
|
98
|
+
let target;
|
|
99
|
+
(0, yaml_1.visit)(yamlDoc.internalDocument, (key, node) => {
|
|
100
|
+
if ((0, yaml_1.isAlias)(node) && node.srcToken && this.isOffsetInsideToken(node.srcToken, offset)) {
|
|
101
|
+
const anchorNode = node.resolve(yamlDoc.internalDocument);
|
|
102
|
+
if (anchorNode) {
|
|
103
|
+
target = { anchorNode, token: node.srcToken, yamlDoc };
|
|
104
|
+
return yaml_1.visit.BREAK;
|
|
105
|
+
}
|
|
106
|
+
}
|
|
107
|
+
if (((0, yaml_1.isCollection)(node) || (0, yaml_1.isScalar)(node)) && node.anchor) {
|
|
108
|
+
const anchorToken = this.findAnchorToken(yamlDoc, node);
|
|
109
|
+
if (anchorToken && this.isOffsetInsideToken(anchorToken, offset)) {
|
|
110
|
+
target = { anchorNode: node, token: anchorToken, yamlDoc };
|
|
111
|
+
return yaml_1.visit.BREAK;
|
|
112
|
+
}
|
|
113
|
+
}
|
|
114
|
+
});
|
|
115
|
+
return target ?? null;
|
|
116
|
+
}
|
|
117
|
+
findAnchorToken(yamlDoc, node) {
|
|
118
|
+
const parent = yamlDoc.getParent(node);
|
|
119
|
+
const candidates = [];
|
|
120
|
+
if (parent && parent.srcToken) {
|
|
121
|
+
candidates.push(parent.srcToken);
|
|
122
|
+
}
|
|
123
|
+
if (node.srcToken) {
|
|
124
|
+
candidates.push(node.srcToken);
|
|
125
|
+
}
|
|
126
|
+
for (const token of candidates) {
|
|
127
|
+
const anchor = this.getAnchorFromToken(token, node);
|
|
128
|
+
if (anchor) {
|
|
129
|
+
return anchor;
|
|
130
|
+
}
|
|
131
|
+
}
|
|
132
|
+
return undefined;
|
|
133
|
+
}
|
|
134
|
+
getAnchorFromToken(token, node) {
|
|
135
|
+
if ((0, astUtils_1.isCollectionItem)(token)) {
|
|
136
|
+
return this.getAnchorFromCollectionItem(token);
|
|
137
|
+
}
|
|
138
|
+
else if (yaml_1.CST.isCollection(token)) {
|
|
139
|
+
const collection = token;
|
|
140
|
+
for (const item of collection.items ?? []) {
|
|
141
|
+
if (item.value !== node.srcToken) {
|
|
142
|
+
continue;
|
|
143
|
+
}
|
|
144
|
+
const anchor = this.getAnchorFromCollectionItem(item);
|
|
145
|
+
if (anchor) {
|
|
146
|
+
return anchor;
|
|
147
|
+
}
|
|
148
|
+
}
|
|
149
|
+
}
|
|
150
|
+
return undefined;
|
|
151
|
+
}
|
|
152
|
+
getAnchorFromCollectionItem(token) {
|
|
153
|
+
for (const t of token.start) {
|
|
154
|
+
if (t.type === 'anchor') {
|
|
155
|
+
return t;
|
|
156
|
+
}
|
|
157
|
+
}
|
|
158
|
+
if (token.sep && Array.isArray(token.sep)) {
|
|
159
|
+
for (const t of token.sep) {
|
|
160
|
+
if (t.type === 'anchor') {
|
|
161
|
+
return t;
|
|
162
|
+
}
|
|
163
|
+
}
|
|
164
|
+
}
|
|
165
|
+
return undefined;
|
|
166
|
+
}
|
|
167
|
+
getNameRange(document, token) {
|
|
168
|
+
const startOffset = token.offset + 1;
|
|
169
|
+
const endOffset = token.offset + token.source.length;
|
|
170
|
+
return vscode_languageserver_types_1.Range.create(document.positionAt(startOffset), document.positionAt(endOffset));
|
|
171
|
+
}
|
|
172
|
+
isOffsetInsideToken(token, offset) {
|
|
173
|
+
return offset >= token.offset && offset <= token.offset + token.source.length;
|
|
174
|
+
}
|
|
175
|
+
findInvalidAnchorChar(name) {
|
|
176
|
+
// YAML 1.2.2 spec: anchor names cannot contain flow indicators or whitespace
|
|
177
|
+
// https://yaml.org/spec/1.2.2/#rule-ns-anchor-char
|
|
178
|
+
const invalidChars = ['[', ']', '{', '}', ',', ' ', '\t'];
|
|
179
|
+
for (const char of invalidChars) {
|
|
180
|
+
if (name.includes(char)) {
|
|
181
|
+
return char === ' ' ? 'space' : char === '\t' ? 'tab' : char;
|
|
182
|
+
}
|
|
183
|
+
}
|
|
184
|
+
return null;
|
|
185
|
+
}
|
|
186
|
+
}
|
|
187
|
+
exports.YamlRename = YamlRename;
|
|
188
|
+
//# sourceMappingURL=yamlRename.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"yamlRename.js","sourceRoot":"","sources":["../../../../../src/languageservice/services/yamlRename.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,10 +5,11 @@
|
|
|
5
5
|
*--------------------------------------------------------------------------------------------*/
|
|
6
6
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
7
7
|
exports.convertErrorToTelemetryMsg = exports.isIterable = exports.isString = exports.isBoolean = exports.isDefined = exports.isNumber = exports.equals = void 0;
|
|
8
|
+
const scalar_type_1 = require("../parser/scalar-type");
|
|
8
9
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/explicit-module-boundary-types
|
|
9
10
|
function equals(one, other, type) {
|
|
10
|
-
if (type === 'boolean') {
|
|
11
|
-
one =
|
|
11
|
+
if (type === 'boolean' && typeof one === 'string') {
|
|
12
|
+
one = (0, scalar_type_1.parseYamlBoolean)(one);
|
|
12
13
|
}
|
|
13
14
|
if (one === other) {
|
|
14
15
|
return true;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"objects.js","sourceRoot":"","sources":["../../../../../src/languageservice/utils/objects.ts"],"names":[],"mappings":";AAAA;;;gGAGgG;;;AAEhG,iHAAiH;AACjH,SAAgB,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,73 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
/*---------------------------------------------------------------------------------------------
|
|
3
|
+
* Copyright (c) IBM Corporation. All rights reserved.
|
|
4
|
+
* Licensed under the MIT License. See License.txt in the project root for license information.
|
|
5
|
+
*--------------------------------------------------------------------------------------------*/
|
|
6
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
7
|
+
exports.toYamlStringScalar = void 0;
|
|
8
|
+
function toYamlStringScalar(s, preferSingleQuote = false) {
|
|
9
|
+
const quote = preferSingleQuote ? "'" : '"';
|
|
10
|
+
// empty string
|
|
11
|
+
if (s.length === 0) {
|
|
12
|
+
return `${quote}${quote}`;
|
|
13
|
+
}
|
|
14
|
+
// single quote character
|
|
15
|
+
if (s.length === 1 && s === '"') {
|
|
16
|
+
return '"\\""';
|
|
17
|
+
}
|
|
18
|
+
// literal quote strings like "" or ''
|
|
19
|
+
if (s.length === 2 && ((s[0] === '"' && s[1] === '"') || (s[0] === "'" && s[1] === "'"))) {
|
|
20
|
+
return s[0] === '"' ? '"\\"\\""' : `"''"`;
|
|
21
|
+
}
|
|
22
|
+
// check if the string is already a properly quoted YAML string
|
|
23
|
+
if (s.length >= 2) {
|
|
24
|
+
const firstChar = s[0];
|
|
25
|
+
const lastChar = s[s.length - 1];
|
|
26
|
+
if ((firstChar === '"' && lastChar === '"') || (firstChar === "'" && lastChar === "'")) {
|
|
27
|
+
return s;
|
|
28
|
+
}
|
|
29
|
+
}
|
|
30
|
+
// strings containing quotes or backslashes
|
|
31
|
+
if (/["\\]/.test(s)) {
|
|
32
|
+
return JSON.stringify(s);
|
|
33
|
+
}
|
|
34
|
+
// support YAML spec 1.1 boolean values and null
|
|
35
|
+
if (/^(?:on|off|true|false|yes|no|null|~)$/i.test(s)) {
|
|
36
|
+
return `${quote}${s}${quote}`;
|
|
37
|
+
}
|
|
38
|
+
// numeric values: integer/float, hex (0x), and octal (0o or YAML 1.1 style 0[0-7]+)
|
|
39
|
+
if (/^-?(?:0|[1-9]\d*)(?:\.\d+)?(?:[eE][+-]?\d+)?$/.test(s) ||
|
|
40
|
+
/^0x[0-9a-fA-F]+$/.test(s) ||
|
|
41
|
+
/^0o[0-7]+$/.test(s) ||
|
|
42
|
+
/^0[0-7]+$/.test(s)) {
|
|
43
|
+
return `"${s}"`;
|
|
44
|
+
}
|
|
45
|
+
// leading/trailing whitespaces need quoting
|
|
46
|
+
if (/^\s|\s$/.test(s)) {
|
|
47
|
+
return preferSingleQuote ? `'${s.replace(/'/g, "''")}'` : JSON.stringify(s);
|
|
48
|
+
}
|
|
49
|
+
// comment indicator
|
|
50
|
+
if (/(?:^|\s)#/.test(s)) {
|
|
51
|
+
return preferSingleQuote ? `'${s.replace(/'/g, "''")}'` : JSON.stringify(s);
|
|
52
|
+
}
|
|
53
|
+
// reserved indicators that cannot start a plain scalar
|
|
54
|
+
if (/^[\][{}#&*!|>'"%@`]/.test(s)) {
|
|
55
|
+
return preferSingleQuote ? `'${s.replace(/'/g, "''")}'` : JSON.stringify(s);
|
|
56
|
+
}
|
|
57
|
+
// -, ?, or : followed by space or end
|
|
58
|
+
if (/^[-?:](\s|$)/.test(s)) {
|
|
59
|
+
return preferSingleQuote ? `'${s.replace(/'/g, "''")}'` : JSON.stringify(s);
|
|
60
|
+
}
|
|
61
|
+
// colon in middle (mapping key indicator)
|
|
62
|
+
// e.g. `foo: bar` or `foo : bar` needs quoting, but `foo:bar` does not
|
|
63
|
+
if (/(?:^|[^:]):(?:\s|$)/.test(s)) {
|
|
64
|
+
return preferSingleQuote ? `'${s.replace(/'/g, "''")}'` : JSON.stringify(s);
|
|
65
|
+
}
|
|
66
|
+
// newlines, tabs, or carriage return
|
|
67
|
+
if (/[\n\t\r]/.test(s)) {
|
|
68
|
+
return JSON.stringify(s);
|
|
69
|
+
}
|
|
70
|
+
return s;
|
|
71
|
+
}
|
|
72
|
+
exports.toYamlStringScalar = toYamlStringScalar;
|
|
73
|
+
//# 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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"}
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import { CustomSchemaProvider, SchemaAdditions, SchemaDeletions, SchemaDeletionsAll } from './services/yamlSchemaService';
|
|
2
|
-
import { Position, CodeAction, CompletionList, Diagnostic, Hover, SymbolInformation, DocumentSymbol, FoldingRange, TextEdit, DocumentLink, CodeLens, DefinitionLink, SelectionRange } from 'vscode-languageserver-types';
|
|
2
|
+
import { Position, CodeAction, CompletionList, Diagnostic, Hover, SymbolInformation, DocumentSymbol, FoldingRange, TextEdit, DocumentLink, CodeLens, DefinitionLink, SelectionRange, Range, WorkspaceEdit } from 'vscode-languageserver-types';
|
|
3
3
|
import { JSONSchema } from './jsonSchema';
|
|
4
4
|
import { DocumentSymbolsContext } from 'vscode-json-languageservice';
|
|
5
|
-
import { ClientCapabilities, CodeActionParams, Connection, DocumentOnTypeFormattingParams, DefinitionParams } from 'vscode-languageserver';
|
|
5
|
+
import { ClientCapabilities, CodeActionParams, Connection, DocumentOnTypeFormattingParams, DefinitionParams, PrepareRenameParams, RenameParams } from 'vscode-languageserver';
|
|
6
6
|
import { TextDocument } from 'vscode-languageserver-textdocument';
|
|
7
7
|
import { FoldingRangesContext, SchemaVersions } from './yamlTypes';
|
|
8
8
|
import { Telemetry } from './telemetry';
|
|
@@ -121,6 +121,8 @@ export interface LanguageService {
|
|
|
121
121
|
getCodeAction: (document: TextDocument, params: CodeActionParams) => CodeAction[] | undefined;
|
|
122
122
|
getCodeLens: (document: TextDocument) => PromiseLike<CodeLens[] | undefined> | CodeLens[] | undefined;
|
|
123
123
|
resolveCodeLens: (param: CodeLens) => PromiseLike<CodeLens> | CodeLens;
|
|
124
|
+
prepareRename: (document: TextDocument, params: PrepareRenameParams) => Range | null;
|
|
125
|
+
doRename: (document: TextDocument, params: RenameParams) => WorkspaceEdit | null;
|
|
124
126
|
}
|
|
125
127
|
export declare function getLanguageService(params: {
|
|
126
128
|
schemaRequestService: SchemaRequestService;
|
|
@@ -21,6 +21,7 @@ const yaml_documents_1 = require("./parser/yaml-documents");
|
|
|
21
21
|
const schemaSelectionHandlers_1 = require("../languageserver/handlers/schemaSelectionHandlers");
|
|
22
22
|
const yamlDefinition_1 = require("./services/yamlDefinition");
|
|
23
23
|
const yamlSelectionRanges_1 = require("./services/yamlSelectionRanges");
|
|
24
|
+
const yamlRename_1 = require("./services/yamlRename");
|
|
24
25
|
var SchemaPriority;
|
|
25
26
|
(function (SchemaPriority) {
|
|
26
27
|
SchemaPriority[SchemaPriority["SchemaStore"] = 1] = "SchemaStore";
|
|
@@ -38,6 +39,7 @@ function getLanguageService(params) {
|
|
|
38
39
|
const yamlCodeLens = new yamlCodeLens_1.YamlCodeLens(schemaService, params.telemetry);
|
|
39
40
|
const yamlLinks = new yamlLinks_1.YamlLinks(params.telemetry);
|
|
40
41
|
const yamlDefinition = new yamlDefinition_1.YamlDefinition(params.telemetry);
|
|
42
|
+
const yamlRename = new yamlRename_1.YamlRename(params.telemetry);
|
|
41
43
|
new schemaSelectionHandlers_1.JSONSchemaSelection(schemaService, params.yamlSettings, params.connection);
|
|
42
44
|
return {
|
|
43
45
|
configure: (settings) => {
|
|
@@ -95,6 +97,8 @@ function getLanguageService(params) {
|
|
|
95
97
|
return yamlCodeLens.getCodeLens(document);
|
|
96
98
|
},
|
|
97
99
|
resolveCodeLens: (param) => yamlCodeLens.resolveCodeLens(param),
|
|
100
|
+
prepareRename: (document, params) => yamlRename.prepareRename(document, params),
|
|
101
|
+
doRename: (document, params) => yamlRename.doRename(document, params),
|
|
98
102
|
};
|
|
99
103
|
}
|
|
100
104
|
exports.getLanguageService = getLanguageService;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"yamlLanguageService.js","sourceRoot":"","sources":["../../../../src/languageservice/yamlLanguageService.ts"],"names":[],"mappings":";AAAA;;;;gGAIgG;;;AAEhG,oEAMsC;
|
|
1
|
+
{"version":3,"file":"yamlLanguageService.js","sourceRoot":"","sources":["../../../../src/languageservice/yamlLanguageService.ts"],"names":[],"mappings":"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"}
|
|
@@ -93,6 +93,10 @@ class YAMLServerInit {
|
|
|
93
93
|
(0, yamlCommands_1.registerCommands)(commandExecutor_1.commandExecutor, this.connection);
|
|
94
94
|
await this.setupl10nBundle(params);
|
|
95
95
|
return {
|
|
96
|
+
serverInfo: {
|
|
97
|
+
name: 'yaml-language-server',
|
|
98
|
+
version: process.env.YAML_LANGUAGE_SERVER_VERSION || 'unknown',
|
|
99
|
+
},
|
|
96
100
|
capabilities: {
|
|
97
101
|
textDocumentSync: vscode_languageserver_1.TextDocumentSyncKind.Incremental,
|
|
98
102
|
completionProvider: { resolveProvider: false },
|
|
@@ -104,6 +108,7 @@ class YAMLServerInit {
|
|
|
104
108
|
},
|
|
105
109
|
documentRangeFormattingProvider: false,
|
|
106
110
|
definitionProvider: true,
|
|
111
|
+
renameProvider: { prepareProvider: true },
|
|
107
112
|
documentLinkProvider: {},
|
|
108
113
|
foldingRangeProvider: true,
|
|
109
114
|
selectionRangeProvider: true,
|
|
@@ -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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"}
|
|
@@ -1630,7 +1630,7 @@ describe('Auto Completion Tests', () => {
|
|
|
1630
1630
|
const content = 'from: ';
|
|
1631
1631
|
const completion = await parseSetup(content, content.length);
|
|
1632
1632
|
(0, chai_1.expect)(completion.items.length).equal(1);
|
|
1633
|
-
(0, chai_1.expect)(completion.items[0]).to.deep.equal((0, verifyError_1.createExpectedCompletion)('@test', '"@test"', 0, 6, 0, 6, 12, 2, {
|
|
1633
|
+
(0, chai_1.expect)(completion.items[0]).to.deep.equal((0, verifyError_1.createExpectedCompletion)('"@test"', '"@test"', 0, 6, 0, 6, 12, 2, {
|
|
1634
1634
|
documentation: undefined,
|
|
1635
1635
|
}));
|
|
1636
1636
|
});
|
|
@@ -2024,10 +2024,10 @@ describe('Auto Completion Tests', () => {
|
|
|
2024
2024
|
const testItem = completion.items.find((i) => i.label === 'test');
|
|
2025
2025
|
(0, chai_1.expect)(testItem).to.not.undefined;
|
|
2026
2026
|
(0, chai_1.expect)(testItem.textEdit.newText).equal('test');
|
|
2027
|
-
const oneItem = completion.items.find((i) => i.label === '1');
|
|
2027
|
+
const oneItem = completion.items.find((i) => i.label === '"1"');
|
|
2028
2028
|
(0, chai_1.expect)(oneItem).to.not.undefined;
|
|
2029
2029
|
(0, chai_1.expect)(oneItem.textEdit.newText).equal('"1"');
|
|
2030
|
-
const trueItem = completion.items.find((i) => i.label === 'true');
|
|
2030
|
+
const trueItem = completion.items.find((i) => i.label === '"true"');
|
|
2031
2031
|
(0, chai_1.expect)(trueItem).to.not.undefined;
|
|
2032
2032
|
(0, chai_1.expect)(trueItem.textEdit.newText).equal('"true"');
|
|
2033
2033
|
});
|
|
@@ -2267,7 +2267,48 @@ describe('Auto Completion Tests', () => {
|
|
|
2267
2267
|
const completion = await parseSetup(content, 9);
|
|
2268
2268
|
(0, chai_1.expect)(completion.items).lengthOf(2);
|
|
2269
2269
|
(0, chai_1.expect)(completion.items[0]).eql((0, verifyError_1.createExpectedCompletion)('2', '2', 0, 9, 0, 9, 12, vscode_languageserver_types_1.InsertTextFormat.Snippet, { documentation: undefined }));
|
|
2270
|
-
(0, chai_1.expect)(completion.items[1]).eql((0, verifyError_1.createExpectedCompletion)('2.1', '2.1', 0, 9, 0, 9, 12, vscode_languageserver_types_1.InsertTextFormat.Snippet, {
|
|
2270
|
+
(0, chai_1.expect)(completion.items[1]).eql((0, verifyError_1.createExpectedCompletion)('2.1', '2.1', 0, 9, 0, 9, 12, vscode_languageserver_types_1.InsertTextFormat.Snippet, {
|
|
2271
|
+
documentation: undefined,
|
|
2272
|
+
detail: 'Default value',
|
|
2273
|
+
}));
|
|
2274
|
+
});
|
|
2275
|
+
it('required enum property completes with default value', async () => {
|
|
2276
|
+
schemaProvider.addSchema(testHelper_1.SCHEMA_ID, {
|
|
2277
|
+
type: 'object',
|
|
2278
|
+
properties: {
|
|
2279
|
+
Mode: {
|
|
2280
|
+
type: 'integer',
|
|
2281
|
+
enum: [0, 1],
|
|
2282
|
+
default: 1,
|
|
2283
|
+
},
|
|
2284
|
+
},
|
|
2285
|
+
required: ['Mode'],
|
|
2286
|
+
});
|
|
2287
|
+
const completion = await parseSetup('', 0);
|
|
2288
|
+
(0, chai_1.expect)(completion.items[0]).eql((0, verifyError_1.createExpectedCompletion)('Mode', 'Mode: 1', 0, 0, 0, 0, 10, vscode_languageserver_types_1.InsertTextFormat.Snippet, { documentation: '' }));
|
|
2289
|
+
});
|
|
2290
|
+
it('enum completion should label the default value', async () => {
|
|
2291
|
+
schemaProvider.addSchema(testHelper_1.SCHEMA_ID, {
|
|
2292
|
+
type: 'object',
|
|
2293
|
+
properties: {
|
|
2294
|
+
Mode: {
|
|
2295
|
+
type: 'integer',
|
|
2296
|
+
enum: [0, 1],
|
|
2297
|
+
default: 1,
|
|
2298
|
+
},
|
|
2299
|
+
},
|
|
2300
|
+
});
|
|
2301
|
+
const content = 'Mode: ';
|
|
2302
|
+
const completion = await parseSetup(content, content.length);
|
|
2303
|
+
const zero = completion.items.find((i) => i.label === '0');
|
|
2304
|
+
const one = completion.items.find((i) => i.label === '1');
|
|
2305
|
+
(0, chai_1.expect)(zero, 'Expected enum option 0').to.not.be.undefined;
|
|
2306
|
+
(0, chai_1.expect)(one, 'Expected enum option 1').to.not.be.undefined;
|
|
2307
|
+
(0, chai_1.expect)(zero).eql((0, verifyError_1.createExpectedCompletion)('0', '0', 0, 6, 0, 6, 12, 2, { documentation: undefined }));
|
|
2308
|
+
(0, chai_1.expect)(one).eql((0, verifyError_1.createExpectedCompletion)('1', '1', 0, 6, 0, 6, 12, 2, {
|
|
2309
|
+
documentation: undefined,
|
|
2310
|
+
detail: 'Default value',
|
|
2311
|
+
}));
|
|
2271
2312
|
});
|
|
2272
2313
|
});
|
|
2273
2314
|
describe('Array completion', () => {
|