yaml-language-server 1.2.1 → 1.2.2
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 +5 -0
- package/README.md +84 -0
- package/lib/esm/languageserver/handlers/notificationHandlers.d.ts +1 -0
- package/lib/esm/languageserver/handlers/notificationHandlers.js +5 -1
- package/lib/esm/languageserver/handlers/notificationHandlers.js.map +1 -1
- package/lib/esm/languageserver/handlers/schemaSelectionHandlers.d.ts +13 -0
- package/lib/esm/languageserver/handlers/schemaSelectionHandlers.js +86 -0
- package/lib/esm/languageserver/handlers/schemaSelectionHandlers.js.map +1 -0
- package/lib/esm/languageserver/handlers/settingsHandlers.d.ts +1 -1
- package/lib/esm/languageserver/handlers/settingsHandlers.js +70 -64
- package/lib/esm/languageserver/handlers/settingsHandlers.js.map +1 -1
- package/lib/esm/languageservice/services/yamlCodeLens.js +3 -42
- package/lib/esm/languageservice/services/yamlCodeLens.js.map +1 -1
- package/lib/esm/languageservice/services/yamlDefinition.js +1 -1
- package/lib/esm/languageservice/services/yamlDefinition.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/yamlLinks.d.ts +6 -1
- package/lib/esm/languageservice/services/yamlLinks.js +17 -12
- package/lib/esm/languageservice/services/yamlLinks.js.map +1 -1
- package/lib/esm/languageservice/utils/schemaUrls.d.ts +7 -0
- package/lib/esm/languageservice/utils/schemaUrls.js +44 -0
- package/lib/esm/languageservice/utils/schemaUrls.js.map +1 -1
- package/lib/esm/languageservice/yamlLanguageService.d.ts +2 -1
- package/lib/esm/languageservice/yamlLanguageService.js +6 -3
- package/lib/esm/languageservice/yamlLanguageService.js.map +1 -1
- package/lib/esm/requestTypes.d.ts +6 -0
- package/lib/esm/requestTypes.js +7 -0
- package/lib/esm/requestTypes.js.map +1 -1
- package/lib/esm/yamlServerInit.js +5 -2
- package/lib/esm/yamlServerInit.js.map +1 -1
- package/lib/esm/yamlSettings.d.ts +2 -0
- package/lib/esm/yamlSettings.js +2 -0
- package/lib/esm/yamlSettings.js.map +1 -1
- package/lib/umd/languageserver/handlers/notificationHandlers.d.ts +1 -0
- package/lib/umd/languageserver/handlers/notificationHandlers.js +4 -0
- package/lib/umd/languageserver/handlers/notificationHandlers.js.map +1 -1
- package/lib/umd/languageserver/handlers/schemaSelectionHandlers.d.ts +13 -0
- package/lib/umd/languageserver/handlers/schemaSelectionHandlers.js +100 -0
- package/lib/umd/languageserver/handlers/schemaSelectionHandlers.js.map +1 -0
- package/lib/umd/languageserver/handlers/settingsHandlers.d.ts +1 -1
- package/lib/umd/languageserver/handlers/settingsHandlers.js +71 -65
- package/lib/umd/languageserver/handlers/settingsHandlers.js.map +1 -1
- package/lib/umd/languageservice/services/yamlCodeLens.js +4 -43
- package/lib/umd/languageservice/services/yamlCodeLens.js.map +1 -1
- package/lib/umd/languageservice/services/yamlDefinition.js +1 -1
- package/lib/umd/languageservice/services/yamlDefinition.js.map +1 -1
- package/lib/umd/languageservice/services/yamlHover.js +1 -1
- package/lib/umd/languageservice/services/yamlHover.js.map +1 -1
- package/lib/umd/languageservice/services/yamlLinks.d.ts +6 -1
- package/lib/umd/languageservice/services/yamlLinks.js +19 -14
- package/lib/umd/languageservice/services/yamlLinks.js.map +1 -1
- package/lib/umd/languageservice/utils/schemaUrls.d.ts +7 -0
- package/lib/umd/languageservice/utils/schemaUrls.js +47 -2
- package/lib/umd/languageservice/utils/schemaUrls.js.map +1 -1
- package/lib/umd/languageservice/yamlLanguageService.d.ts +2 -1
- package/lib/umd/languageservice/yamlLanguageService.js +6 -3
- package/lib/umd/languageservice/yamlLanguageService.js.map +1 -1
- package/lib/umd/requestTypes.d.ts +6 -0
- package/lib/umd/requestTypes.js +8 -1
- package/lib/umd/requestTypes.js.map +1 -1
- package/lib/umd/yamlServerInit.js +5 -2
- package/lib/umd/yamlServerInit.js.map +1 -1
- package/lib/umd/yamlSettings.d.ts +2 -0
- package/lib/umd/yamlSettings.js +2 -0
- package/lib/umd/yamlSettings.js.map +1 -1
- package/out/server/src/languageserver/handlers/notificationHandlers.d.ts +1 -0
- package/out/server/src/languageserver/handlers/notificationHandlers.js +4 -0
- package/out/server/src/languageserver/handlers/notificationHandlers.js.map +1 -1
- package/out/server/src/languageserver/handlers/schemaSelectionHandlers.d.ts +13 -0
- package/out/server/src/languageserver/handlers/schemaSelectionHandlers.js +90 -0
- package/out/server/src/languageserver/handlers/schemaSelectionHandlers.js.map +1 -0
- package/out/server/src/languageserver/handlers/settingsHandlers.d.ts +1 -1
- package/out/server/src/languageserver/handlers/settingsHandlers.js +70 -64
- package/out/server/src/languageserver/handlers/settingsHandlers.js.map +1 -1
- package/out/server/src/languageservice/services/yamlCodeLens.js +3 -42
- package/out/server/src/languageservice/services/yamlCodeLens.js.map +1 -1
- package/out/server/src/languageservice/services/yamlDefinition.js +1 -1
- package/out/server/src/languageservice/services/yamlDefinition.js.map +1 -1
- package/out/server/src/languageservice/services/yamlHover.js +1 -1
- package/out/server/src/languageservice/services/yamlHover.js.map +1 -1
- package/out/server/src/languageservice/services/yamlLinks.d.ts +6 -1
- package/out/server/src/languageservice/services/yamlLinks.js +19 -14
- package/out/server/src/languageservice/services/yamlLinks.js.map +1 -1
- package/out/server/src/languageservice/utils/schemaUrls.d.ts +7 -0
- package/out/server/src/languageservice/utils/schemaUrls.js +46 -1
- package/out/server/src/languageservice/utils/schemaUrls.js.map +1 -1
- package/out/server/src/languageservice/yamlLanguageService.d.ts +2 -1
- package/out/server/src/languageservice/yamlLanguageService.js +5 -2
- package/out/server/src/languageservice/yamlLanguageService.js.map +1 -1
- package/out/server/src/requestTypes.d.ts +6 -0
- package/out/server/src/requestTypes.js +8 -1
- package/out/server/src/requestTypes.js.map +1 -1
- package/out/server/src/yamlServerInit.js +5 -2
- package/out/server/src/yamlServerInit.js.map +1 -1
- package/out/server/src/yamlSettings.d.ts +2 -0
- package/out/server/src/yamlSettings.js +2 -0
- package/out/server/src/yamlSettings.js.map +1 -1
- package/out/server/test/schemaSelectionHandlers.test.d.ts +1 -0
- package/out/server/test/schemaSelectionHandlers.test.js +105 -0
- package/out/server/test/schemaSelectionHandlers.test.js.map +1 -0
- package/out/server/test/yamlCodeLens.test.js +13 -13
- package/out/server/test/yamlCodeLens.test.js.map +1 -1
- package/package.json +1 -1
|
@@ -13,7 +13,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
13
13
|
if (v !== undefined) module.exports = v;
|
|
14
14
|
}
|
|
15
15
|
else if (typeof define === "function" && define.amd) {
|
|
16
|
-
define(["require", "exports", "request-light", "vscode-languageserver", "../../languageservice/utils/paths", "../../languageservice/utils/schemaUrls", "../../languageservice/yamlLanguageService"], factory);
|
|
16
|
+
define(["require", "exports", "request-light", "vscode-languageserver", "../../languageservice/utils/paths", "../../languageservice/utils/schemaUrls", "../../languageservice/yamlLanguageService", "../../requestTypes"], factory);
|
|
17
17
|
}
|
|
18
18
|
})(function (require, exports) {
|
|
19
19
|
"use strict";
|
|
@@ -28,6 +28,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
28
28
|
const paths_1 = require("../../languageservice/utils/paths");
|
|
29
29
|
const schemaUrls_1 = require("../../languageservice/utils/schemaUrls");
|
|
30
30
|
const yamlLanguageService_1 = require("../../languageservice/yamlLanguageService");
|
|
31
|
+
const requestTypes_1 = require("../../requestTypes");
|
|
31
32
|
class SettingsHandler {
|
|
32
33
|
constructor(connection, languageService, yamlSettings, validationHandler, telemetry) {
|
|
33
34
|
this.connection = connection;
|
|
@@ -75,78 +76,83 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
75
76
|
}
|
|
76
77
|
setConfiguration(settings) {
|
|
77
78
|
var _a;
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
if (
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
if (Object.prototype.hasOwnProperty.call(settings.yaml, 'validate')) {
|
|
85
|
-
this.yamlSettings.yamlShouldValidate = settings.yaml.validate;
|
|
86
|
-
}
|
|
87
|
-
if (Object.prototype.hasOwnProperty.call(settings.yaml, 'hover')) {
|
|
88
|
-
this.yamlSettings.yamlShouldHover = settings.yaml.hover;
|
|
89
|
-
}
|
|
90
|
-
if (Object.prototype.hasOwnProperty.call(settings.yaml, 'completion')) {
|
|
91
|
-
this.yamlSettings.yamlShouldCompletion = settings.yaml.completion;
|
|
92
|
-
}
|
|
93
|
-
this.yamlSettings.customTags = settings.yaml.customTags ? settings.yaml.customTags : [];
|
|
94
|
-
this.yamlSettings.maxItemsComputed = Math.trunc(Math.max(0, Number(settings.yaml.maxItemsComputed))) || 5000;
|
|
95
|
-
if (settings.yaml.schemaStore) {
|
|
96
|
-
this.yamlSettings.schemaStoreEnabled = settings.yaml.schemaStore.enable;
|
|
97
|
-
if (settings.yaml.schemaStore.url.length !== 0) {
|
|
98
|
-
this.yamlSettings.schemaStoreUrl = settings.yaml.schemaStore.url;
|
|
79
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
80
|
+
request_light_1.configure(settings.http && settings.http.proxy, settings.http && settings.http.proxyStrictSSL);
|
|
81
|
+
this.yamlSettings.specificValidatorPaths = [];
|
|
82
|
+
if (settings.yaml) {
|
|
83
|
+
if (Object.prototype.hasOwnProperty.call(settings.yaml, 'schemas')) {
|
|
84
|
+
this.yamlSettings.yamlConfigurationSettings = settings.yaml.schemas;
|
|
99
85
|
}
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
if (settings.yaml.format) {
|
|
103
|
-
this.yamlSettings.yamlFormatterSettings = {
|
|
104
|
-
proseWrap: settings.yaml.format.proseWrap || 'preserve',
|
|
105
|
-
printWidth: settings.yaml.format.printWidth || 80,
|
|
106
|
-
};
|
|
107
|
-
if (settings.yaml.format.singleQuote !== undefined) {
|
|
108
|
-
this.yamlSettings.yamlFormatterSettings.singleQuote = settings.yaml.format.singleQuote;
|
|
86
|
+
if (Object.prototype.hasOwnProperty.call(settings.yaml, 'validate')) {
|
|
87
|
+
this.yamlSettings.yamlShouldValidate = settings.yaml.validate;
|
|
109
88
|
}
|
|
110
|
-
if (settings.yaml
|
|
111
|
-
this.yamlSettings.
|
|
89
|
+
if (Object.prototype.hasOwnProperty.call(settings.yaml, 'hover')) {
|
|
90
|
+
this.yamlSettings.yamlShouldHover = settings.yaml.hover;
|
|
112
91
|
}
|
|
113
|
-
if (settings.yaml
|
|
114
|
-
this.yamlSettings.
|
|
92
|
+
if (Object.prototype.hasOwnProperty.call(settings.yaml, 'completion')) {
|
|
93
|
+
this.yamlSettings.yamlShouldCompletion = settings.yaml.completion;
|
|
115
94
|
}
|
|
95
|
+
this.yamlSettings.customTags = settings.yaml.customTags ? settings.yaml.customTags : [];
|
|
96
|
+
this.yamlSettings.maxItemsComputed = Math.trunc(Math.max(0, Number(settings.yaml.maxItemsComputed))) || 5000;
|
|
97
|
+
if (settings.yaml.schemaStore) {
|
|
98
|
+
this.yamlSettings.schemaStoreEnabled = settings.yaml.schemaStore.enable;
|
|
99
|
+
if (settings.yaml.schemaStore.url.length !== 0) {
|
|
100
|
+
this.yamlSettings.schemaStoreUrl = settings.yaml.schemaStore.url;
|
|
101
|
+
}
|
|
102
|
+
}
|
|
103
|
+
this.yamlSettings.yamlVersion = (_a = settings.yaml.yamlVersion) !== null && _a !== void 0 ? _a : '1.2';
|
|
104
|
+
if (settings.yaml.format) {
|
|
105
|
+
this.yamlSettings.yamlFormatterSettings = {
|
|
106
|
+
proseWrap: settings.yaml.format.proseWrap || 'preserve',
|
|
107
|
+
printWidth: settings.yaml.format.printWidth || 80,
|
|
108
|
+
};
|
|
109
|
+
if (settings.yaml.format.singleQuote !== undefined) {
|
|
110
|
+
this.yamlSettings.yamlFormatterSettings.singleQuote = settings.yaml.format.singleQuote;
|
|
111
|
+
}
|
|
112
|
+
if (settings.yaml.format.bracketSpacing !== undefined) {
|
|
113
|
+
this.yamlSettings.yamlFormatterSettings.bracketSpacing = settings.yaml.format.bracketSpacing;
|
|
114
|
+
}
|
|
115
|
+
if (settings.yaml.format.enable !== undefined) {
|
|
116
|
+
this.yamlSettings.yamlFormatterSettings.enable = settings.yaml.format.enable;
|
|
117
|
+
}
|
|
118
|
+
}
|
|
119
|
+
this.yamlSettings.disableAdditionalProperties = settings.yaml.disableAdditionalProperties;
|
|
116
120
|
}
|
|
117
|
-
this.yamlSettings.
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
}
|
|
129
|
-
this.
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
if (
|
|
138
|
-
this.yamlSettings.formatterRegistration
|
|
139
|
-
|
|
121
|
+
this.yamlSettings.schemaConfigurationSettings = [];
|
|
122
|
+
if (settings.yamlEditor && settings.yamlEditor['editor.tabSize']) {
|
|
123
|
+
this.yamlSettings.indentation = ' '.repeat(settings.yamlEditor['editor.tabSize']);
|
|
124
|
+
}
|
|
125
|
+
for (const uri in this.yamlSettings.yamlConfigurationSettings) {
|
|
126
|
+
const globPattern = this.yamlSettings.yamlConfigurationSettings[uri];
|
|
127
|
+
const schemaObj = {
|
|
128
|
+
fileMatch: Array.isArray(globPattern) ? globPattern : [globPattern],
|
|
129
|
+
uri: schemaUrls_1.checkSchemaURI(this.yamlSettings.workspaceFolders, this.yamlSettings.workspaceRoot, uri, this.telemetry),
|
|
130
|
+
};
|
|
131
|
+
this.yamlSettings.schemaConfigurationSettings.push(schemaObj);
|
|
132
|
+
}
|
|
133
|
+
yield this.setSchemaStoreSettingsIfNotSet();
|
|
134
|
+
this.updateConfiguration();
|
|
135
|
+
if (this.yamlSettings.useSchemaSelectionRequests) {
|
|
136
|
+
this.connection.sendNotification(requestTypes_1.SchemaSelectionRequests.schemaStoreInitialized, {});
|
|
137
|
+
}
|
|
138
|
+
// dynamically enable & disable the formatter
|
|
139
|
+
if (this.yamlSettings.clientDynamicRegisterSupport) {
|
|
140
|
+
const enableFormatter = settings && settings.yaml && settings.yaml.format && settings.yaml.format.enable;
|
|
141
|
+
if (enableFormatter) {
|
|
142
|
+
if (!this.yamlSettings.formatterRegistration) {
|
|
143
|
+
this.yamlSettings.formatterRegistration = this.connection.client.register(vscode_languageserver_1.DocumentFormattingRequest.type, {
|
|
144
|
+
documentSelector: [{ language: 'yaml' }],
|
|
145
|
+
});
|
|
146
|
+
}
|
|
147
|
+
}
|
|
148
|
+
else if (this.yamlSettings.formatterRegistration) {
|
|
149
|
+
this.yamlSettings.formatterRegistration.then((r) => {
|
|
150
|
+
return r.dispose();
|
|
140
151
|
});
|
|
152
|
+
this.yamlSettings.formatterRegistration = null;
|
|
141
153
|
}
|
|
142
154
|
}
|
|
143
|
-
|
|
144
|
-
this.yamlSettings.formatterRegistration.then((r) => {
|
|
145
|
-
return r.dispose();
|
|
146
|
-
});
|
|
147
|
-
this.yamlSettings.formatterRegistration = null;
|
|
148
|
-
}
|
|
149
|
-
}
|
|
155
|
+
});
|
|
150
156
|
}
|
|
151
157
|
/**
|
|
152
158
|
* This function helps set the schema store if it hasn't already been set
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"settingsHandlers.js","sourceRoot":"","sources":["../../../../src/languageserver/handlers/settingsHandlers.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;IAAA;;;oGAGgG;IAChG,iDAAwE;IACxE,iEAAkH;IAClH,6DAA2F;IAC3F,uEAAqH;IACrH,mFAA8G;
|
|
1
|
+
{"version":3,"file":"settingsHandlers.js","sourceRoot":"","sources":["../../../../src/languageserver/handlers/settingsHandlers.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", "vscode-uri", "path", "../utils/
|
|
20
|
+
define(["require", "exports", "vscode-languageserver-types", "../../commands", "../parser/yaml-documents", "vscode-uri", "path", "../utils/schemaUrls"], factory);
|
|
21
21
|
}
|
|
22
22
|
})(function (require, exports) {
|
|
23
23
|
"use strict";
|
|
@@ -28,7 +28,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
28
28
|
const yaml_documents_1 = require("../parser/yaml-documents");
|
|
29
29
|
const vscode_uri_1 = require("vscode-uri");
|
|
30
30
|
const path = require("path");
|
|
31
|
-
const
|
|
31
|
+
const schemaUrls_1 = require("../utils/schemaUrls");
|
|
32
32
|
class YamlCodeLens {
|
|
33
33
|
constructor(schemaService, telemetry) {
|
|
34
34
|
this.schemaService = schemaService;
|
|
@@ -43,7 +43,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
43
43
|
for (const currentYAMLDoc of yamlDocument.documents) {
|
|
44
44
|
const schema = yield this.schemaService.getSchemaForResource(document.uri, currentYAMLDoc);
|
|
45
45
|
if (schema === null || schema === void 0 ? void 0 : schema.schema) {
|
|
46
|
-
const schemaUrls =
|
|
46
|
+
const schemaUrls = schemaUrls_1.getSchemaUrls(schema === null || schema === void 0 ? void 0 : schema.schema);
|
|
47
47
|
if (schemaUrls.size === 0) {
|
|
48
48
|
continue;
|
|
49
49
|
}
|
|
@@ -60,7 +60,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
60
60
|
}
|
|
61
61
|
}
|
|
62
62
|
catch (err) {
|
|
63
|
-
this.telemetry.sendError('yaml.codeLens.error', { error: err
|
|
63
|
+
this.telemetry.sendError('yaml.codeLens.error', { error: err.toString() });
|
|
64
64
|
}
|
|
65
65
|
return result;
|
|
66
66
|
});
|
|
@@ -84,44 +84,5 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
84
84
|
}
|
|
85
85
|
return baseName;
|
|
86
86
|
}
|
|
87
|
-
function getSchemaUrl(schema) {
|
|
88
|
-
const result = new Map();
|
|
89
|
-
if (!schema) {
|
|
90
|
-
return result;
|
|
91
|
-
}
|
|
92
|
-
const url = schema.url;
|
|
93
|
-
if (url) {
|
|
94
|
-
if (url.startsWith('schemaservice://combinedSchema/')) {
|
|
95
|
-
addSchemasForOf(schema, result);
|
|
96
|
-
}
|
|
97
|
-
else {
|
|
98
|
-
result.set(schema.url, schema);
|
|
99
|
-
}
|
|
100
|
-
}
|
|
101
|
-
else {
|
|
102
|
-
addSchemasForOf(schema, result);
|
|
103
|
-
}
|
|
104
|
-
return result;
|
|
105
|
-
}
|
|
106
|
-
function addSchemasForOf(schema, result) {
|
|
107
|
-
if (schema.allOf) {
|
|
108
|
-
addInnerSchemaUrls(schema.allOf, result);
|
|
109
|
-
}
|
|
110
|
-
if (schema.anyOf) {
|
|
111
|
-
addInnerSchemaUrls(schema.anyOf, result);
|
|
112
|
-
}
|
|
113
|
-
if (schema.oneOf) {
|
|
114
|
-
addInnerSchemaUrls(schema.oneOf, result);
|
|
115
|
-
}
|
|
116
|
-
}
|
|
117
|
-
function addInnerSchemaUrls(schemas, result) {
|
|
118
|
-
for (const subSchema of schemas) {
|
|
119
|
-
if (!objects_1.isBoolean(subSchema)) {
|
|
120
|
-
if (subSchema.url && !result.has(subSchema.url)) {
|
|
121
|
-
result.set(subSchema.url, subSchema);
|
|
122
|
-
}
|
|
123
|
-
}
|
|
124
|
-
}
|
|
125
|
-
}
|
|
126
87
|
});
|
|
127
88
|
//# 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;IAE9D,2CAAiC;IACjC,6BAA6B;
|
|
1
|
+
{"version":3,"file":"yamlCodeLens.js","sourceRoot":"","sources":["../../../../src/languageservice/services/yamlCodeLens.ts"],"names":[],"mappings":"AAAA;;;gGAGgG;;;;;;;;;;;;;;;;;;;;;;IAGhG,6EAA8D;IAC9D,6CAA8C;IAC9C,6DAA8D;IAE9D,2CAAiC;IACjC,6BAA6B;IAI7B,oDAAoD;IAEpD,MAAa,YAAY;QACvB,YAAoB,aAAgC,EAAmB,SAAoB;YAAvE,kBAAa,GAAb,aAAa,CAAmB;YAAmB,cAAS,GAAT,SAAS,CAAW;QAAG,CAAC;QAE/F,6DAA6D;QACvD,WAAW,CAAC,QAAsB,EAAE,MAAsB;;gBAC9D,MAAM,MAAM,GAAG,EAAE,CAAC;gBAClB,IAAI;oBACF,MAAM,YAAY,GAAG,mCAAkB,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAC;oBAClE,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,MAAM,UAAU,GAAG,0BAAa,CAAC,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,MAAM,CAAC,CAAC;4BACjD,IAAI,UAAU,CAAC,IAAI,KAAK,CAAC,EAAE;gCACzB,SAAS;6BACV;4BACD,KAAK,MAAM,WAAW,IAAI,UAAU,EAAE;gCACpC,MAAM,IAAI,GAAG,sCAAQ,CAAC,MAAM,CAAC,mCAAK,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;gCACvD,IAAI,CAAC,OAAO,GAAG;oCACb,KAAK,EAAE,eAAe,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,WAAW,CAAC,CAAC,CAAC,CAAC;oCACtD,OAAO,EAAE,uBAAY,CAAC,cAAc;oCACpC,SAAS,EAAE,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC;iCAC5B,CAAC;gCACF,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;6BACnB;yBACF;qBACF;iBACF;gBAAC,OAAO,GAAG,EAAE;oBACZ,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,qBAAqB,EAAE,EAAE,KAAK,EAAE,GAAG,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;iBAC5E;gBAED,OAAO,MAAM,CAAC;YAChB,CAAC;SAAA;QACD,eAAe,CAAC,KAAe;YAC7B,OAAO,KAAK,CAAC;QACf,CAAC;KACF;IAnCD,oCAmCC;IAED,SAAS,eAAe,CAAC,GAAW,EAAE,MAAkB;QACtD,MAAM,GAAG,GAAG,gBAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAC3B,IAAI,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QACzC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE;YAC7B,QAAQ,IAAI,OAAO,CAAC;SACrB;QACD,IAAI,MAAM,CAAC,wBAAwB,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE;YACnD,OAAO,MAAM,CAAC,wBAAwB,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,KAAK,GAAG,KAAK,QAAQ,GAAG,CAAC;SACjF;aAAM,IAAI,MAAM,CAAC,KAAK,EAAE;YACvB,OAAO,MAAM,CAAC,KAAK,GAAG,KAAK,QAAQ,GAAG,CAAC;SACxC;QAED,OAAO,QAAQ,CAAC;IAClB,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"yamlDefinition.js","sourceRoot":"","sources":["../../../../src/languageservice/services/yamlDefinition.ts"],"names":[],"mappings":"AAAA;;;gGAGgG;;;;;;;;;;;;;IAEhG,mFAAuF;IAGvF,+BAA+B;IAC/B,6DAA8D;IAC9D,gDAA0D;IAC1D,oDAAiD;IAEjD,SAAgB,aAAa,CAAC,QAAsB,EAAE,MAAwB;QAC5E,IAAI;YACF,MAAM,YAAY,GAAG,mCAAkB,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAC;YAClE,MAAM,MAAM,GAAG,QAAQ,CAAC,QAAQ,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;YAClD,MAAM,UAAU,GAAG,gCAAqB,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC;YAC/D,IAAI,UAAU,EAAE;gBACd,MAAM,CAAC,IAAI,CAAC,GAAG,UAAU,CAAC,mBAAmB,CAAC,MAAM,EAAE,IAAI,uBAAU,CAAC,QAAQ,CAAC,CAAC,CAAC;gBAChF,IAAI,IAAI,IAAI,cAAO,CAAC,IAAI,CAAC,EAAE;oBACzB,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,gBAAgB,CAAC,CAAC;oBAC1D,IAAI,OAAO,IAAI,OAAO,CAAC,KAAK,EAAE;wBAC5B,MAAM,WAAW,GAAG,sCAAK,CAAC,MAAM,CAAC,QAAQ,CAAC,UAAU,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,QAAQ,CAAC,UAAU,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;wBAC/G,MAAM,cAAc,GAAG,sCAAK,CAAC,MAAM,CAAC,QAAQ,CAAC,UAAU,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,QAAQ,CAAC,UAAU,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;wBAClH,OAAO,CAAC,6CAAY,CAAC,MAAM,CAAC,QAAQ,CAAC,GAAG,EAAE,WAAW,EAAE,cAAc,CAAC,CAAC,CAAC;qBACzE;iBACF;aACF;SACF;QAAC,OAAO,GAAG,EAAE;YACZ,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,uBAAuB,EAAE,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"yamlDefinition.js","sourceRoot":"","sources":["../../../../src/languageservice/services/yamlDefinition.ts"],"names":[],"mappings":"AAAA;;;gGAGgG;;;;;;;;;;;;;IAEhG,mFAAuF;IAGvF,+BAA+B;IAC/B,6DAA8D;IAC9D,gDAA0D;IAC1D,oDAAiD;IAEjD,SAAgB,aAAa,CAAC,QAAsB,EAAE,MAAwB;QAC5E,IAAI;YACF,MAAM,YAAY,GAAG,mCAAkB,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAC;YAClE,MAAM,MAAM,GAAG,QAAQ,CAAC,QAAQ,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;YAClD,MAAM,UAAU,GAAG,gCAAqB,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC;YAC/D,IAAI,UAAU,EAAE;gBACd,MAAM,CAAC,IAAI,CAAC,GAAG,UAAU,CAAC,mBAAmB,CAAC,MAAM,EAAE,IAAI,uBAAU,CAAC,QAAQ,CAAC,CAAC,CAAC;gBAChF,IAAI,IAAI,IAAI,cAAO,CAAC,IAAI,CAAC,EAAE;oBACzB,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,gBAAgB,CAAC,CAAC;oBAC1D,IAAI,OAAO,IAAI,OAAO,CAAC,KAAK,EAAE;wBAC5B,MAAM,WAAW,GAAG,sCAAK,CAAC,MAAM,CAAC,QAAQ,CAAC,UAAU,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,QAAQ,CAAC,UAAU,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;wBAC/G,MAAM,cAAc,GAAG,sCAAK,CAAC,MAAM,CAAC,QAAQ,CAAC,UAAU,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,QAAQ,CAAC,UAAU,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;wBAClH,OAAO,CAAC,6CAAY,CAAC,MAAM,CAAC,QAAQ,CAAC,GAAG,EAAE,WAAW,EAAE,cAAc,CAAC,CAAC,CAAC;qBACzE;iBACF;aACF;SACF;QAAC,OAAO,GAAG,EAAE;YACZ,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,uBAAuB,EAAE,EAAE,KAAK,EAAE,GAAG,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;SAC9E;QAED,OAAO,SAAS,CAAC;IACnB,CAAC;IArBD,sCAqBC"}
|
|
@@ -50,7 +50,7 @@
|
|
|
50
50
|
return this.getHover(document, position, currentDoc);
|
|
51
51
|
}
|
|
52
52
|
catch (error) {
|
|
53
|
-
this.telemetry.sendError('yaml.hover.error', { error
|
|
53
|
+
this.telemetry.sendError('yaml.hover.error', { error: error.toString() });
|
|
54
54
|
}
|
|
55
55
|
}
|
|
56
56
|
// method copied from https://github.com/microsoft/vscode-json-languageservice/blob/2ea5ad3d2ffbbe40dea11cfe764a502becf113ce/src/services/jsonHover.ts#L23
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"yamlHover.js","sourceRoot":"","sources":["../../../../src/languageservice/services/yamlHover.ts"],"names":[],"mappings":";;;;;;;;;IAAA;;;;oGAIgG;IAChG,YAAY,CAAC;;;IAEb,6EAAoF;IACpF,gDAA0D;IAG1D,yDAAmE;IAEnE,6DAA8D;IAE9D,yDAAsD;IAEtD,2CAAiC;IACjC,6BAA6B;IAG7B,MAAa,SAAS;QAIpB,YAAY,aAAgC,EAAmB,SAAoB;YAApB,cAAS,GAAT,SAAS,CAAW;YACjF,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC;YACxB,IAAI,CAAC,aAAa,GAAG,aAAa,CAAC;QACrC,CAAC;QAED,SAAS,CAAC,gBAAkC;YAC1C,IAAI,gBAAgB,EAAE;gBACpB,IAAI,CAAC,WAAW,GAAG,gBAAgB,CAAC,KAAK,CAAC;aAC3C;QACH,CAAC;QAED,OAAO,CAAC,QAAsB,EAAE,QAAkB,EAAE,YAAY,GAAG,KAAK;YACtE,IAAI;gBACF,IAAI,CAAC,IAAI,CAAC,WAAW,IAAI,CAAC,QAAQ,EAAE;oBAClC,OAAO,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;iBACnC;gBACD,MAAM,GAAG,GAAG,mCAAkB,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAC;gBACzD,MAAM,MAAM,GAAG,QAAQ,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;gBAC3C,MAAM,UAAU,GAAG,gCAAqB,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;gBACtD,IAAI,UAAU,KAAK,IAAI,EAAE;oBACvB,OAAO,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;iBACnC;gBAED,wCAAyB,CAAC,GAAG,CAAC,SAAS,EAAE,YAAY,CAAC,CAAC;gBACvD,MAAM,eAAe,GAAG,GAAG,CAAC,SAAS,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;gBAC1D,UAAU,CAAC,eAAe,GAAG,eAAe,CAAC;gBAC7C,OAAO,IAAI,CAAC,QAAQ,CAAC,QAAQ,EAAE,QAAQ,EAAE,UAAU,CAAC,CAAC;aACtD;YAAC,OAAO,KAAK,EAAE;gBACd,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,kBAAkB,EAAE,EAAE,KAAK,EAAE,
|
|
1
|
+
{"version":3,"file":"yamlHover.js","sourceRoot":"","sources":["../../../../src/languageservice/services/yamlHover.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,8 @@
|
|
|
1
1
|
import { DocumentLink } from 'vscode-languageserver';
|
|
2
2
|
import { TextDocument } from 'vscode-languageserver-textdocument';
|
|
3
|
-
|
|
3
|
+
import { Telemetry } from '../../languageserver/telemetry';
|
|
4
|
+
export declare class YamlLinks {
|
|
5
|
+
private readonly telemetry;
|
|
6
|
+
constructor(telemetry: Telemetry);
|
|
7
|
+
findLinks(document: TextDocument): Promise<DocumentLink[]>;
|
|
8
|
+
}
|
|
@@ -9,28 +9,33 @@
|
|
|
9
9
|
})(function (require, exports) {
|
|
10
10
|
"use strict";
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
|
-
exports.
|
|
12
|
+
exports.YamlLinks = void 0;
|
|
13
13
|
/*---------------------------------------------------------------------------------------------
|
|
14
14
|
* Copyright (c) Red Hat, Inc. All rights reserved.
|
|
15
15
|
* Licensed under the MIT License. See License.txt in the project root for license information.
|
|
16
16
|
*--------------------------------------------------------------------------------------------*/
|
|
17
17
|
const jsonLinks_1 = require("vscode-json-languageservice/lib/umd/services/jsonLinks");
|
|
18
18
|
const yaml_documents_1 = require("../parser/yaml-documents");
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
// Find links across all YAML Documents then report them back once finished
|
|
23
|
-
const linkPromises = [];
|
|
24
|
-
for (const yamlDoc of doc.documents) {
|
|
25
|
-
linkPromises.push(jsonLinks_1.findLinks(document, yamlDoc));
|
|
26
|
-
}
|
|
27
|
-
// Wait for all the promises to return and then flatten them into one DocumentLink array
|
|
28
|
-
return Promise.all(linkPromises).then((yamlLinkArray) => [].concat(...yamlLinkArray));
|
|
19
|
+
class YamlLinks {
|
|
20
|
+
constructor(telemetry) {
|
|
21
|
+
this.telemetry = telemetry;
|
|
29
22
|
}
|
|
30
|
-
|
|
31
|
-
|
|
23
|
+
findLinks(document) {
|
|
24
|
+
try {
|
|
25
|
+
const doc = yaml_documents_1.yamlDocumentsCache.getYamlDocument(document);
|
|
26
|
+
// Find links across all YAML Documents then report them back once finished
|
|
27
|
+
const linkPromises = [];
|
|
28
|
+
for (const yamlDoc of doc.documents) {
|
|
29
|
+
linkPromises.push(jsonLinks_1.findLinks(document, yamlDoc));
|
|
30
|
+
}
|
|
31
|
+
// Wait for all the promises to return and then flatten them into one DocumentLink array
|
|
32
|
+
return Promise.all(linkPromises).then((yamlLinkArray) => [].concat(...yamlLinkArray));
|
|
33
|
+
}
|
|
34
|
+
catch (err) {
|
|
35
|
+
this.telemetry.sendError('yaml.documentLink.error', { error: err.toString() });
|
|
36
|
+
}
|
|
32
37
|
}
|
|
33
38
|
}
|
|
34
|
-
exports.
|
|
39
|
+
exports.YamlLinks = YamlLinks;
|
|
35
40
|
});
|
|
36
41
|
//# sourceMappingURL=yamlLinks.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"yamlLinks.js","sourceRoot":"","sources":["../../../../src/languageservice/services/yamlLinks.ts"],"names":[],"mappings":";;;;;;;;;;;;IAAA;;;oGAGgG;IAChG,sFAAoG;
|
|
1
|
+
{"version":3,"file":"yamlLinks.js","sourceRoot":"","sources":["../../../../src/languageservice/services/yamlLinks.ts"],"names":[],"mappings":";;;;;;;;;;;;IAAA;;;oGAGgG;IAChG,sFAAoG;IAIpG,6DAA8D;IAE9D,MAAa,SAAS;QACpB,YAA6B,SAAoB;YAApB,cAAS,GAAT,SAAS,CAAW;QAAG,CAAC;QAErD,SAAS,CAAC,QAAsB;YAC9B,IAAI;gBACF,MAAM,GAAG,GAAG,mCAAkB,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAC;gBACzD,2EAA2E;gBAC3E,MAAM,YAAY,GAAG,EAAE,CAAC;gBACxB,KAAK,MAAM,OAAO,IAAI,GAAG,CAAC,SAAS,EAAE;oBACnC,YAAY,CAAC,IAAI,CAAC,qBAAa,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC,CAAC;iBACrD;gBACD,wFAAwF;gBACxF,OAAO,OAAO,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC,IAAI,CAAC,CAAC,aAAa,EAAE,EAAE,CAAC,EAAE,CAAC,MAAM,CAAC,GAAG,aAAa,CAAC,CAAC,CAAC;aACvF;YAAC,OAAO,GAAG,EAAE;gBACZ,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,yBAAyB,EAAE,EAAE,KAAK,EAAE,GAAG,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;aAChF;QACH,CAAC;KACF;IAjBD,8BAiBC"}
|
|
@@ -1,6 +1,13 @@
|
|
|
1
1
|
import { WorkspaceFolder } from 'vscode-languageserver';
|
|
2
2
|
import { URI } from 'vscode-uri';
|
|
3
3
|
import { Telemetry } from '../../languageserver/telemetry';
|
|
4
|
+
import { JSONSchema } from '../jsonSchema';
|
|
4
5
|
export declare const KUBERNETES_SCHEMA_URL = "https://raw.githubusercontent.com/yannh/kubernetes-json-schema/master/v1.20.5-standalone-strict/all.json";
|
|
5
6
|
export declare const JSON_SCHEMASTORE_URL = "https://www.schemastore.org/api/json/catalog.json";
|
|
6
7
|
export declare function checkSchemaURI(workspaceFolders: WorkspaceFolder[], workspaceRoot: URI, uri: string, telemetry: Telemetry): string;
|
|
8
|
+
/**
|
|
9
|
+
* Collect all urls of sub schemas
|
|
10
|
+
* @param schema the root schema
|
|
11
|
+
* @returns map url to schema
|
|
12
|
+
*/
|
|
13
|
+
export declare function getSchemaUrls(schema: JSONSchema): Map<string, JSONSchema>;
|
|
@@ -4,12 +4,13 @@
|
|
|
4
4
|
if (v !== undefined) module.exports = v;
|
|
5
5
|
}
|
|
6
6
|
else if (typeof define === "function" && define.amd) {
|
|
7
|
-
define(["require", "exports", "./paths"], factory);
|
|
7
|
+
define(["require", "exports", "./objects", "./paths"], factory);
|
|
8
8
|
}
|
|
9
9
|
})(function (require, exports) {
|
|
10
10
|
"use strict";
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
|
-
exports.checkSchemaURI = exports.JSON_SCHEMASTORE_URL = exports.KUBERNETES_SCHEMA_URL = void 0;
|
|
12
|
+
exports.getSchemaUrls = exports.checkSchemaURI = exports.JSON_SCHEMASTORE_URL = exports.KUBERNETES_SCHEMA_URL = void 0;
|
|
13
|
+
const objects_1 = require("./objects");
|
|
13
14
|
const paths_1 = require("./paths");
|
|
14
15
|
exports.KUBERNETES_SCHEMA_URL = 'https://raw.githubusercontent.com/yannh/kubernetes-json-schema/master/v1.20.5-standalone-strict/all.json';
|
|
15
16
|
exports.JSON_SCHEMASTORE_URL = 'https://www.schemastore.org/api/json/catalog.json';
|
|
@@ -26,5 +27,49 @@
|
|
|
26
27
|
}
|
|
27
28
|
}
|
|
28
29
|
exports.checkSchemaURI = checkSchemaURI;
|
|
30
|
+
/**
|
|
31
|
+
* Collect all urls of sub schemas
|
|
32
|
+
* @param schema the root schema
|
|
33
|
+
* @returns map url to schema
|
|
34
|
+
*/
|
|
35
|
+
function getSchemaUrls(schema) {
|
|
36
|
+
const result = new Map();
|
|
37
|
+
if (!schema) {
|
|
38
|
+
return result;
|
|
39
|
+
}
|
|
40
|
+
if (schema.url) {
|
|
41
|
+
if (schema.url.startsWith('schemaservice://combinedSchema/')) {
|
|
42
|
+
addSchemasForOf(schema, result);
|
|
43
|
+
}
|
|
44
|
+
else {
|
|
45
|
+
result.set(schema.url, schema);
|
|
46
|
+
}
|
|
47
|
+
}
|
|
48
|
+
else {
|
|
49
|
+
addSchemasForOf(schema, result);
|
|
50
|
+
}
|
|
51
|
+
return result;
|
|
52
|
+
}
|
|
53
|
+
exports.getSchemaUrls = getSchemaUrls;
|
|
54
|
+
function addSchemasForOf(schema, result) {
|
|
55
|
+
if (schema.allOf) {
|
|
56
|
+
addInnerSchemaUrls(schema.allOf, result);
|
|
57
|
+
}
|
|
58
|
+
if (schema.anyOf) {
|
|
59
|
+
addInnerSchemaUrls(schema.anyOf, result);
|
|
60
|
+
}
|
|
61
|
+
if (schema.oneOf) {
|
|
62
|
+
addInnerSchemaUrls(schema.oneOf, result);
|
|
63
|
+
}
|
|
64
|
+
}
|
|
65
|
+
function addInnerSchemaUrls(schemas, result) {
|
|
66
|
+
for (const subSchema of schemas) {
|
|
67
|
+
if (!objects_1.isBoolean(subSchema)) {
|
|
68
|
+
if (subSchema.url && !result.has(subSchema.url)) {
|
|
69
|
+
result.set(subSchema.url, subSchema);
|
|
70
|
+
}
|
|
71
|
+
}
|
|
72
|
+
}
|
|
73
|
+
}
|
|
29
74
|
});
|
|
30
75
|
//# sourceMappingURL=schemaUrls.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"schemaUrls.js","sourceRoot":"","sources":["../../../../src/languageservice/utils/schemaUrls.ts"],"names":[],"mappings":";;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"schemaUrls.js","sourceRoot":"","sources":["../../../../src/languageservice/utils/schemaUrls.ts"],"names":[],"mappings":";;;;;;;;;;;;IAIA,uCAAsC;IACtC,mCAAiE;IAEpD,QAAA,qBAAqB,GAChC,0GAA0G,CAAC;IAChG,QAAA,oBAAoB,GAAG,mDAAmD,CAAC;IAExF,SAAgB,cAAc,CAC5B,gBAAmC,EACnC,aAAkB,EAClB,GAAW,EACX,SAAoB;QAEpB,IAAI,GAAG,CAAC,IAAI,EAAE,CAAC,WAAW,EAAE,KAAK,YAAY,EAAE;YAC7C,SAAS,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,wBAAwB,EAAE,UAAU,EAAE,EAAE,UAAU,EAAE,IAAI,EAAE,EAAE,CAAC,CAAC;YACrF,OAAO,6BAAqB,CAAC;SAC9B;aAAM,IAAI,sBAAc,CAAC,GAAG,CAAC,EAAE;YAC9B,OAAO,8BAAsB,CAAC,gBAAgB,EAAE,aAAa,EAAE,GAAG,CAAC,CAAC;SACrE;aAAM;YACL,OAAO,GAAG,CAAC;SACZ;IACH,CAAC;IAdD,wCAcC;IAED;;;;OAIG;IACH,SAAgB,aAAa,CAAC,MAAkB;QAC9C,MAAM,MAAM,GAAG,IAAI,GAAG,EAAsB,CAAC;QAC7C,IAAI,CAAC,MAAM,EAAE;YACX,OAAO,MAAM,CAAC;SACf;QAED,IAAI,MAAM,CAAC,GAAG,EAAE;YACd,IAAI,MAAM,CAAC,GAAG,CAAC,UAAU,CAAC,iCAAiC,CAAC,EAAE;gBAC5D,eAAe,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;aACjC;iBAAM;gBACL,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;aAChC;SACF;aAAM;YACL,eAAe,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;SACjC;QACD,OAAO,MAAM,CAAC;IAChB,CAAC;IAhBD,sCAgBC;IAED,SAAS,eAAe,CAAC,MAAkB,EAAE,MAA+B;QAC1E,IAAI,MAAM,CAAC,KAAK,EAAE;YAChB,kBAAkB,CAAC,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;SAC1C;QACD,IAAI,MAAM,CAAC,KAAK,EAAE;YAChB,kBAAkB,CAAC,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;SAC1C;QACD,IAAI,MAAM,CAAC,KAAK,EAAE;YAChB,kBAAkB,CAAC,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;SAC1C;IACH,CAAC;IAED,SAAS,kBAAkB,CAAC,OAAwB,EAAE,MAA+B;QACnF,KAAK,MAAM,SAAS,IAAI,OAAO,EAAE;YAC/B,IAAI,CAAC,mBAAS,CAAC,SAAS,CAAC,EAAE;gBACzB,IAAI,SAAS,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE;oBAC/C,MAAM,CAAC,GAAG,CAAC,SAAS,CAAC,GAAG,EAAE,SAAS,CAAC,CAAC;iBACtC;aACF;SACF;IACH,CAAC"}
|
|
@@ -7,6 +7,7 @@ import { TextDocument } from 'vscode-languageserver-textdocument';
|
|
|
7
7
|
import { FoldingRangesContext } from './yamlTypes';
|
|
8
8
|
import { Telemetry } from '../languageserver/telemetry';
|
|
9
9
|
import { YamlVersion } from './parser/yamlParser07';
|
|
10
|
+
import { SettingsState } from '../yamlSettings';
|
|
10
11
|
export declare enum SchemaPriority {
|
|
11
12
|
SchemaStore = 1,
|
|
12
13
|
SchemaAssociation = 2,
|
|
@@ -98,4 +99,4 @@ export interface LanguageService {
|
|
|
98
99
|
getCodeLens(document: TextDocument, params: CodeLensParams): Thenable<CodeLens[] | undefined> | CodeLens[] | undefined;
|
|
99
100
|
resolveCodeLens(param: CodeLens): Thenable<CodeLens> | CodeLens;
|
|
100
101
|
}
|
|
101
|
-
export declare function getLanguageService(schemaRequestService: SchemaRequestService, workspaceContext: WorkspaceContextService, connection: Connection, telemetry: Telemetry, clientCapabilities?: ClientCapabilities): LanguageService;
|
|
102
|
+
export declare function getLanguageService(schemaRequestService: SchemaRequestService, workspaceContext: WorkspaceContextService, connection: Connection, telemetry: Telemetry, yamlSettings: SettingsState, clientCapabilities?: ClientCapabilities): LanguageService;
|
|
@@ -9,7 +9,7 @@
|
|
|
9
9
|
if (v !== undefined) module.exports = v;
|
|
10
10
|
}
|
|
11
11
|
else if (typeof define === "function" && define.amd) {
|
|
12
|
-
define(["require", "exports", "./services/yamlSchemaService", "./services/documentSymbols", "./services/yamlHover", "./services/yamlValidation", "./services/yamlFormatter", "./services/yamlLinks", "./services/yamlFolding", "./services/yamlCodeActions", "../languageserver/commandExecutor", "./services/yamlOnTypeFormatting", "./services/yamlCodeLens", "./services/yamlCommands", "./services/yamlCompletion", "./parser/yaml-documents", "./services/yamlDefinition"], factory);
|
|
12
|
+
define(["require", "exports", "./services/yamlSchemaService", "./services/documentSymbols", "./services/yamlHover", "./services/yamlValidation", "./services/yamlFormatter", "./services/yamlLinks", "./services/yamlFolding", "./services/yamlCodeActions", "../languageserver/commandExecutor", "./services/yamlOnTypeFormatting", "./services/yamlCodeLens", "./services/yamlCommands", "./services/yamlCompletion", "./parser/yaml-documents", "../languageserver/handlers/schemaSelectionHandlers", "./services/yamlDefinition"], factory);
|
|
13
13
|
}
|
|
14
14
|
})(function (require, exports) {
|
|
15
15
|
"use strict";
|
|
@@ -29,6 +29,7 @@
|
|
|
29
29
|
const yamlCommands_1 = require("./services/yamlCommands");
|
|
30
30
|
const yamlCompletion_1 = require("./services/yamlCompletion");
|
|
31
31
|
const yaml_documents_1 = require("./parser/yaml-documents");
|
|
32
|
+
const schemaSelectionHandlers_1 = require("../languageserver/handlers/schemaSelectionHandlers");
|
|
32
33
|
const yamlDefinition_1 = require("./services/yamlDefinition");
|
|
33
34
|
var SchemaPriority;
|
|
34
35
|
(function (SchemaPriority) {
|
|
@@ -37,7 +38,7 @@
|
|
|
37
38
|
SchemaPriority[SchemaPriority["Settings"] = 3] = "Settings";
|
|
38
39
|
SchemaPriority[SchemaPriority["Modeline"] = 4] = "Modeline";
|
|
39
40
|
})(SchemaPriority = exports.SchemaPriority || (exports.SchemaPriority = {}));
|
|
40
|
-
function getLanguageService(schemaRequestService, workspaceContext, connection, telemetry, clientCapabilities) {
|
|
41
|
+
function getLanguageService(schemaRequestService, workspaceContext, connection, telemetry, yamlSettings, clientCapabilities) {
|
|
41
42
|
const schemaService = new yamlSchemaService_1.YAMLSchemaService(schemaRequestService, workspaceContext);
|
|
42
43
|
const completer = new yamlCompletion_1.YamlCompletion(schemaService, clientCapabilities, yaml_documents_1.yamlDocumentsCache, telemetry);
|
|
43
44
|
const hover = new yamlHover_1.YAMLHover(schemaService, telemetry);
|
|
@@ -46,6 +47,8 @@
|
|
|
46
47
|
const formatter = new yamlFormatter_1.YAMLFormatter();
|
|
47
48
|
const yamlCodeActions = new yamlCodeActions_1.YamlCodeActions(clientCapabilities);
|
|
48
49
|
const yamlCodeLens = new yamlCodeLens_1.YamlCodeLens(schemaService, telemetry);
|
|
50
|
+
const yamlLinks = new yamlLinks_1.YamlLinks(telemetry);
|
|
51
|
+
new schemaSelectionHandlers_1.JSONSchemaSelection(schemaService, yamlSettings, connection);
|
|
49
52
|
// register all commands
|
|
50
53
|
yamlCommands_1.registerCommands(commandExecutor_1.commandExecutor, connection);
|
|
51
54
|
return {
|
|
@@ -68,7 +71,7 @@
|
|
|
68
71
|
registerCustomSchemaProvider: (schemaProvider) => {
|
|
69
72
|
schemaService.registerCustomSchemaProvider(schemaProvider);
|
|
70
73
|
},
|
|
71
|
-
findLinks:
|
|
74
|
+
findLinks: yamlLinks.findLinks.bind(yamlLinks),
|
|
72
75
|
doComplete: completer.doComplete.bind(completer),
|
|
73
76
|
doValidation: yamlValidation.doValidation.bind(yamlValidation),
|
|
74
77
|
doHover: hover.doHover.bind(hover),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"yamlLanguageService.js","sourceRoot":"","sources":["../../../src/languageservice/yamlLanguageService.ts"],"names":[],"mappings":"AAAA;;;;gGAIgG;;;;;;;;;;;;;IAEhG,oEAMsC;IActC,gEAAiE;IACjE,oDAAiD;IACjD,8DAA2D;IAC3D,4DAAyD;IAEzD,oDAAiD;IAYjD,wDAA0D;IAE1D,gEAA6D;IAC7D,uEAAoE;IACpE,0EAA6E;IAC7E,0DAAuD;IACvD,0DAA2D;IAG3D,8DAA2D;IAC3D,4DAA6D;
|
|
1
|
+
{"version":3,"file":"yamlLanguageService.js","sourceRoot":"","sources":["../../../src/languageservice/yamlLanguageService.ts"],"names":[],"mappings":"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"}
|