yaml-language-server 1.9.1-eae5206.0 → 1.10.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 +21 -0
- package/CONTRIBUTING.md +8 -0
- package/DCO +37 -0
- package/README.md +2 -0
- package/lib/esm/languageserver/handlers/settingsHandlers.js +8 -1
- package/lib/esm/languageserver/handlers/settingsHandlers.js.map +1 -1
- package/lib/esm/languageservice/jsonASTTypes.js +1 -0
- package/lib/esm/languageservice/jsonSchema.js +1 -0
- package/lib/esm/languageservice/parser/jsonParser07.d.ts +15 -1
- package/lib/esm/languageservice/parser/jsonParser07.js +25 -8
- package/lib/esm/languageservice/parser/jsonParser07.js.map +1 -1
- package/lib/esm/languageservice/parser/yaml-documents.js +10 -2
- package/lib/esm/languageservice/parser/yaml-documents.js.map +1 -1
- package/lib/esm/languageservice/parser/yamlParser07.js.map +1 -1
- package/lib/esm/languageservice/services/validation/types.js +1 -0
- package/lib/esm/languageservice/services/validation/yaml-style.d.ts +12 -0
- package/lib/esm/languageservice/services/validation/yaml-style.js +25 -0
- package/lib/esm/languageservice/services/validation/yaml-style.js.map +1 -0
- package/lib/esm/languageservice/services/yamlCodeActions.d.ts +1 -0
- package/lib/esm/languageservice/services/yamlCodeActions.js +22 -0
- package/lib/esm/languageservice/services/yamlCodeActions.js.map +1 -1
- package/lib/esm/languageservice/services/yamlCodeLens.js +2 -17
- package/lib/esm/languageservice/services/yamlCodeLens.js.map +1 -1
- package/lib/esm/languageservice/services/yamlCompletion.d.ts +1 -1
- package/lib/esm/languageservice/services/yamlCompletion.js +41 -41
- package/lib/esm/languageservice/services/yamlCompletion.js.map +1 -1
- package/lib/esm/languageservice/services/yamlFolding.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/yamlSchemaService.js +14 -0
- package/lib/esm/languageservice/services/yamlSchemaService.js.map +1 -1
- package/lib/esm/languageservice/services/yamlValidation.d.ts +2 -1
- package/lib/esm/languageservice/services/yamlValidation.js +10 -9
- package/lib/esm/languageservice/services/yamlValidation.js.map +1 -1
- package/lib/esm/languageservice/utils/astUtils.js.map +1 -1
- package/lib/esm/languageservice/utils/charCode.js +1 -0
- package/lib/esm/languageservice/utils/flow-style-rewriter.d.ts +6 -0
- package/lib/esm/languageservice/utils/flow-style-rewriter.js +53 -0
- package/lib/esm/languageservice/utils/flow-style-rewriter.js.map +1 -0
- package/lib/esm/languageservice/utils/indentationGuesser.js +6 -6
- package/lib/esm/languageservice/utils/indentationGuesser.js.map +1 -1
- package/lib/esm/languageservice/utils/objects.js.map +1 -1
- package/lib/esm/languageservice/utils/schemaUtils.d.ts +1 -0
- package/lib/esm/languageservice/utils/schemaUtils.js +16 -0
- package/lib/esm/languageservice/utils/schemaUtils.js.map +1 -1
- package/lib/esm/languageservice/utils/strings.js +1 -1
- package/lib/esm/languageservice/utils/strings.js.map +1 -1
- package/lib/esm/languageservice/utils/textBuffer.js +1 -1
- package/lib/esm/languageservice/utils/textBuffer.js.map +1 -1
- package/lib/esm/languageservice/yamlLanguageService.d.ts +8 -0
- package/lib/esm/languageservice/yamlLanguageService.js.map +1 -1
- package/lib/esm/languageservice/yamlTypes.js +1 -0
- package/lib/esm/yamlSettings.d.ts +8 -0
- package/lib/esm/yamlSettings.js.map +1 -1
- package/lib/umd/index.js +7 -2
- package/lib/umd/index.js.map +1 -1
- package/lib/umd/languageserver/handlers/languageHandlers.js +1 -1
- package/lib/umd/languageserver/handlers/languageHandlers.js.map +1 -1
- package/lib/umd/languageserver/handlers/schemaSelectionHandlers.js +1 -1
- package/lib/umd/languageserver/handlers/schemaSelectionHandlers.js.map +1 -1
- package/lib/umd/languageserver/handlers/settingsHandlers.js +15 -8
- package/lib/umd/languageserver/handlers/settingsHandlers.js.map +1 -1
- package/lib/umd/languageserver/handlers/validationHandlers.js +2 -2
- package/lib/umd/languageserver/handlers/validationHandlers.js.map +1 -1
- package/lib/umd/languageservice/parser/ast-converter.js +11 -11
- package/lib/umd/languageservice/parser/ast-converter.js.map +1 -1
- package/lib/umd/languageservice/parser/custom-tag-provider.js +3 -3
- package/lib/umd/languageservice/parser/custom-tag-provider.js.map +1 -1
- package/lib/umd/languageservice/parser/jsonParser07.d.ts +15 -1
- package/lib/umd/languageservice/parser/jsonParser07.js +50 -33
- package/lib/umd/languageservice/parser/jsonParser07.js.map +1 -1
- package/lib/umd/languageservice/parser/yaml-documents.js +23 -15
- package/lib/umd/languageservice/parser/yaml-documents.js.map +1 -1
- package/lib/umd/languageservice/parser/yamlParser07.js +1 -1
- package/lib/umd/languageservice/parser/yamlParser07.js.map +1 -1
- package/lib/umd/languageservice/services/documentSymbols.js +4 -4
- package/lib/umd/languageservice/services/documentSymbols.js.map +1 -1
- package/lib/umd/languageservice/services/schemaRequestHandler.js +6 -5
- package/lib/umd/languageservice/services/schemaRequestHandler.js.map +1 -1
- package/lib/umd/languageservice/services/validation/unused-anchors.js +5 -5
- package/lib/umd/languageservice/services/validation/unused-anchors.js.map +1 -1
- package/lib/umd/languageservice/services/validation/yaml-style.d.ts +12 -0
- package/lib/umd/languageservice/services/validation/yaml-style.js +39 -0
- package/lib/umd/languageservice/services/validation/yaml-style.js.map +1 -0
- package/lib/umd/languageservice/services/yamlCodeActions.d.ts +1 -0
- package/lib/umd/languageservice/services/yamlCodeActions.js +24 -2
- package/lib/umd/languageservice/services/yamlCodeActions.js.map +1 -1
- package/lib/umd/languageservice/services/yamlCodeLens.js +5 -20
- package/lib/umd/languageservice/services/yamlCodeLens.js.map +1 -1
- package/lib/umd/languageservice/services/yamlCompletion.d.ts +1 -1
- package/lib/umd/languageservice/services/yamlCompletion.js +91 -91
- package/lib/umd/languageservice/services/yamlCompletion.js.map +1 -1
- package/lib/umd/languageservice/services/yamlDefinition.js +3 -3
- package/lib/umd/languageservice/services/yamlDefinition.js.map +1 -1
- package/lib/umd/languageservice/services/yamlFolding.js.map +1 -1
- package/lib/umd/languageservice/services/yamlHover.js +5 -5
- package/lib/umd/languageservice/services/yamlHover.js.map +1 -1
- package/lib/umd/languageservice/services/yamlLinks.js +2 -2
- package/lib/umd/languageservice/services/yamlLinks.js.map +1 -1
- package/lib/umd/languageservice/services/yamlSchemaService.js +18 -4
- package/lib/umd/languageservice/services/yamlSchemaService.js.map +1 -1
- package/lib/umd/languageservice/services/yamlValidation.d.ts +2 -1
- package/lib/umd/languageservice/services/yamlValidation.js +16 -14
- package/lib/umd/languageservice/services/yamlValidation.js.map +1 -1
- package/lib/umd/languageservice/utils/astUtils.js +3 -3
- package/lib/umd/languageservice/utils/astUtils.js.map +1 -1
- package/lib/umd/languageservice/utils/flow-style-rewriter.d.ts +6 -0
- package/lib/umd/languageservice/utils/flow-style-rewriter.js +67 -0
- package/lib/umd/languageservice/utils/flow-style-rewriter.js.map +1 -0
- package/lib/umd/languageservice/utils/indentationGuesser.js +6 -6
- package/lib/umd/languageservice/utils/indentationGuesser.js.map +1 -1
- package/lib/umd/languageservice/utils/objects.js.map +1 -1
- package/lib/umd/languageservice/utils/paths.js +9 -6
- package/lib/umd/languageservice/utils/paths.js.map +1 -1
- package/lib/umd/languageservice/utils/schemaUrls.js +3 -3
- package/lib/umd/languageservice/utils/schemaUrls.js.map +1 -1
- package/lib/umd/languageservice/utils/schemaUtils.d.ts +1 -0
- package/lib/umd/languageservice/utils/schemaUtils.js +19 -2
- package/lib/umd/languageservice/utils/schemaUtils.js.map +1 -1
- package/lib/umd/languageservice/utils/strings.js +1 -1
- package/lib/umd/languageservice/utils/strings.js.map +1 -1
- package/lib/umd/languageservice/utils/textBuffer.js +1 -1
- package/lib/umd/languageservice/utils/textBuffer.js.map +1 -1
- package/lib/umd/languageservice/yamlLanguageService.d.ts +8 -0
- package/lib/umd/languageservice/yamlLanguageService.js +1 -1
- package/lib/umd/languageservice/yamlLanguageService.js.map +1 -1
- package/lib/umd/server.js +4 -4
- package/lib/umd/server.js.map +1 -1
- package/lib/umd/webworker/yamlServerMain.js +2 -2
- package/lib/umd/webworker/yamlServerMain.js.map +1 -1
- package/lib/umd/yamlServerInit.js +2 -2
- package/lib/umd/yamlServerInit.js.map +1 -1
- package/lib/umd/yamlSettings.d.ts +8 -0
- package/lib/umd/yamlSettings.js.map +1 -1
- package/out/server/src/index.js +7 -2
- package/out/server/src/index.js.map +1 -1
- package/out/server/src/languageserver/handlers/languageHandlers.js +1 -1
- package/out/server/src/languageserver/handlers/languageHandlers.js.map +1 -1
- package/out/server/src/languageserver/handlers/schemaSelectionHandlers.js +1 -1
- package/out/server/src/languageserver/handlers/schemaSelectionHandlers.js.map +1 -1
- package/out/server/src/languageserver/handlers/settingsHandlers.js +15 -8
- package/out/server/src/languageserver/handlers/settingsHandlers.js.map +1 -1
- package/out/server/src/languageserver/handlers/validationHandlers.js +2 -2
- package/out/server/src/languageserver/handlers/validationHandlers.js.map +1 -1
- package/out/server/src/languageservice/parser/ast-converter.js +11 -11
- package/out/server/src/languageservice/parser/ast-converter.js.map +1 -1
- package/out/server/src/languageservice/parser/custom-tag-provider.js +3 -3
- package/out/server/src/languageservice/parser/custom-tag-provider.js.map +1 -1
- package/out/server/src/languageservice/parser/jsonParser07.d.ts +15 -1
- package/out/server/src/languageservice/parser/jsonParser07.js +50 -33
- package/out/server/src/languageservice/parser/jsonParser07.js.map +1 -1
- package/out/server/src/languageservice/parser/yaml-documents.js +23 -15
- package/out/server/src/languageservice/parser/yaml-documents.js.map +1 -1
- package/out/server/src/languageservice/parser/yamlParser07.js +1 -1
- package/out/server/src/languageservice/parser/yamlParser07.js.map +1 -1
- package/out/server/src/languageservice/services/documentSymbols.js +4 -4
- package/out/server/src/languageservice/services/documentSymbols.js.map +1 -1
- package/out/server/src/languageservice/services/schemaRequestHandler.js +6 -5
- package/out/server/src/languageservice/services/schemaRequestHandler.js.map +1 -1
- package/out/server/src/languageservice/services/validation/unused-anchors.js +5 -5
- package/out/server/src/languageservice/services/validation/unused-anchors.js.map +1 -1
- package/out/server/src/languageservice/services/validation/yaml-style.d.ts +12 -0
- package/out/server/src/languageservice/services/validation/yaml-style.js +29 -0
- package/out/server/src/languageservice/services/validation/yaml-style.js.map +1 -0
- package/out/server/src/languageservice/services/yamlCodeActions.d.ts +1 -0
- package/out/server/src/languageservice/services/yamlCodeActions.js +23 -1
- package/out/server/src/languageservice/services/yamlCodeActions.js.map +1 -1
- package/out/server/src/languageservice/services/yamlCodeLens.js +4 -19
- package/out/server/src/languageservice/services/yamlCodeLens.js.map +1 -1
- package/out/server/src/languageservice/services/yamlCompletion.d.ts +1 -1
- package/out/server/src/languageservice/services/yamlCompletion.js +91 -91
- package/out/server/src/languageservice/services/yamlCompletion.js.map +1 -1
- package/out/server/src/languageservice/services/yamlDefinition.js +3 -3
- package/out/server/src/languageservice/services/yamlDefinition.js.map +1 -1
- package/out/server/src/languageservice/services/yamlFolding.js.map +1 -1
- package/out/server/src/languageservice/services/yamlHover.js +5 -5
- package/out/server/src/languageservice/services/yamlHover.js.map +1 -1
- package/out/server/src/languageservice/services/yamlLinks.js +2 -2
- package/out/server/src/languageservice/services/yamlLinks.js.map +1 -1
- package/out/server/src/languageservice/services/yamlSchemaService.js +17 -3
- package/out/server/src/languageservice/services/yamlSchemaService.js.map +1 -1
- package/out/server/src/languageservice/services/yamlValidation.d.ts +2 -1
- package/out/server/src/languageservice/services/yamlValidation.js +15 -13
- package/out/server/src/languageservice/services/yamlValidation.js.map +1 -1
- package/out/server/src/languageservice/utils/astUtils.js +3 -3
- package/out/server/src/languageservice/utils/astUtils.js.map +1 -1
- package/out/server/src/languageservice/utils/flow-style-rewriter.d.ts +6 -0
- package/out/server/src/languageservice/utils/flow-style-rewriter.js +57 -0
- package/out/server/src/languageservice/utils/flow-style-rewriter.js.map +1 -0
- package/out/server/src/languageservice/utils/indentationGuesser.js +6 -6
- package/out/server/src/languageservice/utils/indentationGuesser.js.map +1 -1
- package/out/server/src/languageservice/utils/objects.js.map +1 -1
- package/out/server/src/languageservice/utils/paths.js +9 -6
- package/out/server/src/languageservice/utils/paths.js.map +1 -1
- package/out/server/src/languageservice/utils/schemaUrls.js +3 -3
- package/out/server/src/languageservice/utils/schemaUrls.js.map +1 -1
- package/out/server/src/languageservice/utils/schemaUtils.d.ts +1 -0
- package/out/server/src/languageservice/utils/schemaUtils.js +18 -1
- package/out/server/src/languageservice/utils/schemaUtils.js.map +1 -1
- package/out/server/src/languageservice/utils/strings.js +1 -1
- package/out/server/src/languageservice/utils/strings.js.map +1 -1
- package/out/server/src/languageservice/utils/textBuffer.js +1 -1
- package/out/server/src/languageservice/utils/textBuffer.js.map +1 -1
- package/out/server/src/languageservice/yamlLanguageService.d.ts +8 -0
- package/out/server/src/languageservice/yamlLanguageService.js +1 -1
- package/out/server/src/languageservice/yamlLanguageService.js.map +1 -1
- package/out/server/src/server.js +4 -4
- package/out/server/src/server.js.map +1 -1
- package/out/server/src/webworker/yamlServerMain.js +2 -2
- package/out/server/src/webworker/yamlServerMain.js.map +1 -1
- package/out/server/src/yamlServerInit.js +2 -2
- package/out/server/src/yamlServerInit.js.map +1 -1
- package/out/server/src/yamlSettings.d.ts +8 -0
- package/out/server/src/yamlSettings.js.map +1 -1
- package/out/server/test/arrUtils.test.js +6 -6
- package/out/server/test/arrUtils.test.js.map +1 -1
- package/out/server/test/astUtils.test.js +18 -18
- package/out/server/test/astUtils.test.js.map +1 -1
- package/out/server/test/autoCompletion.test.js +158 -158
- package/out/server/test/autoCompletion.test.js.map +1 -1
- package/out/server/test/autoCompletionFix.test.js +513 -60
- package/out/server/test/autoCompletionFix.test.js.map +1 -1
- package/out/server/test/code-action-schema.test.js +12 -12
- package/out/server/test/code-action-schema.test.js.map +1 -1
- package/out/server/test/customTags.test.js +3 -3
- package/out/server/test/customTags.test.js.map +1 -1
- package/out/server/test/defaultSnippets.test.js +17 -7
- package/out/server/test/defaultSnippets.test.js.map +1 -1
- package/out/server/test/documentPositionCalculator.test.js +10 -10
- package/out/server/test/documentPositionCalculator.test.js.map +1 -1
- package/out/server/test/documentSymbols.test.js +62 -62
- package/out/server/test/documentSymbols.test.js.map +1 -1
- package/out/server/test/findLinks.test.js +2 -2
- package/out/server/test/findLinks.test.js.map +1 -1
- package/out/server/test/flow-style-rewriter.test.d.ts +1 -0
- package/out/server/test/flow-style-rewriter.test.js +79 -0
- package/out/server/test/flow-style-rewriter.test.js.map +1 -0
- package/out/server/test/formatter.test.js +2 -2
- package/out/server/test/formatter.test.js.map +1 -1
- package/out/server/test/hover.test.js +49 -7
- package/out/server/test/hover.test.js.map +1 -1
- package/out/server/test/integration.test.js +4 -4
- package/out/server/test/integration.test.js.map +1 -1
- package/out/server/test/jsonParser.test.js +6 -6
- package/out/server/test/jsonParser.test.js.map +1 -1
- package/out/server/test/multipleDocuments.test.js +4 -4
- package/out/server/test/multipleDocuments.test.js.map +1 -1
- package/out/server/test/objects.test.js +14 -14
- package/out/server/test/objects.test.js.map +1 -1
- package/out/server/test/paths.test.js +26 -26
- package/out/server/test/paths.test.js.map +1 -1
- package/out/server/test/schema.test.js +9 -9
- package/out/server/test/schema.test.js.map +1 -1
- package/out/server/test/schemaRequestHandler.test.js +3 -3
- package/out/server/test/schemaRequestHandler.test.js.map +1 -1
- package/out/server/test/schemaSelectionHandlers.test.js +4 -4
- package/out/server/test/schemaSelectionHandlers.test.js.map +1 -1
- package/out/server/test/schemaValidation.test.js +122 -47
- package/out/server/test/schemaValidation.test.js.map +1 -1
- package/out/server/test/settingsHandlers.test.js +23 -5
- package/out/server/test/settingsHandlers.test.js.map +1 -1
- package/out/server/test/strings.test.js +19 -19
- package/out/server/test/strings.test.js.map +1 -1
- package/out/server/test/telemetry.test.js +2 -2
- package/out/server/test/telemetry.test.js.map +1 -1
- package/out/server/test/textBuffer.test.js +1 -1
- package/out/server/test/utils/serviceSetup.d.ts +2 -0
- package/out/server/test/utils/serviceSetup.js +10 -0
- package/out/server/test/utils/serviceSetup.js.map +1 -1
- package/out/server/test/utils/testHelper.js +2 -2
- package/out/server/test/utils/testHelper.js.map +1 -1
- package/out/server/test/utils/verifyError.d.ts +1 -2
- package/out/server/test/utils/verifyError.js.map +1 -1
- package/out/server/test/yaml-documents.test.js +29 -29
- package/out/server/test/yaml-documents.test.js.map +1 -1
- package/out/server/test/yamlCodeActions.test.js +42 -15
- package/out/server/test/yamlCodeActions.test.js.map +1 -1
- package/out/server/test/yamlCodeLens.test.js +7 -7
- package/out/server/test/yamlCodeLens.test.js.map +1 -1
- package/out/server/test/yamlCommands.test.js +3 -3
- package/out/server/test/yamlCommands.test.js.map +1 -1
- package/out/server/test/yamlDefinition.test.js +5 -5
- package/out/server/test/yamlDefinition.test.js.map +1 -1
- package/out/server/test/yamlFolding.test.js +44 -44
- package/out/server/test/yamlFolding.test.js.map +1 -1
- package/out/server/test/yamlOnTypeFormatting.test.js +22 -22
- package/out/server/test/yamlOnTypeFormatting.test.js.map +1 -1
- package/out/server/test/yamlParser.test.js +24 -24
- package/out/server/test/yamlParser.test.js.map +1 -1
- package/out/server/test/yamlSchemaService.test.js +7 -7
- package/out/server/test/yamlSchemaService.test.js.map +1 -1
- package/out/server/test/yamlValidation.test.js +98 -22
- package/out/server/test/yamlValidation.test.js.map +1 -1
- package/package.json +5 -4
- package/lib/esm/languageservice/utils/ranges.d.ts +0 -7
- package/lib/esm/languageservice/utils/ranges.js +0 -31
- package/lib/esm/languageservice/utils/ranges.js.map +0 -1
- package/lib/umd/languageservice/utils/ranges.d.ts +0 -7
- package/lib/umd/languageservice/utils/ranges.js +0 -45
- package/lib/umd/languageservice/utils/ranges.js.map +0 -1
- package/out/server/src/languageservice/utils/ranges.d.ts +0 -7
- package/out/server/src/languageservice/utils/ranges.js +0 -35
- package/out/server/src/languageservice/utils/ranges.js.map +0 -1
|
@@ -22,12 +22,13 @@ const textBuffer_1 = require("../utils/textBuffer");
|
|
|
22
22
|
const yaml_documents_1 = require("../parser/yaml-documents");
|
|
23
23
|
const objects_1 = require("../utils/objects");
|
|
24
24
|
const unused_anchors_1 = require("./validation/unused-anchors");
|
|
25
|
+
const yaml_style_1 = require("./validation/yaml-style");
|
|
25
26
|
/**
|
|
26
27
|
* Convert a YAMLDocDiagnostic to a language server Diagnostic
|
|
27
28
|
* @param yamlDiag A YAMLDocDiagnostic from the parser
|
|
28
29
|
* @param textDocument TextDocument from the language server client
|
|
29
30
|
*/
|
|
30
|
-
|
|
31
|
+
const yamlDiagToLSDiag = (yamlDiag, textDocument) => {
|
|
31
32
|
const start = textDocument.positionAt(yamlDiag.location.start);
|
|
32
33
|
const range = {
|
|
33
34
|
start,
|
|
@@ -37,21 +38,28 @@ exports.yamlDiagToLSDiag = (yamlDiag, textDocument) => {
|
|
|
37
38
|
};
|
|
38
39
|
return vscode_languageserver_types_1.Diagnostic.create(range, yamlDiag.message, yamlDiag.severity, yamlDiag.code, jsonParser07_1.YAML_SOURCE);
|
|
39
40
|
};
|
|
41
|
+
exports.yamlDiagToLSDiag = yamlDiagToLSDiag;
|
|
40
42
|
class YAMLValidation {
|
|
41
43
|
constructor(schemaService, telemetry) {
|
|
42
44
|
this.telemetry = telemetry;
|
|
45
|
+
this.validators = [];
|
|
43
46
|
this.MATCHES_MULTIPLE = 'Matches multiple schemas when only one must validate.';
|
|
44
47
|
this.validationEnabled = true;
|
|
45
48
|
this.jsonValidation = new jsonValidation_1.JSONValidation(schemaService, Promise);
|
|
46
|
-
this.additionalValidation = new AdditionalValidation();
|
|
47
49
|
}
|
|
48
50
|
configure(settings) {
|
|
51
|
+
this.validators = [];
|
|
49
52
|
if (settings) {
|
|
50
53
|
this.validationEnabled = settings.validate;
|
|
51
54
|
this.customTags = settings.customTags;
|
|
52
55
|
this.disableAdditionalProperties = settings.disableAdditionalProperties;
|
|
53
56
|
this.yamlVersion = settings.yamlVersion;
|
|
57
|
+
// Add style validator if flow style is set to forbid only.
|
|
58
|
+
if (settings.flowMapping === 'forbid' || settings.flowSequence === 'forbid') {
|
|
59
|
+
this.validators.push(new yaml_style_1.YAMLStyleValidator(settings));
|
|
60
|
+
}
|
|
54
61
|
}
|
|
62
|
+
this.validators.push(new unused_anchors_1.UnusedAnchorsValidator());
|
|
55
63
|
}
|
|
56
64
|
doValidation(textDocument, isKubernetes = false) {
|
|
57
65
|
return __awaiter(this, void 0, void 0, function* () {
|
|
@@ -76,12 +84,12 @@ class YAMLValidation {
|
|
|
76
84
|
validationResult.push(...syd.warnings);
|
|
77
85
|
}
|
|
78
86
|
validationResult.push(...validation);
|
|
79
|
-
validationResult.push(...this.
|
|
87
|
+
validationResult.push(...this.runAdditionalValidators(textDocument, currentYAMLDoc));
|
|
80
88
|
index++;
|
|
81
89
|
}
|
|
82
90
|
}
|
|
83
91
|
catch (err) {
|
|
84
|
-
this.telemetry.sendError('yaml.validation.error', objects_1.convertErrorToTelemetryMsg(err));
|
|
92
|
+
this.telemetry.sendError('yaml.validation.error', (0, objects_1.convertErrorToTelemetryMsg)(err));
|
|
85
93
|
}
|
|
86
94
|
let previousErr;
|
|
87
95
|
const foundSignatures = new Set();
|
|
@@ -96,7 +104,7 @@ class YAMLValidation {
|
|
|
96
104
|
continue;
|
|
97
105
|
}
|
|
98
106
|
if (Object.prototype.hasOwnProperty.call(err, 'location')) {
|
|
99
|
-
err = exports.yamlDiagToLSDiag(err, textDocument);
|
|
107
|
+
err = (0, exports.yamlDiagToLSDiag)(err, textDocument);
|
|
100
108
|
}
|
|
101
109
|
if (!err.source) {
|
|
102
110
|
err.source = jsonParser07_1.YAML_SOURCE;
|
|
@@ -120,14 +128,7 @@ class YAMLValidation {
|
|
|
120
128
|
return duplicateMessagesRemoved;
|
|
121
129
|
});
|
|
122
130
|
}
|
|
123
|
-
|
|
124
|
-
exports.YAMLValidation = YAMLValidation;
|
|
125
|
-
class AdditionalValidation {
|
|
126
|
-
constructor() {
|
|
127
|
-
this.validators = [];
|
|
128
|
-
this.validators.push(new unused_anchors_1.UnusedAnchorsValidator());
|
|
129
|
-
}
|
|
130
|
-
validate(document, yarnDoc) {
|
|
131
|
+
runAdditionalValidators(document, yarnDoc) {
|
|
131
132
|
const result = [];
|
|
132
133
|
for (const validator of this.validators) {
|
|
133
134
|
result.push(...validator.validate(document, yarnDoc));
|
|
@@ -135,4 +136,5 @@ class AdditionalValidation {
|
|
|
135
136
|
return result;
|
|
136
137
|
}
|
|
137
138
|
}
|
|
139
|
+
exports.YAMLValidation = YAMLValidation;
|
|
138
140
|
//# sourceMappingURL=yamlValidation.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"yamlValidation.js","sourceRoot":"","sources":["../../../../../src/languageservice/services/yamlValidation.ts"],"names":[],"mappings":"AAAA;;;;gGAIgG;AAChG,YAAY,CAAC;;;;;;;;;;;;AAEb,6EAAmE;AAMnE,gGAA6F;AAC7F,yDAAqD;AACrD,oDAAiD;AACjD,6DAA8D;AAC9D,8CAA8D;AAG9D,gEAAqE;
|
|
1
|
+
{"version":3,"file":"yamlValidation.js","sourceRoot":"","sources":["../../../../../src/languageservice/services/yamlValidation.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,13 +8,13 @@ exports.isCollectionItem = exports.isInComment = exports.indexOf = exports.isMap
|
|
|
8
8
|
const yaml_1 = require("yaml");
|
|
9
9
|
function getParent(doc, nodeToFind) {
|
|
10
10
|
let parentNode;
|
|
11
|
-
yaml_1.visit(doc, (_, node, path) => {
|
|
11
|
+
(0, yaml_1.visit)(doc, (_, node, path) => {
|
|
12
12
|
if (node === nodeToFind) {
|
|
13
13
|
parentNode = path[path.length - 1];
|
|
14
14
|
return yaml_1.visit.BREAK;
|
|
15
15
|
}
|
|
16
16
|
});
|
|
17
|
-
if (yaml_1.isDocument(parentNode)) {
|
|
17
|
+
if ((0, yaml_1.isDocument)(parentNode)) {
|
|
18
18
|
return undefined;
|
|
19
19
|
}
|
|
20
20
|
return parentNode;
|
|
@@ -25,7 +25,7 @@ function isMapContainsEmptyPair(map) {
|
|
|
25
25
|
return false;
|
|
26
26
|
}
|
|
27
27
|
const pair = map.items[0];
|
|
28
|
-
if (yaml_1.isScalar(pair.key) && yaml_1.isScalar(pair.value) && pair.key.value === '' && !pair.value.value) {
|
|
28
|
+
if ((0, yaml_1.isScalar)(pair.key) && (0, yaml_1.isScalar)(pair.value) && pair.key.value === '' && !pair.value.value) {
|
|
29
29
|
return true;
|
|
30
30
|
}
|
|
31
31
|
return false;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"astUtils.js","sourceRoot":"","sources":["../../../../../src/languageservice/utils/astUtils.ts"],"names":[],"mappings":";AAAA;;;gGAGgG;;;AAEhG,+BAAqF;AAOrF,SAAgB,SAAS,CAAC,GAAa,EAAE,UAAoB;IAC3D,IAAI,UAAgB,CAAC;IACrB,YAAK,
|
|
1
|
+
{"version":3,"file":"astUtils.js","sourceRoot":"","sources":["../../../../../src/languageservice/utils/astUtils.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,57 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.FlowStyleRewriter = void 0;
|
|
4
|
+
const yaml_1 = require("yaml");
|
|
5
|
+
class FlowStyleRewriter {
|
|
6
|
+
constructor(indentation) {
|
|
7
|
+
this.indentation = indentation;
|
|
8
|
+
}
|
|
9
|
+
write(node) {
|
|
10
|
+
if (node.internalNode.srcToken['type'] !== 'flow-collection') {
|
|
11
|
+
return null;
|
|
12
|
+
}
|
|
13
|
+
const collection = node.internalNode.srcToken;
|
|
14
|
+
const blockType = collection.start.type === 'flow-map-start' ? 'block-map' : 'block-seq';
|
|
15
|
+
const parentType = node.parent.type;
|
|
16
|
+
const blockStyle = {
|
|
17
|
+
type: blockType,
|
|
18
|
+
offset: collection.offset,
|
|
19
|
+
indent: collection.indent,
|
|
20
|
+
items: [],
|
|
21
|
+
};
|
|
22
|
+
for (const item of collection.items) {
|
|
23
|
+
yaml_1.CST.visit(item, ({ key, sep, value }) => {
|
|
24
|
+
if (blockType === 'block-map') {
|
|
25
|
+
const start = [{ type: 'space', indent: 0, offset: key.offset, source: this.indentation }];
|
|
26
|
+
if (parentType === 'property') {
|
|
27
|
+
// add a new line if part of a map
|
|
28
|
+
start.unshift({ type: 'newline', indent: 0, offset: key.offset, source: '\n' });
|
|
29
|
+
}
|
|
30
|
+
blockStyle.items.push({
|
|
31
|
+
start: start,
|
|
32
|
+
key: key,
|
|
33
|
+
sep: sep,
|
|
34
|
+
value: value,
|
|
35
|
+
});
|
|
36
|
+
}
|
|
37
|
+
else if (blockType === 'block-seq') {
|
|
38
|
+
blockStyle.items.push({
|
|
39
|
+
start: [
|
|
40
|
+
{ type: 'newline', indent: 0, offset: value.offset, source: '\n' },
|
|
41
|
+
{ type: 'space', indent: 0, offset: value.offset, source: this.indentation },
|
|
42
|
+
{ type: 'seq-item-ind', indent: 0, offset: value.offset, source: '-' },
|
|
43
|
+
{ type: 'space', indent: 0, offset: value.offset, source: ' ' },
|
|
44
|
+
],
|
|
45
|
+
value: value,
|
|
46
|
+
});
|
|
47
|
+
}
|
|
48
|
+
if (value.type === 'flow-collection') {
|
|
49
|
+
return yaml_1.visit.SKIP;
|
|
50
|
+
}
|
|
51
|
+
});
|
|
52
|
+
}
|
|
53
|
+
return yaml_1.CST.stringify(blockStyle);
|
|
54
|
+
}
|
|
55
|
+
}
|
|
56
|
+
exports.FlowStyleRewriter = FlowStyleRewriter;
|
|
57
|
+
//# sourceMappingURL=flow-style-rewriter.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"flow-style-rewriter.js","sourceRoot":"","sources":["../../../../../src/languageservice/utils/flow-style-rewriter.ts"],"names":[],"mappings":";;;AAAA,+BAAkC;AAIlC,MAAa,iBAAiB;IAC5B,YAA6B,WAAmB;QAAnB,gBAAW,GAAX,WAAW,CAAQ;IAAG,CAAC;IAE7C,KAAK,CAAC,IAAa;QACxB,IAAI,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,MAAM,CAAC,KAAK,iBAAiB,EAAE;YAC5D,OAAO,IAAI,CAAC;SACb;QACD,MAAM,UAAU,GAAuB,IAAI,CAAC,YAAY,CAAC,QAA8B,CAAC;QACxF,MAAM,SAAS,GAAG,UAAU,CAAC,KAAK,CAAC,IAAI,KAAK,gBAAgB,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,WAAW,CAAC;QACzF,MAAM,UAAU,GAAG,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC;QAEpC,MAAM,UAAU,GAAG;YACjB,IAAI,EAAE,SAAS;YACf,MAAM,EAAE,UAAU,CAAC,MAAM;YACzB,MAAM,EAAE,UAAU,CAAC,MAAM;YACzB,KAAK,EAAE,EAAE;SACV,CAAC;QAEF,KAAK,MAAM,IAAI,IAAI,UAAU,CAAC,KAAK,EAAE;YACnC,UAAG,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,EAAE,EAAE;gBACtC,IAAI,SAAS,KAAK,WAAW,EAAE;oBAC7B,MAAM,KAAK,GAAG,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,CAAC,WAAW,EAAiB,CAAC,CAAC;oBAC1G,IAAI,UAAU,KAAK,UAAU,EAAE;wBAC7B,kCAAkC;wBAClC,KAAK,CAAC,OAAO,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAiB,CAAC,CAAC;qBAChG;oBACD,UAAU,CAAC,KAAK,CAAC,IAAI,CAAC;wBACpB,KAAK,EAAE,KAAK;wBACZ,GAAG,EAAE,GAAG;wBACR,GAAG,EAAE,GAAG;wBACR,KAAK,EAAE,KAAK;qBACb,CAAC,CAAC;iBACJ;qBAAM,IAAI,SAAS,KAAK,WAAW,EAAE;oBACpC,UAAU,CAAC,KAAK,CAAC,IAAI,CAAC;wBACpB,KAAK,EAAE;4BACL,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,EAAE,KAAK,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAiB;4BACjF,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,EAAE,KAAK,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,CAAC,WAAW,EAAiB;4BAC3F,EAAE,IAAI,EAAE,cAAc,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,EAAE,KAAK,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,EAAiB;4BACrF,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,EAAE,KAAK,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,EAAiB;yBAC/E;wBACD,KAAK,EAAE,KAAK;qBACb,CAAC,CAAC;iBACJ;gBACD,IAAI,KAAK,CAAC,IAAI,KAAK,iBAAiB,EAAE;oBACpC,OAAO,YAAK,CAAC,IAAI,CAAC;iBACnB;YACH,CAAC,CAAC,CAAC;SACJ;QACD,OAAO,UAAG,CAAC,SAAS,CAAC,UAAuB,CAAC,CAAC;IAChD,CAAC;CACF;AAlDD,8CAkDC"}
|
|
@@ -32,7 +32,7 @@ function spacesDiff(a, aLength, b, bLength, result) {
|
|
|
32
32
|
let aSpacesCnt = 0, aTabsCount = 0;
|
|
33
33
|
for (let j = i; j < aLength; j++) {
|
|
34
34
|
const aCharCode = a.charCodeAt(j);
|
|
35
|
-
if (aCharCode === 32 /* Space */) {
|
|
35
|
+
if (aCharCode === 32 /* CharCode.Space */) {
|
|
36
36
|
aSpacesCnt++;
|
|
37
37
|
}
|
|
38
38
|
else {
|
|
@@ -42,7 +42,7 @@ function spacesDiff(a, aLength, b, bLength, result) {
|
|
|
42
42
|
let bSpacesCnt = 0, bTabsCount = 0;
|
|
43
43
|
for (let j = i; j < bLength; j++) {
|
|
44
44
|
const bCharCode = b.charCodeAt(j);
|
|
45
|
-
if (bCharCode === 32 /* Space */) {
|
|
45
|
+
if (bCharCode === 32 /* CharCode.Space */) {
|
|
46
46
|
bSpacesCnt++;
|
|
47
47
|
}
|
|
48
48
|
else {
|
|
@@ -62,8 +62,8 @@ function spacesDiff(a, aLength, b, bLength, result) {
|
|
|
62
62
|
// sometime folks like to align their code, but this should not be used as a hint
|
|
63
63
|
result.spacesDiff = spacesDiff;
|
|
64
64
|
if (spacesDiff > 0 && 0 <= bSpacesCnt - 1 && bSpacesCnt - 1 < a.length && bSpacesCnt < b.length) {
|
|
65
|
-
if (b.charCodeAt(bSpacesCnt) !== 32 /* Space */ && a.charCodeAt(bSpacesCnt - 1) === 32 /* Space */) {
|
|
66
|
-
if (a.charCodeAt(a.length - 1) === 44 /* Comma */) {
|
|
65
|
+
if (b.charCodeAt(bSpacesCnt) !== 32 /* CharCode.Space */ && a.charCodeAt(bSpacesCnt - 1) === 32 /* CharCode.Space */) {
|
|
66
|
+
if (a.charCodeAt(a.length - 1) === 44 /* CharCode.Comma */) {
|
|
67
67
|
// This looks like an alignment desire: e.g.
|
|
68
68
|
// const a = b + c,
|
|
69
69
|
// d = b - c;
|
|
@@ -101,10 +101,10 @@ function guessIndentation(source, defaultTabSize, defaultInsertSpaces) {
|
|
|
101
101
|
let currentLineTabsCount = 0; // count of tabs found in `currentLineText` indentation
|
|
102
102
|
for (let j = 0, lenJ = currentLineLength; j < lenJ; j++) {
|
|
103
103
|
const charCode = useCurrentLineText ? currentLineText.charCodeAt(j) : source.getLineCharCode(lineNumber, j);
|
|
104
|
-
if (charCode === 9 /* Tab */) {
|
|
104
|
+
if (charCode === 9 /* CharCode.Tab */) {
|
|
105
105
|
currentLineTabsCount++;
|
|
106
106
|
}
|
|
107
|
-
else if (charCode === 32 /* Space */) {
|
|
107
|
+
else if (charCode === 32 /* CharCode.Space */) {
|
|
108
108
|
currentLineSpacesCount++;
|
|
109
109
|
}
|
|
110
110
|
else {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"indentationGuesser.js","sourceRoot":"","sources":["../../../../../src/languageservice/utils/indentationGuesser.ts"],"names":[],"mappings":";AAAA;;;gGAGgG;;;AAOhG,MAAM,gBAAgB;IAAtB;QACS,eAAU,GAAG,CAAC,CAAC;QACf,uBAAkB,GAAG,KAAK,CAAC;IACpC,CAAC;CAAA;AAED;;GAEG;AACH,SAAS,UAAU,CAAC,CAAS,EAAE,OAAe,EAAE,CAAS,EAAE,OAAe,EAAE,MAAwB;IAClG,MAAM,CAAC,UAAU,GAAG,CAAC,CAAC;IACtB,MAAM,CAAC,kBAAkB,GAAG,KAAK,CAAC;IAElC,gCAAgC;IAChC,aAAa;IACb,iBAAiB;IACjB,2CAA2C;IAE3C,IAAI,CAAS,CAAC;IAEd,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,OAAO,IAAI,CAAC,GAAG,OAAO,EAAE,CAAC,EAAE,EAAE;QAC3C,MAAM,SAAS,GAAG,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;QAClC,MAAM,SAAS,GAAG,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;QAElC,IAAI,SAAS,KAAK,SAAS,EAAE;YAC3B,MAAM;SACP;KACF;IAED,IAAI,UAAU,GAAG,CAAC,EAChB,UAAU,GAAG,CAAC,CAAC;IACjB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,OAAO,EAAE,CAAC,EAAE,EAAE;QAChC,MAAM,SAAS,GAAG,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;QAClC,IAAI,SAAS,
|
|
1
|
+
{"version":3,"file":"indentationGuesser.js","sourceRoot":"","sources":["../../../../../src/languageservice/utils/indentationGuesser.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"objects.js","sourceRoot":"","sources":["../../../../../src/languageservice/utils/objects.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"objects.js","sourceRoot":"","sources":["../../../../../src/languageservice/utils/objects.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,11 +3,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.workspaceFoldersChanged = exports.relativeToAbsolutePath = exports.isRelativePath = void 0;
|
|
4
4
|
const path_1 = require("path");
|
|
5
5
|
const vscode_uri_1 = require("vscode-uri");
|
|
6
|
-
|
|
6
|
+
const isRelativePath = (path) => {
|
|
7
7
|
const relativePathRegex = /^(((\.\.?)|([\w-@. ]+))(\/|\\\\?))*[\w-. ]*\.[\w-]+$/i;
|
|
8
8
|
return relativePathRegex.test(path);
|
|
9
9
|
};
|
|
10
|
-
exports.
|
|
10
|
+
exports.isRelativePath = isRelativePath;
|
|
11
|
+
const relativeToAbsolutePath = (workspaceFolders, workspaceRoot, uri) => {
|
|
11
12
|
// Iterate through all of the workspace root folders
|
|
12
13
|
for (const folder of workspaceFolders) {
|
|
13
14
|
// If the requested schema URI specifies a workspace root folder
|
|
@@ -16,18 +17,19 @@ exports.relativeToAbsolutePath = (workspaceFolders, workspaceRoot, uri) => {
|
|
|
16
17
|
const pathToFolder = vscode_uri_1.URI.parse(folder.uri).fsPath;
|
|
17
18
|
const withoutFolderPrefix = uri.split(path_1.sep);
|
|
18
19
|
withoutFolderPrefix.shift();
|
|
19
|
-
return vscode_uri_1.URI.file(path_1.join(pathToFolder, withoutFolderPrefix.join())).toString();
|
|
20
|
+
return vscode_uri_1.URI.file((0, path_1.join)(pathToFolder, withoutFolderPrefix.join())).toString();
|
|
20
21
|
}
|
|
21
22
|
}
|
|
22
23
|
// If a root folder was not specified, resolve the relative URI
|
|
23
24
|
// Against the location of the workspace file instead
|
|
24
25
|
if (workspaceRoot) {
|
|
25
|
-
return vscode_uri_1.URI.file(path_1.join(workspaceRoot.fsPath, uri)).toString();
|
|
26
|
+
return vscode_uri_1.URI.file((0, path_1.join)(workspaceRoot.fsPath, uri)).toString();
|
|
26
27
|
}
|
|
27
28
|
// Fallback in case nothing could be applied
|
|
28
|
-
return path_1.normalize(uri);
|
|
29
|
+
return (0, path_1.normalize)(uri);
|
|
29
30
|
};
|
|
30
|
-
exports.
|
|
31
|
+
exports.relativeToAbsolutePath = relativeToAbsolutePath;
|
|
32
|
+
const workspaceFoldersChanged = (workspaceFolders, changedFolders) => {
|
|
31
33
|
workspaceFolders = workspaceFolders.filter((e) => {
|
|
32
34
|
return !changedFolders.removed.some((f) => {
|
|
33
35
|
return f.uri === e.uri;
|
|
@@ -42,4 +44,5 @@ exports.workspaceFoldersChanged = (workspaceFolders, changedFolders) => {
|
|
|
42
44
|
.concat(changedFolders.added);
|
|
43
45
|
return workspaceFolders;
|
|
44
46
|
};
|
|
47
|
+
exports.workspaceFoldersChanged = workspaceFoldersChanged;
|
|
45
48
|
//# sourceMappingURL=paths.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"paths.js","sourceRoot":"","sources":["../../../../../src/languageservice/utils/paths.ts"],"names":[],"mappings":";;;AACA,+BAA4C;AAC5C,2CAAiC;
|
|
1
|
+
{"version":3,"file":"paths.js","sourceRoot":"","sources":["../../../../../src/languageservice/utils/paths.ts"],"names":[],"mappings":";;;AACA,+BAA4C;AAC5C,2CAAiC;AAE1B,MAAM,cAAc,GAAG,CAAC,IAAY,EAAW,EAAE;IACtD,MAAM,iBAAiB,GAAG,uDAAuD,CAAC;IAClF,OAAO,iBAAiB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AACtC,CAAC,CAAC;AAHW,QAAA,cAAc,kBAGzB;AAEK,MAAM,sBAAsB,GAAG,CAAC,gBAAmC,EAAE,aAAkB,EAAE,GAAW,EAAU,EAAE;IACrH,oDAAoD;IACpD,KAAK,MAAM,MAAM,IAAI,gBAAgB,EAAE;QACrC,gEAAgE;QAChE,yEAAyE;QACzE,IAAI,GAAG,CAAC,UAAU,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE;YAC/B,MAAM,YAAY,GAAG,gBAAG,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC;YAClD,MAAM,mBAAmB,GAAG,GAAG,CAAC,KAAK,CAAC,UAAG,CAAC,CAAC;YAC3C,mBAAmB,CAAC,KAAK,EAAE,CAAC;YAE5B,OAAO,gBAAG,CAAC,IAAI,CAAC,IAAA,WAAI,EAAC,YAAY,EAAE,mBAAmB,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC;SAC5E;KACF;IAED,+DAA+D;IAC/D,qDAAqD;IACrD,IAAI,aAAa,EAAE;QACjB,OAAO,gBAAG,CAAC,IAAI,CAAC,IAAA,WAAI,EAAC,aAAa,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC;KAC7D;IAED,4CAA4C;IAC5C,OAAO,IAAA,gBAAS,EAAC,GAAG,CAAC,CAAC;AACxB,CAAC,CAAC;AAtBW,QAAA,sBAAsB,0BAsBjC;AAEK,MAAM,uBAAuB,GAAG,CACrC,gBAAmC,EACnC,cAA2C,EACxB,EAAE;IACrB,gBAAgB,GAAG,gBAAgB,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE;QAC/C,OAAO,CAAC,cAAc,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE;YACxC,OAAO,CAAC,CAAC,GAAG,KAAK,CAAC,CAAC,GAAG,CAAC;QACzB,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IACH,gBAAgB,GAAG,gBAAgB;SAChC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE;QACZ,OAAO,CAAC,cAAc,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE;YACtC,OAAO,CAAC,CAAC,GAAG,KAAK,CAAC,CAAC,GAAG,CAAC;QACzB,CAAC,CAAC,CAAC;IACL,CAAC,CAAC;SACD,MAAM,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC;IAChC,OAAO,gBAAgB,CAAC;AAC1B,CAAC,CAAC;AAjBW,QAAA,uBAAuB,2BAiBlC"}
|
|
@@ -10,8 +10,8 @@ function checkSchemaURI(workspaceFolders, workspaceRoot, uri, telemetry) {
|
|
|
10
10
|
telemetry.send({ name: 'yaml.schema.configured', properties: { kubernetes: true } });
|
|
11
11
|
return exports.KUBERNETES_SCHEMA_URL;
|
|
12
12
|
}
|
|
13
|
-
else if (paths_1.isRelativePath(uri)) {
|
|
14
|
-
return paths_1.relativeToAbsolutePath(workspaceFolders, workspaceRoot, uri);
|
|
13
|
+
else if ((0, paths_1.isRelativePath)(uri)) {
|
|
14
|
+
return (0, paths_1.relativeToAbsolutePath)(workspaceFolders, workspaceRoot, uri);
|
|
15
15
|
}
|
|
16
16
|
else {
|
|
17
17
|
return uri;
|
|
@@ -55,7 +55,7 @@ function addSchemasForOf(schema, result) {
|
|
|
55
55
|
}
|
|
56
56
|
function addInnerSchemaUrls(schemas, result) {
|
|
57
57
|
for (const subSchema of schemas) {
|
|
58
|
-
if (!objects_1.isBoolean(subSchema)) {
|
|
58
|
+
if (!(0, objects_1.isBoolean)(subSchema)) {
|
|
59
59
|
if (subSchema.url && !result.has(subSchema.url)) {
|
|
60
60
|
result.set(subSchema.url, subSchema);
|
|
61
61
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"schemaUrls.js","sourceRoot":"","sources":["../../../../../src/languageservice/utils/schemaUrls.ts"],"names":[],"mappings":";;;AAIA,uCAAsC;AACtC,mCAAiE;AAEpD,QAAA,qBAAqB,GAChC,0GAA0G,CAAC;AAChG,QAAA,oBAAoB,GAAG,mDAAmD,CAAC;AAExF,SAAgB,cAAc,CAC5B,gBAAmC,EACnC,aAAkB,EAClB,GAAW,EACX,SAAoB;IAEpB,IAAI,GAAG,CAAC,IAAI,EAAE,CAAC,WAAW,EAAE,KAAK,YAAY,EAAE;QAC7C,SAAS,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,wBAAwB,EAAE,UAAU,EAAE,EAAE,UAAU,EAAE,IAAI,EAAE,EAAE,CAAC,CAAC;QACrF,OAAO,6BAAqB,CAAC;KAC9B;SAAM,IAAI,sBAAc,
|
|
1
|
+
{"version":3,"file":"schemaUrls.js","sourceRoot":"","sources":["../../../../../src/languageservice/utils/schemaUrls.ts"],"names":[],"mappings":";;;AAIA,uCAAsC;AACtC,mCAAiE;AAEpD,QAAA,qBAAqB,GAChC,0GAA0G,CAAC;AAChG,QAAA,oBAAoB,GAAG,mDAAmD,CAAC;AAExF,SAAgB,cAAc,CAC5B,gBAAmC,EACnC,aAAkB,EAClB,GAAW,EACX,SAAoB;IAEpB,IAAI,GAAG,CAAC,IAAI,EAAE,CAAC,WAAW,EAAE,KAAK,YAAY,EAAE;QAC7C,SAAS,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,wBAAwB,EAAE,UAAU,EAAE,EAAE,UAAU,EAAE,IAAI,EAAE,EAAE,CAAC,CAAC;QACrF,OAAO,6BAAqB,CAAC;KAC9B;SAAM,IAAI,IAAA,sBAAc,EAAC,GAAG,CAAC,EAAE;QAC9B,OAAO,IAAA,8BAAsB,EAAC,gBAAgB,EAAE,aAAa,EAAE,GAAG,CAAC,CAAC;KACrE;SAAM;QACL,OAAO,GAAG,CAAC;KACZ;AACH,CAAC;AAdD,wCAcC;AAED;;;;GAIG;AACH,SAAgB,aAAa,CAAC,MAAkB;IAC9C,MAAM,MAAM,GAAG,IAAI,GAAG,EAAsB,CAAC;IAC7C,IAAI,CAAC,MAAM,EAAE;QACX,OAAO,MAAM,CAAC;KACf;IAED,IAAI,MAAM,CAAC,GAAG,EAAE;QACd,IAAI,MAAM,CAAC,GAAG,CAAC,UAAU,CAAC,iCAAiC,CAAC,EAAE;YAC5D,eAAe,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;SACjC;aAAM;YACL,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;SAChC;KACF;SAAM;QACL,eAAe,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;KACjC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC;AAhBD,sCAgBC;AAED,SAAS,eAAe,CAAC,MAAkB,EAAE,MAA+B;IAC1E,IAAI,MAAM,CAAC,KAAK,EAAE;QAChB,kBAAkB,CAAC,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;KAC1C;IACD,IAAI,MAAM,CAAC,KAAK,EAAE;QAChB,kBAAkB,CAAC,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;KAC1C;IACD,IAAI,MAAM,CAAC,KAAK,EAAE;QAChB,kBAAkB,CAAC,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;KAC1C;AACH,CAAC;AAED,SAAS,kBAAkB,CAAC,OAAwB,EAAE,MAA+B;IACnF,KAAK,MAAM,SAAS,IAAI,OAAO,EAAE;QAC/B,IAAI,CAAC,IAAA,mBAAS,EAAC,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"}
|
|
@@ -14,3 +14,4 @@ export declare function getSchemaTypeName(schema: JSONSchema): string;
|
|
|
14
14
|
* test: https://regex101.com/r/ZpuXxk/1
|
|
15
15
|
*/
|
|
16
16
|
export declare function getSchemaRefTypeTitle($ref: string): string;
|
|
17
|
+
export declare function getSchemaTitle(schema: JSONSchema, url: string): string;
|
|
@@ -1,6 +1,8 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.getSchemaRefTypeTitle = exports.getSchemaTypeName = void 0;
|
|
3
|
+
exports.getSchemaTitle = exports.getSchemaRefTypeTitle = exports.getSchemaTypeName = void 0;
|
|
4
|
+
const vscode_uri_1 = require("vscode-uri");
|
|
5
|
+
const path = require("path");
|
|
4
6
|
function getSchemaTypeName(schema) {
|
|
5
7
|
if (schema.title) {
|
|
6
8
|
return schema.title;
|
|
@@ -40,4 +42,19 @@ function getSchemaRefTypeTitle($ref) {
|
|
|
40
42
|
return type;
|
|
41
43
|
}
|
|
42
44
|
exports.getSchemaRefTypeTitle = getSchemaRefTypeTitle;
|
|
45
|
+
function getSchemaTitle(schema, url) {
|
|
46
|
+
const uri = vscode_uri_1.URI.parse(url);
|
|
47
|
+
let baseName = path.basename(uri.fsPath);
|
|
48
|
+
if (!path.extname(uri.fsPath)) {
|
|
49
|
+
baseName += '.json';
|
|
50
|
+
}
|
|
51
|
+
if (Object.getOwnPropertyDescriptor(schema, 'name')) {
|
|
52
|
+
return Object.getOwnPropertyDescriptor(schema, 'name').value + ` (${baseName})`;
|
|
53
|
+
}
|
|
54
|
+
else if (schema.title) {
|
|
55
|
+
return schema.title + ` (${baseName})`;
|
|
56
|
+
}
|
|
57
|
+
return baseName;
|
|
58
|
+
}
|
|
59
|
+
exports.getSchemaTitle = getSchemaTitle;
|
|
43
60
|
//# sourceMappingURL=schemaUtils.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"schemaUtils.js","sourceRoot":"","sources":["../../../../../src/languageservice/utils/schemaUtils.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"schemaUtils.js","sourceRoot":"","sources":["../../../../../src/languageservice/utils/schemaUtils.ts"],"names":[],"mappings":";;;AAAA,2CAAiC;AAEjC,6BAA6B;AAE7B,SAAgB,iBAAiB,CAAC,MAAkB;IAClD,IAAI,MAAM,CAAC,KAAK,EAAE;QAChB,OAAO,MAAM,CAAC,KAAK,CAAC;KACrB;IACD,IAAI,MAAM,CAAC,GAAG,EAAE;QACd,MAAM,IAAI,GAAG,qBAAqB,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QAC/C,OAAO,IAAI,CAAC;KACb;IACD,IAAI,MAAM,CAAC,IAAI,IAAI,MAAM,CAAC,KAAK,EAAE;QAC/B,MAAM,IAAI,GAAG,qBAAqB,CAAC,MAAM,CAAC,IAAI,IAAI,MAAM,CAAC,KAAK,CAAC,CAAC;QAChE,OAAO,IAAI,CAAC;KACb;IACD,MAAM,OAAO,GAAG,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;IACrH,OAAO,OAAO,CAAC;AACjB,CAAC;AAdD,8CAcC;AAED;;;;;;;;;;;;GAYG;AACH,SAAgB,qBAAqB,CAAC,IAAY;IAChD,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,qCAAqC,CAAC,CAAC;IAChE,IAAI,IAAI,GAAG,CAAC,CAAC,KAAK,IAAI,KAAK,CAAC,CAAC,CAAC,CAAC;IAC/B,IAAI,CAAC,IAAI,EAAE;QACT,IAAI,GAAG,cAAc,CAAC;QACtB,OAAO,CAAC,KAAK,CAAC,SAAS,IAAI,uBAAuB,CAAC,CAAC;KACrD;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AARD,sDAQC;AAED,SAAgB,cAAc,CAAC,MAAkB,EAAE,GAAW;IAC5D,MAAM,GAAG,GAAG,gBAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAC3B,IAAI,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;IACzC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE;QAC7B,QAAQ,IAAI,OAAO,CAAC;KACrB;IACD,IAAI,MAAM,CAAC,wBAAwB,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE;QACnD,OAAO,MAAM,CAAC,wBAAwB,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,KAAK,GAAG,KAAK,QAAQ,GAAG,CAAC;KACjF;SAAM,IAAI,MAAM,CAAC,KAAK,EAAE;QACvB,OAAO,MAAM,CAAC,KAAK,GAAG,KAAK,QAAQ,GAAG,CAAC;KACxC;IAED,OAAO,QAAQ,CAAC;AAClB,CAAC;AAbD,wCAaC"}
|
|
@@ -54,7 +54,7 @@ function getIndentation(lineContent, position) {
|
|
|
54
54
|
}
|
|
55
55
|
for (let i = 0; i < position; i++) {
|
|
56
56
|
const char = lineContent.charCodeAt(i);
|
|
57
|
-
if (char !== 32 /* Space */ && char !== 9 /* Tab */) {
|
|
57
|
+
if (char !== 32 /* CharCode.Space */ && char !== 9 /* CharCode.Tab */) {
|
|
58
58
|
return i;
|
|
59
59
|
}
|
|
60
60
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"strings.js","sourceRoot":"","sources":["../../../../../src/languageservice/utils/strings.ts"],"names":[],"mappings":"AAAA;;;gGAGgG;AAChG,YAAY,CAAC;;;AAIb,SAAgB,UAAU,CAAC,QAAgB,EAAE,MAAc;IACzD,IAAI,QAAQ,CAAC,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE;QACnC,OAAO,KAAK,CAAC;KACd;IAED,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;QACtC,IAAI,QAAQ,CAAC,CAAC,CAAC,KAAK,MAAM,CAAC,CAAC,CAAC,EAAE;YAC7B,OAAO,KAAK,CAAC;SACd;KACF;IAED,OAAO,IAAI,CAAC;AACd,CAAC;AAZD,gCAYC;AAED;;GAEG;AACH,SAAgB,QAAQ,CAAC,QAAgB,EAAE,MAAc;IACvD,MAAM,IAAI,GAAG,QAAQ,CAAC,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC;IAC7C,IAAI,IAAI,GAAG,CAAC,EAAE;QACZ,OAAO,QAAQ,CAAC,WAAW,CAAC,MAAM,CAAC,KAAK,IAAI,CAAC;KAC9C;SAAM,IAAI,IAAI,KAAK,CAAC,EAAE;QACrB,OAAO,QAAQ,KAAK,MAAM,CAAC;KAC5B;SAAM;QACL,OAAO,KAAK,CAAC;KACd;AACH,CAAC;AATD,4BASC;AAED,SAAgB,oBAAoB,CAAC,OAAe;IAClD,MAAM,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC,IAAI,MAAM,CAAC,oBAAoB,CAAC,CAAC,CAAC;IAC9D,OAAO,KAAK,CAAC,CAAC,CAAC,yBAAyB,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,2BAA2B,CAAC,OAAO,CAAC,CAAC;AACtG,CAAC;AAHD,oDAGC;AAED,SAAS,2BAA2B,CAAC,OAAe;IAClD,OAAO,IAAI,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,yBAAyB,EAAE,MAAM,CAAC,CAAC,OAAO,CAAC,MAAM,EAAE,IAAI,CAAC,GAAG,GAAG,CAAC,CAAC;AACpG,CAAC;AAED,SAAS,yBAAyB,CAAC,OAAe,EAAE,IAAY;IAC9D,OAAO,IAAI,MAAM,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;AACnC,CAAC;AAED,SAAgB,2BAA2B,CAAC,OAAe;IACzD,OAAO,OAAO,CAAC,OAAO,CAAC,yBAAyB,EAAE,MAAM,CAAC,CAAC,OAAO,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;AAClF,CAAC;AAFD,kEAEC;AAED,SAAgB,cAAc,CAAC,WAAmB,EAAE,QAAgB;IAClE,IAAI,WAAW,CAAC,MAAM,GAAG,QAAQ,EAAE;QACjC,OAAO,CAAC,CAAC;KACV;IAED,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,QAAQ,EAAE,CAAC,EAAE,EAAE;QACjC,MAAM,IAAI,GAAG,WAAW,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;QACvC,IAAI,IAAI,
|
|
1
|
+
{"version":3,"file":"strings.js","sourceRoot":"","sources":["../../../../../src/languageservice/utils/strings.ts"],"names":[],"mappings":"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"}
|
|
@@ -36,7 +36,7 @@ class TextBuffer {
|
|
|
36
36
|
return this.doc.getText().substring(lineOffsets[lineNumber], nextLineOffset);
|
|
37
37
|
}
|
|
38
38
|
getLineCharCode(lineNumber, index) {
|
|
39
|
-
return this.doc.getText(vscode_languageserver_types_1.Range.create(lineNumber - 1, index
|
|
39
|
+
return this.doc.getText(vscode_languageserver_types_1.Range.create(lineNumber - 1, index, lineNumber - 1, index + 1)).charCodeAt(0);
|
|
40
40
|
}
|
|
41
41
|
getText(range) {
|
|
42
42
|
return this.doc.getText(range);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"textBuffer.js","sourceRoot":"","sources":["../../../../../src/languageservice/utils/textBuffer.ts"],"names":[],"mappings":";AAAA;;;gGAGgG;;;AAGhG,6EAA8D;AAM9D,MAAa,UAAU;IACrB,YAAoB,GAAiB;QAAjB,QAAG,GAAH,GAAG,CAAc;IAAG,CAAC;IAEzC,YAAY;QACV,OAAO,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC;IAC5B,CAAC;IAED,aAAa,CAAC,UAAkB;QAC9B,MAAM,WAAW,GAAK,IAAI,CAAC,GAAoC,CAAC,cAAc,EAAE,CAAC;QACjF,IAAI,UAAU,IAAI,WAAW,CAAC,MAAM,EAAE;YACpC,OAAO,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC,MAAM,CAAC;SAClC;aAAM,IAAI,UAAU,GAAG,CAAC,EAAE;YACzB,OAAO,CAAC,CAAC;SACV;QAED,MAAM,cAAc,GAAG,UAAU,GAAG,CAAC,GAAG,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC,WAAW,CAAC,UAAU,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC,MAAM,CAAC;QACrH,OAAO,cAAc,GAAG,WAAW,CAAC,UAAU,CAAC,CAAC;IAClD,CAAC;IAED,cAAc,CAAC,UAAkB;QAC/B,MAAM,WAAW,GAAK,IAAI,CAAC,GAAoC,CAAC,cAAc,EAAE,CAAC;QACjF,IAAI,UAAU,IAAI,WAAW,CAAC,MAAM,EAAE;YACpC,OAAO,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC;SAC3B;aAAM,IAAI,UAAU,GAAG,CAAC,EAAE;YACzB,OAAO,EAAE,CAAC;SACX;QACD,MAAM,cAAc,GAAG,UAAU,GAAG,CAAC,GAAG,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC,WAAW,CAAC,UAAU,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC,MAAM,CAAC;QACrH,OAAO,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC,SAAS,CAAC,WAAW,CAAC,UAAU,CAAC,EAAE,cAAc,CAAC,CAAC;IAC/E,CAAC;IAED,eAAe,CAAC,UAAkB,EAAE,KAAa;QAC/C,OAAO,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,mCAAK,CAAC,MAAM,CAAC,UAAU,GAAG,CAAC,EAAE,KAAK,
|
|
1
|
+
{"version":3,"file":"textBuffer.js","sourceRoot":"","sources":["../../../../../src/languageservice/utils/textBuffer.ts"],"names":[],"mappings":";AAAA;;;gGAGgG;;;AAGhG,6EAA8D;AAM9D,MAAa,UAAU;IACrB,YAAoB,GAAiB;QAAjB,QAAG,GAAH,GAAG,CAAc;IAAG,CAAC;IAEzC,YAAY;QACV,OAAO,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC;IAC5B,CAAC;IAED,aAAa,CAAC,UAAkB;QAC9B,MAAM,WAAW,GAAK,IAAI,CAAC,GAAoC,CAAC,cAAc,EAAE,CAAC;QACjF,IAAI,UAAU,IAAI,WAAW,CAAC,MAAM,EAAE;YACpC,OAAO,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC,MAAM,CAAC;SAClC;aAAM,IAAI,UAAU,GAAG,CAAC,EAAE;YACzB,OAAO,CAAC,CAAC;SACV;QAED,MAAM,cAAc,GAAG,UAAU,GAAG,CAAC,GAAG,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC,WAAW,CAAC,UAAU,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC,MAAM,CAAC;QACrH,OAAO,cAAc,GAAG,WAAW,CAAC,UAAU,CAAC,CAAC;IAClD,CAAC;IAED,cAAc,CAAC,UAAkB;QAC/B,MAAM,WAAW,GAAK,IAAI,CAAC,GAAoC,CAAC,cAAc,EAAE,CAAC;QACjF,IAAI,UAAU,IAAI,WAAW,CAAC,MAAM,EAAE;YACpC,OAAO,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC;SAC3B;aAAM,IAAI,UAAU,GAAG,CAAC,EAAE;YACzB,OAAO,EAAE,CAAC;SACX;QACD,MAAM,cAAc,GAAG,UAAU,GAAG,CAAC,GAAG,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC,WAAW,CAAC,UAAU,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC,MAAM,CAAC;QACrH,OAAO,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC,SAAS,CAAC,WAAW,CAAC,UAAU,CAAC,EAAE,cAAc,CAAC,CAAC;IAC/E,CAAC;IAED,eAAe,CAAC,UAAkB,EAAE,KAAa;QAC/C,OAAO,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,mCAAK,CAAC,MAAM,CAAC,UAAU,GAAG,CAAC,EAAE,KAAK,EAAE,UAAU,GAAG,CAAC,EAAE,KAAK,GAAG,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;IACxG,CAAC;IAED,OAAO,CAAC,KAAa;QACnB,OAAO,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;IACjC,CAAC;IAED,WAAW,CAAC,MAAc;QACxB,OAAO,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;IACrC,CAAC;CACF;AAzCD,gCAyCC"}
|
|
@@ -53,6 +53,14 @@ export interface LanguageSettings {
|
|
|
53
53
|
* Default yaml lang version
|
|
54
54
|
*/
|
|
55
55
|
yamlVersion?: YamlVersion;
|
|
56
|
+
/**
|
|
57
|
+
* Control the use of flow mappings. Default is allow.
|
|
58
|
+
*/
|
|
59
|
+
flowMapping?: 'allow' | 'forbid';
|
|
60
|
+
/**
|
|
61
|
+
* Control the use of flow sequences. Default is allow.
|
|
62
|
+
*/
|
|
63
|
+
flowSequence?: 'allow' | 'forbid';
|
|
56
64
|
}
|
|
57
65
|
export interface WorkspaceContextService {
|
|
58
66
|
resolveRelativePath(relativePath: string, resource: string): string;
|
|
@@ -42,7 +42,7 @@ function getLanguageService(schemaRequestService, workspaceContext, connection,
|
|
|
42
42
|
const yamlDefinition = new yamlDefinition_1.YamlDefinition(telemetry);
|
|
43
43
|
new schemaSelectionHandlers_1.JSONSchemaSelection(schemaService, yamlSettings, connection);
|
|
44
44
|
// register all commands
|
|
45
|
-
yamlCommands_1.registerCommands(commandExecutor_1.commandExecutor, connection);
|
|
45
|
+
(0, yamlCommands_1.registerCommands)(commandExecutor_1.commandExecutor, connection);
|
|
46
46
|
return {
|
|
47
47
|
configure: (settings) => {
|
|
48
48
|
schemaService.clearExternalSchemas();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"yamlLanguageService.js","sourceRoot":"","sources":["../../../../src/languageservice/yamlLanguageService.ts"],"names":[],"mappings":";AAAA;;;;gGAIgG;;;AAEhG,oEAMsC;AAgBtC,gEAAiE;AACjE,oDAAiD;AACjD,8DAA2D;AAC3D,4DAAyD;AAEzD,oDAAiD;AASjD,wDAA0D;AAE1D,gEAA6D;AAC7D,uEAAoE;AACpE,0EAA6E;AAC7E,0DAAuD;AACvD,0DAA2D;AAG3D,8DAA2D;AAC3D,4DAA6D;AAE7D,gGAAyF;AACzF,8DAA2D;AAE3D,IAAY,cAKX;AALD,WAAY,cAAc;IACxB,iEAAe,CAAA;IACf,6EAAqB,CAAA;IACrB,2DAAY,CAAA;IACZ,2DAAY,CAAA;AACd,CAAC,EALW,cAAc,GAAd,sBAAc,KAAd,sBAAc,QAKzB;
|
|
1
|
+
{"version":3,"file":"yamlLanguageService.js","sourceRoot":"","sources":["../../../../src/languageservice/yamlLanguageService.ts"],"names":[],"mappings":"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"}
|
package/out/server/src/server.js
CHANGED
|
@@ -19,14 +19,14 @@ nls.config(process.env['VSCODE_NLS_CONFIG']);
|
|
|
19
19
|
// Create a connection for the server.
|
|
20
20
|
let connection = null;
|
|
21
21
|
if (process.argv.indexOf('--stdio') === -1) {
|
|
22
|
-
connection = node_1.createConnection(node_1.ProposedFeatures.all);
|
|
22
|
+
connection = (0, node_1.createConnection)(node_1.ProposedFeatures.all);
|
|
23
23
|
}
|
|
24
24
|
else {
|
|
25
|
-
connection = node_1.createConnection();
|
|
25
|
+
connection = (0, node_1.createConnection)();
|
|
26
26
|
}
|
|
27
27
|
process.on('uncaughtException', (err) => {
|
|
28
28
|
// send all uncaught exception to telemetry with stack traces
|
|
29
|
-
connection.console.error(objects_1.convertErrorToTelemetryMsg(err));
|
|
29
|
+
connection.console.error((0, objects_1.convertErrorToTelemetryMsg)(err));
|
|
30
30
|
});
|
|
31
31
|
console.log = connection.console.log.bind(connection.console);
|
|
32
32
|
console.error = connection.console.error.bind(connection.console);
|
|
@@ -50,7 +50,7 @@ const fileSystem = {
|
|
|
50
50
|
* @param uri can be a local file, vscode request, http(s) request or a custom request
|
|
51
51
|
*/
|
|
52
52
|
const schemaRequestHandlerWrapper = (connection, uri) => {
|
|
53
|
-
return schemaRequestHandler_1.schemaRequestHandler(connection, uri, yamlSettings.workspaceFolders, yamlSettings.workspaceRoot, yamlSettings.useVSCodeContentRequest, fileSystem);
|
|
53
|
+
return (0, schemaRequestHandler_1.schemaRequestHandler)(connection, uri, yamlSettings.workspaceFolders, yamlSettings.workspaceRoot, yamlSettings.useVSCodeContentRequest, fileSystem);
|
|
54
54
|
};
|
|
55
55
|
const schemaRequestService = schemaRequestHandlerWrapper.bind(this, connection);
|
|
56
56
|
const telemetry = new telemetry_1.Telemetry(connection);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server.js","sourceRoot":"","sources":["../../../src/server.ts"],"names":[],"mappings":"AAAA;;;;;gGAKgG;AAChG,YAAY,CAAC;;AAEb,qDAA4F;AAC5F,kCAAkC;AAClC,0FAAyG;AACzG,qDAAkD;AAClD,iDAA+C;AAC/C,2BAAoC;AACpC,6DAA6E;AAC7E,0DAAuD;AAEvD,8DAA8D;AAC9D,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,mBAAmB,CAAQ,CAAC,CAAC;AAEpD,sCAAsC;AACtC,IAAI,UAAU,GAAe,IAAI,CAAC;AAElC,IAAI,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,EAAE;IAC1C,UAAU,GAAG,uBAAgB,
|
|
1
|
+
{"version":3,"file":"server.js","sourceRoot":"","sources":["../../../src/server.ts"],"names":[],"mappings":"AAAA;;;;;gGAKgG;AAChG,YAAY,CAAC;;AAEb,qDAA4F;AAC5F,kCAAkC;AAClC,0FAAyG;AACzG,qDAAkD;AAClD,iDAA+C;AAC/C,2BAAoC;AACpC,6DAA6E;AAC7E,0DAAuD;AAEvD,8DAA8D;AAC9D,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,mBAAmB,CAAQ,CAAC,CAAC;AAEpD,sCAAsC;AACtC,IAAI,UAAU,GAAe,IAAI,CAAC;AAElC,IAAI,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,EAAE;IAC1C,UAAU,GAAG,IAAA,uBAAgB,EAAC,uBAAgB,CAAC,GAAG,CAAC,CAAC;CACrD;KAAM;IACL,UAAU,GAAG,IAAA,uBAAgB,GAAE,CAAC;CACjC;AAED,OAAO,CAAC,EAAE,CAAC,mBAAmB,EAAE,CAAC,GAAU,EAAE,EAAE;IAC7C,6DAA6D;IAC7D,UAAU,CAAC,OAAO,CAAC,KAAK,CAAC,IAAA,oCAA0B,EAAC,GAAG,CAAC,CAAC,CAAC;AAC5D,CAAC,CAAC,CAAC;AAEH,OAAO,CAAC,GAAG,GAAG,UAAU,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;AAC9D,OAAO,CAAC,KAAK,GAAG,UAAU,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;AAElE,uHAAuH;AACvH,OAAO,CAAC,KAAK,GAAG,CAAC,GAAG,EAAE,EAAE;IACtB,IAAI,GAAG,KAAK,IAAI,EAAE;QAChB,UAAU,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;KAC9B;SAAM;QACL,UAAU,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;KAC/B;AACH,CAAC,CAAC;AAEF,MAAM,YAAY,GAAG,IAAI,4BAAa,EAAE,CAAC;AAEzC,MAAM,UAAU,GAAG;IACjB,QAAQ,EAAE,CAAC,MAAc,EAAE,QAAiB,EAAE,EAAE;QAC9C,OAAO,aAAE,CAAC,QAAQ,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC;IACjE,CAAC;CACF,CAAC;AAEF;;;GAGG;AACH,MAAM,2BAA2B,GAAG,CAAC,UAAsB,EAAE,GAAW,EAAmB,EAAE;IAC3F,OAAO,IAAA,2CAAoB,EACzB,UAAU,EACV,GAAG,EACH,YAAY,CAAC,gBAAgB,EAC7B,YAAY,CAAC,aAAa,EAC1B,YAAY,CAAC,uBAAuB,EACpC,UAAU,CACX,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,oBAAoB,GAAG,2BAA2B,CAAC,IAAI,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;AAChF,MAAM,SAAS,GAAG,IAAI,qBAAS,CAAC,UAAU,CAAC,CAAC;AAE5C,IAAI,+BAAc,CAAC,UAAU,EAAE,YAAY,EAAE,uCAAgB,EAAE,oBAAoB,EAAE,SAAS,CAAC,CAAC,KAAK,EAAE,CAAC"}
|
|
@@ -20,7 +20,7 @@ var FSReadFile;
|
|
|
20
20
|
})(FSReadFile || (FSReadFile = {}));
|
|
21
21
|
const messageReader = new browser_1.BrowserMessageReader(globalThis);
|
|
22
22
|
const messageWriter = new browser_1.BrowserMessageWriter(globalThis);
|
|
23
|
-
const connection = browser_1.createConnection(messageReader, messageWriter);
|
|
23
|
+
const connection = (0, browser_1.createConnection)(messageReader, messageWriter);
|
|
24
24
|
const yamlSettings = new yamlSettings_1.SettingsState();
|
|
25
25
|
const fileSystem = {
|
|
26
26
|
readFile: (fsPath) => {
|
|
@@ -32,7 +32,7 @@ const fileSystem = {
|
|
|
32
32
|
* @param uri can be a local file, vscode request, http(s) request or a custom request
|
|
33
33
|
*/
|
|
34
34
|
const schemaRequestHandlerWrapper = (connection, uri) => {
|
|
35
|
-
return schemaRequestHandler_1.schemaRequestHandler(connection, uri, yamlSettings.workspaceFolders, yamlSettings.workspaceRoot, yamlSettings.useVSCodeContentRequest, fileSystem);
|
|
35
|
+
return (0, schemaRequestHandler_1.schemaRequestHandler)(connection, uri, yamlSettings.workspaceFolders, yamlSettings.workspaceRoot, yamlSettings.useVSCodeContentRequest, fileSystem);
|
|
36
36
|
};
|
|
37
37
|
const schemaRequestService = schemaRequestHandlerWrapper.bind(this, connection);
|
|
38
38
|
const telemetry = new telemetry_1.Telemetry(connection);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"yamlServerMain.js","sourceRoot":"","sources":["../../../../src/webworker/yamlServerMain.ts"],"names":[],"mappings":";;AAAA;;;;gGAIgG;AAChG,iEAAgE;AAChE,2DAA6G;AAC7G,2DAAwD;AACxD,2FAA0G;AAC1G,sDAAmD;AACnD,kDAAgD;AAEhD,2DAA2D;AAC3D,IAAU,UAAU,CAInB;AAJD,WAAU,UAAU;IAClB,6DAA6D;IAC7D,wDAAwD;IAC3C,eAAI,GAAoC,IAAI,mCAAW,CAAC,aAAa,CAAC,CAAC;AACtF,CAAC,EAJS,UAAU,KAAV,UAAU,QAInB;AAED,MAAM,aAAa,GAAG,IAAI,8BAAoB,CAAC,UAAU,CAAC,CAAC;AAC3D,MAAM,aAAa,GAAG,IAAI,8BAAoB,CAAC,UAAU,CAAC,CAAC;AAE3D,MAAM,UAAU,GAAG,0BAAgB,
|
|
1
|
+
{"version":3,"file":"yamlServerMain.js","sourceRoot":"","sources":["../../../../src/webworker/yamlServerMain.ts"],"names":[],"mappings":";;AAAA;;;;gGAIgG;AAChG,iEAAgE;AAChE,2DAA6G;AAC7G,2DAAwD;AACxD,2FAA0G;AAC1G,sDAAmD;AACnD,kDAAgD;AAEhD,2DAA2D;AAC3D,IAAU,UAAU,CAInB;AAJD,WAAU,UAAU;IAClB,6DAA6D;IAC7D,wDAAwD;IAC3C,eAAI,GAAoC,IAAI,mCAAW,CAAC,aAAa,CAAC,CAAC;AACtF,CAAC,EAJS,UAAU,KAAV,UAAU,QAInB;AAED,MAAM,aAAa,GAAG,IAAI,8BAAoB,CAAC,UAAU,CAAC,CAAC;AAC3D,MAAM,aAAa,GAAG,IAAI,8BAAoB,CAAC,UAAU,CAAC,CAAC;AAE3D,MAAM,UAAU,GAAG,IAAA,0BAAgB,EAAC,aAAa,EAAE,aAAa,CAAC,CAAC;AAElE,MAAM,YAAY,GAAG,IAAI,4BAAa,EAAE,CAAC;AAEzC,MAAM,UAAU,GAAG;IACjB,QAAQ,EAAE,CAAC,MAAc,EAAE,EAAE;QAC3B,OAAO,UAAU,CAAC,WAAW,CAAC,UAAU,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IACzD,CAAC;CACF,CAAC;AAEF;;;GAGG;AACH,MAAM,2BAA2B,GAAG,CAAC,UAAsB,EAAE,GAAW,EAAmB,EAAE;IAC3F,OAAO,IAAA,2CAAoB,EACzB,UAAU,EACV,GAAG,EACH,YAAY,CAAC,gBAAgB,EAC7B,YAAY,CAAC,aAAa,EAC1B,YAAY,CAAC,uBAAuB,EACpC,UAAU,CACX,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,oBAAoB,GAAG,2BAA2B,CAAC,IAAI,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;AAChF,MAAM,SAAS,GAAG,IAAI,qBAAS,CAAC,UAAU,CAAC,CAAC;AAE5C,IAAI,+BAAc,CAAC,UAAU,EAAE,YAAY,EAAE,uCAAgB,EAAE,oBAAoB,EAAE,SAAS,CAAC,CAAC,KAAK,EAAE,CAAC"}
|