yaml-language-server 1.11.1-dcdfa10.0 → 1.11.1-e8be2e1.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +14 -0
- package/README.md +9 -0
- package/eslint-result.sarif +4397 -0
- 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 +44 -60
- package/lib/esm/languageserver/handlers/schemaSelectionHandlers.js.map +1 -1
- package/lib/esm/languageserver/handlers/settingsHandlers.d.ts +1 -1
- package/lib/esm/languageserver/handlers/settingsHandlers.js +161 -183
- package/lib/esm/languageserver/handlers/settingsHandlers.js.map +1 -1
- package/lib/esm/languageserver/telemetry.d.ts +2 -12
- package/lib/esm/languageserver/telemetry.js +1 -1
- package/lib/esm/languageserver/telemetry.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 +44 -19
- 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/documentSymbols.d.ts +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.d.ts +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 +3 -2
- package/lib/esm/languageservice/services/yamlCompletion.js +439 -414
- package/lib/esm/languageservice/services/yamlCompletion.js.map +1 -1
- package/lib/esm/languageservice/services/yamlDefinition.d.ts +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/yamlHover.d.ts +1 -1
- package/lib/esm/languageservice/services/yamlLinks.d.ts +1 -1
- package/lib/esm/languageservice/services/yamlOnTypeFormatting.js +0 -1
- package/lib/esm/languageservice/services/yamlOnTypeFormatting.js.map +1 -1
- package/lib/esm/languageservice/services/yamlSchemaService.js +202 -218
- package/lib/esm/languageservice/services/yamlSchemaService.js.map +1 -1
- package/lib/esm/languageservice/services/yamlValidation.d.ts +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/telemetry.d.ts +16 -0
- package/lib/esm/languageservice/telemetry.js +6 -0
- package/lib/esm/languageservice/telemetry.js.map +1 -0
- package/lib/esm/languageservice/utils/astUtils.js +2 -6
- package/lib/esm/languageservice/utils/astUtils.js.map +1 -1
- package/lib/esm/languageservice/utils/indentationGuesser.js +0 -1
- package/lib/esm/languageservice/utils/indentationGuesser.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/schemaUrls.d.ts +1 -1
- package/lib/esm/languageservice/utils/schemaUrls.js +2 -4
- package/lib/esm/languageservice/utils/schemaUrls.js.map +1 -1
- package/lib/esm/languageservice/utils/schemaUtils.d.ts +2 -0
- package/lib/esm/languageservice/utils/schemaUtils.js +9 -6
- package/lib/esm/languageservice/utils/schemaUtils.js.map +1 -1
- package/lib/esm/languageservice/yamlLanguageService.d.ts +2 -3
- package/lib/esm/languageservice/yamlLanguageService.js +0 -1
- package/lib/esm/languageservice/yamlLanguageService.js.map +1 -1
- package/lib/esm/server.js +5 -14
- package/lib/esm/server.js.map +1 -1
- package/lib/esm/webworker/yamlServerMain.js +2 -2
- package/lib/esm/webworker/yamlServerMain.js.map +1 -1
- package/lib/esm/yamlServerInit.d.ts +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 +44 -60
- package/lib/umd/languageserver/handlers/schemaSelectionHandlers.js.map +1 -1
- package/lib/umd/languageserver/handlers/settingsHandlers.d.ts +1 -1
- package/lib/umd/languageserver/handlers/settingsHandlers.js +161 -183
- package/lib/umd/languageserver/handlers/settingsHandlers.js.map +1 -1
- package/lib/umd/languageserver/telemetry.d.ts +2 -12
- package/lib/umd/languageserver/telemetry.js +3 -3
- package/lib/umd/languageserver/telemetry.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 +45 -20
- 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/documentSymbols.d.ts +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.d.ts +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 +3 -2
- package/lib/umd/languageservice/services/yamlCompletion.js +438 -413
- package/lib/umd/languageservice/services/yamlCompletion.js.map +1 -1
- package/lib/umd/languageservice/services/yamlDefinition.d.ts +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/yamlHover.d.ts +1 -1
- package/lib/umd/languageservice/services/yamlLinks.d.ts +1 -1
- package/lib/umd/languageservice/services/yamlOnTypeFormatting.js +0 -1
- package/lib/umd/languageservice/services/yamlOnTypeFormatting.js.map +1 -1
- package/lib/umd/languageservice/services/yamlSchemaService.js +202 -218
- package/lib/umd/languageservice/services/yamlSchemaService.js.map +1 -1
- package/lib/umd/languageservice/services/yamlValidation.d.ts +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/telemetry.d.ts +16 -0
- package/lib/umd/languageservice/telemetry.js +17 -0
- package/lib/umd/languageservice/telemetry.js.map +1 -0
- package/lib/umd/languageservice/utils/astUtils.js +2 -6
- package/lib/umd/languageservice/utils/astUtils.js.map +1 -1
- package/lib/umd/languageservice/utils/indentationGuesser.js +0 -1
- package/lib/umd/languageservice/utils/indentationGuesser.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/schemaUrls.d.ts +1 -1
- package/lib/umd/languageservice/utils/schemaUrls.js +2 -4
- package/lib/umd/languageservice/utils/schemaUrls.js.map +1 -1
- package/lib/umd/languageservice/utils/schemaUtils.d.ts +2 -0
- package/lib/umd/languageservice/utils/schemaUtils.js +12 -7
- package/lib/umd/languageservice/utils/schemaUtils.js.map +1 -1
- package/lib/umd/languageservice/yamlLanguageService.d.ts +2 -3
- package/lib/umd/languageservice/yamlLanguageService.js +0 -1
- package/lib/umd/languageservice/yamlLanguageService.js.map +1 -1
- package/lib/umd/server.js +4 -13
- package/lib/umd/server.js.map +1 -1
- package/lib/umd/webworker/yamlServerMain.js +1 -1
- package/lib/umd/webworker/yamlServerMain.js.map +1 -1
- package/lib/umd/yamlServerInit.d.ts +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 +44 -60
- package/out/server/src/languageserver/handlers/schemaSelectionHandlers.js.map +1 -1
- package/out/server/src/languageserver/handlers/settingsHandlers.d.ts +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/languageserver/telemetry.d.ts +2 -12
- package/out/server/src/languageserver/telemetry.js +3 -3
- package/out/server/src/languageserver/telemetry.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 +44 -19
- 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/documentSymbols.d.ts +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.d.ts +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 +3 -2
- package/out/server/src/languageservice/services/yamlCompletion.js +438 -413
- package/out/server/src/languageservice/services/yamlCompletion.js.map +1 -1
- package/out/server/src/languageservice/services/yamlDefinition.d.ts +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/yamlHover.d.ts +1 -1
- package/out/server/src/languageservice/services/yamlLinks.d.ts +1 -1
- package/out/server/src/languageservice/services/yamlOnTypeFormatting.js +0 -1
- package/out/server/src/languageservice/services/yamlOnTypeFormatting.js.map +1 -1
- package/out/server/src/languageservice/services/yamlSchemaService.js +202 -218
- package/out/server/src/languageservice/services/yamlSchemaService.js.map +1 -1
- package/out/server/src/languageservice/services/yamlValidation.d.ts +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/telemetry.d.ts +16 -0
- package/out/server/src/languageservice/telemetry.js +7 -0
- package/out/server/src/languageservice/telemetry.js.map +1 -0
- package/out/server/src/languageservice/utils/astUtils.js +2 -6
- package/out/server/src/languageservice/utils/astUtils.js.map +1 -1
- package/out/server/src/languageservice/utils/indentationGuesser.js +0 -1
- package/out/server/src/languageservice/utils/indentationGuesser.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/schemaUrls.d.ts +1 -1
- package/out/server/src/languageservice/utils/schemaUrls.js +2 -4
- package/out/server/src/languageservice/utils/schemaUrls.js.map +1 -1
- package/out/server/src/languageservice/utils/schemaUtils.d.ts +2 -0
- package/out/server/src/languageservice/utils/schemaUtils.js +12 -7
- package/out/server/src/languageservice/utils/schemaUtils.js.map +1 -1
- package/out/server/src/languageservice/yamlLanguageService.d.ts +2 -3
- package/out/server/src/languageservice/yamlLanguageService.js +0 -1
- package/out/server/src/languageservice/yamlLanguageService.js.map +1 -1
- package/out/server/src/server.js +4 -13
- package/out/server/src/server.js.map +1 -1
- package/out/server/src/webworker/yamlServerMain.js +1 -1
- package/out/server/src/webworker/yamlServerMain.js.map +1 -1
- package/out/server/src/yamlServerInit.d.ts +1 -1
- package/out/server/test/autoCompletion.test.js +267 -178
- package/out/server/test/autoCompletion.test.js.map +1 -1
- package/out/server/test/autoCompletionFix.test.js +222 -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 +71 -85
- 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/telemetry.test.js +1 -1
- package/out/server/test/telemetry.test.js.map +1 -1
- package/out/server/test/utils/testsTypes.d.ts +3 -2
- package/out/server/test/utils/testsTypes.js +1 -1
- package/out/server/test/utils/testsTypes.js.map +1 -1
- package/out/server/test/utils/verifyError.d.ts +1 -1
- package/out/server/test/utils/verifyError.js +22 -20
- package/out/server/test/utils/verifyError.js.map +1 -1
- package/out/server/test/yamlCodeLens.test.js +25 -34
- 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 +3 -2
|
@@ -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
|
(function (factory) {
|
|
11
2
|
if (typeof module === "object" && typeof module.exports === "object") {
|
|
12
3
|
var v = factory(require, exports);
|
|
@@ -70,72 +61,71 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
70
61
|
}
|
|
71
62
|
this.validators.push(new unused_anchors_1.UnusedAnchorsValidator());
|
|
72
63
|
}
|
|
73
|
-
doValidation(textDocument, isKubernetes = false) {
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
}
|
|
92
|
-
if (syd.warnings.length > 0) {
|
|
93
|
-
validationResult.push(...syd.warnings);
|
|
94
|
-
}
|
|
95
|
-
validationResult.push(...validation);
|
|
96
|
-
validationResult.push(...this.runAdditionalValidators(textDocument, currentYAMLDoc));
|
|
97
|
-
index++;
|
|
64
|
+
async doValidation(textDocument, isKubernetes = false) {
|
|
65
|
+
if (!this.validationEnabled) {
|
|
66
|
+
return Promise.resolve([]);
|
|
67
|
+
}
|
|
68
|
+
const validationResult = [];
|
|
69
|
+
try {
|
|
70
|
+
const yamlDocument = yaml_documents_1.yamlDocumentsCache.getYamlDocument(textDocument, { customTags: this.customTags, yamlVersion: this.yamlVersion }, true);
|
|
71
|
+
let index = 0;
|
|
72
|
+
for (const currentYAMLDoc of yamlDocument.documents) {
|
|
73
|
+
currentYAMLDoc.isKubernetes = isKubernetes;
|
|
74
|
+
currentYAMLDoc.currentDocIndex = index;
|
|
75
|
+
currentYAMLDoc.disableAdditionalProperties = this.disableAdditionalProperties;
|
|
76
|
+
currentYAMLDoc.uri = textDocument.uri;
|
|
77
|
+
const validation = await this.jsonValidation.doValidation(textDocument, currentYAMLDoc);
|
|
78
|
+
const syd = currentYAMLDoc;
|
|
79
|
+
if (syd.errors.length > 0) {
|
|
80
|
+
// TODO: Get rid of these type assertions (shouldn't need them)
|
|
81
|
+
validationResult.push(...syd.errors);
|
|
98
82
|
}
|
|
83
|
+
if (syd.warnings.length > 0) {
|
|
84
|
+
validationResult.push(...syd.warnings);
|
|
85
|
+
}
|
|
86
|
+
validationResult.push(...validation);
|
|
87
|
+
validationResult.push(...this.runAdditionalValidators(textDocument, currentYAMLDoc));
|
|
88
|
+
index++;
|
|
99
89
|
}
|
|
100
|
-
|
|
101
|
-
|
|
90
|
+
}
|
|
91
|
+
catch (err) {
|
|
92
|
+
this.telemetry.sendError('yaml.validation.error', { error: (0, objects_1.convertErrorToTelemetryMsg)(err) });
|
|
93
|
+
}
|
|
94
|
+
let previousErr;
|
|
95
|
+
const foundSignatures = new Set();
|
|
96
|
+
const duplicateMessagesRemoved = [];
|
|
97
|
+
for (let err of validationResult) {
|
|
98
|
+
/**
|
|
99
|
+
* A patch ontop of the validation that removes the
|
|
100
|
+
* 'Matches many schemas' error for kubernetes
|
|
101
|
+
* for a better user experience.
|
|
102
|
+
*/
|
|
103
|
+
if (isKubernetes && err.message === this.MATCHES_MULTIPLE) {
|
|
104
|
+
continue;
|
|
102
105
|
}
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
* A patch ontop of the validation that removes the
|
|
109
|
-
* 'Matches many schemas' error for kubernetes
|
|
110
|
-
* for a better user experience.
|
|
111
|
-
*/
|
|
112
|
-
if (isKubernetes && err.message === this.MATCHES_MULTIPLE) {
|
|
113
|
-
continue;
|
|
114
|
-
}
|
|
115
|
-
if (Object.prototype.hasOwnProperty.call(err, 'location')) {
|
|
116
|
-
err = (0, exports.yamlDiagToLSDiag)(err, textDocument);
|
|
117
|
-
}
|
|
118
|
-
if (!err.source) {
|
|
119
|
-
err.source = jsonParser07_1.YAML_SOURCE;
|
|
120
|
-
}
|
|
121
|
-
if (previousErr &&
|
|
122
|
-
previousErr.message === err.message &&
|
|
123
|
-
previousErr.range.end.line === err.range.start.line &&
|
|
124
|
-
Math.abs(previousErr.range.end.character - err.range.end.character) >= 1) {
|
|
125
|
-
previousErr.range.end = err.range.end;
|
|
126
|
-
continue;
|
|
127
|
-
}
|
|
128
|
-
else {
|
|
129
|
-
previousErr = err;
|
|
130
|
-
}
|
|
131
|
-
const errSig = err.range.start.line + ' ' + err.range.start.character + ' ' + err.message;
|
|
132
|
-
if (!foundSignatures.has(errSig)) {
|
|
133
|
-
duplicateMessagesRemoved.push(err);
|
|
134
|
-
foundSignatures.add(errSig);
|
|
135
|
-
}
|
|
106
|
+
if (Object.prototype.hasOwnProperty.call(err, 'location')) {
|
|
107
|
+
err = (0, exports.yamlDiagToLSDiag)(err, textDocument);
|
|
108
|
+
}
|
|
109
|
+
if (!err.source) {
|
|
110
|
+
err.source = jsonParser07_1.YAML_SOURCE;
|
|
136
111
|
}
|
|
137
|
-
|
|
138
|
-
|
|
112
|
+
if (previousErr &&
|
|
113
|
+
previousErr.message === err.message &&
|
|
114
|
+
previousErr.range.end.line === err.range.start.line &&
|
|
115
|
+
Math.abs(previousErr.range.end.character - err.range.end.character) >= 1) {
|
|
116
|
+
previousErr.range.end = err.range.end;
|
|
117
|
+
continue;
|
|
118
|
+
}
|
|
119
|
+
else {
|
|
120
|
+
previousErr = err;
|
|
121
|
+
}
|
|
122
|
+
const errSig = err.range.start.line + ' ' + err.range.start.character + ' ' + err.message;
|
|
123
|
+
if (!foundSignatures.has(errSig)) {
|
|
124
|
+
duplicateMessagesRemoved.push(err);
|
|
125
|
+
foundSignatures.add(errSig);
|
|
126
|
+
}
|
|
127
|
+
}
|
|
128
|
+
return duplicateMessagesRemoved;
|
|
139
129
|
}
|
|
140
130
|
runAdditionalValidators(document, yarnDoc) {
|
|
141
131
|
const result = [];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"yamlValidation.js","sourceRoot":"","sources":["../../../../src/languageservice/services/yamlValidation.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"yamlValidation.js","sourceRoot":"","sources":["../../../../src/languageservice/services/yamlValidation.ts"],"names":[],"mappings":";;;;;;;;;IAAA;;;;oGAIgG;IAChG,YAAY,CAAC;;;IAEb,6EAAmE;IAMnE,gGAA6F;IAC7F,yDAAqD;IACrD,oDAAiD;IACjD,6DAA8D;IAC9D,8CAA8D;IAG9D,gEAAqE;IACrE,wDAA6D;IAE7D;;;;OAIG;IACI,MAAM,gBAAgB,GAAG,CAAC,QAA2B,EAAE,YAA0B,EAAc,EAAE;QACtG,MAAM,KAAK,GAAG,YAAY,CAAC,UAAU,CAAC,QAAQ,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;QAC/D,MAAM,KAAK,GAAG;YACZ,KAAK;YACL,GAAG,EAAE,QAAQ,CAAC,QAAQ,CAAC,SAAS;gBAC9B,CAAC,CAAC,sCAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,EAAE,IAAI,uBAAU,CAAC,YAAY,CAAC,CAAC,aAAa,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;gBACrF,CAAC,CAAC,YAAY,CAAC,UAAU,CAAC,QAAQ,CAAC,QAAQ,CAAC,GAAG,CAAC;SACnD,CAAC;QAEF,OAAO,wCAAU,CAAC,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,OAAO,EAAE,QAAQ,CAAC,QAAQ,EAAE,QAAQ,CAAC,IAAI,EAAE,0BAAW,CAAC,CAAC;IACnG,CAAC,CAAC;IAVW,QAAA,gBAAgB,oBAU3B;IAEF,MAAa,cAAc;QAUzB,YAAY,aAAgC,EAAmB,SAAoB;YAApB,cAAS,GAAT,SAAS,CAAW;YAJ3E,eAAU,GAA0B,EAAE,CAAC;YAEvC,qBAAgB,GAAG,uDAAuD,CAAC;YAGjF,IAAI,CAAC,iBAAiB,GAAG,IAAI,CAAC;YAC9B,IAAI,CAAC,cAAc,GAAG,IAAI,+BAAc,CAAC,aAAa,EAAE,OAAO,CAAC,CAAC;QACnE,CAAC;QAEM,SAAS,CAAC,QAA0B;YACzC,IAAI,CAAC,UAAU,GAAG,EAAE,CAAC;YACrB,IAAI,QAAQ,EAAE;gBACZ,IAAI,CAAC,iBAAiB,GAAG,QAAQ,CAAC,QAAQ,CAAC;gBAC3C,IAAI,CAAC,UAAU,GAAG,QAAQ,CAAC,UAAU,CAAC;gBACtC,IAAI,CAAC,2BAA2B,GAAG,QAAQ,CAAC,2BAA2B,CAAC;gBACxE,IAAI,CAAC,WAAW,GAAG,QAAQ,CAAC,WAAW,CAAC;gBACxC,2DAA2D;gBAC3D,IAAI,QAAQ,CAAC,WAAW,KAAK,QAAQ,IAAI,QAAQ,CAAC,YAAY,KAAK,QAAQ,EAAE;oBAC3E,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,+BAAkB,CAAC,QAAQ,CAAC,CAAC,CAAC;iBACxD;aACF;YACD,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,uCAAsB,EAAE,CAAC,CAAC;QACrD,CAAC;QAEM,KAAK,CAAC,YAAY,CAAC,YAA0B,EAAE,YAAY,GAAG,KAAK;YACxE,IAAI,CAAC,IAAI,CAAC,iBAAiB,EAAE;gBAC3B,OAAO,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;aAC5B;YAED,MAAM,gBAAgB,GAAG,EAAE,CAAC;YAC5B,IAAI;gBACF,MAAM,YAAY,GAAiB,mCAAkB,CAAC,eAAe,CACnE,YAAY,EACZ,EAAE,UAAU,EAAE,IAAI,CAAC,UAAU,EAAE,WAAW,EAAE,IAAI,CAAC,WAAW,EAAE,EAC9D,IAAI,CACL,CAAC;gBAEF,IAAI,KAAK,GAAG,CAAC,CAAC;gBACd,KAAK,MAAM,cAAc,IAAI,YAAY,CAAC,SAAS,EAAE;oBACnD,cAAc,CAAC,YAAY,GAAG,YAAY,CAAC;oBAC3C,cAAc,CAAC,eAAe,GAAG,KAAK,CAAC;oBACvC,cAAc,CAAC,2BAA2B,GAAG,IAAI,CAAC,2BAA2B,CAAC;oBAC9E,cAAc,CAAC,GAAG,GAAG,YAAY,CAAC,GAAG,CAAC;oBAEtC,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,YAAY,CAAC,YAAY,EAAE,cAAc,CAAC,CAAC;oBAExF,MAAM,GAAG,GAAI,cAAgD,CAAC;oBAC9D,IAAI,GAAG,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE;wBACzB,+DAA+D;wBAC/D,gBAAgB,CAAC,IAAI,CAAC,GAAG,GAAG,CAAC,MAAM,CAAC,CAAC;qBACtC;oBACD,IAAI,GAAG,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE;wBAC3B,gBAAgB,CAAC,IAAI,CAAC,GAAG,GAAG,CAAC,QAAQ,CAAC,CAAC;qBACxC;oBAED,gBAAgB,CAAC,IAAI,CAAC,GAAG,UAAU,CAAC,CAAC;oBACrC,gBAAgB,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,uBAAuB,CAAC,YAAY,EAAE,cAAc,CAAC,CAAC,CAAC;oBACrF,KAAK,EAAE,CAAC;iBACT;aACF;YAAC,OAAO,GAAG,EAAE;gBACZ,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,uBAAuB,EAAE,EAAE,KAAK,EAAE,IAAA,oCAA0B,EAAC,GAAG,CAAC,EAAE,CAAC,CAAC;aAC/F;YAED,IAAI,WAAuB,CAAC;YAC5B,MAAM,eAAe,GAAG,IAAI,GAAG,EAAE,CAAC;YAClC,MAAM,wBAAwB,GAAiB,EAAE,CAAC;YAClD,KAAK,IAAI,GAAG,IAAI,gBAAgB,EAAE;gBAChC;;;;mBAIG;gBACH,IAAI,YAAY,IAAI,GAAG,CAAC,OAAO,KAAK,IAAI,CAAC,gBAAgB,EAAE;oBACzD,SAAS;iBACV;gBAED,IAAI,MAAM,CAAC,SAAS,CAAC,cAAc,CAAC,IAAI,CAAC,GAAG,EAAE,UAAU,CAAC,EAAE;oBACzD,GAAG,GAAG,IAAA,wBAAgB,EAAC,GAAG,EAAE,YAAY,CAAC,CAAC;iBAC3C;gBAED,IAAI,CAAC,GAAG,CAAC,MAAM,EAAE;oBACf,GAAG,CAAC,MAAM,GAAG,0BAAW,CAAC;iBAC1B;gBAED,IACE,WAAW;oBACX,WAAW,CAAC,OAAO,KAAK,GAAG,CAAC,OAAO;oBACnC,WAAW,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,KAAK,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI;oBACnD,IAAI,CAAC,GAAG,CAAC,WAAW,CAAC,KAAK,CAAC,GAAG,CAAC,SAAS,GAAG,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,SAAS,CAAC,IAAI,CAAC,EACxE;oBACA,WAAW,CAAC,KAAK,CAAC,GAAG,GAAG,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC;oBACtC,SAAS;iBACV;qBAAM;oBACL,WAAW,GAAG,GAAG,CAAC;iBACnB;gBAED,MAAM,MAAM,GAAG,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,GAAG,GAAG,GAAG,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,SAAS,GAAG,GAAG,GAAG,GAAG,CAAC,OAAO,CAAC;gBAC1F,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE;oBAChC,wBAAwB,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;oBACnC,eAAe,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;iBAC7B;aACF;YAED,OAAO,wBAAwB,CAAC;QAClC,CAAC;QACO,uBAAuB,CAAC,QAAsB,EAAE,OAA2B;YACjF,MAAM,MAAM,GAAG,EAAE,CAAC;YAElB,KAAK,MAAM,SAAS,IAAI,IAAI,CAAC,UAAU,EAAE;gBACvC,MAAM,CAAC,IAAI,CAAC,GAAG,SAAS,CAAC,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC,CAAC;aACvD;YACD,OAAO,MAAM,CAAC;QAChB,CAAC;KACF;IAvHD,wCAuHC"}
|
|
@@ -0,0 +1,16 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Due to LSP limitation this object must be JSON serializable
|
|
3
|
+
*/
|
|
4
|
+
export interface TelemetryEvent {
|
|
5
|
+
name: string;
|
|
6
|
+
type?: string;
|
|
7
|
+
properties?: unknown;
|
|
8
|
+
measures?: unknown;
|
|
9
|
+
traits?: unknown;
|
|
10
|
+
context?: unknown;
|
|
11
|
+
}
|
|
12
|
+
export interface Telemetry {
|
|
13
|
+
send(event: TelemetryEvent): void;
|
|
14
|
+
sendError(name: string, properties: unknown): void;
|
|
15
|
+
sendTrack(name: string, properties: unknown): void;
|
|
16
|
+
}
|
|
@@ -0,0 +1,17 @@
|
|
|
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
|
+
(function (factory) {
|
|
6
|
+
if (typeof module === "object" && typeof module.exports === "object") {
|
|
7
|
+
var v = factory(require, exports);
|
|
8
|
+
if (v !== undefined) module.exports = v;
|
|
9
|
+
}
|
|
10
|
+
else if (typeof define === "function" && define.amd) {
|
|
11
|
+
define(["require", "exports"], factory);
|
|
12
|
+
}
|
|
13
|
+
})(function (require, exports) {
|
|
14
|
+
"use strict";
|
|
15
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
16
|
+
});
|
|
17
|
+
//# sourceMappingURL=telemetry.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"telemetry.js","sourceRoot":"","sources":["../../../src/languageservice/telemetry.ts"],"names":[],"mappings":"AAAA;;;gGAGgG"}
|
|
@@ -34,10 +34,7 @@
|
|
|
34
34
|
return false;
|
|
35
35
|
}
|
|
36
36
|
const pair = map.items[0];
|
|
37
|
-
|
|
38
|
-
return true;
|
|
39
|
-
}
|
|
40
|
-
return false;
|
|
37
|
+
return (0, yaml_1.isScalar)(pair.key) && (0, yaml_1.isScalar)(pair.value) && pair.key.value === '' && !pair.value.value;
|
|
41
38
|
}
|
|
42
39
|
exports.isMapContainsEmptyPair = isMapContainsEmptyPair;
|
|
43
40
|
function indexOf(seq, item) {
|
|
@@ -59,8 +56,7 @@
|
|
|
59
56
|
for (const token of tokens) {
|
|
60
57
|
if (token.type === 'document') {
|
|
61
58
|
_visit([], token, (item) => {
|
|
62
|
-
|
|
63
|
-
if (isCollectionItem(item) && ((_a = item.value) === null || _a === void 0 ? void 0 : _a.type) === 'comment') {
|
|
59
|
+
if (isCollectionItem(item) && item.value?.type === 'comment') {
|
|
64
60
|
if (token.offset <= offset && item.value.source.length + item.value.offset >= offset) {
|
|
65
61
|
inComment = true;
|
|
66
62
|
return yaml_1.visit.BREAK;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"astUtils.js","sourceRoot":"","sources":["../../../../src/languageservice/utils/astUtils.ts"],"names":[],"mappings":"AAAA;;;gGAGgG;;;;;;;;;;;;;IAEhG,+BAAqF;IAOrF,SAAgB,SAAS,CAAC,GAAa,EAAE,UAAoB;QAC3D,IAAI,UAAgB,CAAC;QACrB,IAAA,YAAK,EAAC,GAAG,EAAE,CAAC,CAAC,EAAE,IAAU,EAAE,IAAI,EAAE,EAAE;YACjC,IAAI,IAAI,KAAK,UAAU,EAAE;gBACvB,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAS,CAAC;gBAC3C,OAAO,YAAK,CAAC,KAAK,CAAC;aACpB;QACH,CAAC,CAAC,CAAC;QAEH,IAAI,IAAA,iBAAU,EAAC,UAAU,CAAC,EAAE;YAC1B,OAAO,SAAS,CAAC;SAClB;QAED,OAAO,UAAU,CAAC;IACpB,CAAC;IAdD,8BAcC;IACD,SAAgB,sBAAsB,CAAC,GAAY;QACjD,IAAI,GAAG,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE;YACxB,OAAO,KAAK,CAAC;SACd;QAED,MAAM,IAAI,GAAG,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QAC1B,
|
|
1
|
+
{"version":3,"file":"astUtils.js","sourceRoot":"","sources":["../../../../src/languageservice/utils/astUtils.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"indentationGuesser.js","sourceRoot":"","sources":["../../../../src/languageservice/utils/indentationGuesser.ts"],"names":[],"mappings":"AAAA;;;gGAGgG;;;;;;;;;;;;;IAOhG,MAAM,gBAAgB;QAAtB;YACS,eAAU,GAAG,CAAC,CAAC;YACf,uBAAkB,GAAG,KAAK,CAAC;QACpC,CAAC;KAAA;IAED;;OAEG;IACH,SAAS,UAAU,CAAC,CAAS,EAAE,OAAe,EAAE,CAAS,EAAE,OAAe,EAAE,MAAwB;QAClG,MAAM,CAAC,UAAU,GAAG,CAAC,CAAC;QACtB,MAAM,CAAC,kBAAkB,GAAG,KAAK,CAAC;QAElC,gCAAgC;QAChC,aAAa;QACb,iBAAiB;QACjB,2CAA2C;QAE3C,IAAI,CAAS,CAAC;QAEd,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,OAAO,IAAI,CAAC,GAAG,OAAO,EAAE,CAAC,EAAE,EAAE;YAC3C,MAAM,SAAS,GAAG,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;YAClC,MAAM,SAAS,GAAG,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;YAElC,IAAI,SAAS,KAAK,SAAS,EAAE;gBAC3B,MAAM;aACP;SACF;QAED,IAAI,UAAU,GAAG,CAAC,EAChB,UAAU,GAAG,CAAC,CAAC;QACjB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,OAAO,EAAE,CAAC,EAAE,EAAE;YAChC,MAAM,SAAS,GAAG,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;YAClC,IAAI,SAAS,4BAAmB,EAAE;gBAChC,UAAU,EAAE,CAAC;aACd;iBAAM;gBACL,UAAU,EAAE,CAAC;aACd;SACF;QAED,IAAI,UAAU,GAAG,CAAC,EAChB,UAAU,GAAG,CAAC,CAAC;QACjB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,OAAO,EAAE,CAAC,EAAE,EAAE;YAChC,MAAM,SAAS,GAAG,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;YAClC,IAAI,SAAS,4BAAmB,EAAE;gBAChC,UAAU,EAAE,CAAC;aACd;iBAAM;gBACL,UAAU,EAAE,CAAC;aACd;SACF;QAED,IAAI,UAAU,GAAG,CAAC,IAAI,UAAU,GAAG,CAAC,EAAE;YACpC,OAAO;SACR;QACD,IAAI,UAAU,GAAG,CAAC,IAAI,UAAU,GAAG,CAAC,EAAE;YACpC,OAAO;SACR;QAED,MAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,CAAC,UAAU,GAAG,UAAU,CAAC,CAAC;QACnD,MAAM,UAAU,GAAG,IAAI,CAAC,GAAG,CAAC,UAAU,GAAG,UAAU,CAAC,CAAC;QAErD,IAAI,QAAQ,KAAK,CAAC,EAAE;YAClB,2EAA2E;YAC3E,iFAAiF;YACjF,MAAM,CAAC,UAAU,GAAG,UAAU,CAAC;YAE/B,IAAI,UAAU,GAAG,CAAC,IAAI,CAAC,IAAI,UAAU,GAAG,CAAC,IAAI,UAAU,GAAG,CAAC,GAAG,CAAC,CAAC,MAAM,IAAI,UAAU,GAAG,CAAC,CAAC,MAAM,EAAE;gBAC/F,IAAI,CAAC,CAAC,UAAU,CAAC,UAAU,CAAC,4BAAmB,IAAI,CAAC,CAAC,UAAU,CAAC,UAAU,GAAG,CAAC,CAAC,4BAAmB,EAAE;oBAClG,IAAI,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,4BAAmB,EAAE;wBACjD,4CAA4C;wBAC5C,mBAAmB;wBACnB,mBAAmB;wBACnB,MAAM,CAAC,kBAAkB,GAAG,IAAI,CAAC;qBAClC;iBACF;aACF;YACD,OAAO;SACR;QACD,IAAI,UAAU,GAAG,QAAQ,KAAK,CAAC,EAAE;YAC/B,MAAM,CAAC,UAAU,GAAG,UAAU,GAAG,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"indentationGuesser.js","sourceRoot":"","sources":["../../../../src/languageservice/utils/indentationGuesser.ts"],"names":[],"mappings":"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"}
|
|
@@ -96,11 +96,10 @@
|
|
|
96
96
|
* @param err any error
|
|
97
97
|
*/
|
|
98
98
|
function convertErrorToTelemetryMsg(err) {
|
|
99
|
-
var _a;
|
|
100
99
|
if (!err)
|
|
101
100
|
return 'null';
|
|
102
101
|
if (err instanceof Error) {
|
|
103
|
-
return
|
|
102
|
+
return err.stack ?? err.toString();
|
|
104
103
|
}
|
|
105
104
|
return err.toString();
|
|
106
105
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"objects.js","sourceRoot":"","sources":["../../../../src/languageservice/utils/objects.ts"],"names":[],"mappings":";;;;;;;;;IAAA;;;oGAGgG;IAChG,YAAY,CAAC;;;IAEb,iHAAiH;IACjH,SAAgB,MAAM,CAAC,GAAQ,EAAE,KAAU;QACzC,IAAI,GAAG,KAAK,KAAK,EAAE;YACjB,OAAO,IAAI,CAAC;SACb;QACD,IAAI,GAAG,KAAK,IAAI,IAAI,GAAG,KAAK,SAAS,IAAI,KAAK,KAAK,IAAI,IAAI,KAAK,KAAK,SAAS,EAAE;YAC9E,OAAO,KAAK,CAAC;SACd;QACD,IAAI,OAAO,GAAG,KAAK,OAAO,KAAK,EAAE;YAC/B,OAAO,KAAK,CAAC;SACd;QACD,IAAI,OAAO,GAAG,KAAK,QAAQ,EAAE;YAC3B,OAAO,KAAK,CAAC;SACd;QACD,IAAI,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;YAC/C,OAAO,KAAK,CAAC;SACd;QAED,IAAI,CAAS,EAAE,GAAW,CAAC;QAE3B,IAAI,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;YACtB,IAAI,GAAG,CAAC,MAAM,KAAK,KAAK,CAAC,MAAM,EAAE;gBAC/B,OAAO,KAAK,CAAC;aACd;YACD,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,GAAG,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;gBAC/B,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE;oBAC7B,OAAO,KAAK,CAAC;iBACd;aACF;SACF;aAAM;YACL,MAAM,OAAO,GAAa,EAAE,CAAC;YAE7B,KAAK,GAAG,IAAI,GAAG,EAAE;gBACf,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;aACnB;YACD,OAAO,CAAC,IAAI,EAAE,CAAC;YACf,MAAM,SAAS,GAAa,EAAE,CAAC;YAC/B,KAAK,GAAG,IAAI,KAAK,EAAE;gBACjB,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;aACrB;YACD,SAAS,CAAC,IAAI,EAAE,CAAC;YACjB,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,SAAS,CAAC,EAAE;gBAC/B,OAAO,KAAK,CAAC;aACd;YACD,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;gBACnC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE;oBAC/C,OAAO,KAAK,CAAC;iBACd;aACF;SACF;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IAlDD,wBAkDC;IAED,SAAgB,QAAQ,CAAC,GAAY;QACnC,OAAO,OAAO,GAAG,KAAK,QAAQ,CAAC;IACjC,CAAC;IAFD,4BAEC;IAED,wDAAwD;IACxD,SAAgB,SAAS,CAAC,GAAY;QACpC,OAAO,OAAO,GAAG,KAAK,WAAW,CAAC;IACpC,CAAC;IAFD,8BAEC;IAED,SAAgB,SAAS,CAAC,GAAY;QACpC,OAAO,OAAO,GAAG,KAAK,SAAS,CAAC;IAClC,CAAC;IAFD,8BAEC;IAED,SAAgB,QAAQ,CAAC,GAAY;QACnC,OAAO,OAAO,GAAG,KAAK,QAAQ,CAAC;IACjC,CAAC;IAFD,4BAEC;IAED;;;;OAIG;IACH,SAAgB,UAAU,CAAC,GAAY;QACrC,OAAO,MAAM,CAAC,QAAQ,IAAI,MAAM,CAAC,GAAG,CAAC,CAAC;IACxC,CAAC;IAFD,gCAEC;IAED;;;OAGG;IACH,SAAgB,0BAA0B,CAAC,GAAY
|
|
1
|
+
{"version":3,"file":"objects.js","sourceRoot":"","sources":["../../../../src/languageservice/utils/objects.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { WorkspaceFolder } from 'vscode-languageserver-protocol';
|
|
2
2
|
import { URI } from 'vscode-uri';
|
|
3
|
-
import { Telemetry } from '
|
|
3
|
+
import { Telemetry } from '../telemetry';
|
|
4
4
|
import { JSONSchema } from '../jsonSchema';
|
|
5
5
|
export declare const KUBERNETES_SCHEMA_URL = "https://raw.githubusercontent.com/yannh/kubernetes-json-schema/master/v1.22.4-standalone-strict/all.json";
|
|
6
6
|
export declare const JSON_SCHEMASTORE_URL = "https://www.schemastore.org/api/json/catalog.json";
|
|
@@ -64,10 +64,8 @@
|
|
|
64
64
|
}
|
|
65
65
|
function addInnerSchemaUrls(schemas, result) {
|
|
66
66
|
for (const subSchema of schemas) {
|
|
67
|
-
if (!(0, objects_1.isBoolean)(subSchema)) {
|
|
68
|
-
|
|
69
|
-
result.set(subSchema.url, subSchema);
|
|
70
|
-
}
|
|
67
|
+
if (!(0, objects_1.isBoolean)(subSchema) && subSchema.url && !result.has(subSchema.url)) {
|
|
68
|
+
result.set(subSchema.url, subSchema);
|
|
71
69
|
}
|
|
72
70
|
}
|
|
73
71
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"schemaUrls.js","sourceRoot":"","sources":["../../../../src/languageservice/utils/schemaUrls.ts"],"names":[],"mappings":";;;;;;;;;;;;IAIA,uCAAsC;IACtC,mCAAiE;IAEpD,QAAA,qBAAqB,GAChC,0GAA0G,CAAC;IAChG,QAAA,oBAAoB,GAAG,mDAAmD,CAAC;IAExF,SAAgB,cAAc,CAC5B,gBAAmC,EACnC,aAAkB,EAClB,GAAW,EACX,SAAoB;QAEpB,IAAI,GAAG,CAAC,IAAI,EAAE,CAAC,WAAW,EAAE,KAAK,YAAY,EAAE;YAC7C,SAAS,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,wBAAwB,EAAE,UAAU,EAAE,EAAE,UAAU,EAAE,IAAI,EAAE,EAAE,CAAC,CAAC;YACrF,OAAO,6BAAqB,CAAC;SAC9B;aAAM,IAAI,IAAA,sBAAc,EAAC,GAAG,CAAC,EAAE;YAC9B,OAAO,IAAA,8BAAsB,EAAC,gBAAgB,EAAE,aAAa,EAAE,GAAG,CAAC,CAAC;SACrE;aAAM;YACL,OAAO,GAAG,CAAC;SACZ;IACH,CAAC;IAdD,wCAcC;IAED;;;;OAIG;IACH,SAAgB,aAAa,CAAC,MAAkB;QAC9C,MAAM,MAAM,GAAG,IAAI,GAAG,EAAsB,CAAC;QAC7C,IAAI,CAAC,MAAM,EAAE;YACX,OAAO,MAAM,CAAC;SACf;QAED,IAAI,MAAM,CAAC,GAAG,EAAE;YACd,IAAI,MAAM,CAAC,GAAG,CAAC,UAAU,CAAC,iCAAiC,CAAC,EAAE;gBAC5D,eAAe,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;aACjC;iBAAM;gBACL,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;aAChC;SACF;aAAM;YACL,eAAe,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;SACjC;QACD,OAAO,MAAM,CAAC;IAChB,CAAC;IAhBD,sCAgBC;IAED,SAAS,eAAe,CAAC,MAAkB,EAAE,MAA+B;QAC1E,IAAI,MAAM,CAAC,KAAK,EAAE;YAChB,kBAAkB,CAAC,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;SAC1C;QACD,IAAI,MAAM,CAAC,KAAK,EAAE;YAChB,kBAAkB,CAAC,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;SAC1C;QACD,IAAI,MAAM,CAAC,KAAK,EAAE;YAChB,kBAAkB,CAAC,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;SAC1C;IACH,CAAC;IAED,SAAS,kBAAkB,CAAC,OAAwB,EAAE,MAA+B;QACnF,KAAK,MAAM,SAAS,IAAI,OAAO,EAAE;YAC/B,IAAI,CAAC,IAAA,mBAAS,EAAC,SAAS,CAAC,
|
|
1
|
+
{"version":3,"file":"schemaUrls.js","sourceRoot":"","sources":["../../../../src/languageservice/utils/schemaUrls.ts"],"names":[],"mappings":";;;;;;;;;;;;IAIA,uCAAsC;IACtC,mCAAiE;IAEpD,QAAA,qBAAqB,GAChC,0GAA0G,CAAC;IAChG,QAAA,oBAAoB,GAAG,mDAAmD,CAAC;IAExF,SAAgB,cAAc,CAC5B,gBAAmC,EACnC,aAAkB,EAClB,GAAW,EACX,SAAoB;QAEpB,IAAI,GAAG,CAAC,IAAI,EAAE,CAAC,WAAW,EAAE,KAAK,YAAY,EAAE;YAC7C,SAAS,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,wBAAwB,EAAE,UAAU,EAAE,EAAE,UAAU,EAAE,IAAI,EAAE,EAAE,CAAC,CAAC;YACrF,OAAO,6BAAqB,CAAC;SAC9B;aAAM,IAAI,IAAA,sBAAc,EAAC,GAAG,CAAC,EAAE;YAC9B,OAAO,IAAA,8BAAsB,EAAC,gBAAgB,EAAE,aAAa,EAAE,GAAG,CAAC,CAAC;SACrE;aAAM;YACL,OAAO,GAAG,CAAC;SACZ;IACH,CAAC;IAdD,wCAcC;IAED;;;;OAIG;IACH,SAAgB,aAAa,CAAC,MAAkB;QAC9C,MAAM,MAAM,GAAG,IAAI,GAAG,EAAsB,CAAC;QAC7C,IAAI,CAAC,MAAM,EAAE;YACX,OAAO,MAAM,CAAC;SACf;QAED,IAAI,MAAM,CAAC,GAAG,EAAE;YACd,IAAI,MAAM,CAAC,GAAG,CAAC,UAAU,CAAC,iCAAiC,CAAC,EAAE;gBAC5D,eAAe,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;aACjC;iBAAM;gBACL,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;aAChC;SACF;aAAM;YACL,eAAe,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;SACjC;QACD,OAAO,MAAM,CAAC;IAChB,CAAC;IAhBD,sCAgBC;IAED,SAAS,eAAe,CAAC,MAAkB,EAAE,MAA+B;QAC1E,IAAI,MAAM,CAAC,KAAK,EAAE;YAChB,kBAAkB,CAAC,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;SAC1C;QACD,IAAI,MAAM,CAAC,KAAK,EAAE;YAChB,kBAAkB,CAAC,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;SAC1C;QACD,IAAI,MAAM,CAAC,KAAK,EAAE;YAChB,kBAAkB,CAAC,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;SAC1C;IACH,CAAC;IAED,SAAS,kBAAkB,CAAC,OAAwB,EAAE,MAA+B;QACnF,KAAK,MAAM,SAAS,IAAI,OAAO,EAAE;YAC/B,IAAI,CAAC,IAAA,mBAAS,EAAC,SAAS,CAAC,IAAI,SAAS,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE;gBACxE,MAAM,CAAC,GAAG,CAAC,SAAS,CAAC,GAAG,EAAE,SAAS,CAAC,CAAC;aACtC;SACF;IACH,CAAC"}
|
|
@@ -15,3 +15,5 @@ export declare function getSchemaTypeName(schema: JSONSchema): string;
|
|
|
15
15
|
*/
|
|
16
16
|
export declare function getSchemaRefTypeTitle($ref: string): string;
|
|
17
17
|
export declare function getSchemaTitle(schema: JSONSchema, url: string): string;
|
|
18
|
+
export declare function isPrimitiveType(schema: JSONSchema): boolean;
|
|
19
|
+
export declare function isAnyOfAllOfOneOfType(schema: JSONSchema): boolean;
|
|
@@ -9,7 +9,7 @@
|
|
|
9
9
|
})(function (require, exports) {
|
|
10
10
|
"use strict";
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
|
-
exports.getSchemaTitle = exports.getSchemaRefTypeTitle = exports.getSchemaTypeName = void 0;
|
|
12
|
+
exports.isAnyOfAllOfOneOfType = exports.isPrimitiveType = exports.getSchemaTitle = exports.getSchemaRefTypeTitle = exports.getSchemaTypeName = void 0;
|
|
13
13
|
const vscode_uri_1 = require("vscode-uri");
|
|
14
14
|
const path = require("path");
|
|
15
15
|
function getSchemaTypeName(schema) {
|
|
@@ -17,15 +17,12 @@
|
|
|
17
17
|
return schema.title;
|
|
18
18
|
}
|
|
19
19
|
if (schema.$id) {
|
|
20
|
-
|
|
21
|
-
return type;
|
|
20
|
+
return getSchemaRefTypeTitle(schema.$id);
|
|
22
21
|
}
|
|
23
22
|
if (schema.$ref || schema._$ref) {
|
|
24
|
-
|
|
25
|
-
return type;
|
|
23
|
+
return getSchemaRefTypeTitle(schema.$ref || schema._$ref);
|
|
26
24
|
}
|
|
27
|
-
|
|
28
|
-
return typeStr;
|
|
25
|
+
return schema.closestTitle || (Array.isArray(schema.type) ? schema.type.join(' | ') : schema.type); //object
|
|
29
26
|
}
|
|
30
27
|
exports.getSchemaTypeName = getSchemaTypeName;
|
|
31
28
|
/**
|
|
@@ -66,5 +63,13 @@
|
|
|
66
63
|
return baseName;
|
|
67
64
|
}
|
|
68
65
|
exports.getSchemaTitle = getSchemaTitle;
|
|
66
|
+
function isPrimitiveType(schema) {
|
|
67
|
+
return schema.type !== 'object' && !isAnyOfAllOfOneOfType(schema);
|
|
68
|
+
}
|
|
69
|
+
exports.isPrimitiveType = isPrimitiveType;
|
|
70
|
+
function isAnyOfAllOfOneOfType(schema) {
|
|
71
|
+
return !!(schema.anyOf || schema.allOf || schema.oneOf);
|
|
72
|
+
}
|
|
73
|
+
exports.isAnyOfAllOfOneOfType = isAnyOfAllOfOneOfType;
|
|
69
74
|
});
|
|
70
75
|
//# sourceMappingURL=schemaUtils.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"schemaUtils.js","sourceRoot":"","sources":["../../../../src/languageservice/utils/schemaUtils.ts"],"names":[],"mappings":";;;;;;;;;;;;IAAA,2CAAiC;IAEjC,6BAA6B;IAE7B,SAAgB,iBAAiB,CAAC,MAAkB;QAClD,IAAI,MAAM,CAAC,KAAK,EAAE;YAChB,OAAO,MAAM,CAAC,KAAK,CAAC;SACrB;QACD,IAAI,MAAM,CAAC,GAAG,EAAE;YACd,
|
|
1
|
+
{"version":3,"file":"schemaUtils.js","sourceRoot":"","sources":["../../../../src/languageservice/utils/schemaUtils.ts"],"names":[],"mappings":";;;;;;;;;;;;IAAA,2CAAiC;IAEjC,6BAA6B;IAE7B,SAAgB,iBAAiB,CAAC,MAAkB;QAClD,IAAI,MAAM,CAAC,KAAK,EAAE;YAChB,OAAO,MAAM,CAAC,KAAK,CAAC;SACrB;QACD,IAAI,MAAM,CAAC,GAAG,EAAE;YACd,OAAO,qBAAqB,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;SAC1C;QACD,IAAI,MAAM,CAAC,IAAI,IAAI,MAAM,CAAC,KAAK,EAAE;YAC/B,OAAO,qBAAqB,CAAC,MAAM,CAAC,IAAI,IAAI,MAAM,CAAC,KAAK,CAAC,CAAC;SAC3D;QACD,OAAO,MAAM,CAAC,YAAY,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,QAAQ;IAC9G,CAAC;IAXD,8CAWC;IAED;;;;;;;;;;;;OAYG;IACH,SAAgB,qBAAqB,CAAC,IAAY;QAChD,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,qCAAqC,CAAC,CAAC;QAChE,IAAI,IAAI,GAAG,CAAC,CAAC,KAAK,IAAI,KAAK,CAAC,CAAC,CAAC,CAAC;QAC/B,IAAI,CAAC,IAAI,EAAE;YACT,IAAI,GAAG,cAAc,CAAC;YACtB,OAAO,CAAC,KAAK,CAAC,SAAS,IAAI,uBAAuB,CAAC,CAAC;SACrD;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IARD,sDAQC;IAED,SAAgB,cAAc,CAAC,MAAkB,EAAE,GAAW;QAC5D,MAAM,GAAG,GAAG,gBAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAC3B,IAAI,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QACzC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE;YAC7B,QAAQ,IAAI,OAAO,CAAC;SACrB;QACD,IAAI,MAAM,CAAC,wBAAwB,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE;YACnD,OAAO,MAAM,CAAC,wBAAwB,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,KAAK,GAAG,KAAK,QAAQ,GAAG,CAAC;SACjF;aAAM,IAAI,MAAM,CAAC,KAAK,EAAE;YACvB,OAAO,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,GAAG,KAAK,GAAG,MAAM,CAAC,WAAW,GAAG,KAAK,QAAQ,GAAG,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,GAAG,KAAK,QAAQ,GAAG,CAAC;SAC5H;QAED,OAAO,QAAQ,CAAC;IAClB,CAAC;IAbD,wCAaC;IAED,SAAgB,eAAe,CAAC,MAAkB;QAChD,OAAO,MAAM,CAAC,IAAI,KAAK,QAAQ,IAAI,CAAC,qBAAqB,CAAC,MAAM,CAAC,CAAC;IACpE,CAAC;IAFD,0CAEC;IAED,SAAgB,qBAAqB,CAAC,MAAkB;QACtD,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,IAAI,MAAM,CAAC,KAAK,IAAI,MAAM,CAAC,KAAK,CAAC,CAAC;IAC1D,CAAC;IAFD,sDAEC"}
|
|
@@ -5,14 +5,13 @@ import { DocumentSymbolsContext } from 'vscode-json-languageservice';
|
|
|
5
5
|
import { ClientCapabilities, CodeActionParams, Connection, DocumentOnTypeFormattingParams, DefinitionParams } from 'vscode-languageserver';
|
|
6
6
|
import { TextDocument } from 'vscode-languageserver-textdocument';
|
|
7
7
|
import { FoldingRangesContext, SchemaVersions } from './yamlTypes';
|
|
8
|
-
import { Telemetry } from '
|
|
8
|
+
import { Telemetry } from './telemetry';
|
|
9
9
|
import { YamlVersion } from './parser/yamlParser07';
|
|
10
10
|
import { SettingsState } from '../yamlSettings';
|
|
11
11
|
export declare enum SchemaPriority {
|
|
12
12
|
SchemaStore = 1,
|
|
13
13
|
SchemaAssociation = 2,
|
|
14
|
-
Settings = 3
|
|
15
|
-
Modeline = 4
|
|
14
|
+
Settings = 3
|
|
16
15
|
}
|
|
17
16
|
export interface SchemasSettings {
|
|
18
17
|
priority?: SchemaPriority;
|
|
@@ -36,7 +36,6 @@
|
|
|
36
36
|
SchemaPriority[SchemaPriority["SchemaStore"] = 1] = "SchemaStore";
|
|
37
37
|
SchemaPriority[SchemaPriority["SchemaAssociation"] = 2] = "SchemaAssociation";
|
|
38
38
|
SchemaPriority[SchemaPriority["Settings"] = 3] = "Settings";
|
|
39
|
-
SchemaPriority[SchemaPriority["Modeline"] = 4] = "Modeline";
|
|
40
39
|
})(SchemaPriority = exports.SchemaPriority || (exports.SchemaPriority = {}));
|
|
41
40
|
function getLanguageService(schemaRequestService, workspaceContext, connection, telemetry, yamlSettings, clientCapabilities) {
|
|
42
41
|
const schemaService = new yamlSchemaService_1.YAMLSchemaService(schemaRequestService, workspaceContext);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"yamlLanguageService.js","sourceRoot":"","sources":["../../../src/languageservice/yamlLanguageService.ts"],"names":[],"mappings":"AAAA;;;;gGAIgG;;;;;;;;;;;;;IAEhG,oEAMsC;IAgBtC,gEAAiE;IACjE,oDAAiD;IACjD,8DAA2D;IAC3D,4DAAyD;IAEzD,oDAAiD;IASjD,wDAA0D;IAE1D,gEAA6D;IAC7D,uEAAoE;IACpE,0EAA6E;IAC7E,0DAAuD;IACvD,0DAA2D;IAG3D,8DAA2D;IAC3D,4DAA6D;IAE7D,gGAAyF;IACzF,8DAA2D;IAE3D,IAAY,
|
|
1
|
+
{"version":3,"file":"yamlLanguageService.js","sourceRoot":"","sources":["../../../src/languageservice/yamlLanguageService.ts"],"names":[],"mappings":"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"}
|
package/lib/umd/server.js
CHANGED
|
@@ -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
|
(function (factory) {
|
|
11
2
|
if (typeof module === "object" && typeof module.exports === "object") {
|
|
12
3
|
var v = factory(require, exports);
|
|
@@ -59,10 +50,10 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
59
50
|
};
|
|
60
51
|
const yamlSettings = new yamlSettings_1.SettingsState();
|
|
61
52
|
const fileSystem = {
|
|
62
|
-
readFile: (fsPath, encoding) =>
|
|
63
|
-
const b =
|
|
53
|
+
readFile: async (fsPath, encoding) => {
|
|
54
|
+
const b = await fs_1.promises.readFile(fsPath, encoding);
|
|
64
55
|
return b.toString();
|
|
65
|
-
}
|
|
56
|
+
},
|
|
66
57
|
};
|
|
67
58
|
/**
|
|
68
59
|
* Handles schema content requests given the schema URI
|
|
@@ -72,7 +63,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
72
63
|
return (0, schemaRequestHandler_1.schemaRequestHandler)(connection, uri, yamlSettings.workspaceFolders, yamlSettings.workspaceRoot, yamlSettings.useVSCodeContentRequest, fileSystem);
|
|
73
64
|
};
|
|
74
65
|
const schemaRequestService = schemaRequestHandlerWrapper.bind(this, connection);
|
|
75
|
-
const telemetry = new telemetry_1.
|
|
66
|
+
const telemetry = new telemetry_1.TelemetryImpl(connection);
|
|
76
67
|
new yamlServerInit_1.YAMLServerInit(connection, yamlSettings, schemaRequestHandler_1.workspaceContext, schemaRequestService, telemetry).start();
|
|
77
68
|
});
|
|
78
69
|
//# sourceMappingURL=server.js.map
|
package/lib/umd/server.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server.js","sourceRoot":"","sources":["../../src/server.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"server.js","sourceRoot":"","sources":["../../src/server.ts"],"names":[],"mappings":";;;;;;;;;IAAA;;;;;oGAKgG;IAChG,YAAY,CAAC;;IAEb,qDAA4F;IAC5F,kCAAkC;IAClC,0FAAyG;IACzG,qDAAkD;IAClD,iDAA+C;IAC/C,2BAAoC;IACpC,6DAA6E;IAC7E,0DAA2D;IAE3D,8DAA8D;IAC9D,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,mBAAmB,CAAQ,CAAC,CAAC;IAEpD,sCAAsC;IACtC,IAAI,UAAU,GAAe,IAAI,CAAC;IAElC,IAAI,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,EAAE;QAC1C,UAAU,GAAG,IAAA,uBAAgB,EAAC,uBAAgB,CAAC,GAAG,CAAC,CAAC;KACrD;SAAM;QACL,UAAU,GAAG,IAAA,uBAAgB,GAAE,CAAC;KACjC;IAED,OAAO,CAAC,EAAE,CAAC,mBAAmB,EAAE,CAAC,GAAU,EAAE,EAAE;QAC7C,6DAA6D;QAC7D,UAAU,CAAC,OAAO,CAAC,KAAK,CAAC,IAAA,oCAA0B,EAAC,GAAG,CAAC,CAAC,CAAC;IAC5D,CAAC,CAAC,CAAC;IAEH,OAAO,CAAC,GAAG,GAAG,UAAU,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;IAC9D,OAAO,CAAC,KAAK,GAAG,UAAU,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;IAElE,uHAAuH;IACvH,OAAO,CAAC,KAAK,GAAG,CAAC,GAAG,EAAE,EAAE;QACtB,IAAI,GAAG,KAAK,IAAI,EAAE;YAChB,UAAU,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;SAC9B;aAAM;YACL,UAAU,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;SAC/B;IACH,CAAC,CAAC;IAEF,MAAM,YAAY,GAAG,IAAI,4BAAa,EAAE,CAAC;IAEzC,MAAM,UAAU,GAAG;QACjB,QAAQ,EAAE,KAAK,EAAE,MAAc,EAAE,QAAiB,EAAE,EAAE;YACpD,MAAM,CAAC,GAAG,MAAM,aAAE,CAAC,QAAQ,CAAC,MAAM,EAAE,QAA0B,CAAC,CAAC;YAChE,OAAO,CAAC,CAAC,QAAQ,EAAE,CAAC;QACtB,CAAC;KACF,CAAC;IAEF;;;OAGG;IACH,MAAM,2BAA2B,GAAG,CAAC,UAAsB,EAAE,GAAW,EAAmB,EAAE;QAC3F,OAAO,IAAA,2CAAoB,EACzB,UAAU,EACV,GAAG,EACH,YAAY,CAAC,gBAAgB,EAC7B,YAAY,CAAC,aAAa,EAC1B,YAAY,CAAC,uBAAuB,EACpC,UAAU,CACX,CAAC;IACJ,CAAC,CAAC;IAEF,MAAM,oBAAoB,GAAG,2BAA2B,CAAC,IAAI,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;IAChF,MAAM,SAAS,GAAG,IAAI,yBAAa,CAAC,UAAU,CAAC,CAAC;IAEhD,IAAI,+BAAc,CAAC,UAAU,EAAE,YAAY,EAAE,uCAAgB,EAAE,oBAAoB,EAAE,SAAS,CAAC,CAAC,KAAK,EAAE,CAAC"}
|
|
@@ -44,7 +44,7 @@
|
|
|
44
44
|
return (0, schemaRequestHandler_1.schemaRequestHandler)(connection, uri, yamlSettings.workspaceFolders, yamlSettings.workspaceRoot, yamlSettings.useVSCodeContentRequest, fileSystem);
|
|
45
45
|
};
|
|
46
46
|
const schemaRequestService = schemaRequestHandlerWrapper.bind(this, connection);
|
|
47
|
-
const telemetry = new telemetry_1.
|
|
47
|
+
const telemetry = new telemetry_1.TelemetryImpl(connection);
|
|
48
48
|
new yamlServerInit_1.YAMLServerInit(connection, yamlSettings, schemaRequestHandler_1.workspaceContext, schemaRequestService, telemetry).start();
|
|
49
49
|
});
|
|
50
50
|
//# sourceMappingURL=yamlServerMain.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"yamlServerMain.js","sourceRoot":"","sources":["../../../src/webworker/yamlServerMain.ts"],"names":[],"mappings":";;;;;;;;;;;IAAA;;;;oGAIgG;IAChG,iEAAgE;IAChE,2DAA6G;IAC7G,
|
|
1
|
+
{"version":3,"file":"yamlServerMain.js","sourceRoot":"","sources":["../../../src/webworker/yamlServerMain.ts"],"names":[],"mappings":";;;;;;;;;;;IAAA;;;;oGAIgG;IAChG,iEAAgE;IAChE,2DAA6G;IAC7G,2DAA4D;IAC5D,2FAA0G;IAC1G,sDAAmD;IACnD,kDAAgD;IAEhD,2DAA2D;IAC3D,IAAU,UAAU,CAInB;IAJD,WAAU,UAAU;QAClB,6DAA6D;QAC7D,wDAAwD;QAC3C,eAAI,GAAoC,IAAI,mCAAW,CAAC,aAAa,CAAC,CAAC;IACtF,CAAC,EAJS,UAAU,KAAV,UAAU,QAInB;IAED,MAAM,aAAa,GAAG,IAAI,8BAAoB,CAAC,UAAU,CAAC,CAAC;IAC3D,MAAM,aAAa,GAAG,IAAI,8BAAoB,CAAC,UAAU,CAAC,CAAC;IAE3D,MAAM,UAAU,GAAG,IAAA,0BAAgB,EAAC,aAAa,EAAE,aAAa,CAAC,CAAC;IAElE,MAAM,YAAY,GAAG,IAAI,4BAAa,EAAE,CAAC;IAEzC,MAAM,UAAU,GAAG;QACjB,QAAQ,EAAE,CAAC,MAAc,EAAE,EAAE;YAC3B,OAAO,UAAU,CAAC,WAAW,CAAC,UAAU,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QACzD,CAAC;KACF,CAAC;IAEF;;;OAGG;IACH,MAAM,2BAA2B,GAAG,CAAC,UAAsB,EAAE,GAAW,EAAmB,EAAE;QAC3F,OAAO,IAAA,2CAAoB,EACzB,UAAU,EACV,GAAG,EACH,YAAY,CAAC,gBAAgB,EAC7B,YAAY,CAAC,aAAa,EAC1B,YAAY,CAAC,uBAAuB,EACpC,UAAU,CACX,CAAC;IACJ,CAAC,CAAC;IAEF,MAAM,oBAAoB,GAAG,2BAA2B,CAAC,IAAI,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;IAChF,MAAM,SAAS,GAAG,IAAI,yBAAa,CAAC,UAAU,CAAC,CAAC;IAEhD,IAAI,+BAAc,CAAC,UAAU,EAAE,YAAY,EAAE,uCAAgB,EAAE,oBAAoB,EAAE,SAAS,CAAC,CAAC,KAAK,EAAE,CAAC"}
|
|
@@ -4,7 +4,7 @@ import { SettingsState } from './yamlSettings';
|
|
|
4
4
|
import { LanguageHandlers } from './languageserver/handlers/languageHandlers';
|
|
5
5
|
import { ValidationHandler } from './languageserver/handlers/validationHandlers';
|
|
6
6
|
import { SettingsHandler } from './languageserver/handlers/settingsHandlers';
|
|
7
|
-
import { Telemetry } from './
|
|
7
|
+
import { Telemetry } from './languageservice/telemetry';
|
|
8
8
|
export declare class YAMLServerInit {
|
|
9
9
|
private readonly connection;
|
|
10
10
|
private yamlSettings;
|
|
@@ -62,7 +62,10 @@ class LanguageHandlers {
|
|
|
62
62
|
if (!document) {
|
|
63
63
|
return;
|
|
64
64
|
}
|
|
65
|
-
const customFormatterSettings =
|
|
65
|
+
const customFormatterSettings = {
|
|
66
|
+
tabWidth: formatParams.options.tabSize,
|
|
67
|
+
...this.yamlSettings.yamlFormatterSettings,
|
|
68
|
+
};
|
|
66
69
|
return this.languageService.doFormat(document, customFormatterSettings);
|
|
67
70
|
}
|
|
68
71
|
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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"}
|