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
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"yamlHover.js","sourceRoot":"","sources":["../../../../../src/languageservice/services/yamlHover.ts"],"names":[],"mappings":"AAAA;;;;gGAIgG;AAChG,YAAY,CAAC;;;AAEb,6EAAoF;AACpF,gDAA0D;AAG1D,yDAAmE;AAEnE,6DAA8D;AAE9D,yDAAsD;AAEtD,2CAAiC;AACjC,6BAA6B;AAG7B,MAAa,SAAS;IAIpB,YAAY,aAAgC,EAAmB,SAAoB;QAApB,cAAS,GAAT,SAAS,CAAW;QACjF,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC;QACxB,IAAI,CAAC,aAAa,GAAG,aAAa,CAAC;IACrC,CAAC;IAED,SAAS,CAAC,gBAAkC;QAC1C,IAAI,gBAAgB,EAAE;YACpB,IAAI,CAAC,WAAW,GAAG,gBAAgB,CAAC,KAAK,CAAC;SAC3C;IACH,CAAC;IAED,OAAO,CAAC,QAAsB,EAAE,QAAkB,EAAE,YAAY,GAAG,KAAK;QACtE,IAAI;YACF,IAAI,CAAC,IAAI,CAAC,WAAW,IAAI,CAAC,QAAQ,EAAE;gBAClC,OAAO,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;aACnC;YACD,MAAM,GAAG,GAAG,mCAAkB,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAC;YACzD,MAAM,MAAM,GAAG,QAAQ,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;YAC3C,MAAM,UAAU,GAAG,gCAAqB,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;YACtD,IAAI,UAAU,KAAK,IAAI,EAAE;gBACvB,OAAO,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;aACnC;YAED,wCAAyB,CAAC,GAAG,CAAC,SAAS,EAAE,YAAY,CAAC,CAAC;YACvD,MAAM,eAAe,GAAG,GAAG,CAAC,SAAS,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;YAC1D,UAAU,CAAC,eAAe,GAAG,eAAe,CAAC;YAC7C,OAAO,IAAI,CAAC,QAAQ,CAAC,QAAQ,EAAE,QAAQ,EAAE,UAAU,CAAC,CAAC;SACtD;QAAC,OAAO,KAAK,EAAE;YACd,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
|
+
}
|
|
@@ -1,26 +1,31 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.
|
|
3
|
+
exports.YamlLinks = void 0;
|
|
4
4
|
/*---------------------------------------------------------------------------------------------
|
|
5
5
|
* Copyright (c) Red Hat, Inc. All rights reserved.
|
|
6
6
|
* Licensed under the MIT License. See License.txt in the project root for license information.
|
|
7
7
|
*--------------------------------------------------------------------------------------------*/
|
|
8
8
|
const jsonLinks_1 = require("vscode-json-languageservice/lib/umd/services/jsonLinks");
|
|
9
9
|
const yaml_documents_1 = require("../parser/yaml-documents");
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
// Find links across all YAML Documents then report them back once finished
|
|
14
|
-
const linkPromises = [];
|
|
15
|
-
for (const yamlDoc of doc.documents) {
|
|
16
|
-
linkPromises.push(jsonLinks_1.findLinks(document, yamlDoc));
|
|
17
|
-
}
|
|
18
|
-
// Wait for all the promises to return and then flatten them into one DocumentLink array
|
|
19
|
-
return Promise.all(linkPromises).then((yamlLinkArray) => [].concat(...yamlLinkArray));
|
|
10
|
+
class YamlLinks {
|
|
11
|
+
constructor(telemetry) {
|
|
12
|
+
this.telemetry = telemetry;
|
|
20
13
|
}
|
|
21
|
-
|
|
22
|
-
|
|
14
|
+
findLinks(document) {
|
|
15
|
+
try {
|
|
16
|
+
const doc = yaml_documents_1.yamlDocumentsCache.getYamlDocument(document);
|
|
17
|
+
// Find links across all YAML Documents then report them back once finished
|
|
18
|
+
const linkPromises = [];
|
|
19
|
+
for (const yamlDoc of doc.documents) {
|
|
20
|
+
linkPromises.push(jsonLinks_1.findLinks(document, yamlDoc));
|
|
21
|
+
}
|
|
22
|
+
// Wait for all the promises to return and then flatten them into one DocumentLink array
|
|
23
|
+
return Promise.all(linkPromises).then((yamlLinkArray) => [].concat(...yamlLinkArray));
|
|
24
|
+
}
|
|
25
|
+
catch (err) {
|
|
26
|
+
this.telemetry.sendError('yaml.documentLink.error', { error: err.toString() });
|
|
27
|
+
}
|
|
23
28
|
}
|
|
24
29
|
}
|
|
25
|
-
exports.
|
|
30
|
+
exports.YamlLinks = YamlLinks;
|
|
26
31
|
//# sourceMappingURL=yamlLinks.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"yamlLinks.js","sourceRoot":"","sources":["../../../../../src/languageservice/services/yamlLinks.ts"],"names":[],"mappings":";;;AAAA;;;gGAGgG;AAChG,sFAAoG;
|
|
1
|
+
{"version":3,"file":"yamlLinks.js","sourceRoot":"","sources":["../../../../../src/languageservice/services/yamlLinks.ts"],"names":[],"mappings":";;;AAAA;;;gGAGgG;AAChG,sFAAoG;AAIpG,6DAA8D;AAE9D,MAAa,SAAS;IACpB,YAA6B,SAAoB;QAApB,cAAS,GAAT,SAAS,CAAW;IAAG,CAAC;IAErD,SAAS,CAAC,QAAsB;QAC9B,IAAI;YACF,MAAM,GAAG,GAAG,mCAAkB,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAC;YACzD,2EAA2E;YAC3E,MAAM,YAAY,GAAG,EAAE,CAAC;YACxB,KAAK,MAAM,OAAO,IAAI,GAAG,CAAC,SAAS,EAAE;gBACnC,YAAY,CAAC,IAAI,CAAC,qBAAa,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC,CAAC;aACrD;YACD,wFAAwF;YACxF,OAAO,OAAO,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC,IAAI,CAAC,CAAC,aAAa,EAAE,EAAE,CAAC,EAAE,CAAC,MAAM,CAAC,GAAG,aAAa,CAAC,CAAC,CAAC;SACvF;QAAC,OAAO,GAAG,EAAE;YACZ,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,yBAAyB,EAAE,EAAE,KAAK,EAAE,GAAG,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;SAChF;IACH,CAAC;CACF;AAjBD,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>;
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.checkSchemaURI = exports.JSON_SCHEMASTORE_URL = exports.KUBERNETES_SCHEMA_URL = void 0;
|
|
3
|
+
exports.getSchemaUrls = exports.checkSchemaURI = exports.JSON_SCHEMASTORE_URL = exports.KUBERNETES_SCHEMA_URL = void 0;
|
|
4
|
+
const objects_1 = require("./objects");
|
|
4
5
|
const paths_1 = require("./paths");
|
|
5
6
|
exports.KUBERNETES_SCHEMA_URL = 'https://raw.githubusercontent.com/yannh/kubernetes-json-schema/master/v1.20.5-standalone-strict/all.json';
|
|
6
7
|
exports.JSON_SCHEMASTORE_URL = 'https://www.schemastore.org/api/json/catalog.json';
|
|
@@ -17,4 +18,48 @@ function checkSchemaURI(workspaceFolders, workspaceRoot, uri, telemetry) {
|
|
|
17
18
|
}
|
|
18
19
|
}
|
|
19
20
|
exports.checkSchemaURI = checkSchemaURI;
|
|
21
|
+
/**
|
|
22
|
+
* Collect all urls of sub schemas
|
|
23
|
+
* @param schema the root schema
|
|
24
|
+
* @returns map url to schema
|
|
25
|
+
*/
|
|
26
|
+
function getSchemaUrls(schema) {
|
|
27
|
+
const result = new Map();
|
|
28
|
+
if (!schema) {
|
|
29
|
+
return result;
|
|
30
|
+
}
|
|
31
|
+
if (schema.url) {
|
|
32
|
+
if (schema.url.startsWith('schemaservice://combinedSchema/')) {
|
|
33
|
+
addSchemasForOf(schema, result);
|
|
34
|
+
}
|
|
35
|
+
else {
|
|
36
|
+
result.set(schema.url, schema);
|
|
37
|
+
}
|
|
38
|
+
}
|
|
39
|
+
else {
|
|
40
|
+
addSchemasForOf(schema, result);
|
|
41
|
+
}
|
|
42
|
+
return result;
|
|
43
|
+
}
|
|
44
|
+
exports.getSchemaUrls = getSchemaUrls;
|
|
45
|
+
function addSchemasForOf(schema, result) {
|
|
46
|
+
if (schema.allOf) {
|
|
47
|
+
addInnerSchemaUrls(schema.allOf, result);
|
|
48
|
+
}
|
|
49
|
+
if (schema.anyOf) {
|
|
50
|
+
addInnerSchemaUrls(schema.anyOf, result);
|
|
51
|
+
}
|
|
52
|
+
if (schema.oneOf) {
|
|
53
|
+
addInnerSchemaUrls(schema.oneOf, result);
|
|
54
|
+
}
|
|
55
|
+
}
|
|
56
|
+
function addInnerSchemaUrls(schemas, result) {
|
|
57
|
+
for (const subSchema of schemas) {
|
|
58
|
+
if (!objects_1.isBoolean(subSchema)) {
|
|
59
|
+
if (subSchema.url && !result.has(subSchema.url)) {
|
|
60
|
+
result.set(subSchema.url, subSchema);
|
|
61
|
+
}
|
|
62
|
+
}
|
|
63
|
+
}
|
|
64
|
+
}
|
|
20
65
|
//# 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":";;;AAIA,uCAAsC;AACtC,mCAAiE;AAEpD,QAAA,qBAAqB,GAChC,0GAA0G,CAAC;AAChG,QAAA,oBAAoB,GAAG,mDAAmD,CAAC;AAExF,SAAgB,cAAc,CAC5B,gBAAmC,EACnC,aAAkB,EAClB,GAAW,EACX,SAAoB;IAEpB,IAAI,GAAG,CAAC,IAAI,EAAE,CAAC,WAAW,EAAE,KAAK,YAAY,EAAE;QAC7C,SAAS,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,wBAAwB,EAAE,UAAU,EAAE,EAAE,UAAU,EAAE,IAAI,EAAE,EAAE,CAAC,CAAC;QACrF,OAAO,6BAAqB,CAAC;KAC9B;SAAM,IAAI,sBAAc,CAAC,GAAG,CAAC,EAAE;QAC9B,OAAO,8BAAsB,CAAC,gBAAgB,EAAE,aAAa,EAAE,GAAG,CAAC,CAAC;KACrE;SAAM;QACL,OAAO,GAAG,CAAC;KACZ;AACH,CAAC;AAdD,wCAcC;AAED;;;;GAIG;AACH,SAAgB,aAAa,CAAC,MAAkB;IAC9C,MAAM,MAAM,GAAG,IAAI,GAAG,EAAsB,CAAC;IAC7C,IAAI,CAAC,MAAM,EAAE;QACX,OAAO,MAAM,CAAC;KACf;IAED,IAAI,MAAM,CAAC,GAAG,EAAE;QACd,IAAI,MAAM,CAAC,GAAG,CAAC,UAAU,CAAC,iCAAiC,CAAC,EAAE;YAC5D,eAAe,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;SACjC;aAAM;YACL,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;SAChC;KACF;SAAM;QACL,eAAe,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;KACjC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC;AAhBD,sCAgBC;AAED,SAAS,eAAe,CAAC,MAAkB,EAAE,MAA+B;IAC1E,IAAI,MAAM,CAAC,KAAK,EAAE;QAChB,kBAAkB,CAAC,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;KAC1C;IACD,IAAI,MAAM,CAAC,KAAK,EAAE;QAChB,kBAAkB,CAAC,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;KAC1C;IACD,IAAI,MAAM,CAAC,KAAK,EAAE;QAChB,kBAAkB,CAAC,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;KAC1C;AACH,CAAC;AAED,SAAS,kBAAkB,CAAC,OAAwB,EAAE,MAA+B;IACnF,KAAK,MAAM,SAAS,IAAI,OAAO,EAAE;QAC/B,IAAI,CAAC,mBAAS,CAAC,SAAS,CAAC,EAAE;YACzB,IAAI,SAAS,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE;gBAC/C,MAAM,CAAC,GAAG,CAAC,SAAS,CAAC,GAAG,EAAE,SAAS,CAAC,CAAC;aACtC;SACF;KACF;AACH,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;
|
|
@@ -20,6 +20,7 @@ const yamlCodeLens_1 = require("./services/yamlCodeLens");
|
|
|
20
20
|
const yamlCommands_1 = require("./services/yamlCommands");
|
|
21
21
|
const yamlCompletion_1 = require("./services/yamlCompletion");
|
|
22
22
|
const yaml_documents_1 = require("./parser/yaml-documents");
|
|
23
|
+
const schemaSelectionHandlers_1 = require("../languageserver/handlers/schemaSelectionHandlers");
|
|
23
24
|
const yamlDefinition_1 = require("./services/yamlDefinition");
|
|
24
25
|
var SchemaPriority;
|
|
25
26
|
(function (SchemaPriority) {
|
|
@@ -28,7 +29,7 @@ var SchemaPriority;
|
|
|
28
29
|
SchemaPriority[SchemaPriority["Settings"] = 3] = "Settings";
|
|
29
30
|
SchemaPriority[SchemaPriority["Modeline"] = 4] = "Modeline";
|
|
30
31
|
})(SchemaPriority = exports.SchemaPriority || (exports.SchemaPriority = {}));
|
|
31
|
-
function getLanguageService(schemaRequestService, workspaceContext, connection, telemetry, clientCapabilities) {
|
|
32
|
+
function getLanguageService(schemaRequestService, workspaceContext, connection, telemetry, yamlSettings, clientCapabilities) {
|
|
32
33
|
const schemaService = new yamlSchemaService_1.YAMLSchemaService(schemaRequestService, workspaceContext);
|
|
33
34
|
const completer = new yamlCompletion_1.YamlCompletion(schemaService, clientCapabilities, yaml_documents_1.yamlDocumentsCache, telemetry);
|
|
34
35
|
const hover = new yamlHover_1.YAMLHover(schemaService, telemetry);
|
|
@@ -37,6 +38,8 @@ function getLanguageService(schemaRequestService, workspaceContext, connection,
|
|
|
37
38
|
const formatter = new yamlFormatter_1.YAMLFormatter();
|
|
38
39
|
const yamlCodeActions = new yamlCodeActions_1.YamlCodeActions(clientCapabilities);
|
|
39
40
|
const yamlCodeLens = new yamlCodeLens_1.YamlCodeLens(schemaService, telemetry);
|
|
41
|
+
const yamlLinks = new yamlLinks_1.YamlLinks(telemetry);
|
|
42
|
+
new schemaSelectionHandlers_1.JSONSchemaSelection(schemaService, yamlSettings, connection);
|
|
40
43
|
// register all commands
|
|
41
44
|
yamlCommands_1.registerCommands(commandExecutor_1.commandExecutor, connection);
|
|
42
45
|
return {
|
|
@@ -59,7 +62,7 @@ function getLanguageService(schemaRequestService, workspaceContext, connection,
|
|
|
59
62
|
registerCustomSchemaProvider: (schemaProvider) => {
|
|
60
63
|
schemaService.registerCustomSchemaProvider(schemaProvider);
|
|
61
64
|
},
|
|
62
|
-
findLinks:
|
|
65
|
+
findLinks: yamlLinks.findLinks.bind(yamlLinks),
|
|
63
66
|
doComplete: completer.doComplete.bind(completer),
|
|
64
67
|
doValidation: yamlValidation.doValidation.bind(yamlValidation),
|
|
65
68
|
doHover: hover.doHover.bind(hover),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"yamlLanguageService.js","sourceRoot":"","sources":["../../../../src/languageservice/yamlLanguageService.ts"],"names":[],"mappings":";AAAA;;;;gGAIgG;;;AAEhG,oEAMsC;AActC,gEAAiE;AACjE,oDAAiD;AACjD,8DAA2D;AAC3D,4DAAyD;AAEzD,oDAAiD;AAYjD,wDAA0D;AAE1D,gEAA6D;AAC7D,uEAAoE;AACpE,0EAA6E;AAC7E,0DAAuD;AACvD,0DAA2D;AAG3D,8DAA2D;AAC3D,4DAA6D;
|
|
1
|
+
{"version":3,"file":"yamlLanguageService.js","sourceRoot":"","sources":["../../../../src/languageservice/yamlLanguageService.ts"],"names":[],"mappings":"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"}
|
|
@@ -53,3 +53,9 @@ export declare namespace ColorSymbolRequest {
|
|
|
53
53
|
export declare namespace SchemaModificationNotification {
|
|
54
54
|
const type: RequestType<SchemaAdditions | SchemaDeletions, void, {}>;
|
|
55
55
|
}
|
|
56
|
+
export declare namespace SchemaSelectionRequests {
|
|
57
|
+
const type: NotificationType<void>;
|
|
58
|
+
const getSchema: RequestType<string, JSONSchemaDescription[], {}>;
|
|
59
|
+
const getAllSchemas: RequestType<string, JSONSchemaDescriptionExt[], {}>;
|
|
60
|
+
const schemaStoreInitialized: NotificationType<{}>;
|
|
61
|
+
}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.SchemaModificationNotification = exports.ColorSymbolRequest = exports.CustomSchemaRequest = exports.CustomSchemaContentRequest = exports.VSCodeContentRequest = exports.ResultLimitReachedNotification = exports.VSCodeContentRequestRegistration = exports.DynamicCustomSchemaRequestRegistration = exports.SchemaAssociationNotification = void 0;
|
|
3
|
+
exports.SchemaSelectionRequests = exports.SchemaModificationNotification = exports.ColorSymbolRequest = exports.CustomSchemaRequest = exports.CustomSchemaContentRequest = exports.VSCodeContentRequest = exports.ResultLimitReachedNotification = exports.VSCodeContentRequestRegistration = exports.DynamicCustomSchemaRequestRegistration = exports.SchemaAssociationNotification = void 0;
|
|
4
4
|
/* eslint-disable @typescript-eslint/ban-types */
|
|
5
5
|
/* eslint-disable @typescript-eslint/no-namespace */
|
|
6
6
|
const vscode_languageserver_1 = require("vscode-languageserver");
|
|
@@ -41,4 +41,11 @@ var SchemaModificationNotification;
|
|
|
41
41
|
(function (SchemaModificationNotification) {
|
|
42
42
|
SchemaModificationNotification.type = new vscode_languageserver_1.RequestType('json/schema/modify');
|
|
43
43
|
})(SchemaModificationNotification = exports.SchemaModificationNotification || (exports.SchemaModificationNotification = {}));
|
|
44
|
+
var SchemaSelectionRequests;
|
|
45
|
+
(function (SchemaSelectionRequests) {
|
|
46
|
+
SchemaSelectionRequests.type = new vscode_languageserver_1.NotificationType('yaml/supportSchemaSelection');
|
|
47
|
+
SchemaSelectionRequests.getSchema = new vscode_languageserver_1.RequestType('yaml/get/jsonSchema');
|
|
48
|
+
SchemaSelectionRequests.getAllSchemas = new vscode_languageserver_1.RequestType('yaml/get/all/jsonSchemas');
|
|
49
|
+
SchemaSelectionRequests.schemaStoreInitialized = new vscode_languageserver_1.NotificationType('yaml/schema/store/initialized');
|
|
50
|
+
})(SchemaSelectionRequests = exports.SchemaSelectionRequests || (exports.SchemaSelectionRequests = {}));
|
|
44
51
|
//# sourceMappingURL=requestTypes.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"requestTypes.js","sourceRoot":"","sources":["../../../src/requestTypes.ts"],"names":[],"mappings":";;;AAAA,iDAAiD;AACjD,oDAAoD;AACpD,iEAAsE;AAgCtE,IAAiB,6BAA6B,CAK7C;AALD,WAAiB,6BAA6B;IAC5C,8DAA8D;IACjD,kCAAI,GAAkE,IAAI,wCAAgB,CACrG,yBAAyB,CAC1B,CAAC;AACJ,CAAC,EALgB,6BAA6B,GAA7B,qCAA6B,KAA7B,qCAA6B,QAK7C;AAED,IAAiB,sCAAsC,CAEtD;AAFD,WAAiB,sCAAsC;IACxC,2CAAI,GAAyB,IAAI,wCAAgB,CAAC,kCAAkC,CAAC,CAAC;AACrG,CAAC,EAFgB,sCAAsC,GAAtC,8CAAsC,KAAtC,8CAAsC,QAEtD;AAED,IAAiB,gCAAgC,CAEhD;AAFD,WAAiB,gCAAgC;IAClC,qCAAI,GAAyB,IAAI,wCAAgB,CAAC,6BAA6B,CAAC,CAAC;AAChG,CAAC,EAFgB,gCAAgC,GAAhC,wCAAgC,KAAhC,wCAAgC,QAEhD;AAED,IAAiB,8BAA8B,CAE9C;AAFD,WAAiB,8BAA8B;IAChC,mCAAI,GAA6B,IAAI,wCAAgB,CAAC,yBAAyB,CAAC,CAAC;AAChG,CAAC,EAFgB,8BAA8B,GAA9B,sCAA8B,KAA9B,sCAA8B,QAE9C;AAED,IAAiB,oBAAoB,CAEpC;AAFD,WAAiB,oBAAoB;IACtB,yBAAI,GAAoC,IAAI,mCAAW,CAAC,gBAAgB,CAAC,CAAC;AACzF,CAAC,EAFgB,oBAAoB,GAApB,4BAAoB,KAApB,4BAAoB,QAEpC;AAED,IAAiB,0BAA0B,CAE1C;AAFD,WAAiB,0BAA0B;IAC5B,+BAAI,GAAoC,IAAI,mCAAW,CAAC,uBAAuB,CAAC,CAAC;AAChG,CAAC,EAFgB,0BAA0B,GAA1B,kCAA0B,KAA1B,kCAA0B,QAE1C;AAED,IAAiB,mBAAmB,CAEnC;AAFD,WAAiB,mBAAmB;IACrB,wBAAI,GAA4B,IAAI,mCAAW,CAAC,uBAAuB,CAAC,CAAC;AACxF,CAAC,EAFgB,mBAAmB,GAAnB,2BAAmB,KAAnB,2BAAmB,QAEnC;AAED,IAAiB,kBAAkB,CAElC;AAFD,WAAiB,kBAAkB;IACpB,uBAAI,GAA4B,IAAI,mCAAW,CAAC,mBAAmB,CAAC,CAAC;AACpF,CAAC,EAFgB,kBAAkB,GAAlB,0BAAkB,KAAlB,0BAAkB,QAElC;AAED,IAAiB,8BAA8B,CAE9C;AAFD,WAAiB,8BAA8B;IAChC,mCAAI,GAA6D,IAAI,mCAAW,CAAC,oBAAoB,CAAC,CAAC;AACtH,CAAC,EAFgB,8BAA8B,GAA9B,sCAA8B,KAA9B,sCAA8B,QAE9C"}
|
|
1
|
+
{"version":3,"file":"requestTypes.js","sourceRoot":"","sources":["../../../src/requestTypes.ts"],"names":[],"mappings":";;;AAAA,iDAAiD;AACjD,oDAAoD;AACpD,iEAAsE;AAgCtE,IAAiB,6BAA6B,CAK7C;AALD,WAAiB,6BAA6B;IAC5C,8DAA8D;IACjD,kCAAI,GAAkE,IAAI,wCAAgB,CACrG,yBAAyB,CAC1B,CAAC;AACJ,CAAC,EALgB,6BAA6B,GAA7B,qCAA6B,KAA7B,qCAA6B,QAK7C;AAED,IAAiB,sCAAsC,CAEtD;AAFD,WAAiB,sCAAsC;IACxC,2CAAI,GAAyB,IAAI,wCAAgB,CAAC,kCAAkC,CAAC,CAAC;AACrG,CAAC,EAFgB,sCAAsC,GAAtC,8CAAsC,KAAtC,8CAAsC,QAEtD;AAED,IAAiB,gCAAgC,CAEhD;AAFD,WAAiB,gCAAgC;IAClC,qCAAI,GAAyB,IAAI,wCAAgB,CAAC,6BAA6B,CAAC,CAAC;AAChG,CAAC,EAFgB,gCAAgC,GAAhC,wCAAgC,KAAhC,wCAAgC,QAEhD;AAED,IAAiB,8BAA8B,CAE9C;AAFD,WAAiB,8BAA8B;IAChC,mCAAI,GAA6B,IAAI,wCAAgB,CAAC,yBAAyB,CAAC,CAAC;AAChG,CAAC,EAFgB,8BAA8B,GAA9B,sCAA8B,KAA9B,sCAA8B,QAE9C;AAED,IAAiB,oBAAoB,CAEpC;AAFD,WAAiB,oBAAoB;IACtB,yBAAI,GAAoC,IAAI,mCAAW,CAAC,gBAAgB,CAAC,CAAC;AACzF,CAAC,EAFgB,oBAAoB,GAApB,4BAAoB,KAApB,4BAAoB,QAEpC;AAED,IAAiB,0BAA0B,CAE1C;AAFD,WAAiB,0BAA0B;IAC5B,+BAAI,GAAoC,IAAI,mCAAW,CAAC,uBAAuB,CAAC,CAAC;AAChG,CAAC,EAFgB,0BAA0B,GAA1B,kCAA0B,KAA1B,kCAA0B,QAE1C;AAED,IAAiB,mBAAmB,CAEnC;AAFD,WAAiB,mBAAmB;IACrB,wBAAI,GAA4B,IAAI,mCAAW,CAAC,uBAAuB,CAAC,CAAC;AACxF,CAAC,EAFgB,mBAAmB,GAAnB,2BAAmB,KAAnB,2BAAmB,QAEnC;AAED,IAAiB,kBAAkB,CAElC;AAFD,WAAiB,kBAAkB;IACpB,uBAAI,GAA4B,IAAI,mCAAW,CAAC,mBAAmB,CAAC,CAAC;AACpF,CAAC,EAFgB,kBAAkB,GAAlB,0BAAkB,KAAlB,0BAAkB,QAElC;AAED,IAAiB,8BAA8B,CAE9C;AAFD,WAAiB,8BAA8B;IAChC,mCAAI,GAA6D,IAAI,mCAAW,CAAC,oBAAoB,CAAC,CAAC;AACtH,CAAC,EAFgB,8BAA8B,GAA9B,sCAA8B,KAA9B,sCAA8B,QAE9C;AAED,IAAiB,uBAAuB,CAKvC;AALD,WAAiB,uBAAuB;IACzB,4BAAI,GAA2B,IAAI,wCAAgB,CAAC,6BAA6B,CAAC,CAAC;IACnF,iCAAS,GAAqD,IAAI,mCAAW,CAAC,qBAAqB,CAAC,CAAC;IACrG,qCAAa,GAAwD,IAAI,mCAAW,CAAC,0BAA0B,CAAC,CAAC;IACjH,8CAAsB,GAAyB,IAAI,wCAAgB,CAAC,+BAA+B,CAAC,CAAC;AACpH,CAAC,EALgB,uBAAuB,GAAvB,+BAAuB,KAAvB,+BAAuB,QAKvC"}
|
|
@@ -30,7 +30,7 @@ class YAMLServerInit {
|
|
|
30
30
|
return this.connectionInitialized(params);
|
|
31
31
|
});
|
|
32
32
|
this.connection.onInitialized(() => {
|
|
33
|
-
if (this.yamlSettings.
|
|
33
|
+
if (this.yamlSettings.hasWsChangeWatchedFileDynamicRegistration) {
|
|
34
34
|
this.connection.workspace.onDidChangeWorkspaceFolders((changedFolders) => {
|
|
35
35
|
this.yamlSettings.workspaceFolders = paths_1.workspaceFoldersChanged(this.yamlSettings.workspaceFolders, changedFolders);
|
|
36
36
|
});
|
|
@@ -43,7 +43,7 @@ class YAMLServerInit {
|
|
|
43
43
|
// public for test setup
|
|
44
44
|
connectionInitialized(params) {
|
|
45
45
|
this.yamlSettings.capabilities = params.capabilities;
|
|
46
|
-
this.languageService = yamlLanguageService_1.getLanguageService(this.schemaRequestService, this.workspaceContext, this.connection, this.telemetry, params.capabilities);
|
|
46
|
+
this.languageService = yamlLanguageService_1.getLanguageService(this.schemaRequestService, this.workspaceContext, this.connection, this.telemetry, this.yamlSettings, params.capabilities);
|
|
47
47
|
// Only try to parse the workspace root if its not null. Otherwise initialize will fail
|
|
48
48
|
if (params.rootUri) {
|
|
49
49
|
this.yamlSettings.workspaceRoot = vscode_uri_1.URI.parse(params.rootUri);
|
|
@@ -58,6 +58,9 @@ class YAMLServerInit {
|
|
|
58
58
|
this.yamlSettings.hasWorkspaceFolderCapability =
|
|
59
59
|
this.yamlSettings.capabilities.workspace && !!this.yamlSettings.capabilities.workspace.workspaceFolders;
|
|
60
60
|
this.yamlSettings.hasConfigurationCapability = !!(this.yamlSettings.capabilities.workspace && !!this.yamlSettings.capabilities.workspace.configuration);
|
|
61
|
+
this.yamlSettings.hasWsChangeWatchedFileDynamicRegistration = !!(this.yamlSettings.capabilities.workspace &&
|
|
62
|
+
this.yamlSettings.capabilities.workspace.didChangeWatchedFiles &&
|
|
63
|
+
this.yamlSettings.capabilities.workspace.didChangeWatchedFiles.dynamicRegistration);
|
|
61
64
|
this.registerHandlers();
|
|
62
65
|
return {
|
|
63
66
|
capabilities: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"yamlServerInit.js","sourceRoot":"","sources":["../../../src/yamlServerInit.ts"],"names":[],"mappings":";;;AAAA,iEAA6G;AAC7G,+EAK+C;AAC/C,yDAAwE;AACxE,2CAAiC;AAEjC,iFAA8E;AAC9E,yFAAsF;AACtF,+EAA4E;AAC5E,qFAAiF;AACjF,iFAA6E;AAC7E,yCAA0C;AAC1C,mFAAgF;AAChF,sEAAmE;AACnE,0DAAuD;AAEvD,MAAa,cAAc;IAOzB,YACmB,UAAsB,EAC/B,YAA2B,EAC3B,gBAAyC,EACzC,oBAA0C;QAHjC,eAAU,GAAV,UAAU,CAAY;QAC/B,iBAAY,GAAZ,YAAY,CAAe;QAC3B,qBAAgB,GAAhB,gBAAgB,CAAyB;QACzC,yBAAoB,GAApB,oBAAoB,CAAsB;QAElD,IAAI,CAAC,YAAY,CAAC,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QACpD,IAAI,CAAC,SAAS,GAAG,IAAI,qBAAS,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QAEhD;;;WAGG;QACH,IAAI,CAAC,UAAU,CAAC,YAAY,CAC1B,CAAC,MAAwB,EAAoB,EAAE;YAC7C,OAAO,IAAI,CAAC,qBAAqB,CAAC,MAAM,CAAC,CAAC;QAC5C,CAAC,CACF,CAAC;QACF,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,GAAG,EAAE;YACjC,IAAI,IAAI,CAAC,YAAY,CAAC,
|
|
1
|
+
{"version":3,"file":"yamlServerInit.js","sourceRoot":"","sources":["../../../src/yamlServerInit.ts"],"names":[],"mappings":"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"}
|
|
@@ -68,6 +68,8 @@ export declare class SettingsState {
|
|
|
68
68
|
hasConfigurationCapability: boolean;
|
|
69
69
|
useVSCodeContentRequest: boolean;
|
|
70
70
|
yamlVersion: YamlVersion;
|
|
71
|
+
useSchemaSelectionRequests: boolean;
|
|
72
|
+
hasWsChangeWatchedFileDynamicRegistration: boolean;
|
|
71
73
|
}
|
|
72
74
|
export declare class TextDocumentTestManager extends TextDocuments<TextDocument> {
|
|
73
75
|
testTextDocuments: Map<string, TextDocument>;
|
|
@@ -43,6 +43,8 @@ class SettingsState {
|
|
|
43
43
|
this.hasConfigurationCapability = false;
|
|
44
44
|
this.useVSCodeContentRequest = false;
|
|
45
45
|
this.yamlVersion = '1.2';
|
|
46
|
+
this.useSchemaSelectionRequests = false;
|
|
47
|
+
this.hasWsChangeWatchedFileDynamicRegistration = false;
|
|
46
48
|
}
|
|
47
49
|
}
|
|
48
50
|
exports.SettingsState = SettingsState;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"yamlSettings.js","sourceRoot":"","sources":["../../../src/yamlSettings.ts"],"names":[],"mappings":";;;AAAA,qDAA4G;AAK5G,2FAAkE;AAClE,mEAA0E;AAqC1E,0DAA0D;AAC1D,MAAa,aAAa;IAA1B;QACE,8BAAyB,GAAyB,SAAS,CAAC;QAC5D,uBAAkB,GAA4D,SAAS,CAAC;QACxF,0BAAqB,GAAyB,IAAI,CAAC;QACnD,2BAAsB,GAAG,EAAE,CAAC;QAC5B,gCAA2B,GAAG,EAAE,CAAC;QACjC,uBAAkB,GAAG,IAAI,CAAC;QAC1B,0BAAqB,GAAG;YACtB,WAAW,EAAE,KAAK;YAClB,cAAc,EAAE,IAAI;YACpB,SAAS,EAAE,UAAU;YACrB,UAAU,EAAE,EAAE;YACd,MAAM,EAAE,IAAI;SACa,CAAC;QAC5B,oBAAe,GAAG,IAAI,CAAC;QACvB,yBAAoB,GAAG,IAAI,CAAC;QAC5B,wBAAmB,GAAG,EAAE,CAAC;QACzB,eAAU,GAAG,EAAE,CAAC;QAChB,uBAAkB,GAAG,IAAI,CAAC;QAC1B,mBAAc,GAAG,iCAAoB,CAAC;QACtC,gBAAW,GAAuB,SAAS,CAAC;QAC5C,gCAA2B,GAAG,KAAK,CAAC;QACpC,qBAAgB,GAAG,IAAI,CAAC;QAExB,0BAA0B;QAC1B,8BAAyB,GAAoC,EAAE,CAAC;QAChE,sBAAiB,GAAG,GAAG,CAAC;QAExB,mEAAmE;QACnE,mCAAmC;QACnC,cAAS,GAA0D,IAAI,oBAAa,CAAC,iDAAY,CAAC,CAAC;QAInG,kBAAa,GAAQ,IAAI,CAAC;QAC1B,qBAAgB,GAAsB,EAAE,CAAC;QACzC,iCAA4B,GAAG,KAAK,CAAC;QACrC,sCAAiC,GAAG,KAAK,CAAC;QAC1C,iCAA4B,GAAG,KAAK,CAAC;QACrC,+BAA0B,GAAG,KAAK,CAAC;QACnC,4BAAuB,GAAG,KAAK,CAAC;QAChC,gBAAW,GAAgB,KAAK,CAAC;
|
|
1
|
+
{"version":3,"file":"yamlSettings.js","sourceRoot":"","sources":["../../../src/yamlSettings.ts"],"names":[],"mappings":";;;AAAA,qDAA4G;AAK5G,2FAAkE;AAClE,mEAA0E;AAqC1E,0DAA0D;AAC1D,MAAa,aAAa;IAA1B;QACE,8BAAyB,GAAyB,SAAS,CAAC;QAC5D,uBAAkB,GAA4D,SAAS,CAAC;QACxF,0BAAqB,GAAyB,IAAI,CAAC;QACnD,2BAAsB,GAAG,EAAE,CAAC;QAC5B,gCAA2B,GAAG,EAAE,CAAC;QACjC,uBAAkB,GAAG,IAAI,CAAC;QAC1B,0BAAqB,GAAG;YACtB,WAAW,EAAE,KAAK;YAClB,cAAc,EAAE,IAAI;YACpB,SAAS,EAAE,UAAU;YACrB,UAAU,EAAE,EAAE;YACd,MAAM,EAAE,IAAI;SACa,CAAC;QAC5B,oBAAe,GAAG,IAAI,CAAC;QACvB,yBAAoB,GAAG,IAAI,CAAC;QAC5B,wBAAmB,GAAG,EAAE,CAAC;QACzB,eAAU,GAAG,EAAE,CAAC;QAChB,uBAAkB,GAAG,IAAI,CAAC;QAC1B,mBAAc,GAAG,iCAAoB,CAAC;QACtC,gBAAW,GAAuB,SAAS,CAAC;QAC5C,gCAA2B,GAAG,KAAK,CAAC;QACpC,qBAAgB,GAAG,IAAI,CAAC;QAExB,0BAA0B;QAC1B,8BAAyB,GAAoC,EAAE,CAAC;QAChE,sBAAiB,GAAG,GAAG,CAAC;QAExB,mEAAmE;QACnE,mCAAmC;QACnC,cAAS,GAA0D,IAAI,oBAAa,CAAC,iDAAY,CAAC,CAAC;QAInG,kBAAa,GAAQ,IAAI,CAAC;QAC1B,qBAAgB,GAAsB,EAAE,CAAC;QACzC,iCAA4B,GAAG,KAAK,CAAC;QACrC,sCAAiC,GAAG,KAAK,CAAC;QAC1C,iCAA4B,GAAG,KAAK,CAAC;QACrC,+BAA0B,GAAG,KAAK,CAAC;QACnC,4BAAuB,GAAG,KAAK,CAAC;QAChC,gBAAW,GAAgB,KAAK,CAAC;QACjC,+BAA0B,GAAG,KAAK,CAAC;QACnC,8CAAyC,GAAG,KAAK,CAAC;IACpD,CAAC;CAAA;AA5CD,sCA4CC;AAED,MAAa,uBAAwB,SAAQ,oBAA2B;IAGtE;QACE,KAAK,CAAC,iDAAY,CAAC,CAAC;QAHtB,sBAAiB,GAAG,IAAI,GAAG,EAAwB,CAAC;IAIpD,CAAC;IAED,GAAG,CAAC,GAAW;QACb,OAAO,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IACzC,CAAC;IAED,GAAG,CAAC,YAA0B;QAC5B,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,YAAY,CAAC,GAAG,EAAE,YAAY,CAAC,CAAC;IAC7D,CAAC;CACF;AAdD,0DAcC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export {};
|
|
@@ -0,0 +1,105 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
3
|
+
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
4
|
+
return new (P || (P = Promise))(function (resolve, reject) {
|
|
5
|
+
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
6
|
+
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
7
|
+
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
8
|
+
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
9
|
+
});
|
|
10
|
+
};
|
|
11
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
|
+
/*---------------------------------------------------------------------------------------------
|
|
13
|
+
* Copyright (c) Red Hat, Inc. All rights reserved.
|
|
14
|
+
* Licensed under the MIT License. See License.txt in the project root for license information.
|
|
15
|
+
*--------------------------------------------------------------------------------------------*/
|
|
16
|
+
const sinon = require("sinon");
|
|
17
|
+
const chai = require("chai");
|
|
18
|
+
const sinonChai = require("sinon-chai");
|
|
19
|
+
const schemaSelectionHandlers_1 = require("../src/languageserver/handlers/schemaSelectionHandlers");
|
|
20
|
+
const yamlSchemaService_1 = require("../src/languageservice/services/yamlSchemaService");
|
|
21
|
+
const yamlSettings_1 = require("../src/yamlSettings");
|
|
22
|
+
const requestTypes_1 = require("../src/requestTypes");
|
|
23
|
+
const testHelper_1 = require("./utils/testHelper");
|
|
24
|
+
const expect = chai.expect;
|
|
25
|
+
chai.use(sinonChai);
|
|
26
|
+
describe('Schema Selection Handlers', () => {
|
|
27
|
+
const sandbox = sinon.createSandbox();
|
|
28
|
+
const connection = {};
|
|
29
|
+
let service;
|
|
30
|
+
let requestServiceMock;
|
|
31
|
+
beforeEach(() => {
|
|
32
|
+
requestServiceMock = sandbox.fake.resolves(undefined);
|
|
33
|
+
service = new yamlSchemaService_1.YAMLSchemaService(requestServiceMock);
|
|
34
|
+
connection.client = {};
|
|
35
|
+
const onRequest = sandbox.fake();
|
|
36
|
+
connection.onRequest = onRequest;
|
|
37
|
+
});
|
|
38
|
+
afterEach(() => {
|
|
39
|
+
sandbox.restore();
|
|
40
|
+
});
|
|
41
|
+
it('add handler for "getSchema" and "getAllSchemas" requests', () => {
|
|
42
|
+
new schemaSelectionHandlers_1.JSONSchemaSelection(service, new yamlSettings_1.SettingsState(), connection);
|
|
43
|
+
expect(connection.onRequest).calledWith(requestTypes_1.SchemaSelectionRequests.getSchema);
|
|
44
|
+
expect(connection.onRequest).calledWith(requestTypes_1.SchemaSelectionRequests.getAllSchemas);
|
|
45
|
+
});
|
|
46
|
+
it('getAllSchemas should return all schemas', () => __awaiter(void 0, void 0, void 0, function* () {
|
|
47
|
+
service.registerExternalSchema('https://some.com/some.json', ['foo.yaml'], undefined, 'Schema name', 'Schema description');
|
|
48
|
+
const settings = new yamlSettings_1.SettingsState();
|
|
49
|
+
const testTextDocument = testHelper_1.setupSchemaIDTextDocument('');
|
|
50
|
+
settings.documents = new yamlSettings_1.TextDocumentTestManager();
|
|
51
|
+
settings.documents.set(testTextDocument);
|
|
52
|
+
const selection = new schemaSelectionHandlers_1.JSONSchemaSelection(service, settings, connection);
|
|
53
|
+
const result = yield selection.getAllSchemas(testTextDocument.uri);
|
|
54
|
+
expect(result).length(1);
|
|
55
|
+
expect(result[0]).to.be.eqls({
|
|
56
|
+
uri: 'https://some.com/some.json',
|
|
57
|
+
fromStore: true,
|
|
58
|
+
usedForCurrentFile: false,
|
|
59
|
+
name: 'Schema name',
|
|
60
|
+
description: 'Schema description',
|
|
61
|
+
});
|
|
62
|
+
}));
|
|
63
|
+
it('getAllSchemas should return all schemas and mark used for current file', () => __awaiter(void 0, void 0, void 0, function* () {
|
|
64
|
+
service.registerExternalSchema('https://some.com/some.json', [testHelper_1.SCHEMA_ID], undefined, 'Schema name', 'Schema description');
|
|
65
|
+
const settings = new yamlSettings_1.SettingsState();
|
|
66
|
+
const testTextDocument = testHelper_1.setupSchemaIDTextDocument('');
|
|
67
|
+
settings.documents = new yamlSettings_1.TextDocumentTestManager();
|
|
68
|
+
settings.documents.set(testTextDocument);
|
|
69
|
+
const selection = new schemaSelectionHandlers_1.JSONSchemaSelection(service, settings, connection);
|
|
70
|
+
const result = yield selection.getAllSchemas(testTextDocument.uri);
|
|
71
|
+
expect(result).length(1);
|
|
72
|
+
expect(result[0]).to.be.eqls({
|
|
73
|
+
uri: 'https://some.com/some.json',
|
|
74
|
+
fromStore: false,
|
|
75
|
+
usedForCurrentFile: true,
|
|
76
|
+
name: 'Schema name',
|
|
77
|
+
description: 'Schema description',
|
|
78
|
+
});
|
|
79
|
+
}));
|
|
80
|
+
it('getSchemas should return all schemas', () => __awaiter(void 0, void 0, void 0, function* () {
|
|
81
|
+
service.registerExternalSchema('https://some.com/some.json', [testHelper_1.SCHEMA_ID], undefined, 'Schema name', 'Schema description');
|
|
82
|
+
const settings = new yamlSettings_1.SettingsState();
|
|
83
|
+
const testTextDocument = testHelper_1.setupSchemaIDTextDocument('');
|
|
84
|
+
settings.documents = new yamlSettings_1.TextDocumentTestManager();
|
|
85
|
+
settings.documents.set(testTextDocument);
|
|
86
|
+
const selection = new schemaSelectionHandlers_1.JSONSchemaSelection(service, settings, connection);
|
|
87
|
+
const result = yield selection.getSchemas(testTextDocument.uri);
|
|
88
|
+
expect(result).length(1);
|
|
89
|
+
expect(result[0]).to.be.eqls({
|
|
90
|
+
uri: 'https://some.com/some.json',
|
|
91
|
+
name: 'Schema name',
|
|
92
|
+
description: 'Schema description',
|
|
93
|
+
});
|
|
94
|
+
}));
|
|
95
|
+
it('getSchemas should handle empty schemas', () => __awaiter(void 0, void 0, void 0, function* () {
|
|
96
|
+
const settings = new yamlSettings_1.SettingsState();
|
|
97
|
+
const testTextDocument = testHelper_1.setupSchemaIDTextDocument('');
|
|
98
|
+
settings.documents = new yamlSettings_1.TextDocumentTestManager();
|
|
99
|
+
settings.documents.set(testTextDocument);
|
|
100
|
+
const selection = new schemaSelectionHandlers_1.JSONSchemaSelection(service, settings, connection);
|
|
101
|
+
const result = yield selection.getSchemas(testTextDocument.uri);
|
|
102
|
+
expect(result).length(0);
|
|
103
|
+
}));
|
|
104
|
+
});
|
|
105
|
+
//# sourceMappingURL=schemaSelectionHandlers.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"schemaSelectionHandlers.test.js","sourceRoot":"","sources":["../../../test/schemaSelectionHandlers.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -37,16 +37,16 @@ describe('YAML CodeLens', () => {
|
|
|
37
37
|
afterEach(() => {
|
|
38
38
|
sandbox.restore();
|
|
39
39
|
});
|
|
40
|
-
function createCommand(title, arg) {
|
|
40
|
+
function createCommand(title, command, arg) {
|
|
41
41
|
return {
|
|
42
42
|
title,
|
|
43
|
-
command
|
|
43
|
+
command,
|
|
44
44
|
arguments: [arg],
|
|
45
45
|
};
|
|
46
46
|
}
|
|
47
|
-
function createCodeLens(title, arg) {
|
|
47
|
+
function createCodeLens(title, command, arg) {
|
|
48
48
|
const lens = vscode_languageserver_protocol_1.CodeLens.create(vscode_languageserver_protocol_1.Range.create(0, 0, 0, 0));
|
|
49
|
-
lens.command = createCommand(title, arg);
|
|
49
|
+
lens.command = createCommand(title, command, arg);
|
|
50
50
|
return lens;
|
|
51
51
|
}
|
|
52
52
|
it('should provides CodeLens with jumpToSchema command', () => __awaiter(void 0, void 0, void 0, function* () {
|
|
@@ -59,7 +59,7 @@ describe('YAML CodeLens', () => {
|
|
|
59
59
|
const result = yield codeLens.getCodeLens(doc, { textDocument: { uri: doc.uri } });
|
|
60
60
|
expect(result).is.not.empty;
|
|
61
61
|
expect(result[0].command).is.not.undefined;
|
|
62
|
-
expect(result[0].command).is.deep.equal(createCommand('schema.json', 'some://url/to/schema.json'));
|
|
62
|
+
expect(result[0].command).is.deep.equal(createCommand('schema.json', commands_1.YamlCommands.JUMP_TO_SCHEMA, 'some://url/to/schema.json'));
|
|
63
63
|
}));
|
|
64
64
|
it('should place CodeLens at beginning of the file and it has command', () => __awaiter(void 0, void 0, void 0, function* () {
|
|
65
65
|
const doc = testHelper_1.setupTextDocument('foo: bar');
|
|
@@ -70,7 +70,7 @@ describe('YAML CodeLens', () => {
|
|
|
70
70
|
const codeLens = new yamlCodeLens_1.YamlCodeLens(yamlSchemaService, telemetry);
|
|
71
71
|
const result = yield codeLens.getCodeLens(doc, { textDocument: { uri: doc.uri } });
|
|
72
72
|
expect(result[0].range).is.deep.equal(vscode_languageserver_protocol_1.Range.create(0, 0, 0, 0));
|
|
73
|
-
expect(result[0].command).is.deep.equal(createCommand('schema.json', 'some://url/to/schema.json'));
|
|
73
|
+
expect(result[0].command).is.deep.equal(createCommand('schema.json', commands_1.YamlCommands.JUMP_TO_SCHEMA, 'some://url/to/schema.json'));
|
|
74
74
|
}));
|
|
75
75
|
it('command name should contains schema title', () => __awaiter(void 0, void 0, void 0, function* () {
|
|
76
76
|
const doc = testHelper_1.setupTextDocument('foo: bar');
|
|
@@ -81,7 +81,7 @@ describe('YAML CodeLens', () => {
|
|
|
81
81
|
yamlSchemaService.getSchemaForResource.resolves({ schema });
|
|
82
82
|
const codeLens = new yamlCodeLens_1.YamlCodeLens(yamlSchemaService, telemetry);
|
|
83
83
|
const result = yield codeLens.getCodeLens(doc, { textDocument: { uri: doc.uri } });
|
|
84
|
-
expect(result[0].command).is.deep.equal(createCommand('fooBar (schema.json)', 'some://url/to/schema.json'));
|
|
84
|
+
expect(result[0].command).is.deep.equal(createCommand('fooBar (schema.json)', commands_1.YamlCommands.JUMP_TO_SCHEMA, 'some://url/to/schema.json'));
|
|
85
85
|
}));
|
|
86
86
|
it('should provide lens for oneOf schemas', () => __awaiter(void 0, void 0, void 0, function* () {
|
|
87
87
|
const doc = testHelper_1.setupTextDocument('foo: bar');
|
|
@@ -100,8 +100,8 @@ describe('YAML CodeLens', () => {
|
|
|
100
100
|
const result = yield codeLens.getCodeLens(doc, { textDocument: { uri: doc.uri } });
|
|
101
101
|
expect(result).has.length(2);
|
|
102
102
|
expect(result).is.deep.equal([
|
|
103
|
-
createCodeLens('schema1.json', 'some://url/schema1.json'),
|
|
104
|
-
createCodeLens('schema2.json', 'some://url/schema2.json'),
|
|
103
|
+
createCodeLens('schema1.json', commands_1.YamlCommands.JUMP_TO_SCHEMA, 'some://url/schema1.json'),
|
|
104
|
+
createCodeLens('schema2.json', commands_1.YamlCommands.JUMP_TO_SCHEMA, 'some://url/schema2.json'),
|
|
105
105
|
]);
|
|
106
106
|
}));
|
|
107
107
|
it('should provide lens for allOf schemas', () => __awaiter(void 0, void 0, void 0, function* () {
|
|
@@ -121,8 +121,8 @@ describe('YAML CodeLens', () => {
|
|
|
121
121
|
const result = yield codeLens.getCodeLens(doc, { textDocument: { uri: doc.uri } });
|
|
122
122
|
expect(result).has.length(2);
|
|
123
123
|
expect(result).is.deep.equal([
|
|
124
|
-
createCodeLens('schema1.json', 'some://url/schema1.json'),
|
|
125
|
-
createCodeLens('schema2.json', 'some://url/schema2.json'),
|
|
124
|
+
createCodeLens('schema1.json', commands_1.YamlCommands.JUMP_TO_SCHEMA, 'some://url/schema1.json'),
|
|
125
|
+
createCodeLens('schema2.json', commands_1.YamlCommands.JUMP_TO_SCHEMA, 'some://url/schema2.json'),
|
|
126
126
|
]);
|
|
127
127
|
}));
|
|
128
128
|
it('should provide lens for anyOf schemas', () => __awaiter(void 0, void 0, void 0, function* () {
|
|
@@ -142,8 +142,8 @@ describe('YAML CodeLens', () => {
|
|
|
142
142
|
const result = yield codeLens.getCodeLens(doc, { textDocument: { uri: doc.uri } });
|
|
143
143
|
expect(result).has.length(2);
|
|
144
144
|
expect(result).is.deep.equal([
|
|
145
|
-
createCodeLens('schema1.json', 'some://url/schema1.json'),
|
|
146
|
-
createCodeLens('schema2.json', 'some://url/schema2.json'),
|
|
145
|
+
createCodeLens('schema1.json', commands_1.YamlCommands.JUMP_TO_SCHEMA, 'some://url/schema1.json'),
|
|
146
|
+
createCodeLens('schema2.json', commands_1.YamlCommands.JUMP_TO_SCHEMA, 'some://url/schema2.json'),
|
|
147
147
|
]);
|
|
148
148
|
}));
|
|
149
149
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"yamlCodeLens.test.js","sourceRoot":"","sources":["../../../test/yamlCodeLens.test.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA;;;gGAGgG;AAChG,+BAA+B;AAC/B,wCAAwC;AACxC,6BAA6B;AAC7B,+EAA4E;AAC5E,yFAAsF;AACtF,mDAAuD;AAEvD,mFAA0E;AAC1E,8CAA+C;AAC/C,+DAA4D;AAE5D,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;AAC3B,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;AAEpB,QAAQ,CAAC,eAAe,EAAE,GAAG,EAAE;IAC7B,MAAM,OAAO,GAAG,KAAK,CAAC,aAAa,EAAE,CAAC;IACtC,IAAI,iBAAgE,CAAC;IACrE,IAAI,aAAoD,CAAC;IACzD,IAAI,SAAoB,CAAC;IAEzB,UAAU,CAAC,GAAG,EAAE;QACd,iBAAiB,GAAG,OAAO,CAAC,kBAAkB,CAAC,qCAAiB,CAAC,CAAC;QAClE,aAAa,GAAG,OAAO,CAAC,kBAAkB,CAAC,qBAAS,CAAC,CAAC;QACtD,SAAS,GAAI,aAAsC,CAAC;IACtD,CAAC,CAAC,CAAC;IAEH,SAAS,CAAC,GAAG,EAAE;QACb,OAAO,CAAC,OAAO,EAAE,CAAC;IACpB,CAAC,CAAC,CAAC;IAEH,SAAS,aAAa,CAAC,KAAa,EAAE,GAAW;
|
|
1
|
+
{"version":3,"file":"yamlCodeLens.test.js","sourceRoot":"","sources":["../../../test/yamlCodeLens.test.ts"],"names":[],"mappings":"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"}
|