yaml-language-server 1.8.1-c2e2e0f.0 → 1.9.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 +24 -0
- package/CONTRIBUTING.md +8 -0
- package/DCO +37 -0
- package/README.md +1 -0
- package/lib/esm/languageserver/handlers/settingsHandlers.js.map +1 -1
- package/lib/esm/languageservice/jsonASTTypes.js +1 -0
- package/lib/esm/languageservice/jsonSchema.js +1 -0
- package/lib/esm/languageservice/parser/jsonParser07.js +3 -3
- package/lib/esm/languageservice/parser/jsonParser07.js.map +1 -1
- package/lib/esm/languageservice/parser/yaml-documents.js +10 -2
- package/lib/esm/languageservice/parser/yaml-documents.js.map +1 -1
- package/lib/esm/languageservice/parser/yamlParser07.js.map +1 -1
- package/lib/esm/languageservice/services/validation/types.js +1 -0
- package/lib/esm/languageservice/services/yamlCodeActions.js.map +1 -1
- package/lib/esm/languageservice/services/yamlCodeLens.js +2 -17
- package/lib/esm/languageservice/services/yamlCodeLens.js.map +1 -1
- package/lib/esm/languageservice/services/yamlCompletion.js +51 -36
- package/lib/esm/languageservice/services/yamlCompletion.js.map +1 -1
- package/lib/esm/languageservice/services/yamlFolding.js.map +1 -1
- package/lib/esm/languageservice/services/yamlHover.js +1 -1
- package/lib/esm/languageservice/services/yamlHover.js.map +1 -1
- package/lib/esm/languageservice/services/yamlSchemaService.js +14 -0
- package/lib/esm/languageservice/services/yamlSchemaService.js.map +1 -1
- package/lib/esm/languageservice/utils/astUtils.js.map +1 -1
- package/lib/esm/languageservice/utils/charCode.js +1 -0
- package/lib/esm/languageservice/utils/indentationGuesser.js +6 -6
- package/lib/esm/languageservice/utils/indentationGuesser.js.map +1 -1
- package/lib/esm/languageservice/utils/objects.js.map +1 -1
- package/lib/esm/languageservice/utils/schemaUtils.d.ts +1 -0
- package/lib/esm/languageservice/utils/schemaUtils.js +16 -0
- package/lib/esm/languageservice/utils/schemaUtils.js.map +1 -1
- package/lib/esm/languageservice/utils/strings.js +1 -1
- package/lib/esm/languageservice/utils/strings.js.map +1 -1
- package/lib/esm/languageservice/utils/textBuffer.js +1 -1
- package/lib/esm/languageservice/utils/textBuffer.js.map +1 -1
- package/lib/esm/languageservice/yamlTypes.js +1 -0
- package/lib/umd/index.js +7 -2
- package/lib/umd/index.js.map +1 -1
- package/lib/umd/languageserver/handlers/languageHandlers.js +1 -1
- package/lib/umd/languageserver/handlers/languageHandlers.js.map +1 -1
- package/lib/umd/languageserver/handlers/schemaSelectionHandlers.js +1 -1
- package/lib/umd/languageserver/handlers/schemaSelectionHandlers.js.map +1 -1
- package/lib/umd/languageserver/handlers/settingsHandlers.js +7 -7
- package/lib/umd/languageserver/handlers/settingsHandlers.js.map +1 -1
- package/lib/umd/languageserver/handlers/validationHandlers.js +2 -2
- package/lib/umd/languageserver/handlers/validationHandlers.js.map +1 -1
- package/lib/umd/languageservice/parser/ast-converter.js +11 -11
- package/lib/umd/languageservice/parser/ast-converter.js.map +1 -1
- package/lib/umd/languageservice/parser/custom-tag-provider.js +3 -3
- package/lib/umd/languageservice/parser/custom-tag-provider.js.map +1 -1
- package/lib/umd/languageservice/parser/jsonParser07.js +28 -28
- package/lib/umd/languageservice/parser/jsonParser07.js.map +1 -1
- package/lib/umd/languageservice/parser/yaml-documents.js +23 -15
- package/lib/umd/languageservice/parser/yaml-documents.js.map +1 -1
- package/lib/umd/languageservice/parser/yamlParser07.js +1 -1
- package/lib/umd/languageservice/parser/yamlParser07.js.map +1 -1
- package/lib/umd/languageservice/services/documentSymbols.js +4 -4
- package/lib/umd/languageservice/services/documentSymbols.js.map +1 -1
- package/lib/umd/languageservice/services/schemaRequestHandler.js +6 -5
- package/lib/umd/languageservice/services/schemaRequestHandler.js.map +1 -1
- package/lib/umd/languageservice/services/validation/unused-anchors.js +5 -5
- package/lib/umd/languageservice/services/validation/unused-anchors.js.map +1 -1
- package/lib/umd/languageservice/services/yamlCodeActions.js +1 -1
- package/lib/umd/languageservice/services/yamlCodeActions.js.map +1 -1
- package/lib/umd/languageservice/services/yamlCodeLens.js +5 -20
- package/lib/umd/languageservice/services/yamlCodeLens.js.map +1 -1
- package/lib/umd/languageservice/services/yamlCompletion.js +101 -86
- package/lib/umd/languageservice/services/yamlCompletion.js.map +1 -1
- package/lib/umd/languageservice/services/yamlDefinition.js +3 -3
- package/lib/umd/languageservice/services/yamlDefinition.js.map +1 -1
- package/lib/umd/languageservice/services/yamlFolding.js.map +1 -1
- package/lib/umd/languageservice/services/yamlHover.js +5 -5
- package/lib/umd/languageservice/services/yamlHover.js.map +1 -1
- package/lib/umd/languageservice/services/yamlLinks.js +2 -2
- package/lib/umd/languageservice/services/yamlLinks.js.map +1 -1
- package/lib/umd/languageservice/services/yamlSchemaService.js +18 -4
- package/lib/umd/languageservice/services/yamlSchemaService.js.map +1 -1
- package/lib/umd/languageservice/services/yamlValidation.js +4 -3
- package/lib/umd/languageservice/services/yamlValidation.js.map +1 -1
- package/lib/umd/languageservice/utils/astUtils.js +3 -3
- package/lib/umd/languageservice/utils/astUtils.js.map +1 -1
- package/lib/umd/languageservice/utils/indentationGuesser.js +6 -6
- package/lib/umd/languageservice/utils/indentationGuesser.js.map +1 -1
- package/lib/umd/languageservice/utils/objects.js.map +1 -1
- package/lib/umd/languageservice/utils/paths.js +9 -6
- package/lib/umd/languageservice/utils/paths.js.map +1 -1
- package/lib/umd/languageservice/utils/schemaUrls.js +3 -3
- package/lib/umd/languageservice/utils/schemaUrls.js.map +1 -1
- package/lib/umd/languageservice/utils/schemaUtils.d.ts +1 -0
- package/lib/umd/languageservice/utils/schemaUtils.js +19 -2
- package/lib/umd/languageservice/utils/schemaUtils.js.map +1 -1
- package/lib/umd/languageservice/utils/strings.js +1 -1
- package/lib/umd/languageservice/utils/strings.js.map +1 -1
- package/lib/umd/languageservice/utils/textBuffer.js +1 -1
- package/lib/umd/languageservice/utils/textBuffer.js.map +1 -1
- package/lib/umd/languageservice/yamlLanguageService.js +1 -1
- package/lib/umd/languageservice/yamlLanguageService.js.map +1 -1
- package/lib/umd/server.js +4 -4
- package/lib/umd/server.js.map +1 -1
- package/lib/umd/webworker/yamlServerMain.js +2 -2
- package/lib/umd/webworker/yamlServerMain.js.map +1 -1
- package/lib/umd/yamlServerInit.js +2 -2
- package/lib/umd/yamlServerInit.js.map +1 -1
- package/out/server/src/index.js +7 -2
- package/out/server/src/index.js.map +1 -1
- package/out/server/src/languageserver/handlers/languageHandlers.js +1 -1
- package/out/server/src/languageserver/handlers/languageHandlers.js.map +1 -1
- package/out/server/src/languageserver/handlers/schemaSelectionHandlers.js +1 -1
- package/out/server/src/languageserver/handlers/schemaSelectionHandlers.js.map +1 -1
- package/out/server/src/languageserver/handlers/settingsHandlers.js +7 -7
- package/out/server/src/languageserver/handlers/settingsHandlers.js.map +1 -1
- package/out/server/src/languageserver/handlers/validationHandlers.js +2 -2
- package/out/server/src/languageserver/handlers/validationHandlers.js.map +1 -1
- package/out/server/src/languageservice/parser/ast-converter.js +11 -11
- package/out/server/src/languageservice/parser/ast-converter.js.map +1 -1
- package/out/server/src/languageservice/parser/custom-tag-provider.js +3 -3
- package/out/server/src/languageservice/parser/custom-tag-provider.js.map +1 -1
- package/out/server/src/languageservice/parser/jsonParser07.js +28 -28
- package/out/server/src/languageservice/parser/jsonParser07.js.map +1 -1
- package/out/server/src/languageservice/parser/yaml-documents.js +23 -15
- package/out/server/src/languageservice/parser/yaml-documents.js.map +1 -1
- package/out/server/src/languageservice/parser/yamlParser07.js +1 -1
- package/out/server/src/languageservice/parser/yamlParser07.js.map +1 -1
- package/out/server/src/languageservice/services/documentSymbols.js +4 -4
- package/out/server/src/languageservice/services/documentSymbols.js.map +1 -1
- package/out/server/src/languageservice/services/schemaRequestHandler.js +6 -5
- package/out/server/src/languageservice/services/schemaRequestHandler.js.map +1 -1
- package/out/server/src/languageservice/services/validation/unused-anchors.js +5 -5
- package/out/server/src/languageservice/services/validation/unused-anchors.js.map +1 -1
- package/out/server/src/languageservice/services/yamlCodeActions.js +1 -1
- package/out/server/src/languageservice/services/yamlCodeActions.js.map +1 -1
- package/out/server/src/languageservice/services/yamlCodeLens.js +4 -19
- package/out/server/src/languageservice/services/yamlCodeLens.js.map +1 -1
- package/out/server/src/languageservice/services/yamlCompletion.js +100 -85
- package/out/server/src/languageservice/services/yamlCompletion.js.map +1 -1
- package/out/server/src/languageservice/services/yamlDefinition.js +3 -3
- package/out/server/src/languageservice/services/yamlDefinition.js.map +1 -1
- package/out/server/src/languageservice/services/yamlFolding.js.map +1 -1
- package/out/server/src/languageservice/services/yamlHover.js +5 -5
- package/out/server/src/languageservice/services/yamlHover.js.map +1 -1
- package/out/server/src/languageservice/services/yamlLinks.js +2 -2
- package/out/server/src/languageservice/services/yamlLinks.js.map +1 -1
- package/out/server/src/languageservice/services/yamlSchemaService.js +17 -3
- package/out/server/src/languageservice/services/yamlSchemaService.js.map +1 -1
- package/out/server/src/languageservice/services/yamlValidation.js +4 -3
- package/out/server/src/languageservice/services/yamlValidation.js.map +1 -1
- package/out/server/src/languageservice/utils/astUtils.js +3 -3
- package/out/server/src/languageservice/utils/astUtils.js.map +1 -1
- package/out/server/src/languageservice/utils/indentationGuesser.js +6 -6
- package/out/server/src/languageservice/utils/indentationGuesser.js.map +1 -1
- package/out/server/src/languageservice/utils/objects.js.map +1 -1
- package/out/server/src/languageservice/utils/paths.js +9 -6
- package/out/server/src/languageservice/utils/paths.js.map +1 -1
- package/out/server/src/languageservice/utils/schemaUrls.js +3 -3
- package/out/server/src/languageservice/utils/schemaUrls.js.map +1 -1
- package/out/server/src/languageservice/utils/schemaUtils.d.ts +1 -0
- package/out/server/src/languageservice/utils/schemaUtils.js +18 -1
- package/out/server/src/languageservice/utils/schemaUtils.js.map +1 -1
- package/out/server/src/languageservice/utils/strings.js +1 -1
- package/out/server/src/languageservice/utils/strings.js.map +1 -1
- package/out/server/src/languageservice/utils/textBuffer.js +1 -1
- package/out/server/src/languageservice/utils/textBuffer.js.map +1 -1
- package/out/server/src/languageservice/yamlLanguageService.js +1 -1
- package/out/server/src/languageservice/yamlLanguageService.js.map +1 -1
- package/out/server/src/server.js +4 -4
- package/out/server/src/server.js.map +1 -1
- package/out/server/src/webworker/yamlServerMain.js +2 -2
- package/out/server/src/webworker/yamlServerMain.js.map +1 -1
- package/out/server/src/yamlServerInit.js +2 -2
- package/out/server/src/yamlServerInit.js.map +1 -1
- package/out/server/test/arrUtils.test.js +6 -6
- package/out/server/test/arrUtils.test.js.map +1 -1
- package/out/server/test/astUtils.test.js +18 -18
- package/out/server/test/astUtils.test.js.map +1 -1
- package/out/server/test/autoCompletion.test.js +267 -256
- package/out/server/test/autoCompletion.test.js.map +1 -1
- package/out/server/test/autoCompletionFix.test.js +408 -71
- package/out/server/test/autoCompletionFix.test.js.map +1 -1
- package/out/server/test/code-action-schema.test.js +12 -12
- package/out/server/test/code-action-schema.test.js.map +1 -1
- package/out/server/test/customTags.test.js +3 -3
- package/out/server/test/customTags.test.js.map +1 -1
- package/out/server/test/defaultSnippets.test.js +53 -32
- package/out/server/test/defaultSnippets.test.js.map +1 -1
- package/out/server/test/documentPositionCalculator.test.js +10 -10
- package/out/server/test/documentPositionCalculator.test.js.map +1 -1
- package/out/server/test/documentSymbols.test.js +62 -62
- package/out/server/test/documentSymbols.test.js.map +1 -1
- package/out/server/test/findLinks.test.js +2 -2
- package/out/server/test/findLinks.test.js.map +1 -1
- package/out/server/test/formatter.test.js +2 -2
- package/out/server/test/formatter.test.js.map +1 -1
- package/out/server/test/hover.test.js +107 -42
- package/out/server/test/hover.test.js.map +1 -1
- package/out/server/test/integration.test.js +4 -4
- package/out/server/test/integration.test.js.map +1 -1
- package/out/server/test/jsonParser.test.js +6 -6
- package/out/server/test/jsonParser.test.js.map +1 -1
- package/out/server/test/multipleDocuments.test.js +4 -4
- package/out/server/test/multipleDocuments.test.js.map +1 -1
- package/out/server/test/objects.test.js +14 -14
- package/out/server/test/objects.test.js.map +1 -1
- package/out/server/test/paths.test.js +26 -26
- package/out/server/test/paths.test.js.map +1 -1
- package/out/server/test/schema.test.js +9 -9
- package/out/server/test/schema.test.js.map +1 -1
- package/out/server/test/schemaRequestHandler.test.js +3 -3
- package/out/server/test/schemaRequestHandler.test.js.map +1 -1
- package/out/server/test/schemaSelectionHandlers.test.js +4 -4
- package/out/server/test/schemaSelectionHandlers.test.js.map +1 -1
- package/out/server/test/schemaValidation.test.js +69 -47
- package/out/server/test/schemaValidation.test.js.map +1 -1
- package/out/server/test/settingsHandlers.test.js +5 -5
- package/out/server/test/settingsHandlers.test.js.map +1 -1
- package/out/server/test/strings.test.js +19 -19
- package/out/server/test/strings.test.js.map +1 -1
- package/out/server/test/telemetry.test.js +2 -2
- package/out/server/test/telemetry.test.js.map +1 -1
- package/out/server/test/textBuffer.test.js +1 -1
- package/out/server/test/utils/testHelper.d.ts +11 -0
- package/out/server/test/utils/testHelper.js +22 -3
- package/out/server/test/utils/testHelper.js.map +1 -1
- package/out/server/test/yaml-documents.test.js +29 -29
- package/out/server/test/yaml-documents.test.js.map +1 -1
- package/out/server/test/yamlCodeActions.test.js +15 -15
- package/out/server/test/yamlCodeActions.test.js.map +1 -1
- package/out/server/test/yamlCodeLens.test.js +7 -7
- package/out/server/test/yamlCodeLens.test.js.map +1 -1
- package/out/server/test/yamlCommands.test.js +3 -3
- package/out/server/test/yamlCommands.test.js.map +1 -1
- package/out/server/test/yamlDefinition.test.js +5 -5
- package/out/server/test/yamlDefinition.test.js.map +1 -1
- package/out/server/test/yamlFolding.test.js +44 -44
- package/out/server/test/yamlFolding.test.js.map +1 -1
- package/out/server/test/yamlOnTypeFormatting.test.js +22 -22
- package/out/server/test/yamlOnTypeFormatting.test.js.map +1 -1
- package/out/server/test/yamlParser.test.js +24 -24
- package/out/server/test/yamlParser.test.js.map +1 -1
- package/out/server/test/yamlSchemaService.test.js +7 -7
- package/out/server/test/yamlSchemaService.test.js.map +1 -1
- package/out/server/test/yamlValidation.test.js +22 -22
- package/out/server/test/yamlValidation.test.js.map +1 -1
- package/package.json +5 -4
|
@@ -50,7 +50,7 @@
|
|
|
50
50
|
const comments = this._internalDocument.commentBefore.split('\n');
|
|
51
51
|
comments.forEach((comment) => this._lineComments.push(`#${comment}`));
|
|
52
52
|
}
|
|
53
|
-
yaml_1.visit(this.internalDocument, (_key, node) => {
|
|
53
|
+
(0, yaml_1.visit)(this.internalDocument, (_key, node) => {
|
|
54
54
|
if (node === null || node === void 0 ? void 0 : node.commentBefore) {
|
|
55
55
|
const comments = node === null || node === void 0 ? void 0 : node.commentBefore.split('\n');
|
|
56
56
|
comments.forEach((comment) => this._lineComments.push(`#${comment}`));
|
|
@@ -65,7 +65,7 @@
|
|
|
65
65
|
}
|
|
66
66
|
set internalDocument(document) {
|
|
67
67
|
this._internalDocument = document;
|
|
68
|
-
this.root = ast_converter_1.convertAST(null, this._internalDocument.contents, this._internalDocument, this.lineCounter);
|
|
68
|
+
this.root = (0, ast_converter_1.convertAST)(null, this._internalDocument.contents, this._internalDocument, this.lineCounter);
|
|
69
69
|
}
|
|
70
70
|
get internalDocument() {
|
|
71
71
|
return this._internalDocument;
|
|
@@ -91,8 +91,12 @@
|
|
|
91
91
|
if (lineContent.trim().length === 0) {
|
|
92
92
|
return [this.findClosestNode(positionOffset, textBuffer, configuredIndentation), true];
|
|
93
93
|
}
|
|
94
|
+
const textAfterPosition = lineContent.substring(position.character);
|
|
95
|
+
const spacesAfterPositionMatch = textAfterPosition.match(/^([ ]+)\n?$/);
|
|
96
|
+
const areOnlySpacesAfterPosition = !!spacesAfterPositionMatch;
|
|
97
|
+
const countOfSpacesAfterPosition = spacesAfterPositionMatch === null || spacesAfterPositionMatch === void 0 ? void 0 : spacesAfterPositionMatch[1].length;
|
|
94
98
|
let closestNode;
|
|
95
|
-
yaml_1.visit(this.internalDocument, (key, node) => {
|
|
99
|
+
(0, yaml_1.visit)(this.internalDocument, (key, node) => {
|
|
96
100
|
if (!node) {
|
|
97
101
|
return;
|
|
98
102
|
}
|
|
@@ -100,7 +104,11 @@
|
|
|
100
104
|
if (!range) {
|
|
101
105
|
return;
|
|
102
106
|
}
|
|
103
|
-
|
|
107
|
+
const isNullNodeOnTheLine = () => areOnlySpacesAfterPosition &&
|
|
108
|
+
positionOffset + countOfSpacesAfterPosition === range[2] &&
|
|
109
|
+
(0, yaml_1.isScalar)(node) &&
|
|
110
|
+
node.value === null;
|
|
111
|
+
if ((range[0] <= positionOffset && range[1] >= positionOffset) || isNullNodeOnTheLine()) {
|
|
104
112
|
closestNode = node;
|
|
105
113
|
}
|
|
106
114
|
else {
|
|
@@ -113,7 +121,7 @@
|
|
|
113
121
|
let offsetDiff = this.internalDocument.range[2];
|
|
114
122
|
let maxOffset = this.internalDocument.range[0];
|
|
115
123
|
let closestNode;
|
|
116
|
-
yaml_1.visit(this.internalDocument, (key, node) => {
|
|
124
|
+
(0, yaml_1.visit)(this.internalDocument, (key, node) => {
|
|
117
125
|
if (!node) {
|
|
118
126
|
return;
|
|
119
127
|
}
|
|
@@ -121,7 +129,7 @@
|
|
|
121
129
|
if (!range) {
|
|
122
130
|
return;
|
|
123
131
|
}
|
|
124
|
-
const diff = range[
|
|
132
|
+
const diff = range[1] - offset;
|
|
125
133
|
if (maxOffset <= range[0] && diff <= 0 && Math.abs(diff) <= offsetDiff) {
|
|
126
134
|
offsetDiff = Math.abs(diff);
|
|
127
135
|
maxOffset = range[0];
|
|
@@ -130,8 +138,8 @@
|
|
|
130
138
|
});
|
|
131
139
|
const position = textBuffer.getPosition(offset);
|
|
132
140
|
const lineContent = textBuffer.getLineContent(position.line);
|
|
133
|
-
const indentation = strings_1.getIndentation(lineContent, position.character);
|
|
134
|
-
if (yaml_1.isScalar(closestNode) && closestNode.value === null) {
|
|
141
|
+
const indentation = (0, strings_1.getIndentation)(lineContent, position.character);
|
|
142
|
+
if ((0, yaml_1.isScalar)(closestNode) && closestNode.value === null) {
|
|
135
143
|
return closestNode;
|
|
136
144
|
}
|
|
137
145
|
if (indentation === position.character) {
|
|
@@ -144,7 +152,7 @@
|
|
|
144
152
|
return this.internalDocument.contents;
|
|
145
153
|
}
|
|
146
154
|
configuredIndentation = !configuredIndentation ? 2 : configuredIndentation;
|
|
147
|
-
if (yaml_1.isNode(node) && node.range) {
|
|
155
|
+
if ((0, yaml_1.isNode)(node) && node.range) {
|
|
148
156
|
const position = textBuffer.getPosition(node.range[0]);
|
|
149
157
|
const lineContent = textBuffer.getLineContent(position.line);
|
|
150
158
|
currentLine = currentLine === '' ? lineContent.trim() : currentLine;
|
|
@@ -159,10 +167,10 @@
|
|
|
159
167
|
}
|
|
160
168
|
else if (position.character < indentation) {
|
|
161
169
|
const parent = this.getParent(node);
|
|
162
|
-
if (yaml_1.isPair(parent) && yaml_1.isNode(parent.value)) {
|
|
170
|
+
if ((0, yaml_1.isPair)(parent) && (0, yaml_1.isNode)(parent.value)) {
|
|
163
171
|
return parent.value;
|
|
164
172
|
}
|
|
165
|
-
else if (yaml_1.isPair(rootParent) && yaml_1.isNode(rootParent.value)) {
|
|
173
|
+
else if ((0, yaml_1.isPair)(rootParent) && (0, yaml_1.isNode)(rootParent.value)) {
|
|
166
174
|
return rootParent.value;
|
|
167
175
|
}
|
|
168
176
|
}
|
|
@@ -170,7 +178,7 @@
|
|
|
170
178
|
return node;
|
|
171
179
|
}
|
|
172
180
|
}
|
|
173
|
-
else if (yaml_1.isPair(node)) {
|
|
181
|
+
else if ((0, yaml_1.isPair)(node)) {
|
|
174
182
|
rootParent = node;
|
|
175
183
|
const parent = this.getParent(node);
|
|
176
184
|
return this.getProperParentByIndentation(indentation, parent, textBuffer, currentLine, configuredIndentation, rootParent);
|
|
@@ -178,7 +186,7 @@
|
|
|
178
186
|
return node;
|
|
179
187
|
}
|
|
180
188
|
getParent(node) {
|
|
181
|
-
return astUtils_1.getParent(this.internalDocument, node);
|
|
189
|
+
return (0, astUtils_1.getParent)(this.internalDocument, node);
|
|
182
190
|
}
|
|
183
191
|
}
|
|
184
192
|
exports.SingleYAMLDocument = SingleYAMLDocument;
|
|
@@ -224,13 +232,13 @@
|
|
|
224
232
|
}
|
|
225
233
|
const cacheEntry = this.cache.get(key);
|
|
226
234
|
if (cacheEntry.version !== document.version ||
|
|
227
|
-
(parserOptions.customTags && !arrUtils_1.isArrayEqual(cacheEntry.parserOptions.customTags, parserOptions.customTags))) {
|
|
235
|
+
(parserOptions.customTags && !(0, arrUtils_1.isArrayEqual)(cacheEntry.parserOptions.customTags, parserOptions.customTags))) {
|
|
228
236
|
let text = document.getText();
|
|
229
237
|
// if text is contains only whitespace wrap all text in object to force schema selection
|
|
230
238
|
if (addRootObject && !/\S/.test(text)) {
|
|
231
239
|
text = `{${text}}`;
|
|
232
240
|
}
|
|
233
|
-
const doc = yamlParser07_1.parse(text, parserOptions, document);
|
|
241
|
+
const doc = (0, yamlParser07_1.parse)(text, parserOptions, document);
|
|
234
242
|
cacheEntry.document = doc;
|
|
235
243
|
cacheEntry.version = document.version;
|
|
236
244
|
cacheEntry.parserOptions = parserOptions;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"yaml-documents.js","sourceRoot":"","sources":["../../../../src/languageservice/parser/yaml-documents.ts"],"names":[],"mappings":"AAAA;;;gGAGgG;;;;;;;;;;;;;IAGhG,iDAA8C;IAC9C,+BAA+F;IAE/F,iDAAmF;IACnF,6EAAwD;IACxD,mDAA6C;IAE7C,gDAAiD;IACjD,gDAA8C;IAE9C,8CAAkD;IAGlD;;;OAGG;IACH,MAAa,kBAAmB,SAAQ,2BAAY;QAOlD,YAAY,WAAyB;YACnC,KAAK,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;YAChB,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;QACjC,CAAC;QAED;;WAEG;QACH,KAAK;YACH,MAAM,IAAI,GAAG,IAAI,kBAAkB,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;YACtD,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC,YAAY,CAAC;YACtC,IAAI,CAAC,2BAA2B,GAAG,IAAI,CAAC,2BAA2B,CAAC;YACpE,IAAI,CAAC,eAAe,GAAG,IAAI,CAAC,eAAe,CAAC;YAC5C,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC,YAAY,CAAC,KAAK,EAAE,CAAC;YAC/C,gCAAgC;YAChC,IAAI,CAAC,gBAAgB,GAAG,IAAI,CAAC,iBAAiB,CAAC,KAAK,EAAE,CAAC;YACvD,OAAO,IAAI,CAAC;QACd,CAAC;QAEO,mBAAmB;YACzB,IAAI,CAAC,aAAa,GAAG,EAAE,CAAC;YACxB,IAAI,IAAI,CAAC,iBAAiB,CAAC,aAAa,EAAE;gBACxC,MAAM,QAAQ,GAAG,IAAI,CAAC,iBAAiB,CAAC,aAAa,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;gBAClE,QAAQ,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,OAAO,EAAE,CAAC,CAAC,CAAC;aACvE;YACD,YAAK,
|
|
1
|
+
{"version":3,"file":"yaml-documents.js","sourceRoot":"","sources":["../../../../src/languageservice/parser/yaml-documents.ts"],"names":[],"mappings":"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"}
|
|
@@ -34,7 +34,7 @@
|
|
|
34
34
|
var _a;
|
|
35
35
|
const options = {
|
|
36
36
|
strict: false,
|
|
37
|
-
customTags: custom_tag_provider_1.getCustomTags(parserOptions.customTags),
|
|
37
|
+
customTags: (0, custom_tag_provider_1.getCustomTags)(parserOptions.customTags),
|
|
38
38
|
version: (_a = parserOptions.yamlVersion) !== null && _a !== void 0 ? _a : exports.defaultOptions.yamlVersion,
|
|
39
39
|
keepSourceTokens: true,
|
|
40
40
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"yamlParser07.js","sourceRoot":"","sources":["../../../../src/languageservice/parser/yamlParser07.ts"],"names":[],"mappings":";;;;;;;;;IAAA;;;;oGAIgG;IAChG,YAAY,CAAC;;;IAEb,+BAA6G;IAC7G,qDAAoE;IAK3D,6FALA,6BAAY,OAKA;IAAE,mGALA,mCAAkB,OAKA;IAJzC,+DAAsD;IAEtD,oDAAiD;IASpC,QAAA,cAAc,GAAkB;QAC3C,UAAU,EAAE,EAAE;QACd,WAAW,EAAE,KAAK;KACnB,CAAC;IACF;;;;OAIG;IACH,SAAgB,KAAK,CAAC,IAAY,EAAE,gBAA+B,sBAAc,EAAE,QAAuB;;QACxG,MAAM,OAAO,GAAmD;YAC9D,MAAM,EAAE,KAAK;YACb,UAAU,EAAE,mCAAa,
|
|
1
|
+
{"version":3,"file":"yamlParser07.js","sourceRoot":"","sources":["../../../../src/languageservice/parser/yamlParser07.ts"],"names":[],"mappings":";;;;;;;;;IAAA;;;;oGAIgG;IAChG,YAAY,CAAC;;;IAEb,+BAA6G;IAC7G,qDAAoE;IAK3D,6FALA,6BAAY,OAKA;IAAE,mGALA,mCAAkB,OAKA;IAJzC,+DAAsD;IAEtD,oDAAiD;IASpC,QAAA,cAAc,GAAkB;QAC3C,UAAU,EAAE,EAAE;QACd,WAAW,EAAE,KAAK;KACnB,CAAC;IACF;;;;OAIG;IACH,SAAgB,KAAK,CAAC,IAAY,EAAE,gBAA+B,sBAAc,EAAE,QAAuB;;QACxG,MAAM,OAAO,GAAmD;YAC9D,MAAM,EAAE,KAAK;YACb,UAAU,EAAE,IAAA,mCAAa,EAAC,aAAa,CAAC,UAAU,CAAC;YACnD,OAAO,EAAE,MAAA,aAAa,CAAC,WAAW,mCAAI,sBAAc,CAAC,WAAW;YAChE,gBAAgB,EAAE,IAAI;SACvB,CAAC;QACF,MAAM,QAAQ,GAAG,IAAI,eAAQ,CAAC,OAAO,CAAC,CAAC;QACvC,MAAM,WAAW,GAAG,IAAI,kBAAW,EAAE,CAAC;QACtC,IAAI,eAAe,GAAG,KAAK,CAAC;QAC5B,IAAI,QAAQ,EAAE;YACZ,MAAM,UAAU,GAAG,IAAI,uBAAU,CAAC,QAAQ,CAAC,CAAC;YAC5C,MAAM,QAAQ,GAAG,UAAU,CAAC,WAAW,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YACrD,MAAM,WAAW,GAAG,UAAU,CAAC,cAAc,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;YAC7D,eAAe,GAAG,WAAW,CAAC,IAAI,EAAE,CAAC,MAAM,KAAK,CAAC,CAAC;SACnD;QACD,MAAM,MAAM,GAAG,eAAe,CAAC,CAAC,CAAC,IAAI,aAAM,EAAE,CAAC,CAAC,CAAC,IAAI,aAAM,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC;QACnF,MAAM,MAAM,GAAG,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAClC,MAAM,SAAS,GAAG,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QACrC,MAAM,IAAI,GAAG,QAAQ,CAAC,OAAO,CAAC,SAAS,EAAE,IAAI,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;QAC5D,iDAAiD;QACjD,MAAM,QAAQ,GAAyB,KAAK,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,6BAA6B,CAAC,GAAG,EAAE,WAAW,CAAC,CAAC,CAAC;QAElH,iCAAiC;QACjC,OAAO,IAAI,6BAAY,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAC;IAC/C,CAAC;IAzBD,sBAyBC;IAED,SAAS,6BAA6B,CAAC,SAAmB,EAAE,WAAwB;QAClF,MAAM,GAAG,GAAG,IAAI,mCAAkB,CAAC,WAAW,CAAC,CAAC;QAChD,GAAG,CAAC,gBAAgB,GAAG,SAAS,CAAC;QACjC,OAAO,GAAG,CAAC;IACb,CAAC"}
|
|
@@ -28,10 +28,10 @@
|
|
|
28
28
|
this.jsonDocumentSymbols.getKeyLabel = (property) => {
|
|
29
29
|
const keyNode = property.keyNode.internalNode;
|
|
30
30
|
let name = '';
|
|
31
|
-
if (yaml_1.isMap(keyNode)) {
|
|
31
|
+
if ((0, yaml_1.isMap)(keyNode)) {
|
|
32
32
|
name = '{}';
|
|
33
33
|
}
|
|
34
|
-
else if (yaml_1.isSeq(keyNode)) {
|
|
34
|
+
else if ((0, yaml_1.isSeq)(keyNode)) {
|
|
35
35
|
name = '[]';
|
|
36
36
|
}
|
|
37
37
|
else {
|
|
@@ -54,7 +54,7 @@
|
|
|
54
54
|
}
|
|
55
55
|
}
|
|
56
56
|
catch (err) {
|
|
57
|
-
this.telemetry.sendError('yaml.documentSymbols.error', { error: objects_1.convertErrorToTelemetryMsg(err) });
|
|
57
|
+
this.telemetry.sendError('yaml.documentSymbols.error', { error: (0, objects_1.convertErrorToTelemetryMsg)(err) });
|
|
58
58
|
}
|
|
59
59
|
return results;
|
|
60
60
|
}
|
|
@@ -72,7 +72,7 @@
|
|
|
72
72
|
}
|
|
73
73
|
}
|
|
74
74
|
catch (err) {
|
|
75
|
-
this.telemetry.sendError('yaml.hierarchicalDocumentSymbols.error', { error: objects_1.convertErrorToTelemetryMsg(err) });
|
|
75
|
+
this.telemetry.sendError('yaml.hierarchicalDocumentSymbols.error', { error: (0, objects_1.convertErrorToTelemetryMsg)(err) });
|
|
76
76
|
}
|
|
77
77
|
return results;
|
|
78
78
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"documentSymbols.js","sourceRoot":"","sources":["../../../../src/languageservice/services/documentSymbols.ts"],"names":[],"mappings":";;;;;;;;;IAAA;;;;oGAIgG;IAChG,YAAY,CAAC;;;IAIb,0GAAuG;IAGvG,6DAA8D;IAE9D,+BAA0C;IAC1C,8CAA8D;IAE9D,MAAa,mBAAmB;QAG9B,YAAY,aAAgC,EAAmB,SAAoB;YAApB,cAAS,GAAT,SAAS,CAAW;YACjF,IAAI,CAAC,mBAAmB,GAAG,IAAI,yCAAmB,CAAC,aAAa,CAAC,CAAC;YAElE,mDAAmD;YACnD,8DAA8D;YAC9D,IAAI,CAAC,mBAAmB,CAAC,WAAW,GAAG,CAAC,QAAa,EAAE,EAAE;gBACvD,MAAM,OAAO,GAAS,QAAQ,CAAC,OAAO,CAAC,YAAY,CAAC;gBACpD,IAAI,IAAI,GAAG,EAAE,CAAC;gBACd,IAAI,YAAK,
|
|
1
|
+
{"version":3,"file":"documentSymbols.js","sourceRoot":"","sources":["../../../../src/languageservice/services/documentSymbols.ts"],"names":[],"mappings":";;;;;;;;;IAAA;;;;oGAIgG;IAChG,YAAY,CAAC;;;IAIb,0GAAuG;IAGvG,6DAA8D;IAE9D,+BAA0C;IAC1C,8CAA8D;IAE9D,MAAa,mBAAmB;QAG9B,YAAY,aAAgC,EAAmB,SAAoB;YAApB,cAAS,GAAT,SAAS,CAAW;YACjF,IAAI,CAAC,mBAAmB,GAAG,IAAI,yCAAmB,CAAC,aAAa,CAAC,CAAC;YAElE,mDAAmD;YACnD,8DAA8D;YAC9D,IAAI,CAAC,mBAAmB,CAAC,WAAW,GAAG,CAAC,QAAa,EAAE,EAAE;gBACvD,MAAM,OAAO,GAAS,QAAQ,CAAC,OAAO,CAAC,YAAY,CAAC;gBACpD,IAAI,IAAI,GAAG,EAAE,CAAC;gBACd,IAAI,IAAA,YAAK,EAAC,OAAO,CAAC,EAAE;oBAClB,IAAI,GAAG,IAAI,CAAC;iBACb;qBAAM,IAAI,IAAA,YAAK,EAAC,OAAO,CAAC,EAAE;oBACzB,IAAI,GAAG,IAAI,CAAC;iBACb;qBAAM;oBACL,IAAI,GAAG,OAAO,CAAC,MAAM,CAAC;iBACvB;gBACD,OAAO,IAAI,CAAC;YACd,CAAC,CAAC;QACJ,CAAC;QAEM,mBAAmB,CACxB,QAAsB,EACtB,UAAkC,EAAE,WAAW,EAAE,MAAM,CAAC,SAAS,EAAE;YAEnE,IAAI,OAAO,GAAG,EAAE,CAAC;YACjB,IAAI;gBACF,MAAM,GAAG,GAAG,mCAAkB,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAC;gBACzD,IAAI,CAAC,GAAG,IAAI,GAAG,CAAC,WAAW,CAAC,CAAC,MAAM,KAAK,CAAC,EAAE;oBACzC,OAAO,IAAI,CAAC;iBACb;gBAED,KAAK,MAAM,OAAO,IAAI,GAAG,CAAC,WAAW,CAAC,EAAE;oBACtC,IAAI,OAAO,CAAC,IAAI,EAAE;wBAChB,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,mBAAmB,CAAC,mBAAmB,CAAC,QAAQ,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC;qBACpG;iBACF;aACF;YAAC,OAAO,GAAG,EAAE;gBACZ,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,4BAA4B,EAAE,EAAE,KAAK,EAAE,IAAA,oCAA0B,EAAC,GAAG,CAAC,EAAE,CAAC,CAAC;aACpG;YACD,OAAO,OAAO,CAAC;QACjB,CAAC;QAEM,+BAA+B,CACpC,QAAsB,EACtB,UAAkC,EAAE,WAAW,EAAE,MAAM,CAAC,SAAS,EAAE;YAEnE,IAAI,OAAO,GAAG,EAAE,CAAC;YACjB,IAAI;gBACF,MAAM,GAAG,GAAG,mCAAkB,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAC;gBACzD,IAAI,CAAC,GAAG,IAAI,GAAG,CAAC,WAAW,CAAC,CAAC,MAAM,KAAK,CAAC,EAAE;oBACzC,OAAO,IAAI,CAAC;iBACb;gBAED,KAAK,MAAM,OAAO,IAAI,GAAG,CAAC,WAAW,CAAC,EAAE;oBACtC,IAAI,OAAO,CAAC,IAAI,EAAE;wBAChB,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,mBAAmB,CAAC,oBAAoB,CAAC,QAAQ,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC;qBACrG;iBACF;aACF;YAAC,OAAO,GAAG,EAAE;gBACZ,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,wCAAwC,EAAE,EAAE,KAAK,EAAE,IAAA,oCAA0B,EAAC,GAAG,CAAC,EAAE,CAAC,CAAC;aAChH;YAED,OAAO,OAAO,CAAC;QACjB,CAAC;KACF;IAlED,kDAkEC"}
|
|
@@ -19,14 +19,14 @@
|
|
|
19
19
|
* Handles schema content requests given the schema URI
|
|
20
20
|
* @param uri can be a local file, vscode request, http(s) request or a custom request
|
|
21
21
|
*/
|
|
22
|
-
|
|
22
|
+
const schemaRequestHandler = (connection, uri, workspaceFolders, workspaceRoot, useVSCodeContentRequest, fs) => {
|
|
23
23
|
if (!uri) {
|
|
24
24
|
return Promise.reject('No schema specified');
|
|
25
25
|
}
|
|
26
26
|
// If the requested schema URI is a relative file path
|
|
27
27
|
// Convert it into a proper absolute path URI
|
|
28
|
-
if (paths_1.isRelativePath(uri)) {
|
|
29
|
-
uri = paths_1.relativeToAbsolutePath(workspaceFolders, workspaceRoot, uri);
|
|
28
|
+
if ((0, paths_1.isRelativePath)(uri)) {
|
|
29
|
+
uri = (0, paths_1.relativeToAbsolutePath)(workspaceFolders, workspaceRoot, uri);
|
|
30
30
|
}
|
|
31
31
|
let scheme = vscode_uri_1.URI.parse(uri).scheme.toLowerCase();
|
|
32
32
|
// test if uri is windows path, ie starts with 'c:\'
|
|
@@ -57,15 +57,16 @@
|
|
|
57
57
|
}
|
|
58
58
|
// Send the HTTP(S) schema content request and return the result
|
|
59
59
|
const headers = { 'Accept-Encoding': 'gzip, deflate' };
|
|
60
|
-
return request_light_1.xhr({ url: uri, followRedirects: 5, headers }).then((response) => {
|
|
60
|
+
return (0, request_light_1.xhr)({ url: uri, followRedirects: 5, headers }).then((response) => {
|
|
61
61
|
return response.responseText;
|
|
62
62
|
}, (error) => {
|
|
63
|
-
return Promise.reject(error.responseText || request_light_1.getErrorStatusDescription(error.status) || error.toString());
|
|
63
|
+
return Promise.reject(error.responseText || (0, request_light_1.getErrorStatusDescription)(error.status) || error.toString());
|
|
64
64
|
});
|
|
65
65
|
}
|
|
66
66
|
// Neither local file nor vscode, nor HTTP(S) schema request, so send it off as a custom request
|
|
67
67
|
return connection.sendRequest(requestTypes_1.CustomSchemaContentRequest.type, uri);
|
|
68
68
|
};
|
|
69
|
+
exports.schemaRequestHandler = schemaRequestHandler;
|
|
69
70
|
exports.workspaceContext = {
|
|
70
71
|
resolveRelativePath: (relativePath, resource) => {
|
|
71
72
|
return URL.resolve(resource, relativePath);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"schemaRequestHandler.js","sourceRoot":"","sources":["../../../../src/languageservice/services/schemaRequestHandler.ts"],"names":[],"mappings":";;;;;;;;;;;;IAAA,2CAAiC;IAEjC,iDAA4E;IAC5E,2BAA2B;IAC3B,qDAAsF;IACtF,0CAAwE;IAOxE;;;OAGG;
|
|
1
|
+
{"version":3,"file":"schemaRequestHandler.js","sourceRoot":"","sources":["../../../../src/languageservice/services/schemaRequestHandler.ts"],"names":[],"mappings":"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"}
|
|
@@ -23,15 +23,15 @@
|
|
|
23
23
|
const anchors = new Set();
|
|
24
24
|
const usedAnchors = new Set();
|
|
25
25
|
const anchorParent = new Map();
|
|
26
|
-
yaml_1.visit(yamlDoc.internalDocument, (key, node, path) => {
|
|
27
|
-
if (!yaml_1.isNode(node)) {
|
|
26
|
+
(0, yaml_1.visit)(yamlDoc.internalDocument, (key, node, path) => {
|
|
27
|
+
if (!(0, yaml_1.isNode)(node)) {
|
|
28
28
|
return;
|
|
29
29
|
}
|
|
30
|
-
if ((yaml_1.isCollection(node) || yaml_1.isScalar(node)) && node.anchor) {
|
|
30
|
+
if (((0, yaml_1.isCollection)(node) || (0, yaml_1.isScalar)(node)) && node.anchor) {
|
|
31
31
|
anchors.add(node);
|
|
32
32
|
anchorParent.set(node, path[path.length - 1]);
|
|
33
33
|
}
|
|
34
|
-
if (yaml_1.isAlias(node)) {
|
|
34
|
+
if ((0, yaml_1.isAlias)(node)) {
|
|
35
35
|
usedAnchors.add(node.resolve(yamlDoc.internalDocument));
|
|
36
36
|
}
|
|
37
37
|
});
|
|
@@ -51,7 +51,7 @@
|
|
|
51
51
|
getAnchorNode(parentNode) {
|
|
52
52
|
if (parentNode && parentNode.srcToken) {
|
|
53
53
|
const token = parentNode.srcToken;
|
|
54
|
-
if (astUtils_1.isCollectionItem(token)) {
|
|
54
|
+
if ((0, astUtils_1.isCollectionItem)(token)) {
|
|
55
55
|
return getAnchorFromCollectionItem(token);
|
|
56
56
|
}
|
|
57
57
|
else if (yaml_1.CST.isCollection(token)) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"unused-anchors.js","sourceRoot":"","sources":["../../../../../src/languageservice/services/validation/unused-anchors.ts"],"names":[],"mappings":"AAAA;;;gGAGgG;;;;;;;;;;;;;IAGhG,6EAAmG;IACnG,+BAAiH;IAIjH,sEAA2E;IAE3E,MAAa,sBAAsB;QACjC,QAAQ,CAAC,QAAsB,EAAE,OAA2B;YAC1D,MAAM,MAAM,GAAG,EAAE,CAAC;YAClB,MAAM,OAAO,GAAG,IAAI,GAAG,EAA8B,CAAC;YACtD,MAAM,WAAW,GAAG,IAAI,GAAG,EAAQ,CAAC;YACpC,MAAM,YAAY,GAAG,IAAI,GAAG,EAA2C,CAAC;YAExE,YAAK,
|
|
1
|
+
{"version":3,"file":"unused-anchors.js","sourceRoot":"","sources":["../../../../../src/languageservice/services/validation/unused-anchors.ts"],"names":[],"mappings":"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"}
|
|
@@ -139,7 +139,7 @@
|
|
|
139
139
|
const range = vscode_languageserver_types_1.Range.create(diag.range.start, diag.range.end);
|
|
140
140
|
const actual = buffer.getText(range);
|
|
141
141
|
const lineContent = buffer.getLineContent(range.end.line);
|
|
142
|
-
const lastWhitespaceChar = strings_1.getFirstNonWhitespaceCharacterAfterOffset(lineContent, range.end.character);
|
|
142
|
+
const lastWhitespaceChar = (0, strings_1.getFirstNonWhitespaceCharacterAfterOffset)(lineContent, range.end.character);
|
|
143
143
|
range.end.character = lastWhitespaceChar;
|
|
144
144
|
const action = vscode_languageserver_types_1.CodeAction.create(`Delete unused anchor: ${actual}`, createWorkspaceEdit(document.uri, [vscode_languageserver_types_1.TextEdit.del(range)]), vscode_languageserver_types_1.CodeActionKind.QuickFix);
|
|
145
145
|
action.diagnostics = [diag];
|
|
@@ -1 +1 @@
|
|
|
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;IAEjD,yDAAqD;IACrD,8CAA6E;IAK7E,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;YAElF,OAAO,MAAM,CAAC;QAChB,CAAC;QAEO,sBAAsB,CAAC,WAAyB;;YACtD,MAAM,yBAAyB,
|
|
1
|
+
{"version":3,"file":"yamlCodeActions.js","sourceRoot":"","sources":["../../../../src/languageservice/services/yamlCodeActions.ts"],"names":[],"mappings":"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"}
|
|
@@ -17,7 +17,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
17
17
|
if (v !== undefined) module.exports = v;
|
|
18
18
|
}
|
|
19
19
|
else if (typeof define === "function" && define.amd) {
|
|
20
|
-
define(["require", "exports", "vscode-languageserver-types", "../../commands", "../parser/yaml-documents", "
|
|
20
|
+
define(["require", "exports", "vscode-languageserver-types", "../../commands", "../parser/yaml-documents", "../utils/schemaUrls", "../utils/objects", "../utils/schemaUtils"], factory);
|
|
21
21
|
}
|
|
22
22
|
})(function (require, exports) {
|
|
23
23
|
"use strict";
|
|
@@ -26,10 +26,9 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
26
26
|
const vscode_languageserver_types_1 = require("vscode-languageserver-types");
|
|
27
27
|
const commands_1 = require("../../commands");
|
|
28
28
|
const yaml_documents_1 = require("../parser/yaml-documents");
|
|
29
|
-
const vscode_uri_1 = require("vscode-uri");
|
|
30
|
-
const path = require("path");
|
|
31
29
|
const schemaUrls_1 = require("../utils/schemaUrls");
|
|
32
30
|
const objects_1 = require("../utils/objects");
|
|
31
|
+
const schemaUtils_1 = require("../utils/schemaUtils");
|
|
33
32
|
class YamlCodeLens {
|
|
34
33
|
constructor(schemaService, telemetry) {
|
|
35
34
|
this.schemaService = schemaService;
|
|
@@ -45,13 +44,13 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
45
44
|
const schema = yield this.schemaService.getSchemaForResource(document.uri, currentYAMLDoc);
|
|
46
45
|
if (schema === null || schema === void 0 ? void 0 : schema.schema) {
|
|
47
46
|
// merge schemas from all docs to avoid duplicates
|
|
48
|
-
schemaUrls = new Map([...schemaUrls_1.getSchemaUrls(schema === null || schema === void 0 ? void 0 : schema.schema), ...schemaUrls]);
|
|
47
|
+
schemaUrls = new Map([...(0, schemaUrls_1.getSchemaUrls)(schema === null || schema === void 0 ? void 0 : schema.schema), ...schemaUrls]);
|
|
49
48
|
}
|
|
50
49
|
}
|
|
51
50
|
for (const urlToSchema of schemaUrls) {
|
|
52
51
|
const lens = vscode_languageserver_types_1.CodeLens.create(vscode_languageserver_types_1.Range.create(0, 0, 0, 0));
|
|
53
52
|
lens.command = {
|
|
54
|
-
title:
|
|
53
|
+
title: (0, schemaUtils_1.getSchemaTitle)(urlToSchema[1], urlToSchema[0]),
|
|
55
54
|
command: commands_1.YamlCommands.JUMP_TO_SCHEMA,
|
|
56
55
|
arguments: [urlToSchema[0]],
|
|
57
56
|
};
|
|
@@ -59,7 +58,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
59
58
|
}
|
|
60
59
|
}
|
|
61
60
|
catch (err) {
|
|
62
|
-
this.telemetry.sendError('yaml.codeLens.error', { error: objects_1.convertErrorToTelemetryMsg(err) });
|
|
61
|
+
this.telemetry.sendError('yaml.codeLens.error', { error: (0, objects_1.convertErrorToTelemetryMsg)(err) });
|
|
63
62
|
}
|
|
64
63
|
return result;
|
|
65
64
|
});
|
|
@@ -69,19 +68,5 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
69
68
|
}
|
|
70
69
|
}
|
|
71
70
|
exports.YamlCodeLens = YamlCodeLens;
|
|
72
|
-
function getCommandTitle(url, schema) {
|
|
73
|
-
const uri = vscode_uri_1.URI.parse(url);
|
|
74
|
-
let baseName = path.basename(uri.fsPath);
|
|
75
|
-
if (!path.extname(uri.fsPath)) {
|
|
76
|
-
baseName += '.json';
|
|
77
|
-
}
|
|
78
|
-
if (Object.getOwnPropertyDescriptor(schema, 'name')) {
|
|
79
|
-
return Object.getOwnPropertyDescriptor(schema, 'name').value + ` (${baseName})`;
|
|
80
|
-
}
|
|
81
|
-
else if (schema.title) {
|
|
82
|
-
return schema.title + ` (${baseName})`;
|
|
83
|
-
}
|
|
84
|
-
return baseName;
|
|
85
|
-
}
|
|
86
71
|
});
|
|
87
72
|
//# sourceMappingURL=yamlCodeLens.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"yamlCodeLens.js","sourceRoot":"","sources":["../../../../src/languageservice/services/yamlCodeLens.ts"],"names":[],"mappings":"AAAA;;;gGAGgG;;;;;;;;;;;;;;;;;;;;;;IAGhG,6EAA8D;IAC9D,6CAA8C;IAC9C,6DAA8D;
|
|
1
|
+
{"version":3,"file":"yamlCodeLens.js","sourceRoot":"","sources":["../../../../src/languageservice/services/yamlCodeLens.ts"],"names":[],"mappings":"AAAA;;;gGAGgG;;;;;;;;;;;;;;;;;;;;;;IAGhG,6EAA8D;IAC9D,6CAA8C;IAC9C,6DAA8D;IAI9D,oDAAoD;IACpD,8CAA8D;IAC9D,sDAAsD;IAEtD,MAAa,YAAY;QACvB,YAAoB,aAAgC,EAAmB,SAAoB;YAAvE,kBAAa,GAAb,aAAa,CAAmB;YAAmB,cAAS,GAAT,SAAS,CAAW;QAAG,CAAC;QAEzF,WAAW,CAAC,QAAsB;;gBACtC,MAAM,MAAM,GAAG,EAAE,CAAC;gBAClB,IAAI;oBACF,MAAM,YAAY,GAAG,mCAAkB,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAC;oBAClE,IAAI,UAAU,GAAG,IAAI,GAAG,EAAsB,CAAC;oBAC/C,KAAK,MAAM,cAAc,IAAI,YAAY,CAAC,SAAS,EAAE;wBACnD,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,oBAAoB,CAAC,QAAQ,CAAC,GAAG,EAAE,cAAc,CAAC,CAAC;wBAC3F,IAAI,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,MAAM,EAAE;4BAClB,kDAAkD;4BAClD,UAAU,GAAG,IAAI,GAAG,CAAC,CAAC,GAAG,IAAA,0BAAa,EAAC,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,MAAM,CAAC,EAAE,GAAG,UAAU,CAAC,CAAC,CAAC;yBACzE;qBACF;oBACD,KAAK,MAAM,WAAW,IAAI,UAAU,EAAE;wBACpC,MAAM,IAAI,GAAG,sCAAQ,CAAC,MAAM,CAAC,mCAAK,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;wBACvD,IAAI,CAAC,OAAO,GAAG;4BACb,KAAK,EAAE,IAAA,4BAAc,EAAC,WAAW,CAAC,CAAC,CAAC,EAAE,WAAW,CAAC,CAAC,CAAC,CAAC;4BACrD,OAAO,EAAE,uBAAY,CAAC,cAAc;4BACpC,SAAS,EAAE,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC;yBAC5B,CAAC;wBACF,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;qBACnB;iBACF;gBAAC,OAAO,GAAG,EAAE;oBACZ,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,qBAAqB,EAAE,EAAE,KAAK,EAAE,IAAA,oCAA0B,EAAC,GAAG,CAAC,EAAE,CAAC,CAAC;iBAC7F;gBAED,OAAO,MAAM,CAAC;YAChB,CAAC;SAAA;QACD,eAAe,CAAC,KAAe;YAC7B,OAAO,KAAK,CAAC;QACf,CAAC;KACF;IAjCD,oCAiCC"}
|