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
|
@@ -4,19 +4,24 @@
|
|
|
4
4
|
*--------------------------------------------------------------------------------------------*/
|
|
5
5
|
import { findLinks as JSONFindLinks } from 'vscode-json-languageservice/lib/umd/services/jsonLinks';
|
|
6
6
|
import { yamlDocumentsCache } from '../parser/yaml-documents';
|
|
7
|
-
export
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
// Find links across all YAML Documents then report them back once finished
|
|
11
|
-
const linkPromises = [];
|
|
12
|
-
for (const yamlDoc of doc.documents) {
|
|
13
|
-
linkPromises.push(JSONFindLinks(document, yamlDoc));
|
|
14
|
-
}
|
|
15
|
-
// Wait for all the promises to return and then flatten them into one DocumentLink array
|
|
16
|
-
return Promise.all(linkPromises).then((yamlLinkArray) => [].concat(...yamlLinkArray));
|
|
7
|
+
export class YamlLinks {
|
|
8
|
+
constructor(telemetry) {
|
|
9
|
+
this.telemetry = telemetry;
|
|
17
10
|
}
|
|
18
|
-
|
|
19
|
-
|
|
11
|
+
findLinks(document) {
|
|
12
|
+
try {
|
|
13
|
+
const doc = yamlDocumentsCache.getYamlDocument(document);
|
|
14
|
+
// Find links across all YAML Documents then report them back once finished
|
|
15
|
+
const linkPromises = [];
|
|
16
|
+
for (const yamlDoc of doc.documents) {
|
|
17
|
+
linkPromises.push(JSONFindLinks(document, yamlDoc));
|
|
18
|
+
}
|
|
19
|
+
// Wait for all the promises to return and then flatten them into one DocumentLink array
|
|
20
|
+
return Promise.all(linkPromises).then((yamlLinkArray) => [].concat(...yamlLinkArray));
|
|
21
|
+
}
|
|
22
|
+
catch (err) {
|
|
23
|
+
this.telemetry.sendError('yaml.documentLink.error', { error: err.toString() });
|
|
24
|
+
}
|
|
20
25
|
}
|
|
21
26
|
}
|
|
22
27
|
//# sourceMappingURL=yamlLinks.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"yamlLinks.js","sourceRoot":"","sources":["../../../../src/languageservice/services/yamlLinks.ts"],"names":[],"mappings":"AAAA;;;gGAGgG;AAChG,OAAO,EAAE,SAAS,IAAI,aAAa,EAAE,MAAM,wDAAwD,CAAC;
|
|
1
|
+
{"version":3,"file":"yamlLinks.js","sourceRoot":"","sources":["../../../../src/languageservice/services/yamlLinks.ts"],"names":[],"mappings":"AAAA;;;gGAGgG;AAChG,OAAO,EAAE,SAAS,IAAI,aAAa,EAAE,MAAM,wDAAwD,CAAC;AAIpG,OAAO,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AAE9D,MAAM,OAAO,SAAS;IACpB,YAA6B,SAAoB;QAApB,cAAS,GAAT,SAAS,CAAW;IAAG,CAAC;IAErD,SAAS,CAAC,QAAsB;QAC9B,IAAI;YACF,MAAM,GAAG,GAAG,kBAAkB,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,aAAa,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"}
|
|
@@ -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,3 +1,4 @@
|
|
|
1
|
+
import { isBoolean } from './objects';
|
|
1
2
|
import { isRelativePath, relativeToAbsolutePath } from './paths';
|
|
2
3
|
export const KUBERNETES_SCHEMA_URL = 'https://raw.githubusercontent.com/yannh/kubernetes-json-schema/master/v1.20.5-standalone-strict/all.json';
|
|
3
4
|
export const JSON_SCHEMASTORE_URL = 'https://www.schemastore.org/api/json/catalog.json';
|
|
@@ -13,4 +14,47 @@ export function checkSchemaURI(workspaceFolders, workspaceRoot, uri, telemetry)
|
|
|
13
14
|
return uri;
|
|
14
15
|
}
|
|
15
16
|
}
|
|
17
|
+
/**
|
|
18
|
+
* Collect all urls of sub schemas
|
|
19
|
+
* @param schema the root schema
|
|
20
|
+
* @returns map url to schema
|
|
21
|
+
*/
|
|
22
|
+
export function getSchemaUrls(schema) {
|
|
23
|
+
const result = new Map();
|
|
24
|
+
if (!schema) {
|
|
25
|
+
return result;
|
|
26
|
+
}
|
|
27
|
+
if (schema.url) {
|
|
28
|
+
if (schema.url.startsWith('schemaservice://combinedSchema/')) {
|
|
29
|
+
addSchemasForOf(schema, result);
|
|
30
|
+
}
|
|
31
|
+
else {
|
|
32
|
+
result.set(schema.url, schema);
|
|
33
|
+
}
|
|
34
|
+
}
|
|
35
|
+
else {
|
|
36
|
+
addSchemasForOf(schema, result);
|
|
37
|
+
}
|
|
38
|
+
return result;
|
|
39
|
+
}
|
|
40
|
+
function addSchemasForOf(schema, result) {
|
|
41
|
+
if (schema.allOf) {
|
|
42
|
+
addInnerSchemaUrls(schema.allOf, result);
|
|
43
|
+
}
|
|
44
|
+
if (schema.anyOf) {
|
|
45
|
+
addInnerSchemaUrls(schema.anyOf, result);
|
|
46
|
+
}
|
|
47
|
+
if (schema.oneOf) {
|
|
48
|
+
addInnerSchemaUrls(schema.oneOf, result);
|
|
49
|
+
}
|
|
50
|
+
}
|
|
51
|
+
function addInnerSchemaUrls(schemas, result) {
|
|
52
|
+
for (const subSchema of schemas) {
|
|
53
|
+
if (!isBoolean(subSchema)) {
|
|
54
|
+
if (subSchema.url && !result.has(subSchema.url)) {
|
|
55
|
+
result.set(subSchema.url, subSchema);
|
|
56
|
+
}
|
|
57
|
+
}
|
|
58
|
+
}
|
|
59
|
+
}
|
|
16
60
|
//# 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,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AACtC,OAAO,EAAE,cAAc,EAAE,sBAAsB,EAAE,MAAM,SAAS,CAAC;AAEjE,MAAM,CAAC,MAAM,qBAAqB,GAChC,0GAA0G,CAAC;AAC7G,MAAM,CAAC,MAAM,oBAAoB,GAAG,mDAAmD,CAAC;AAExF,MAAM,UAAU,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,qBAAqB,CAAC;KAC9B;SAAM,IAAI,cAAc,CAAC,GAAG,CAAC,EAAE;QAC9B,OAAO,sBAAsB,CAAC,gBAAgB,EAAE,aAAa,EAAE,GAAG,CAAC,CAAC;KACrE;SAAM;QACL,OAAO,GAAG,CAAC;KACZ;AACH,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,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;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,SAAS,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;
|
|
@@ -8,7 +8,7 @@ import { YAMLDocumentSymbols } from './services/documentSymbols';
|
|
|
8
8
|
import { YAMLHover } from './services/yamlHover';
|
|
9
9
|
import { YAMLValidation } from './services/yamlValidation';
|
|
10
10
|
import { YAMLFormatter } from './services/yamlFormatter';
|
|
11
|
-
import {
|
|
11
|
+
import { YamlLinks } from './services/yamlLinks';
|
|
12
12
|
import { getFoldingRanges } from './services/yamlFolding';
|
|
13
13
|
import { YamlCodeActions } from './services/yamlCodeActions';
|
|
14
14
|
import { commandExecutor } from '../languageserver/commandExecutor';
|
|
@@ -17,6 +17,7 @@ import { YamlCodeLens } from './services/yamlCodeLens';
|
|
|
17
17
|
import { registerCommands } from './services/yamlCommands';
|
|
18
18
|
import { YamlCompletion } from './services/yamlCompletion';
|
|
19
19
|
import { yamlDocumentsCache } from './parser/yaml-documents';
|
|
20
|
+
import { JSONSchemaSelection } from '../languageserver/handlers/schemaSelectionHandlers';
|
|
20
21
|
import { getDefinition } from './services/yamlDefinition';
|
|
21
22
|
export var SchemaPriority;
|
|
22
23
|
(function (SchemaPriority) {
|
|
@@ -25,7 +26,7 @@ export var SchemaPriority;
|
|
|
25
26
|
SchemaPriority[SchemaPriority["Settings"] = 3] = "Settings";
|
|
26
27
|
SchemaPriority[SchemaPriority["Modeline"] = 4] = "Modeline";
|
|
27
28
|
})(SchemaPriority || (SchemaPriority = {}));
|
|
28
|
-
export function getLanguageService(schemaRequestService, workspaceContext, connection, telemetry, clientCapabilities) {
|
|
29
|
+
export function getLanguageService(schemaRequestService, workspaceContext, connection, telemetry, yamlSettings, clientCapabilities) {
|
|
29
30
|
const schemaService = new YAMLSchemaService(schemaRequestService, workspaceContext);
|
|
30
31
|
const completer = new YamlCompletion(schemaService, clientCapabilities, yamlDocumentsCache, telemetry);
|
|
31
32
|
const hover = new YAMLHover(schemaService, telemetry);
|
|
@@ -34,6 +35,8 @@ export function getLanguageService(schemaRequestService, workspaceContext, conne
|
|
|
34
35
|
const formatter = new YAMLFormatter();
|
|
35
36
|
const yamlCodeActions = new YamlCodeActions(clientCapabilities);
|
|
36
37
|
const yamlCodeLens = new YamlCodeLens(schemaService, telemetry);
|
|
38
|
+
const yamlLinks = new YamlLinks(telemetry);
|
|
39
|
+
new JSONSchemaSelection(schemaService, yamlSettings, connection);
|
|
37
40
|
// register all commands
|
|
38
41
|
registerCommands(commandExecutor, connection);
|
|
39
42
|
return {
|
|
@@ -56,7 +59,7 @@ export function getLanguageService(schemaRequestService, workspaceContext, conne
|
|
|
56
59
|
registerCustomSchemaProvider: (schemaProvider) => {
|
|
57
60
|
schemaService.registerCustomSchemaProvider(schemaProvider);
|
|
58
61
|
},
|
|
59
|
-
findLinks,
|
|
62
|
+
findLinks: yamlLinks.findLinks.bind(yamlLinks),
|
|
60
63
|
doComplete: completer.doComplete.bind(completer),
|
|
61
64
|
doValidation: yamlValidation.doValidation.bind(yamlValidation),
|
|
62
65
|
doHover: hover.doHover.bind(hover),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"yamlLanguageService.js","sourceRoot":"","sources":["../../../src/languageservice/yamlLanguageService.ts"],"names":[],"mappings":"AAAA;;;;gGAIgG;AAEhG,OAAO,EACL,iBAAiB,GAKlB,MAAM,8BAA8B,CAAC;AActC,OAAO,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AACjE,OAAO,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AACjD,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAC3D,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAEzD,OAAO,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAYjD,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAE1D,OAAO,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAC7D,OAAO,EAAE,eAAe,EAAE,MAAM,mCAAmC,CAAC;AACpE,OAAO,EAAE,0BAA0B,EAAE,MAAM,iCAAiC,CAAC;AAC7E,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AACvD,OAAO,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAG3D,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAC3D,OAAO,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;
|
|
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
|
+
}
|
package/lib/esm/requestTypes.js
CHANGED
|
@@ -38,4 +38,11 @@ export var SchemaModificationNotification;
|
|
|
38
38
|
(function (SchemaModificationNotification) {
|
|
39
39
|
SchemaModificationNotification.type = new RequestType('json/schema/modify');
|
|
40
40
|
})(SchemaModificationNotification || (SchemaModificationNotification = {}));
|
|
41
|
+
export var SchemaSelectionRequests;
|
|
42
|
+
(function (SchemaSelectionRequests) {
|
|
43
|
+
SchemaSelectionRequests.type = new NotificationType('yaml/supportSchemaSelection');
|
|
44
|
+
SchemaSelectionRequests.getSchema = new RequestType('yaml/get/jsonSchema');
|
|
45
|
+
SchemaSelectionRequests.getAllSchemas = new RequestType('yaml/get/all/jsonSchemas');
|
|
46
|
+
SchemaSelectionRequests.schemaStoreInitialized = new NotificationType('yaml/schema/store/initialized');
|
|
47
|
+
})(SchemaSelectionRequests || (SchemaSelectionRequests = {}));
|
|
41
48
|
//# sourceMappingURL=requestTypes.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"requestTypes.js","sourceRoot":"","sources":["../../src/requestTypes.ts"],"names":[],"mappings":"AAAA,iDAAiD;AACjD,oDAAoD;AACpD,OAAO,EAAE,gBAAgB,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAgCtE,MAAM,KAAW,6BAA6B,CAK7C;AALD,WAAiB,6BAA6B;IAC5C,8DAA8D;IACjD,kCAAI,GAAkE,IAAI,gBAAgB,CACrG,yBAAyB,CAC1B,CAAC;AACJ,CAAC,EALgB,6BAA6B,KAA7B,6BAA6B,QAK7C;AAED,MAAM,KAAW,sCAAsC,CAEtD;AAFD,WAAiB,sCAAsC;IACxC,2CAAI,GAAyB,IAAI,gBAAgB,CAAC,kCAAkC,CAAC,CAAC;AACrG,CAAC,EAFgB,sCAAsC,KAAtC,sCAAsC,QAEtD;AAED,MAAM,KAAW,gCAAgC,CAEhD;AAFD,WAAiB,gCAAgC;IAClC,qCAAI,GAAyB,IAAI,gBAAgB,CAAC,6BAA6B,CAAC,CAAC;AAChG,CAAC,EAFgB,gCAAgC,KAAhC,gCAAgC,QAEhD;AAED,MAAM,KAAW,8BAA8B,CAE9C;AAFD,WAAiB,8BAA8B;IAChC,mCAAI,GAA6B,IAAI,gBAAgB,CAAC,yBAAyB,CAAC,CAAC;AAChG,CAAC,EAFgB,8BAA8B,KAA9B,8BAA8B,QAE9C;AAED,MAAM,KAAW,oBAAoB,CAEpC;AAFD,WAAiB,oBAAoB;IACtB,yBAAI,GAAoC,IAAI,WAAW,CAAC,gBAAgB,CAAC,CAAC;AACzF,CAAC,EAFgB,oBAAoB,KAApB,oBAAoB,QAEpC;AAED,MAAM,KAAW,0BAA0B,CAE1C;AAFD,WAAiB,0BAA0B;IAC5B,+BAAI,GAAoC,IAAI,WAAW,CAAC,uBAAuB,CAAC,CAAC;AAChG,CAAC,EAFgB,0BAA0B,KAA1B,0BAA0B,QAE1C;AAED,MAAM,KAAW,mBAAmB,CAEnC;AAFD,WAAiB,mBAAmB;IACrB,wBAAI,GAA4B,IAAI,WAAW,CAAC,uBAAuB,CAAC,CAAC;AACxF,CAAC,EAFgB,mBAAmB,KAAnB,mBAAmB,QAEnC;AAED,MAAM,KAAW,kBAAkB,CAElC;AAFD,WAAiB,kBAAkB;IACpB,uBAAI,GAA4B,IAAI,WAAW,CAAC,mBAAmB,CAAC,CAAC;AACpF,CAAC,EAFgB,kBAAkB,KAAlB,kBAAkB,QAElC;AAED,MAAM,KAAW,8BAA8B,CAE9C;AAFD,WAAiB,8BAA8B;IAChC,mCAAI,GAA6D,IAAI,WAAW,CAAC,oBAAoB,CAAC,CAAC;AACtH,CAAC,EAFgB,8BAA8B,KAA9B,8BAA8B,QAE9C"}
|
|
1
|
+
{"version":3,"file":"requestTypes.js","sourceRoot":"","sources":["../../src/requestTypes.ts"],"names":[],"mappings":"AAAA,iDAAiD;AACjD,oDAAoD;AACpD,OAAO,EAAE,gBAAgB,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAgCtE,MAAM,KAAW,6BAA6B,CAK7C;AALD,WAAiB,6BAA6B;IAC5C,8DAA8D;IACjD,kCAAI,GAAkE,IAAI,gBAAgB,CACrG,yBAAyB,CAC1B,CAAC;AACJ,CAAC,EALgB,6BAA6B,KAA7B,6BAA6B,QAK7C;AAED,MAAM,KAAW,sCAAsC,CAEtD;AAFD,WAAiB,sCAAsC;IACxC,2CAAI,GAAyB,IAAI,gBAAgB,CAAC,kCAAkC,CAAC,CAAC;AACrG,CAAC,EAFgB,sCAAsC,KAAtC,sCAAsC,QAEtD;AAED,MAAM,KAAW,gCAAgC,CAEhD;AAFD,WAAiB,gCAAgC;IAClC,qCAAI,GAAyB,IAAI,gBAAgB,CAAC,6BAA6B,CAAC,CAAC;AAChG,CAAC,EAFgB,gCAAgC,KAAhC,gCAAgC,QAEhD;AAED,MAAM,KAAW,8BAA8B,CAE9C;AAFD,WAAiB,8BAA8B;IAChC,mCAAI,GAA6B,IAAI,gBAAgB,CAAC,yBAAyB,CAAC,CAAC;AAChG,CAAC,EAFgB,8BAA8B,KAA9B,8BAA8B,QAE9C;AAED,MAAM,KAAW,oBAAoB,CAEpC;AAFD,WAAiB,oBAAoB;IACtB,yBAAI,GAAoC,IAAI,WAAW,CAAC,gBAAgB,CAAC,CAAC;AACzF,CAAC,EAFgB,oBAAoB,KAApB,oBAAoB,QAEpC;AAED,MAAM,KAAW,0BAA0B,CAE1C;AAFD,WAAiB,0BAA0B;IAC5B,+BAAI,GAAoC,IAAI,WAAW,CAAC,uBAAuB,CAAC,CAAC;AAChG,CAAC,EAFgB,0BAA0B,KAA1B,0BAA0B,QAE1C;AAED,MAAM,KAAW,mBAAmB,CAEnC;AAFD,WAAiB,mBAAmB;IACrB,wBAAI,GAA4B,IAAI,WAAW,CAAC,uBAAuB,CAAC,CAAC;AACxF,CAAC,EAFgB,mBAAmB,KAAnB,mBAAmB,QAEnC;AAED,MAAM,KAAW,kBAAkB,CAElC;AAFD,WAAiB,kBAAkB;IACpB,uBAAI,GAA4B,IAAI,WAAW,CAAC,mBAAmB,CAAC,CAAC;AACpF,CAAC,EAFgB,kBAAkB,KAAlB,kBAAkB,QAElC;AAED,MAAM,KAAW,8BAA8B,CAE9C;AAFD,WAAiB,8BAA8B;IAChC,mCAAI,GAA6D,IAAI,WAAW,CAAC,oBAAoB,CAAC,CAAC;AACtH,CAAC,EAFgB,8BAA8B,KAA9B,8BAA8B,QAE9C;AAED,MAAM,KAAW,uBAAuB,CAKvC;AALD,WAAiB,uBAAuB;IACzB,4BAAI,GAA2B,IAAI,gBAAgB,CAAC,6BAA6B,CAAC,CAAC;IACnF,iCAAS,GAAqD,IAAI,WAAW,CAAC,qBAAqB,CAAC,CAAC;IACrG,qCAAa,GAAwD,IAAI,WAAW,CAAC,0BAA0B,CAAC,CAAC;IACjH,8CAAsB,GAAyB,IAAI,gBAAgB,CAAC,+BAA+B,CAAC,CAAC;AACpH,CAAC,EALgB,uBAAuB,KAAvB,uBAAuB,QAKvC"}
|
|
@@ -27,7 +27,7 @@ export class YAMLServerInit {
|
|
|
27
27
|
return this.connectionInitialized(params);
|
|
28
28
|
});
|
|
29
29
|
this.connection.onInitialized(() => {
|
|
30
|
-
if (this.yamlSettings.
|
|
30
|
+
if (this.yamlSettings.hasWsChangeWatchedFileDynamicRegistration) {
|
|
31
31
|
this.connection.workspace.onDidChangeWorkspaceFolders((changedFolders) => {
|
|
32
32
|
this.yamlSettings.workspaceFolders = workspaceFoldersChanged(this.yamlSettings.workspaceFolders, changedFolders);
|
|
33
33
|
});
|
|
@@ -40,7 +40,7 @@ export class YAMLServerInit {
|
|
|
40
40
|
// public for test setup
|
|
41
41
|
connectionInitialized(params) {
|
|
42
42
|
this.yamlSettings.capabilities = params.capabilities;
|
|
43
|
-
this.languageService = getCustomLanguageService(this.schemaRequestService, this.workspaceContext, this.connection, this.telemetry, params.capabilities);
|
|
43
|
+
this.languageService = getCustomLanguageService(this.schemaRequestService, this.workspaceContext, this.connection, this.telemetry, this.yamlSettings, params.capabilities);
|
|
44
44
|
// Only try to parse the workspace root if its not null. Otherwise initialize will fail
|
|
45
45
|
if (params.rootUri) {
|
|
46
46
|
this.yamlSettings.workspaceRoot = URI.parse(params.rootUri);
|
|
@@ -55,6 +55,9 @@ export class YAMLServerInit {
|
|
|
55
55
|
this.yamlSettings.hasWorkspaceFolderCapability =
|
|
56
56
|
this.yamlSettings.capabilities.workspace && !!this.yamlSettings.capabilities.workspace.workspaceFolders;
|
|
57
57
|
this.yamlSettings.hasConfigurationCapability = !!(this.yamlSettings.capabilities.workspace && !!this.yamlSettings.capabilities.workspace.configuration);
|
|
58
|
+
this.yamlSettings.hasWsChangeWatchedFileDynamicRegistration = !!(this.yamlSettings.capabilities.workspace &&
|
|
59
|
+
this.yamlSettings.capabilities.workspace.didChangeWatchedFiles &&
|
|
60
|
+
this.yamlSettings.capabilities.workspace.didChangeWatchedFiles.dynamicRegistration);
|
|
58
61
|
this.registerHandlers();
|
|
59
62
|
return {
|
|
60
63
|
capabilities: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"yamlServerInit.js","sourceRoot":"","sources":["../../src/yamlServerInit.ts"],"names":[],"mappings":"AAAA,OAAO,EAAkD,oBAAoB,EAAE,MAAM,uBAAuB,CAAC;AAC7G,OAAO,EACL,kBAAkB,IAAI,wBAAwB,GAI/C,MAAM,uCAAuC,CAAC;AAC/C,OAAO,EAAE,uBAAuB,EAAE,MAAM,+BAA+B,CAAC;AACxE,OAAO,EAAE,GAAG,EAAE,MAAM,YAAY,CAAC;AAEjC,OAAO,EAAE,gBAAgB,EAAE,MAAM,4CAA4C,CAAC;AAC9E,OAAO,EAAE,oBAAoB,EAAE,MAAM,gDAAgD,CAAC;AACtF,OAAO,EAAE,eAAe,EAAE,MAAM,2CAA2C,CAAC;AAC5E,OAAO,EAAE,iBAAiB,EAAE,MAAM,8CAA8C,CAAC;AACjF,OAAO,EAAE,eAAe,EAAE,MAAM,4CAA4C,CAAC;AAC7E,OAAO,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAC1C,OAAO,EAAE,iBAAiB,EAAE,MAAM,6CAA6C,CAAC;AAChF,OAAO,EAAE,eAAe,EAAE,MAAM,kCAAkC,CAAC;AACnE,OAAO,EAAE,SAAS,EAAE,MAAM,4BAA4B,CAAC;AAEvD,MAAM,OAAO,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,SAAS,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>;
|
package/lib/esm/yamlSettings.js
CHANGED
|
@@ -40,6 +40,8 @@ export class SettingsState {
|
|
|
40
40
|
this.hasConfigurationCapability = false;
|
|
41
41
|
this.useVSCodeContentRequest = false;
|
|
42
42
|
this.yamlVersion = '1.2';
|
|
43
|
+
this.useSchemaSelectionRequests = false;
|
|
44
|
+
this.hasWsChangeWatchedFileDynamicRegistration = false;
|
|
43
45
|
}
|
|
44
46
|
}
|
|
45
47
|
export class TextDocumentTestManager extends TextDocuments {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"yamlSettings.js","sourceRoot":"","sources":["../../src/yamlSettings.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAmD,MAAM,4BAA4B,CAAC;AAK5G,OAAO,EAAE,YAAY,EAAE,MAAM,oCAAoC,CAAC;AAClE,OAAO,EAAE,oBAAoB,EAAE,MAAM,oCAAoC,CAAC;AAqC1E,0DAA0D;AAC1D,MAAM,OAAO,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,oBAAoB,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,aAAa,CAAC,YAAY,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,OAAO,EAAE,aAAa,EAAmD,MAAM,4BAA4B,CAAC;AAK5G,OAAO,EAAE,YAAY,EAAE,MAAM,oCAAoC,CAAC;AAClE,OAAO,EAAE,oBAAoB,EAAE,MAAM,oCAAoC,CAAC;AAqC1E,0DAA0D;AAC1D,MAAM,OAAO,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,oBAAoB,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,aAAa,CAAC,YAAY,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;AAED,MAAM,OAAO,uBAAwB,SAAQ,aAA2B;IAGtE;QACE,KAAK,CAAC,YAAY,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"}
|
|
@@ -22,6 +22,7 @@
|
|
|
22
22
|
this.connection.onNotification(requestTypes_1.SchemaAssociationNotification.type, (associations) => this.schemaAssociationNotificationHandler(associations));
|
|
23
23
|
this.connection.onNotification(requestTypes_1.DynamicCustomSchemaRequestRegistration.type, () => this.dynamicSchemaRequestHandler());
|
|
24
24
|
this.connection.onNotification(requestTypes_1.VSCodeContentRequestRegistration.type, () => this.vscodeContentRequestHandler());
|
|
25
|
+
this.connection.onNotification(requestTypes_1.SchemaSelectionRequests.type, () => this.schemaSelectionRequestHandler());
|
|
25
26
|
}
|
|
26
27
|
/**
|
|
27
28
|
* Received a notification from the client with schema associations from other extensions
|
|
@@ -51,6 +52,9 @@
|
|
|
51
52
|
vscodeContentRequestHandler() {
|
|
52
53
|
this.yamlSettings.useVSCodeContentRequest = true;
|
|
53
54
|
}
|
|
55
|
+
schemaSelectionRequestHandler() {
|
|
56
|
+
this.yamlSettings.useSchemaSelectionRequests = true;
|
|
57
|
+
}
|
|
54
58
|
}
|
|
55
59
|
exports.NotificationHandlers = NotificationHandlers;
|
|
56
60
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"notificationHandlers.js","sourceRoot":"","sources":["../../../../src/languageserver/handlers/notificationHandlers.ts"],"names":[],"mappings":";;;;;;;;;;;;IAOA,
|
|
1
|
+
{"version":3,"file":"notificationHandlers.js","sourceRoot":"","sources":["../../../../src/languageserver/handlers/notificationHandlers.ts"],"names":[],"mappings":";;;;;;;;;;;;IAOA,qDAM4B;IAI5B,MAAa,oBAAoB;QAK/B,YACmB,UAAsB,EACvC,eAAgC,EAChC,YAA2B,EAC3B,eAAgC;YAHf,eAAU,GAAV,UAAU,CAAY;YAKvC,IAAI,CAAC,eAAe,GAAG,eAAe,CAAC;YACvC,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;YACjC,IAAI,CAAC,eAAe,GAAG,eAAe,CAAC;QACzC,CAAC;QAEM,gBAAgB;YACrB,IAAI,CAAC,UAAU,CAAC,cAAc,CAAC,4CAA6B,CAAC,IAAI,EAAE,CAAC,YAAY,EAAE,EAAE,CAClF,IAAI,CAAC,oCAAoC,CAAC,YAAY,CAAC,CACxD,CAAC;YACF,IAAI,CAAC,UAAU,CAAC,cAAc,CAAC,qDAAsC,CAAC,IAAI,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,2BAA2B,EAAE,CAAC,CAAC;YACtH,IAAI,CAAC,UAAU,CAAC,cAAc,CAAC,+CAAgC,CAAC,IAAI,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,2BAA2B,EAAE,CAAC,CAAC;YAChH,IAAI,CAAC,UAAU,CAAC,cAAc,CAAC,sCAAuB,CAAC,IAAI,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,6BAA6B,EAAE,CAAC,CAAC;QAC3G,CAAC;QAED;;;WAGG;QACK,oCAAoC,CAAC,YAA8D;YACzG,IAAI,CAAC,YAAY,CAAC,kBAAkB,GAAG,YAAY,CAAC;YACpD,IAAI,CAAC,YAAY,CAAC,sBAAsB,GAAG,EAAE,CAAC;YAC9C,IAAI,CAAC,eAAe,CAAC,8BAA8B,EAAE,CAAC;YACtD,IAAI,CAAC,eAAe,CAAC,mBAAmB,EAAE,CAAC;QAC7C,CAAC;QAED;;;WAGG;QACK,2BAA2B;YACjC,MAAM,cAAc,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE;gBACnC,OAAO,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC,kCAAmB,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;YACzE,CAAC,CAAyB,CAAC;YAC3B,IAAI,CAAC,eAAe,CAAC,4BAA4B,CAAC,cAAc,CAAC,CAAC;QACpE,CAAC;QAED;;;;WAIG;QACK,2BAA2B;YACjC,IAAI,CAAC,YAAY,CAAC,uBAAuB,GAAG,IAAI,CAAC;QACnD,CAAC;QAEO,6BAA6B;YACnC,IAAI,CAAC,YAAY,CAAC,0BAA0B,GAAG,IAAI,CAAC;QACtD,CAAC;KACF;IA3DD,oDA2DC"}
|
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
import { Connection } from 'vscode-languageserver/node';
|
|
2
|
+
import { YAMLSchemaService } from '../../languageservice/services/yamlSchemaService';
|
|
3
|
+
import { SettingsState } from '../../yamlSettings';
|
|
4
|
+
import { JSONSchemaDescription, JSONSchemaDescriptionExt } from '../../requestTypes';
|
|
5
|
+
export declare class JSONSchemaSelection {
|
|
6
|
+
private readonly schemaService;
|
|
7
|
+
private readonly yamlSettings;
|
|
8
|
+
private readonly connection;
|
|
9
|
+
constructor(schemaService: YAMLSchemaService, yamlSettings: SettingsState, connection: Connection);
|
|
10
|
+
getSchemas(docUri: string): Promise<JSONSchemaDescription[]>;
|
|
11
|
+
private getSchemasForFile;
|
|
12
|
+
getAllSchemas(docUri: string): Promise<JSONSchemaDescriptionExt[]>;
|
|
13
|
+
}
|
|
@@ -0,0 +1,100 @@
|
|
|
1
|
+
/*---------------------------------------------------------------------------------------------
|
|
2
|
+
* Copyright (c) Red Hat, Inc. All rights reserved.
|
|
3
|
+
* Licensed under the MIT License. See License.txt in the project root for license information.
|
|
4
|
+
*--------------------------------------------------------------------------------------------*/
|
|
5
|
+
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
6
|
+
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
7
|
+
return new (P || (P = Promise))(function (resolve, reject) {
|
|
8
|
+
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
9
|
+
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
10
|
+
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
11
|
+
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
12
|
+
});
|
|
13
|
+
};
|
|
14
|
+
(function (factory) {
|
|
15
|
+
if (typeof module === "object" && typeof module.exports === "object") {
|
|
16
|
+
var v = factory(require, exports);
|
|
17
|
+
if (v !== undefined) module.exports = v;
|
|
18
|
+
}
|
|
19
|
+
else if (typeof define === "function" && define.amd) {
|
|
20
|
+
define(["require", "exports", "../../languageservice/parser/yaml-documents", "../../languageservice/utils/schemaUrls", "../../requestTypes"], factory);
|
|
21
|
+
}
|
|
22
|
+
})(function (require, exports) {
|
|
23
|
+
"use strict";
|
|
24
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
25
|
+
exports.JSONSchemaSelection = void 0;
|
|
26
|
+
const yaml_documents_1 = require("../../languageservice/parser/yaml-documents");
|
|
27
|
+
const schemaUrls_1 = require("../../languageservice/utils/schemaUrls");
|
|
28
|
+
const requestTypes_1 = require("../../requestTypes");
|
|
29
|
+
class JSONSchemaSelection {
|
|
30
|
+
constructor(schemaService, yamlSettings, connection) {
|
|
31
|
+
this.schemaService = schemaService;
|
|
32
|
+
this.yamlSettings = yamlSettings;
|
|
33
|
+
this.connection = connection;
|
|
34
|
+
this.connection.onRequest(requestTypes_1.SchemaSelectionRequests.getSchema, (fileUri) => {
|
|
35
|
+
return this.getSchemas(fileUri);
|
|
36
|
+
});
|
|
37
|
+
this.connection.onRequest(requestTypes_1.SchemaSelectionRequests.getAllSchemas, (fileUri) => {
|
|
38
|
+
return this.getAllSchemas(fileUri);
|
|
39
|
+
});
|
|
40
|
+
}
|
|
41
|
+
getSchemas(docUri) {
|
|
42
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
43
|
+
const schemas = yield this.getSchemasForFile(docUri);
|
|
44
|
+
const result = Array.from(schemas).map((val) => {
|
|
45
|
+
return {
|
|
46
|
+
name: val[1].title,
|
|
47
|
+
uri: val[0],
|
|
48
|
+
description: val[1].description,
|
|
49
|
+
};
|
|
50
|
+
});
|
|
51
|
+
return result;
|
|
52
|
+
});
|
|
53
|
+
}
|
|
54
|
+
getSchemasForFile(docUri) {
|
|
55
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
56
|
+
const document = this.yamlSettings.documents.get(docUri);
|
|
57
|
+
const schemas = new Map();
|
|
58
|
+
if (!document) {
|
|
59
|
+
return schemas;
|
|
60
|
+
}
|
|
61
|
+
const yamlDoc = yaml_documents_1.yamlDocumentsCache.getYamlDocument(document);
|
|
62
|
+
for (const currentYAMLDoc of yamlDoc.documents) {
|
|
63
|
+
const schema = yield this.schemaService.getSchemaForResource(document.uri, currentYAMLDoc);
|
|
64
|
+
if (schema === null || schema === void 0 ? void 0 : schema.schema) {
|
|
65
|
+
const schemaUrls = schemaUrls_1.getSchemaUrls(schema === null || schema === void 0 ? void 0 : schema.schema);
|
|
66
|
+
if (schemaUrls.size === 0) {
|
|
67
|
+
continue;
|
|
68
|
+
}
|
|
69
|
+
for (const urlToSchema of schemaUrls) {
|
|
70
|
+
schemas.set(urlToSchema[0], urlToSchema[1]);
|
|
71
|
+
}
|
|
72
|
+
}
|
|
73
|
+
}
|
|
74
|
+
return schemas;
|
|
75
|
+
});
|
|
76
|
+
}
|
|
77
|
+
getAllSchemas(docUri) {
|
|
78
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
79
|
+
const fileSchemas = yield this.getSchemasForFile(docUri);
|
|
80
|
+
const fileSchemasHandle = Array.from(fileSchemas.entries()).map((val) => {
|
|
81
|
+
return {
|
|
82
|
+
uri: val[0],
|
|
83
|
+
fromStore: false,
|
|
84
|
+
usedForCurrentFile: true,
|
|
85
|
+
name: val[1].title,
|
|
86
|
+
description: val[1].description,
|
|
87
|
+
};
|
|
88
|
+
});
|
|
89
|
+
const result = [];
|
|
90
|
+
let allSchemas = this.schemaService.getAllSchemas();
|
|
91
|
+
allSchemas = allSchemas.filter((val) => !fileSchemas.has(val.uri));
|
|
92
|
+
result.push(...fileSchemasHandle);
|
|
93
|
+
result.push(...allSchemas);
|
|
94
|
+
return result;
|
|
95
|
+
});
|
|
96
|
+
}
|
|
97
|
+
}
|
|
98
|
+
exports.JSONSchemaSelection = JSONSchemaSelection;
|
|
99
|
+
});
|
|
100
|
+
//# sourceMappingURL=schemaSelectionHandlers.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"schemaSelectionHandlers.js","sourceRoot":"","sources":["../../../../src/languageserver/handlers/schemaSelectionHandlers.ts"],"names":[],"mappings":"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"}
|
|
@@ -15,7 +15,7 @@ export declare class SettingsHandler {
|
|
|
15
15
|
* The server pull the 'yaml', 'http.proxy', 'http.proxyStrictSSL', '[yaml]' settings sections
|
|
16
16
|
*/
|
|
17
17
|
pullConfiguration(): Promise<void>;
|
|
18
|
-
setConfiguration(settings: Settings): void
|
|
18
|
+
setConfiguration(settings: Settings): Promise<void>;
|
|
19
19
|
/**
|
|
20
20
|
* This function helps set the schema store if it hasn't already been set
|
|
21
21
|
* AND the schema store setting is enabled. If the schema store setting
|