yaml-language-server 1.11.1-dcdfa10.0 → 1.11.1-e200432.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/esm/languageserver/handlers/languageHandlers.js +4 -1
- package/lib/esm/languageserver/handlers/languageHandlers.js.map +1 -1
- package/lib/esm/languageserver/handlers/schemaSelectionHandlers.js +45 -60
- package/lib/esm/languageserver/handlers/schemaSelectionHandlers.js.map +1 -1
- package/lib/esm/languageserver/handlers/settingsHandlers.js +161 -183
- package/lib/esm/languageserver/handlers/settingsHandlers.js.map +1 -1
- package/lib/esm/languageservice/jsonSchema.d.ts +1 -0
- package/lib/esm/languageservice/parser/jsonParser07.d.ts +2 -0
- package/lib/esm/languageservice/parser/jsonParser07.js +40 -16
- package/lib/esm/languageservice/parser/jsonParser07.js.map +1 -1
- package/lib/esm/languageservice/parser/yaml-documents.js +6 -5
- package/lib/esm/languageservice/parser/yaml-documents.js.map +1 -1
- package/lib/esm/languageservice/parser/yamlParser07.js +1 -2
- package/lib/esm/languageservice/parser/yamlParser07.js.map +1 -1
- package/lib/esm/languageservice/services/validation/yaml-style.js +2 -3
- package/lib/esm/languageservice/services/validation/yaml-style.js.map +1 -1
- package/lib/esm/languageservice/services/yamlCodeActions.js +2 -3
- package/lib/esm/languageservice/services/yamlCodeActions.js.map +1 -1
- package/lib/esm/languageservice/services/yamlCodeLens.js +23 -34
- package/lib/esm/languageservice/services/yamlCodeLens.js.map +1 -1
- package/lib/esm/languageservice/services/yamlCommands.js +3 -12
- package/lib/esm/languageservice/services/yamlCommands.js.map +1 -1
- package/lib/esm/languageservice/services/yamlCompletion.d.ts +2 -1
- package/lib/esm/languageservice/services/yamlCompletion.js +423 -412
- package/lib/esm/languageservice/services/yamlCompletion.js.map +1 -1
- package/lib/esm/languageservice/services/yamlFolding.js +1 -2
- package/lib/esm/languageservice/services/yamlFolding.js.map +1 -1
- package/lib/esm/languageservice/services/yamlSchemaService.js +176 -199
- package/lib/esm/languageservice/services/yamlSchemaService.js.map +1 -1
- package/lib/esm/languageservice/services/yamlValidation.js +61 -71
- package/lib/esm/languageservice/services/yamlValidation.js.map +1 -1
- package/lib/esm/languageservice/utils/astUtils.js +1 -2
- package/lib/esm/languageservice/utils/astUtils.js.map +1 -1
- package/lib/esm/languageservice/utils/objects.js +1 -2
- package/lib/esm/languageservice/utils/objects.js.map +1 -1
- package/lib/esm/languageservice/utils/schemaUtils.d.ts +2 -0
- package/lib/esm/languageservice/utils/schemaUtils.js +6 -0
- package/lib/esm/languageservice/utils/schemaUtils.js.map +1 -1
- package/lib/esm/server.js +3 -12
- package/lib/esm/server.js.map +1 -1
- package/lib/umd/languageserver/handlers/languageHandlers.js +4 -1
- package/lib/umd/languageserver/handlers/languageHandlers.js.map +1 -1
- package/lib/umd/languageserver/handlers/schemaSelectionHandlers.js +45 -60
- package/lib/umd/languageserver/handlers/schemaSelectionHandlers.js.map +1 -1
- package/lib/umd/languageserver/handlers/settingsHandlers.js +161 -183
- package/lib/umd/languageserver/handlers/settingsHandlers.js.map +1 -1
- package/lib/umd/languageservice/jsonSchema.d.ts +1 -0
- package/lib/umd/languageservice/parser/jsonParser07.d.ts +2 -0
- package/lib/umd/languageservice/parser/jsonParser07.js +41 -17
- package/lib/umd/languageservice/parser/jsonParser07.js.map +1 -1
- package/lib/umd/languageservice/parser/yaml-documents.js +6 -5
- package/lib/umd/languageservice/parser/yaml-documents.js.map +1 -1
- package/lib/umd/languageservice/parser/yamlParser07.js +1 -2
- package/lib/umd/languageservice/parser/yamlParser07.js.map +1 -1
- package/lib/umd/languageservice/services/validation/yaml-style.js +2 -3
- package/lib/umd/languageservice/services/validation/yaml-style.js.map +1 -1
- package/lib/umd/languageservice/services/yamlCodeActions.js +2 -3
- package/lib/umd/languageservice/services/yamlCodeActions.js.map +1 -1
- package/lib/umd/languageservice/services/yamlCodeLens.js +23 -34
- package/lib/umd/languageservice/services/yamlCodeLens.js.map +1 -1
- package/lib/umd/languageservice/services/yamlCommands.js +3 -12
- package/lib/umd/languageservice/services/yamlCommands.js.map +1 -1
- package/lib/umd/languageservice/services/yamlCompletion.d.ts +2 -1
- package/lib/umd/languageservice/services/yamlCompletion.js +422 -411
- package/lib/umd/languageservice/services/yamlCompletion.js.map +1 -1
- package/lib/umd/languageservice/services/yamlFolding.js +1 -2
- package/lib/umd/languageservice/services/yamlFolding.js.map +1 -1
- package/lib/umd/languageservice/services/yamlSchemaService.js +176 -199
- package/lib/umd/languageservice/services/yamlSchemaService.js.map +1 -1
- package/lib/umd/languageservice/services/yamlValidation.js +61 -71
- package/lib/umd/languageservice/services/yamlValidation.js.map +1 -1
- package/lib/umd/languageservice/utils/astUtils.js +1 -2
- package/lib/umd/languageservice/utils/astUtils.js.map +1 -1
- package/lib/umd/languageservice/utils/objects.js +1 -2
- package/lib/umd/languageservice/utils/objects.js.map +1 -1
- package/lib/umd/languageservice/utils/schemaUtils.d.ts +2 -0
- package/lib/umd/languageservice/utils/schemaUtils.js +9 -1
- package/lib/umd/languageservice/utils/schemaUtils.js.map +1 -1
- package/lib/umd/server.js +3 -12
- package/lib/umd/server.js.map +1 -1
- package/out/server/src/languageserver/handlers/languageHandlers.js +4 -1
- package/out/server/src/languageserver/handlers/languageHandlers.js.map +1 -1
- package/out/server/src/languageserver/handlers/schemaSelectionHandlers.js +45 -60
- package/out/server/src/languageserver/handlers/schemaSelectionHandlers.js.map +1 -1
- package/out/server/src/languageserver/handlers/settingsHandlers.js +161 -183
- package/out/server/src/languageserver/handlers/settingsHandlers.js.map +1 -1
- package/out/server/src/languageservice/jsonSchema.d.ts +1 -0
- package/out/server/src/languageservice/parser/jsonParser07.d.ts +2 -0
- package/out/server/src/languageservice/parser/jsonParser07.js +40 -16
- package/out/server/src/languageservice/parser/jsonParser07.js.map +1 -1
- package/out/server/src/languageservice/parser/yaml-documents.js +6 -5
- package/out/server/src/languageservice/parser/yaml-documents.js.map +1 -1
- package/out/server/src/languageservice/parser/yamlParser07.js +1 -2
- package/out/server/src/languageservice/parser/yamlParser07.js.map +1 -1
- package/out/server/src/languageservice/services/validation/yaml-style.js +2 -3
- package/out/server/src/languageservice/services/validation/yaml-style.js.map +1 -1
- package/out/server/src/languageservice/services/yamlCodeActions.js +2 -3
- package/out/server/src/languageservice/services/yamlCodeActions.js.map +1 -1
- package/out/server/src/languageservice/services/yamlCodeLens.js +23 -34
- package/out/server/src/languageservice/services/yamlCodeLens.js.map +1 -1
- package/out/server/src/languageservice/services/yamlCommands.js +3 -12
- package/out/server/src/languageservice/services/yamlCommands.js.map +1 -1
- package/out/server/src/languageservice/services/yamlCompletion.d.ts +2 -1
- package/out/server/src/languageservice/services/yamlCompletion.js +422 -411
- package/out/server/src/languageservice/services/yamlCompletion.js.map +1 -1
- package/out/server/src/languageservice/services/yamlFolding.js +1 -2
- package/out/server/src/languageservice/services/yamlFolding.js.map +1 -1
- package/out/server/src/languageservice/services/yamlSchemaService.js +176 -199
- package/out/server/src/languageservice/services/yamlSchemaService.js.map +1 -1
- package/out/server/src/languageservice/services/yamlValidation.js +61 -71
- package/out/server/src/languageservice/services/yamlValidation.js.map +1 -1
- package/out/server/src/languageservice/utils/astUtils.js +1 -2
- package/out/server/src/languageservice/utils/astUtils.js.map +1 -1
- package/out/server/src/languageservice/utils/objects.js +1 -2
- package/out/server/src/languageservice/utils/objects.js.map +1 -1
- package/out/server/src/languageservice/utils/schemaUtils.d.ts +2 -0
- package/out/server/src/languageservice/utils/schemaUtils.js +9 -1
- package/out/server/src/languageservice/utils/schemaUtils.js.map +1 -1
- package/out/server/src/server.js +3 -12
- package/out/server/src/server.js.map +1 -1
- package/out/server/test/autoCompletion.test.js +244 -178
- package/out/server/test/autoCompletion.test.js.map +1 -1
- package/out/server/test/autoCompletionFix.test.js +194 -134
- package/out/server/test/autoCompletionFix.test.js.map +1 -1
- package/out/server/test/code-action-schema.test.js +6 -15
- package/out/server/test/code-action-schema.test.js.map +1 -1
- package/out/server/test/defaultSnippets.test.js +11 -19
- package/out/server/test/defaultSnippets.test.js.map +1 -1
- package/out/server/test/findLinks.test.js +3 -12
- package/out/server/test/findLinks.test.js.map +1 -1
- package/out/server/test/hover.test.js +64 -73
- package/out/server/test/hover.test.js.map +1 -1
- package/out/server/test/integration.test.js +3 -12
- package/out/server/test/integration.test.js.map +1 -1
- package/out/server/test/jsonParser.test.js +15 -26
- package/out/server/test/jsonParser.test.js.map +1 -1
- package/out/server/test/multipleDocuments.test.js +3 -12
- package/out/server/test/multipleDocuments.test.js.map +1 -1
- package/out/server/test/schema.test.js +67 -76
- package/out/server/test/schema.test.js.map +1 -1
- package/out/server/test/schemaRequestHandler.test.js +9 -18
- package/out/server/test/schemaRequestHandler.test.js.map +1 -1
- package/out/server/test/schemaSelectionHandlers.test.js +12 -21
- package/out/server/test/schemaSelectionHandlers.test.js.map +1 -1
- package/out/server/test/schemaValidation.test.js +216 -97
- package/out/server/test/schemaValidation.test.js.map +1 -1
- package/out/server/test/settingsHandlers.test.js +44 -55
- package/out/server/test/settingsHandlers.test.js.map +1 -1
- package/out/server/test/utils/verifyError.d.ts +1 -1
- package/out/server/test/utils/verifyError.js +21 -18
- package/out/server/test/utils/verifyError.js.map +1 -1
- package/out/server/test/yamlCodeLens.test.js +24 -33
- package/out/server/test/yamlCodeLens.test.js.map +1 -1
- package/out/server/test/yamlCommands.test.js +6 -15
- package/out/server/test/yamlCommands.test.js.map +1 -1
- package/out/server/test/yamlSchema.test.js +9 -18
- package/out/server/test/yamlSchema.test.js.map +1 -1
- package/out/server/test/yamlSchemaService.test.js +9 -18
- package/out/server/test/yamlSchemaService.test.js.map +1 -1
- package/out/server/test/yamlValidation.test.js +30 -39
- package/out/server/test/yamlValidation.test.js.map +1 -1
- package/package.json +1 -1
|
@@ -59,7 +59,10 @@ export class LanguageHandlers {
|
|
|
59
59
|
if (!document) {
|
|
60
60
|
return;
|
|
61
61
|
}
|
|
62
|
-
const customFormatterSettings =
|
|
62
|
+
const customFormatterSettings = {
|
|
63
|
+
tabWidth: formatParams.options.tabSize,
|
|
64
|
+
...this.yamlSettings.yamlFormatterSettings,
|
|
65
|
+
};
|
|
63
66
|
return this.languageService.doFormat(document, customFormatterSettings);
|
|
64
67
|
}
|
|
65
68
|
formatOnTypeHandler(params) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"languageHandlers.js","sourceRoot":"","sources":["../../../../src/languageserver/handlers/languageHandlers.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"languageHandlers.js","sourceRoot":"","sources":["../../../../src/languageserver/handlers/languageHandlers.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,15 +2,6 @@
|
|
|
2
2
|
* Copyright (c) Red Hat, Inc. All rights reserved.
|
|
3
3
|
* Licensed under the MIT License. See License.txt in the project root for license information.
|
|
4
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
5
|
import { yamlDocumentsCache } from '../../languageservice/parser/yaml-documents';
|
|
15
6
|
import { getSchemaUrls } from '../../languageservice/utils/schemaUrls';
|
|
16
7
|
import { SchemaSelectionRequests } from '../../requestTypes';
|
|
@@ -26,63 +17,57 @@ export class JSONSchemaSelection {
|
|
|
26
17
|
return this.getAllSchemas(fileUri);
|
|
27
18
|
});
|
|
28
19
|
}
|
|
29
|
-
getSchemas(docUri) {
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
};
|
|
39
|
-
});
|
|
40
|
-
return result;
|
|
20
|
+
async getSchemas(docUri) {
|
|
21
|
+
const schemas = await this.getSchemasForFile(docUri);
|
|
22
|
+
const result = Array.from(schemas).map((val) => {
|
|
23
|
+
return {
|
|
24
|
+
name: val[1].title,
|
|
25
|
+
uri: val[0],
|
|
26
|
+
description: val[1].description,
|
|
27
|
+
versions: val[1].versions,
|
|
28
|
+
};
|
|
41
29
|
});
|
|
30
|
+
return result;
|
|
42
31
|
}
|
|
43
|
-
getSchemasForFile(docUri) {
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
schemas.set(urlToSchema[0], urlToSchema[1]);
|
|
60
|
-
}
|
|
32
|
+
async getSchemasForFile(docUri) {
|
|
33
|
+
const document = this.yamlSettings.documents.get(docUri);
|
|
34
|
+
const schemas = new Map();
|
|
35
|
+
if (!document) {
|
|
36
|
+
return schemas;
|
|
37
|
+
}
|
|
38
|
+
const yamlDoc = yamlDocumentsCache.getYamlDocument(document);
|
|
39
|
+
for (const currentYAMLDoc of yamlDoc.documents) {
|
|
40
|
+
const schema = await this.schemaService.getSchemaForResource(document.uri, currentYAMLDoc);
|
|
41
|
+
if (schema?.schema) {
|
|
42
|
+
const schemaUrls = getSchemaUrls(schema?.schema);
|
|
43
|
+
if (schemaUrls.size === 0) {
|
|
44
|
+
continue;
|
|
45
|
+
}
|
|
46
|
+
for (const urlToSchema of schemaUrls) {
|
|
47
|
+
schemas.set(urlToSchema[0], urlToSchema[1]);
|
|
61
48
|
}
|
|
62
49
|
}
|
|
63
|
-
|
|
64
|
-
|
|
50
|
+
}
|
|
51
|
+
return schemas;
|
|
65
52
|
}
|
|
66
|
-
getAllSchemas(docUri) {
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
};
|
|
78
|
-
});
|
|
79
|
-
const result = [];
|
|
80
|
-
let allSchemas = this.schemaService.getAllSchemas();
|
|
81
|
-
allSchemas = allSchemas.filter((val) => !fileSchemas.has(val.uri));
|
|
82
|
-
result.push(...fileSchemasHandle);
|
|
83
|
-
result.push(...allSchemas);
|
|
84
|
-
return result;
|
|
53
|
+
async getAllSchemas(docUri) {
|
|
54
|
+
const fileSchemas = await this.getSchemasForFile(docUri);
|
|
55
|
+
const fileSchemasHandle = Array.from(fileSchemas.entries()).map((val) => {
|
|
56
|
+
return {
|
|
57
|
+
uri: val[0],
|
|
58
|
+
fromStore: false,
|
|
59
|
+
usedForCurrentFile: true,
|
|
60
|
+
name: val[1].title,
|
|
61
|
+
description: val[1].description,
|
|
62
|
+
versions: val[1].versions,
|
|
63
|
+
};
|
|
85
64
|
});
|
|
65
|
+
const result = [];
|
|
66
|
+
let allSchemas = this.schemaService.getAllSchemas();
|
|
67
|
+
allSchemas = allSchemas.filter((val) => !fileSchemas.has(val.uri));
|
|
68
|
+
result.push(...fileSchemasHandle);
|
|
69
|
+
result.push(...allSchemas);
|
|
70
|
+
return result;
|
|
86
71
|
}
|
|
87
72
|
}
|
|
88
73
|
//# sourceMappingURL=schemaSelectionHandlers.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"schemaSelectionHandlers.js","sourceRoot":"","sources":["../../../../src/languageserver/handlers/schemaSelectionHandlers.ts"],"names":[],"mappings":"AAAA;;;gGAGgG
|
|
1
|
+
{"version":3,"file":"schemaSelectionHandlers.js","sourceRoot":"","sources":["../../../../src/languageserver/handlers/schemaSelectionHandlers.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,12 +1,3 @@
|
|
|
1
|
-
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
2
|
-
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
3
|
-
return new (P || (P = Promise))(function (resolve, reject) {
|
|
4
|
-
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
5
|
-
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
6
|
-
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
7
|
-
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
8
|
-
});
|
|
9
|
-
};
|
|
10
1
|
/*---------------------------------------------------------------------------------------------
|
|
11
2
|
* Copyright (c) Red Hat, Inc. All rights reserved.
|
|
12
3
|
* Licensed under the MIT License. See License.txt in the project root for license information.
|
|
@@ -26,217 +17,204 @@ export class SettingsHandler {
|
|
|
26
17
|
this.validationHandler = validationHandler;
|
|
27
18
|
this.telemetry = telemetry;
|
|
28
19
|
}
|
|
29
|
-
registerHandlers() {
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
yield this.connection.client.register(DidChangeConfigurationNotification.type);
|
|
35
|
-
}
|
|
36
|
-
catch (err) {
|
|
37
|
-
this.telemetry.sendError('yaml.settings.error', { error: convertErrorToTelemetryMsg(err) });
|
|
38
|
-
}
|
|
20
|
+
async registerHandlers() {
|
|
21
|
+
if (this.yamlSettings.hasConfigurationCapability && this.yamlSettings.clientDynamicRegisterSupport) {
|
|
22
|
+
try {
|
|
23
|
+
// Register for all configuration changes.
|
|
24
|
+
await this.connection.client.register(DidChangeConfigurationNotification.type);
|
|
39
25
|
}
|
|
40
|
-
|
|
41
|
-
|
|
26
|
+
catch (err) {
|
|
27
|
+
this.telemetry.sendError('yaml.settings.error', { error: convertErrorToTelemetryMsg(err) });
|
|
28
|
+
}
|
|
29
|
+
}
|
|
30
|
+
this.connection.onDidChangeConfiguration(() => this.pullConfiguration());
|
|
42
31
|
}
|
|
43
32
|
/**
|
|
44
33
|
* The server pull the 'yaml', 'http.proxy', 'http.proxyStrictSSL', '[yaml]' settings sections
|
|
45
34
|
*/
|
|
46
|
-
pullConfiguration() {
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
]
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
};
|
|
66
|
-
yield this.setConfiguration(settings);
|
|
67
|
-
});
|
|
35
|
+
async pullConfiguration() {
|
|
36
|
+
const config = await this.connection.workspace.getConfiguration([
|
|
37
|
+
{ section: 'yaml' },
|
|
38
|
+
{ section: 'http' },
|
|
39
|
+
{ section: '[yaml]' },
|
|
40
|
+
{ section: 'editor' },
|
|
41
|
+
{ section: 'files' },
|
|
42
|
+
]);
|
|
43
|
+
const settings = {
|
|
44
|
+
yaml: config[0],
|
|
45
|
+
http: {
|
|
46
|
+
proxy: config[1]?.proxy ?? '',
|
|
47
|
+
proxyStrictSSL: config[1]?.proxyStrictSSL ?? false,
|
|
48
|
+
},
|
|
49
|
+
yamlEditor: config[2],
|
|
50
|
+
vscodeEditor: config[3],
|
|
51
|
+
files: config[4],
|
|
52
|
+
};
|
|
53
|
+
await this.setConfiguration(settings);
|
|
68
54
|
}
|
|
69
|
-
setConfiguration(settings) {
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
55
|
+
async setConfiguration(settings) {
|
|
56
|
+
configureHttpRequests(settings.http && settings.http.proxy, settings.http && settings.http.proxyStrictSSL);
|
|
57
|
+
this.yamlSettings.specificValidatorPaths = [];
|
|
58
|
+
if (settings.yaml) {
|
|
59
|
+
if (Object.prototype.hasOwnProperty.call(settings.yaml, 'schemas')) {
|
|
60
|
+
this.yamlSettings.yamlConfigurationSettings = settings.yaml.schemas;
|
|
61
|
+
}
|
|
62
|
+
if (Object.prototype.hasOwnProperty.call(settings.yaml, 'validate')) {
|
|
63
|
+
this.yamlSettings.yamlShouldValidate = settings.yaml.validate;
|
|
64
|
+
}
|
|
65
|
+
if (Object.prototype.hasOwnProperty.call(settings.yaml, 'hover')) {
|
|
66
|
+
this.yamlSettings.yamlShouldHover = settings.yaml.hover;
|
|
67
|
+
}
|
|
68
|
+
if (Object.prototype.hasOwnProperty.call(settings.yaml, 'completion')) {
|
|
69
|
+
this.yamlSettings.yamlShouldCompletion = settings.yaml.completion;
|
|
70
|
+
}
|
|
71
|
+
this.yamlSettings.customTags = settings.yaml.customTags ? settings.yaml.customTags : [];
|
|
72
|
+
this.yamlSettings.maxItemsComputed = Math.trunc(Math.max(0, Number(settings.yaml.maxItemsComputed))) || 5000;
|
|
73
|
+
if (settings.yaml.schemaStore) {
|
|
74
|
+
this.yamlSettings.schemaStoreEnabled = settings.yaml.schemaStore.enable;
|
|
75
|
+
if (settings.yaml.schemaStore.url.length !== 0) {
|
|
76
|
+
this.yamlSettings.schemaStoreUrl = settings.yaml.schemaStore.url;
|
|
86
77
|
}
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
this.yamlSettings.schemaStoreUrl = settings.yaml.schemaStore.url;
|
|
78
|
+
}
|
|
79
|
+
if (settings.files?.associations) {
|
|
80
|
+
for (const [ext, languageId] of Object.entries(settings.files.associations)) {
|
|
81
|
+
if (languageId === 'yaml') {
|
|
82
|
+
this.yamlSettings.fileExtensions.push(ext);
|
|
93
83
|
}
|
|
94
84
|
}
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
85
|
+
}
|
|
86
|
+
this.yamlSettings.yamlVersion = settings.yaml.yamlVersion ?? '1.2';
|
|
87
|
+
if (settings.yaml.format) {
|
|
88
|
+
this.yamlSettings.yamlFormatterSettings = {
|
|
89
|
+
proseWrap: settings.yaml.format.proseWrap || 'preserve',
|
|
90
|
+
printWidth: settings.yaml.format.printWidth || 80,
|
|
91
|
+
};
|
|
92
|
+
if (settings.yaml.format.singleQuote !== undefined) {
|
|
93
|
+
this.yamlSettings.yamlFormatterSettings.singleQuote = settings.yaml.format.singleQuote;
|
|
101
94
|
}
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
this.yamlSettings.yamlFormatterSettings = {
|
|
105
|
-
proseWrap: settings.yaml.format.proseWrap || 'preserve',
|
|
106
|
-
printWidth: settings.yaml.format.printWidth || 80,
|
|
107
|
-
};
|
|
108
|
-
if (settings.yaml.format.singleQuote !== undefined) {
|
|
109
|
-
this.yamlSettings.yamlFormatterSettings.singleQuote = settings.yaml.format.singleQuote;
|
|
110
|
-
}
|
|
111
|
-
if (settings.yaml.format.bracketSpacing !== undefined) {
|
|
112
|
-
this.yamlSettings.yamlFormatterSettings.bracketSpacing = settings.yaml.format.bracketSpacing;
|
|
113
|
-
}
|
|
114
|
-
if (settings.yaml.format.enable !== undefined) {
|
|
115
|
-
this.yamlSettings.yamlFormatterSettings.enable = settings.yaml.format.enable;
|
|
116
|
-
}
|
|
95
|
+
if (settings.yaml.format.bracketSpacing !== undefined) {
|
|
96
|
+
this.yamlSettings.yamlFormatterSettings.bracketSpacing = settings.yaml.format.bracketSpacing;
|
|
117
97
|
}
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
if (settings.yaml.suggest) {
|
|
121
|
-
this.yamlSettings.suggest.parentSkeletonSelectedFirst = settings.yaml.suggest.parentSkeletonSelectedFirst;
|
|
98
|
+
if (settings.yaml.format.enable !== undefined) {
|
|
99
|
+
this.yamlSettings.yamlFormatterSettings.enable = settings.yaml.format.enable;
|
|
122
100
|
}
|
|
123
|
-
this.yamlSettings.style = {
|
|
124
|
-
flowMapping: (_d = (_c = settings.yaml.style) === null || _c === void 0 ? void 0 : _c.flowMapping) !== null && _d !== void 0 ? _d : 'allow',
|
|
125
|
-
flowSequence: (_f = (_e = settings.yaml.style) === null || _e === void 0 ? void 0 : _e.flowSequence) !== null && _f !== void 0 ? _f : 'allow',
|
|
126
|
-
};
|
|
127
101
|
}
|
|
128
|
-
this.yamlSettings.
|
|
129
|
-
|
|
130
|
-
if (settings.
|
|
131
|
-
|
|
132
|
-
!settings.vscodeEditor['detectIndentation'] && settings.yamlEditor ? settings.yamlEditor['editor.tabSize'] : tabSize;
|
|
102
|
+
this.yamlSettings.disableAdditionalProperties = settings.yaml.disableAdditionalProperties;
|
|
103
|
+
this.yamlSettings.disableDefaultProperties = settings.yaml.disableDefaultProperties;
|
|
104
|
+
if (settings.yaml.suggest) {
|
|
105
|
+
this.yamlSettings.suggest.parentSkeletonSelectedFirst = settings.yaml.suggest.parentSkeletonSelectedFirst;
|
|
133
106
|
}
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
this.
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
|
|
107
|
+
this.yamlSettings.style = {
|
|
108
|
+
flowMapping: settings.yaml.style?.flowMapping ?? 'allow',
|
|
109
|
+
flowSequence: settings.yaml.style?.flowSequence ?? 'allow',
|
|
110
|
+
};
|
|
111
|
+
}
|
|
112
|
+
this.yamlSettings.schemaConfigurationSettings = [];
|
|
113
|
+
let tabSize = 2;
|
|
114
|
+
if (settings.vscodeEditor) {
|
|
115
|
+
tabSize =
|
|
116
|
+
!settings.vscodeEditor['detectIndentation'] && settings.yamlEditor ? settings.yamlEditor['editor.tabSize'] : tabSize;
|
|
117
|
+
}
|
|
118
|
+
if (settings.yamlEditor && settings.yamlEditor['editor.tabSize']) {
|
|
119
|
+
this.yamlSettings.indentation = ' '.repeat(tabSize);
|
|
120
|
+
}
|
|
121
|
+
for (const uri in this.yamlSettings.yamlConfigurationSettings) {
|
|
122
|
+
const globPattern = this.yamlSettings.yamlConfigurationSettings[uri];
|
|
123
|
+
const schemaObj = {
|
|
124
|
+
fileMatch: Array.isArray(globPattern) ? globPattern : [globPattern],
|
|
125
|
+
uri: checkSchemaURI(this.yamlSettings.workspaceFolders, this.yamlSettings.workspaceRoot, uri, this.telemetry),
|
|
126
|
+
};
|
|
127
|
+
this.yamlSettings.schemaConfigurationSettings.push(schemaObj);
|
|
128
|
+
}
|
|
129
|
+
await this.setSchemaStoreSettingsIfNotSet();
|
|
130
|
+
this.updateConfiguration();
|
|
131
|
+
if (this.yamlSettings.useSchemaSelectionRequests) {
|
|
132
|
+
this.connection.sendNotification(SchemaSelectionRequests.schemaStoreInitialized, {});
|
|
133
|
+
}
|
|
134
|
+
// dynamically enable & disable the formatter
|
|
135
|
+
if (this.yamlSettings.clientDynamicRegisterSupport) {
|
|
136
|
+
const enableFormatter = settings && settings.yaml && settings.yaml.format && settings.yaml.format.enable;
|
|
137
|
+
if (enableFormatter) {
|
|
138
|
+
if (!this.yamlSettings.formatterRegistration) {
|
|
139
|
+
this.yamlSettings.formatterRegistration = this.connection.client.register(DocumentFormattingRequest.type, {
|
|
140
|
+
documentSelector: [{ language: 'yaml' }],
|
|
163
141
|
});
|
|
164
|
-
this.yamlSettings.formatterRegistration = null;
|
|
165
142
|
}
|
|
166
143
|
}
|
|
167
|
-
|
|
144
|
+
else if (this.yamlSettings.formatterRegistration) {
|
|
145
|
+
this.yamlSettings.formatterRegistration.then((r) => {
|
|
146
|
+
return r.dispose();
|
|
147
|
+
});
|
|
148
|
+
this.yamlSettings.formatterRegistration = null;
|
|
149
|
+
}
|
|
150
|
+
}
|
|
168
151
|
}
|
|
169
152
|
/**
|
|
170
153
|
* This function helps set the schema store if it hasn't already been set
|
|
171
154
|
* AND the schema store setting is enabled. If the schema store setting
|
|
172
155
|
* is not enabled we need to clear the schemas.
|
|
173
156
|
*/
|
|
174
|
-
setSchemaStoreSettingsIfNotSet() {
|
|
175
|
-
|
|
176
|
-
|
|
177
|
-
|
|
178
|
-
|
|
179
|
-
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
|
|
183
|
-
|
|
184
|
-
|
|
185
|
-
|
|
186
|
-
|
|
187
|
-
this.yamlSettings.schemaStoreSettings = schemaStore.schemas;
|
|
188
|
-
}
|
|
189
|
-
catch (err) {
|
|
190
|
-
// ignore
|
|
191
|
-
}
|
|
157
|
+
async setSchemaStoreSettingsIfNotSet() {
|
|
158
|
+
const schemaStoreIsSet = this.yamlSettings.schemaStoreSettings.length !== 0;
|
|
159
|
+
let schemaStoreUrl = '';
|
|
160
|
+
if (this.yamlSettings.schemaStoreUrl.length !== 0) {
|
|
161
|
+
schemaStoreUrl = this.yamlSettings.schemaStoreUrl;
|
|
162
|
+
}
|
|
163
|
+
else {
|
|
164
|
+
schemaStoreUrl = JSON_SCHEMASTORE_URL;
|
|
165
|
+
}
|
|
166
|
+
if (this.yamlSettings.schemaStoreEnabled && !schemaStoreIsSet) {
|
|
167
|
+
try {
|
|
168
|
+
const schemaStore = await this.getSchemaStoreMatchingSchemas(schemaStoreUrl);
|
|
169
|
+
this.yamlSettings.schemaStoreSettings = schemaStore.schemas;
|
|
192
170
|
}
|
|
193
|
-
|
|
194
|
-
|
|
171
|
+
catch (err) {
|
|
172
|
+
// ignore
|
|
195
173
|
}
|
|
196
|
-
}
|
|
174
|
+
}
|
|
175
|
+
else if (!this.yamlSettings.schemaStoreEnabled) {
|
|
176
|
+
this.yamlSettings.schemaStoreSettings = [];
|
|
177
|
+
}
|
|
197
178
|
}
|
|
198
179
|
/**
|
|
199
180
|
* When the schema store is enabled, download and store YAML schema associations
|
|
200
181
|
*/
|
|
201
182
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
202
|
-
getSchemaStoreMatchingSchemas(schemaStoreUrl) {
|
|
203
|
-
|
|
204
|
-
|
|
205
|
-
|
|
206
|
-
|
|
207
|
-
|
|
208
|
-
|
|
209
|
-
|
|
210
|
-
|
|
211
|
-
|
|
212
|
-
|
|
213
|
-
|
|
214
|
-
|
|
215
|
-
|
|
216
|
-
|
|
217
|
-
|
|
218
|
-
|
|
219
|
-
|
|
220
|
-
|
|
221
|
-
|
|
222
|
-
|
|
223
|
-
|
|
224
|
-
|
|
225
|
-
|
|
226
|
-
});
|
|
227
|
-
}
|
|
183
|
+
async getSchemaStoreMatchingSchemas(schemaStoreUrl) {
|
|
184
|
+
const response = await xhr({ url: schemaStoreUrl });
|
|
185
|
+
const languageSettings = {
|
|
186
|
+
schemas: [],
|
|
187
|
+
};
|
|
188
|
+
// Parse the schema store catalog as JSON
|
|
189
|
+
const schemas = JSON.parse(response.responseText);
|
|
190
|
+
for (const schemaIndex in schemas.schemas) {
|
|
191
|
+
const schema = schemas.schemas[schemaIndex];
|
|
192
|
+
if (schema && schema.fileMatch) {
|
|
193
|
+
for (const fileMatch in schema.fileMatch) {
|
|
194
|
+
const currFileMatch = schema.fileMatch[fileMatch];
|
|
195
|
+
// If the schema is for files with a YAML extension, save the schema association
|
|
196
|
+
if (this.yamlSettings.fileExtensions.findIndex((value) => {
|
|
197
|
+
return currFileMatch.indexOf(value) > -1;
|
|
198
|
+
}) > -1) {
|
|
199
|
+
languageSettings.schemas.push({
|
|
200
|
+
uri: schema.url,
|
|
201
|
+
fileMatch: [currFileMatch],
|
|
202
|
+
priority: SchemaPriority.SchemaStore,
|
|
203
|
+
name: schema.name,
|
|
204
|
+
description: schema.description,
|
|
205
|
+
versions: schema.versions,
|
|
206
|
+
});
|
|
228
207
|
}
|
|
229
208
|
}
|
|
230
209
|
}
|
|
231
|
-
|
|
232
|
-
|
|
210
|
+
}
|
|
211
|
+
return languageSettings;
|
|
233
212
|
}
|
|
234
213
|
/**
|
|
235
214
|
* Called when server settings or schema associations are changed
|
|
236
215
|
* Re-creates schema associations and re-validates any open YAML files
|
|
237
216
|
*/
|
|
238
217
|
updateConfiguration() {
|
|
239
|
-
var _a, _b;
|
|
240
218
|
let languageSettings = {
|
|
241
219
|
validate: this.yamlSettings.yamlShouldValidate,
|
|
242
220
|
hover: this.yamlSettings.yamlShouldHover,
|
|
@@ -248,8 +226,8 @@ export class SettingsHandler {
|
|
|
248
226
|
disableAdditionalProperties: this.yamlSettings.disableAdditionalProperties,
|
|
249
227
|
disableDefaultProperties: this.yamlSettings.disableDefaultProperties,
|
|
250
228
|
parentSkeletonSelectedFirst: this.yamlSettings.suggest.parentSkeletonSelectedFirst,
|
|
251
|
-
flowMapping:
|
|
252
|
-
flowSequence:
|
|
229
|
+
flowMapping: this.yamlSettings.style?.flowMapping,
|
|
230
|
+
flowSequence: this.yamlSettings.style?.flowSequence,
|
|
253
231
|
yamlVersion: this.yamlSettings.yamlVersion,
|
|
254
232
|
};
|
|
255
233
|
if (this.yamlSettings.schemaAssociations) {
|