yaml-language-server 1.19.1-fce910a.0 → 1.20.1-82d8808.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 +27 -0
- package/Dockerfile +2 -2
- package/README.md +3 -3
- package/eslint-result.sarif +147 -172
- package/l10n/bundle.l10n.de.json +56 -0
- package/l10n/bundle.l10n.fr.json +56 -0
- package/l10n/bundle.l10n.ja.json +56 -0
- package/l10n/bundle.l10n.json +56 -0
- package/l10n/bundle.l10n.ko.json +56 -0
- package/l10n/bundle.l10n.zh-cn.json +56 -0
- package/l10n/bundle.l10n.zh-tw.json +56 -0
- package/lib/esm/languageservice/jsonASTTypes.d.ts +2 -2
- package/lib/esm/languageservice/jsonSchema.d.ts +1 -1
- package/lib/esm/languageservice/parser/ast-converter.d.ts +7 -2
- package/lib/esm/languageservice/parser/ast-converter.js +20 -12
- package/lib/esm/languageservice/parser/ast-converter.js.map +1 -1
- package/lib/esm/languageservice/parser/jsonParser07.js +38 -45
- package/lib/esm/languageservice/parser/jsonParser07.js.map +1 -1
- package/lib/esm/languageservice/parser/yamlParser07.d.ts +1 -1
- package/lib/esm/languageservice/services/validation/unused-anchors.js +3 -2
- package/lib/esm/languageservice/services/validation/unused-anchors.js.map +1 -1
- package/lib/esm/languageservice/services/validation/yaml-style.js +3 -2
- package/lib/esm/languageservice/services/validation/yaml-style.js.map +1 -1
- package/lib/esm/languageservice/services/yamlCodeActions.js +8 -7
- package/lib/esm/languageservice/services/yamlCodeActions.js.map +1 -1
- package/lib/esm/languageservice/services/yamlCompletion.js +40 -38
- package/lib/esm/languageservice/services/yamlCompletion.js.map +1 -1
- package/lib/esm/languageservice/services/yamlHover.js +11 -4
- package/lib/esm/languageservice/services/yamlHover.js.map +1 -1
- package/lib/esm/languageservice/services/yamlSchemaService.js +31 -8
- package/lib/esm/languageservice/services/yamlSchemaService.js.map +1 -1
- package/lib/esm/languageservice/yamlTypes.d.ts +1 -1
- package/lib/esm/requestTypes.d.ts +1 -1
- package/lib/esm/server.js +0 -3
- package/lib/esm/server.js.map +1 -1
- package/lib/esm/yamlServerInit.d.ts +2 -1
- package/lib/esm/yamlServerInit.js +24 -2
- package/lib/esm/yamlServerInit.js.map +1 -1
- package/lib/esm/yamlSettings.d.ts +1 -1
- package/lib/esm/yamlSettings.js.map +1 -1
- package/lib/umd/languageservice/jsonASTTypes.d.ts +2 -2
- package/lib/umd/languageservice/jsonSchema.d.ts +1 -1
- package/lib/umd/languageservice/parser/ast-converter.d.ts +7 -2
- package/lib/umd/languageservice/parser/ast-converter.js +21 -13
- package/lib/umd/languageservice/parser/ast-converter.js.map +1 -1
- package/lib/umd/languageservice/parser/jsonParser07.js +39 -46
- package/lib/umd/languageservice/parser/jsonParser07.js.map +1 -1
- package/lib/umd/languageservice/parser/yamlParser07.d.ts +1 -1
- package/lib/umd/languageservice/services/validation/unused-anchors.js +4 -3
- package/lib/umd/languageservice/services/validation/unused-anchors.js.map +1 -1
- package/lib/umd/languageservice/services/validation/yaml-style.js +4 -3
- package/lib/umd/languageservice/services/validation/yaml-style.js.map +1 -1
- package/lib/umd/languageservice/services/yamlCodeActions.js +9 -8
- package/lib/umd/languageservice/services/yamlCodeActions.js.map +1 -1
- package/lib/umd/languageservice/services/yamlCompletion.js +41 -39
- package/lib/umd/languageservice/services/yamlCompletion.js.map +1 -1
- package/lib/umd/languageservice/services/yamlHover.js +12 -5
- package/lib/umd/languageservice/services/yamlHover.js.map +1 -1
- package/lib/umd/languageservice/services/yamlSchemaService.js +32 -9
- package/lib/umd/languageservice/services/yamlSchemaService.js.map +1 -1
- package/lib/umd/languageservice/yamlTypes.d.ts +1 -1
- package/lib/umd/requestTypes.d.ts +1 -1
- package/lib/umd/server.js +1 -4
- package/lib/umd/server.js.map +1 -1
- package/lib/umd/yamlServerInit.d.ts +2 -1
- package/lib/umd/yamlServerInit.js +25 -3
- package/lib/umd/yamlServerInit.js.map +1 -1
- package/lib/umd/yamlSettings.d.ts +1 -1
- package/lib/umd/yamlSettings.js.map +1 -1
- package/out/server/src/languageservice/jsonASTTypes.d.ts +2 -2
- package/out/server/src/languageservice/jsonSchema.d.ts +1 -1
- package/out/server/src/languageservice/parser/ast-converter.d.ts +7 -2
- package/out/server/src/languageservice/parser/ast-converter.js +21 -13
- package/out/server/src/languageservice/parser/ast-converter.js.map +1 -1
- package/out/server/src/languageservice/parser/jsonParser07.js +38 -45
- package/out/server/src/languageservice/parser/jsonParser07.js.map +1 -1
- package/out/server/src/languageservice/parser/yamlParser07.d.ts +1 -1
- package/out/server/src/languageservice/services/validation/unused-anchors.js +3 -2
- package/out/server/src/languageservice/services/validation/unused-anchors.js.map +1 -1
- package/out/server/src/languageservice/services/validation/yaml-style.js +3 -2
- package/out/server/src/languageservice/services/validation/yaml-style.js.map +1 -1
- package/out/server/src/languageservice/services/yamlCodeActions.js +8 -7
- package/out/server/src/languageservice/services/yamlCodeActions.js.map +1 -1
- package/out/server/src/languageservice/services/yamlCompletion.js +40 -38
- package/out/server/src/languageservice/services/yamlCompletion.js.map +1 -1
- package/out/server/src/languageservice/services/yamlHover.js +11 -4
- package/out/server/src/languageservice/services/yamlHover.js.map +1 -1
- package/out/server/src/languageservice/services/yamlSchemaService.js +31 -8
- package/out/server/src/languageservice/services/yamlSchemaService.js.map +1 -1
- package/out/server/src/languageservice/yamlTypes.d.ts +1 -1
- package/out/server/src/requestTypes.d.ts +1 -1
- package/out/server/src/server.js +0 -3
- package/out/server/src/server.js.map +1 -1
- package/out/server/src/yamlServerInit.d.ts +2 -1
- package/out/server/src/yamlServerInit.js +24 -2
- package/out/server/src/yamlServerInit.js.map +1 -1
- package/out/server/src/yamlSettings.d.ts +1 -1
- package/out/server/src/yamlSettings.js.map +1 -1
- package/out/server/test/autoCompletion.test.js +146 -76
- package/out/server/test/autoCompletion.test.js.map +1 -1
- package/out/server/test/bundlel10n.test.d.ts +1 -0
- package/out/server/test/bundlel10n.test.js +72 -0
- package/out/server/test/bundlel10n.test.js.map +1 -0
- package/out/server/test/hover.test.js +103 -0
- package/out/server/test/hover.test.js.map +1 -1
- package/out/server/test/utils/testHelper.js +5 -0
- package/out/server/test/utils/testHelper.js.map +1 -1
- package/out/server/test/utils/verifyError.d.ts +1 -1
- package/out/server/test/utils/verifyError.js.map +1 -1
- package/out/server/test/yamlParser.test.js +61 -0
- package/out/server/test/yamlParser.test.js.map +1 -1
- package/out/server/test/yamlSelectionRanges.test.js +1 -1
- package/package.json +10 -10
package/lib/esm/server.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server.js","sourceRoot":"","sources":["../../src/server.ts"],"names":[],"mappings":"AAAA;;;;;gGAKgG;AAEhG,OAAO,EAAE,gBAAgB,EAAc,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAC5F,OAAO,
|
|
1
|
+
{"version":3,"file":"server.js","sourceRoot":"","sources":["../../src/server.ts"],"names":[],"mappings":"AAAA;;;;;gGAKgG;AAEhG,OAAO,EAAE,gBAAgB,EAAc,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAC5F,OAAO,EAAE,oBAAoB,EAAE,gBAAgB,EAAE,MAAM,iDAAiD,CAAC;AACzG,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAC/C,OAAO,EAAE,QAAQ,IAAI,EAAE,EAAE,MAAM,IAAI,CAAC;AACpC,OAAO,EAAE,0BAA0B,EAAE,MAAM,iCAAiC,CAAC;AAC7E,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAE3D,sCAAsC;AACtC,IAAI,UAAU,GAAe,IAAI,CAAC;AAElC,IAAI,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,EAAE;IAC1C,UAAU,GAAG,gBAAgB,CAAC,gBAAgB,CAAC,GAAG,CAAC,CAAC;CACrD;KAAM;IACL,UAAU,GAAG,gBAAgB,EAAE,CAAC;CACjC;AAED,OAAO,CAAC,EAAE,CAAC,mBAAmB,EAAE,CAAC,GAAU,EAAE,EAAE;IAC7C,6DAA6D;IAC7D,UAAU,CAAC,OAAO,CAAC,KAAK,CAAC,0BAA0B,CAAC,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,aAAa,EAAE,CAAC;AAEzC,MAAM,UAAU,GAAG;IACjB,QAAQ,EAAE,KAAK,EAAE,MAAc,EAAE,QAAiB,EAAE,EAAE;QACpD,MAAM,CAAC,GAAG,MAAM,EAAE,CAAC,QAAQ,CAAC,MAAM,EAAE,QAA0B,CAAC,CAAC;QAChE,OAAO,CAAC,CAAC,QAAQ,EAAE,CAAC;IACtB,CAAC;CACF,CAAC;AAEF;;;GAGG;AACH,MAAM,2BAA2B,GAAG,CAAC,UAAsB,EAAE,GAAW,EAAmB,EAAE;IAC3F,OAAO,oBAAoB,CACzB,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,aAAa,CAAC,UAAU,CAAC,CAAC;AAEhD,IAAI,cAAc,CAAC,UAAU,EAAE,YAAY,EAAE,gBAAgB,EAAE,oBAAoB,EAAE,SAAS,CAAC,CAAC,KAAK,EAAE,CAAC"}
|
|
@@ -16,7 +16,8 @@ export declare class YAMLServerInit {
|
|
|
16
16
|
validationHandler: ValidationHandler;
|
|
17
17
|
settingsHandler: SettingsHandler;
|
|
18
18
|
constructor(connection: Connection, yamlSettings: SettingsState, workspaceContext: WorkspaceContextService, schemaRequestService: SchemaRequestService, telemetry: Telemetry);
|
|
19
|
-
|
|
19
|
+
setupl10nBundle(params: InitializeParams): Promise<void>;
|
|
20
|
+
connectionInitialized(params: InitializeParams): Promise<InitializeResult>;
|
|
20
21
|
private registerHandlers;
|
|
21
22
|
start(): void;
|
|
22
23
|
}
|
|
@@ -11,6 +11,9 @@ import { YamlCommands } from './commands';
|
|
|
11
11
|
import { WorkspaceHandlers } from './languageserver/handlers/workspaceHandlers';
|
|
12
12
|
import { commandExecutor } from './languageserver/commandExecutor';
|
|
13
13
|
import { registerCommands } from './languageservice/services/yamlCommands';
|
|
14
|
+
import * as l10n from '@vscode/l10n';
|
|
15
|
+
import * as path from 'path';
|
|
16
|
+
import * as fs from 'fs';
|
|
14
17
|
export class YAMLServerInit {
|
|
15
18
|
constructor(connection, yamlSettings, workspaceContext, schemaRequestService, telemetry) {
|
|
16
19
|
this.connection = connection;
|
|
@@ -23,7 +26,7 @@ export class YAMLServerInit {
|
|
|
23
26
|
* Run when the client connects to the server after it is activated.
|
|
24
27
|
* The server receives the root path(s) of the workspace and the client capabilities.
|
|
25
28
|
*/
|
|
26
|
-
this.connection.onInitialize((params) => {
|
|
29
|
+
this.connection.onInitialize(async (params) => {
|
|
27
30
|
return this.connectionInitialized(params);
|
|
28
31
|
});
|
|
29
32
|
this.connection.onInitialized(() => {
|
|
@@ -37,8 +40,26 @@ export class YAMLServerInit {
|
|
|
37
40
|
this.settingsHandler.pullConfiguration();
|
|
38
41
|
});
|
|
39
42
|
}
|
|
43
|
+
async setupl10nBundle(params) {
|
|
44
|
+
const __dirname = path.dirname(__filename);
|
|
45
|
+
const l10nPath = params.initializationOptions?.l10nPath || path.join(__dirname, '../../../l10n');
|
|
46
|
+
const locale = params.locale || 'en';
|
|
47
|
+
if (l10nPath) {
|
|
48
|
+
const bundleFile = !fs.existsSync(path.join(l10nPath, `bundle.l10n.${locale}.json`))
|
|
49
|
+
? `bundle.l10n.json`
|
|
50
|
+
: `bundle.l10n.${locale}.json`;
|
|
51
|
+
const baseBundleFile = path.join(l10nPath, bundleFile);
|
|
52
|
+
process.env.VSCODE_NLS_CONFIG = JSON.stringify({
|
|
53
|
+
locale,
|
|
54
|
+
_languagePackSupport: true,
|
|
55
|
+
});
|
|
56
|
+
await l10n.config({
|
|
57
|
+
uri: URI.file(baseBundleFile).toString(),
|
|
58
|
+
});
|
|
59
|
+
}
|
|
60
|
+
}
|
|
40
61
|
// public for test setup
|
|
41
|
-
connectionInitialized(params) {
|
|
62
|
+
async connectionInitialized(params) {
|
|
42
63
|
this.yamlSettings.capabilities = params.capabilities;
|
|
43
64
|
this.languageService = getCustomLanguageService({
|
|
44
65
|
schemaRequestService: this.schemaRequestService,
|
|
@@ -67,6 +88,7 @@ export class YAMLServerInit {
|
|
|
67
88
|
this.yamlSettings.capabilities.workspace.didChangeWatchedFiles.dynamicRegistration);
|
|
68
89
|
this.registerHandlers();
|
|
69
90
|
registerCommands(commandExecutor, this.connection);
|
|
91
|
+
await this.setupl10nBundle(params);
|
|
70
92
|
return {
|
|
71
93
|
capabilities: {
|
|
72
94
|
textDocumentSync: TextDocumentSyncKind.Incremental,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"yamlServerInit.js","sourceRoot":"","sources":["../../src/yamlServerInit.ts"],"names":[],"mappings":"AAAA,OAAO,EAAkD,oBAAoB,EAAE,MAAM,uBAAuB,CAAC;AAC7G,OAAO,EACL,kBAAkB,IAAI,wBAAwB,GAI/C,MAAM,uCAAuC,CAAC;AAC/C,OAAO,EAAE,uBAAuB,EAAE,MAAM,+BAA+B,CAAC;AACxE,OAAO,EAAE,GAAG,EAAE,MAAM,YAAY,CAAC;AAEjC,OAAO,EAAE,gBAAgB,EAAE,MAAM,4CAA4C,CAAC;AAC9E,OAAO,EAAE,oBAAoB,EAAE,MAAM,gDAAgD,CAAC;AACtF,OAAO,EAAE,eAAe,EAAE,MAAM,2CAA2C,CAAC;AAC5E,OAAO,EAAE,iBAAiB,EAAE,MAAM,8CAA8C,CAAC;AACjF,OAAO,EAAE,eAAe,EAAE,MAAM,4CAA4C,CAAC;AAC7E,OAAO,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAC1C,OAAO,EAAE,iBAAiB,EAAE,MAAM,6CAA6C,CAAC;AAChF,OAAO,EAAE,eAAe,EAAE,MAAM,kCAAkC,CAAC;AAEnE,OAAO,EAAE,gBAAgB,EAAE,MAAM,yCAAyC,CAAC;
|
|
1
|
+
{"version":3,"file":"yamlServerInit.js","sourceRoot":"","sources":["../../src/yamlServerInit.ts"],"names":[],"mappings":"AAAA,OAAO,EAAkD,oBAAoB,EAAE,MAAM,uBAAuB,CAAC;AAC7G,OAAO,EACL,kBAAkB,IAAI,wBAAwB,GAI/C,MAAM,uCAAuC,CAAC;AAC/C,OAAO,EAAE,uBAAuB,EAAE,MAAM,+BAA+B,CAAC;AACxE,OAAO,EAAE,GAAG,EAAE,MAAM,YAAY,CAAC;AAEjC,OAAO,EAAE,gBAAgB,EAAE,MAAM,4CAA4C,CAAC;AAC9E,OAAO,EAAE,oBAAoB,EAAE,MAAM,gDAAgD,CAAC;AACtF,OAAO,EAAE,eAAe,EAAE,MAAM,2CAA2C,CAAC;AAC5E,OAAO,EAAE,iBAAiB,EAAE,MAAM,8CAA8C,CAAC;AACjF,OAAO,EAAE,eAAe,EAAE,MAAM,4CAA4C,CAAC;AAC7E,OAAO,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAC1C,OAAO,EAAE,iBAAiB,EAAE,MAAM,6CAA6C,CAAC;AAChF,OAAO,EAAE,eAAe,EAAE,MAAM,kCAAkC,CAAC;AAEnE,OAAO,EAAE,gBAAgB,EAAE,MAAM,yCAAyC,CAAC;AAC3E,OAAO,KAAK,IAAI,MAAM,cAAc,CAAC;AACrC,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAC7B,OAAO,KAAK,EAAE,MAAM,IAAI,CAAC;AAEzB,MAAM,OAAO,cAAc;IAMzB,YACmB,UAAsB,EAC/B,YAA2B,EAC3B,gBAAyC,EACzC,oBAA0C,EAC1C,SAAoB;QAJX,eAAU,GAAV,UAAU,CAAY;QAC/B,iBAAY,GAAZ,YAAY,CAAe;QAC3B,qBAAgB,GAAhB,gBAAgB,CAAyB;QACzC,yBAAoB,GAApB,oBAAoB,CAAsB;QAC1C,cAAS,GAAT,SAAS,CAAW;QAE5B,IAAI,CAAC,YAAY,CAAC,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QAEpD;;;WAGG;QACH,IAAI,CAAC,UAAU,CAAC,YAAY,CAAC,KAAK,EAAE,MAAwB,EAA6B,EAAE;YACzF,OAAO,IAAI,CAAC,qBAAqB,CAAC,MAAM,CAAC,CAAC;QAC5C,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,GAAG,EAAE;YACjC,IAAI,IAAI,CAAC,YAAY,CAAC,yCAAyC,EAAE;gBAC/D,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,2BAA2B,CAAC,CAAC,cAAc,EAAE,EAAE;oBACvE,IAAI,CAAC,YAAY,CAAC,gBAAgB,GAAG,uBAAuB,CAAC,IAAI,CAAC,YAAY,CAAC,gBAAgB,EAAE,cAAc,CAAC,CAAC;gBACnH,CAAC,CAAC,CAAC;aACJ;YACD,iDAAiD;YACjD,IAAI,CAAC,eAAe,CAAC,gBAAgB,EAAE,CAAC;YACxC,IAAI,CAAC,eAAe,CAAC,iBAAiB,EAAE,CAAC;QAC3C,CAAC,CAAC,CAAC;IACL,CAAC;IAEM,KAAK,CAAC,eAAe,CAAC,MAAwB;QACnD,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;QAC3C,MAAM,QAAQ,GAAW,MAAM,CAAC,qBAAqB,EAAE,QAAQ,IAAI,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,eAAe,CAAC,CAAC;QACzG,MAAM,MAAM,GAAW,MAAM,CAAC,MAAM,IAAI,IAAI,CAAC;QAC7C,IAAI,QAAQ,EAAE;YACZ,MAAM,UAAU,GAAG,CAAC,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,eAAe,MAAM,OAAO,CAAC,CAAC;gBAClF,CAAC,CAAC,kBAAkB;gBACpB,CAAC,CAAC,eAAe,MAAM,OAAO,CAAC;YACjC,MAAM,cAAc,GAAG,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAC;YACvD,OAAO,CAAC,GAAG,CAAC,iBAAiB,GAAG,IAAI,CAAC,SAAS,CAAC;gBAC7C,MAAM;gBACN,oBAAoB,EAAE,IAAI;aAC3B,CAAC,CAAC;YACH,MAAM,IAAI,CAAC,MAAM,CAAC;gBAChB,GAAG,EAAE,GAAG,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC,QAAQ,EAAE;aACzC,CAAC,CAAC;SACJ;IACH,CAAC;IAED,wBAAwB;IACxB,KAAK,CAAC,qBAAqB,CAAC,MAAwB;QAClD,IAAI,CAAC,YAAY,CAAC,YAAY,GAAG,MAAM,CAAC,YAAY,CAAC;QACrD,IAAI,CAAC,eAAe,GAAG,wBAAwB,CAAC;YAC9C,oBAAoB,EAAE,IAAI,CAAC,oBAAoB;YAC/C,gBAAgB,EAAE,IAAI,CAAC,gBAAgB;YACvC,UAAU,EAAE,IAAI,CAAC,UAAU;YAC3B,YAAY,EAAE,IAAI,CAAC,YAAY;YAC/B,SAAS,EAAE,IAAI,CAAC,SAAS;YACzB,kBAAkB,EAAE,MAAM,CAAC,YAAY;SACxC,CAAC,CAAC;QAEH,uFAAuF;QACvF,IAAI,MAAM,CAAC,OAAO,EAAE;YAClB,IAAI,CAAC,YAAY,CAAC,aAAa,GAAG,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;SAC7D;QACD,IAAI,CAAC,YAAY,CAAC,gBAAgB,GAAG,MAAM,CAAC,gBAAgB,IAAI,EAAE,CAAC;QAEnE,IAAI,CAAC,YAAY,CAAC,iCAAiC,GAAG,CAAC,CAAC,CACtD,IAAI,CAAC,YAAY,CAAC,YAAY,CAAC,YAAY;YAC3C,IAAI,CAAC,YAAY,CAAC,YAAY,CAAC,YAAY,CAAC,cAAc;YAC1D,IAAI,CAAC,YAAY,CAAC,YAAY,CAAC,YAAY,CAAC,cAAc,CAAC,iCAAiC,CAC7F,CAAC;QACF,IAAI,CAAC,YAAY,CAAC,4BAA4B,GAAG,CAAC,CAAC,CACjD,IAAI,CAAC,YAAY,CAAC,YAAY,CAAC,YAAY;YAC3C,IAAI,CAAC,YAAY,CAAC,YAAY,CAAC,YAAY,CAAC,UAAU;YACtD,IAAI,CAAC,YAAY,CAAC,YAAY,CAAC,YAAY,CAAC,UAAU,CAAC,mBAAmB,CAC3E,CAAC;QACF,IAAI,CAAC,YAAY,CAAC,4BAA4B;YAC5C,IAAI,CAAC,YAAY,CAAC,YAAY,CAAC,SAAS,IAAI,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,YAAY,CAAC,SAAS,CAAC,gBAAgB,CAAC;QAE1G,IAAI,CAAC,YAAY,CAAC,0BAA0B,GAAG,CAAC,CAAC,CAC/C,IAAI,CAAC,YAAY,CAAC,YAAY,CAAC,SAAS,IAAI,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,YAAY,CAAC,SAAS,CAAC,aAAa,CACrG,CAAC;QAEF,IAAI,CAAC,YAAY,CAAC,yCAAyC,GAAG,CAAC,CAAC,CAC9D,IAAI,CAAC,YAAY,CAAC,YAAY,CAAC,SAAS;YACxC,IAAI,CAAC,YAAY,CAAC,YAAY,CAAC,SAAS,CAAC,qBAAqB;YAC9D,IAAI,CAAC,YAAY,CAAC,YAAY,CAAC,SAAS,CAAC,qBAAqB,CAAC,mBAAmB,CACnF,CAAC;QACF,IAAI,CAAC,gBAAgB,EAAE,CAAC;QACxB,gBAAgB,CAAC,eAAe,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC;QACnD,MAAM,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC;QACnC,OAAO;YACL,YAAY,EAAE;gBACZ,gBAAgB,EAAE,oBAAoB,CAAC,WAAW;gBAClD,kBAAkB,EAAE,EAAE,eAAe,EAAE,KAAK,EAAE;gBAC9C,aAAa,EAAE,IAAI;gBACnB,sBAAsB,EAAE,IAAI;gBAC5B,0BAA0B,EAAE,CAAC,IAAI,CAAC,YAAY,CAAC,4BAA4B;gBAC3E,gCAAgC,EAAE;oBAChC,qBAAqB,EAAE,IAAI;iBAC5B;gBACD,+BAA+B,EAAE,KAAK;gBACtC,kBAAkB,EAAE,IAAI;gBACxB,oBAAoB,EAAE,EAAE;gBACxB,oBAAoB,EAAE,IAAI;gBAC1B,sBAAsB,EAAE,IAAI;gBAC5B,kBAAkB,EAAE,IAAI;gBACxB,gBAAgB,EAAE;oBAChB,eAAe,EAAE,KAAK;iBACvB;gBACD,sBAAsB,EAAE;oBACtB,QAAQ,EAAE,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;iBAChE;gBACD,SAAS,EAAE;oBACT,gBAAgB,EAAE;wBAChB,mBAAmB,EAAE,IAAI;wBACzB,SAAS,EAAE,IAAI;qBAChB;iBACF;aACF;SACF,CAAC;IACJ,CAAC;IAEO,gBAAgB;QACtB,qDAAqD;QACrD,IAAI,CAAC,iBAAiB,GAAG,IAAI,iBAAiB,CAAC,IAAI,CAAC,UAAU,EAAE,IAAI,CAAC,eAAe,EAAE,IAAI,CAAC,YAAY,CAAC,CAAC;QACzG,IAAI,CAAC,eAAe,GAAG,IAAI,eAAe,CACxC,IAAI,CAAC,UAAU,EACf,IAAI,CAAC,eAAe,EACpB,IAAI,CAAC,YAAY,EACjB,IAAI,CAAC,iBAAiB,EACtB,IAAI,CAAC,SAAS,CACf,CAAC;QACF,2CAA2C;QAC3C,IAAI,CAAC,eAAe,GAAG,IAAI,gBAAgB,CAAC,IAAI,CAAC,UAAU,EAAE,IAAI,CAAC,eAAe,EAAE,IAAI,CAAC,YAAY,EAAE,IAAI,CAAC,iBAAiB,CAAC,CAAC;QAC9H,IAAI,CAAC,eAAe,CAAC,gBAAgB,EAAE,CAAC;QACxC,IAAI,oBAAoB,CAAC,IAAI,CAAC,UAAU,EAAE,IAAI,CAAC,eAAe,EAAE,IAAI,CAAC,YAAY,EAAE,IAAI,CAAC,eAAe,CAAC,CAAC,gBAAgB,EAAE,CAAC;QAC5H,IAAI,eAAe,CAAC,IAAI,CAAC,UAAU,EAAE,IAAI,CAAC,eAAe,CAAC,CAAC,gBAAgB,EAAE,CAAC;QAC9E,IAAI,iBAAiB,CAAC,IAAI,CAAC,UAAU,EAAE,eAAe,CAAC,CAAC,gBAAgB,EAAE,CAAC;IAC7E,CAAC;IAED,KAAK;QACH,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE,CAAC;IAC3B,CAAC;CACF"}
|
|
@@ -79,7 +79,7 @@ export declare class SettingsState {
|
|
|
79
79
|
keyOrdering: boolean;
|
|
80
80
|
maxItemsComputed: number;
|
|
81
81
|
pendingValidationRequests: {
|
|
82
|
-
[uri: string]: NodeJS.
|
|
82
|
+
[uri: string]: NodeJS.Timeout;
|
|
83
83
|
};
|
|
84
84
|
validationDelayMs: number;
|
|
85
85
|
documents: TextDocuments<TextDocument> | TextDocumentTestManager;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"yamlSettings.js","sourceRoot":"","sources":["../../src/yamlSettings.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAmD,MAAM,uBAAuB,CAAC;AAKvG,OAAO,EAAE,YAAY,EAAE,MAAM,oCAAoC,CAAC;AAClE,OAAO,EAAE,oBAAoB,EAAE,MAAM,oCAAoC,CAAC;AAoD1E,0DAA0D;AAC1D,MAAM,OAAO,aAAa;IAA1B;QACE,8BAAyB,GAAyB,SAAS,CAAC;QAC5D,uBAAkB,GAA4D,SAAS,CAAC;QACxF,0BAAqB,GAA4B,IAAI,CAAC;QACtD,2BAAsB,GAAG,EAAE,CAAC;QAC5B,gCAA2B,GAAG,EAAE,CAAC;QACjC,uBAAkB,GAAG,IAAI,CAAC;QAC1B,0BAAqB,GAAG;YACtB,WAAW,EAAE,KAAK;YAClB,cAAc,EAAE,IAAI;YACpB,SAAS,EAAE,UAAU;YACrB,UAAU,EAAE,EAAE;YACd,aAAa,EAAE,IAAI;YACnB,MAAM,EAAE,IAAI;SACa,CAAC;QAC5B,oBAAe,GAAG,IAAI,CAAC;QACvB,yBAAoB,GAAG,IAAI,CAAC;QAC5B,wBAAmB,GAAG,EAAE,CAAC;QACzB,eAAU,GAAG,EAAE,CAAC;QAChB,uBAAkB,GAAG,IAAI,CAAC;QAC1B,mBAAc,GAAG,oBAAoB,CAAC;QACtC,gBAAW,GAAuB,SAAS,CAAC;QAC5C,gCAA2B,GAAG,KAAK,CAAC;QACpC,6BAAwB,GAAG,KAAK,CAAC;QACjC,YAAO,GAAG;YACR,2BAA2B,EAAE,KAAK;SACnC,CAAC;QAKF,gBAAW,GAAG,KAAK,CAAC;QACpB,qBAAgB,GAAG,IAAI,CAAC;QAExB,0BAA0B;QAC1B,8BAAyB,
|
|
1
|
+
{"version":3,"file":"yamlSettings.js","sourceRoot":"","sources":["../../src/yamlSettings.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAmD,MAAM,uBAAuB,CAAC;AAKvG,OAAO,EAAE,YAAY,EAAE,MAAM,oCAAoC,CAAC;AAClE,OAAO,EAAE,oBAAoB,EAAE,MAAM,oCAAoC,CAAC;AAoD1E,0DAA0D;AAC1D,MAAM,OAAO,aAAa;IAA1B;QACE,8BAAyB,GAAyB,SAAS,CAAC;QAC5D,uBAAkB,GAA4D,SAAS,CAAC;QACxF,0BAAqB,GAA4B,IAAI,CAAC;QACtD,2BAAsB,GAAG,EAAE,CAAC;QAC5B,gCAA2B,GAAG,EAAE,CAAC;QACjC,uBAAkB,GAAG,IAAI,CAAC;QAC1B,0BAAqB,GAAG;YACtB,WAAW,EAAE,KAAK;YAClB,cAAc,EAAE,IAAI;YACpB,SAAS,EAAE,UAAU;YACrB,UAAU,EAAE,EAAE;YACd,aAAa,EAAE,IAAI;YACnB,MAAM,EAAE,IAAI;SACa,CAAC;QAC5B,oBAAe,GAAG,IAAI,CAAC;QACvB,yBAAoB,GAAG,IAAI,CAAC;QAC5B,wBAAmB,GAAG,EAAE,CAAC;QACzB,eAAU,GAAG,EAAE,CAAC;QAChB,uBAAkB,GAAG,IAAI,CAAC;QAC1B,mBAAc,GAAG,oBAAoB,CAAC;QACtC,gBAAW,GAAuB,SAAS,CAAC;QAC5C,gCAA2B,GAAG,KAAK,CAAC;QACpC,6BAAwB,GAAG,KAAK,CAAC;QACjC,YAAO,GAAG;YACR,2BAA2B,EAAE,KAAK;SACnC,CAAC;QAKF,gBAAW,GAAG,KAAK,CAAC;QACpB,qBAAgB,GAAG,IAAI,CAAC;QAExB,0BAA0B;QAC1B,8BAAyB,GAAsC,EAAE,CAAC;QAClE,sBAAiB,GAAG,GAAG,CAAC;QAExB,mEAAmE;QACnE,mCAAmC;QACnC,cAAS,GAA0D,IAAI,aAAa,CAAC,YAAY,CAAC,CAAC;QAInG,kBAAa,GAAQ,IAAI,CAAC;QAC1B,qBAAgB,GAAsB,EAAE,CAAC;QACzC,iCAA4B,GAAG,KAAK,CAAC;QACrC,sCAAiC,GAAG,KAAK,CAAC;QAC1C,iCAA4B,GAAG,KAAK,CAAC;QACrC,+BAA0B,GAAG,KAAK,CAAC;QACnC,4BAAuB,GAAG,KAAK,CAAC;QAChC,gBAAW,GAAgB,KAAK,CAAC;QACjC,+BAA0B,GAAG,KAAK,CAAC;QACnC,8CAAyC,GAAG,KAAK,CAAC;QAClD,mBAAc,GAAa,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC/C,CAAC;CAAA;AAED,MAAM,OAAO,uBAAwB,SAAQ,aAA2B;IAGtE;QACE,KAAK,CAAC,YAAY,CAAC,CAAC;QAHtB,sBAAiB,GAAG,IAAI,GAAG,EAAwB,CAAC;IAIpD,CAAC;IAED,GAAG,CAAC,GAAW;QACb,OAAO,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IACzC,CAAC;IAED,GAAG,CAAC,YAA0B;QAC5B,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,YAAY,CAAC,GAAG,EAAE,YAAY,CAAC,CAAC;IAC7D,CAAC;CACF"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { Node, Pair } from 'yaml';
|
|
2
|
-
export
|
|
3
|
-
export
|
|
2
|
+
export type YamlNode = Node | Pair;
|
|
3
|
+
export type ASTNode = ObjectASTNode | PropertyASTNode | ArrayASTNode | StringASTNode | NumberASTNode | BooleanASTNode | NullASTNode;
|
|
4
4
|
export interface BaseASTNode {
|
|
5
5
|
readonly type: 'object' | 'array' | 'property' | 'string' | 'number' | 'boolean' | 'null';
|
|
6
6
|
readonly parent?: ASTNode;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { CompletionItemKind } from 'vscode-json-languageservice';
|
|
2
2
|
import { SchemaVersions } from './yamlTypes';
|
|
3
|
-
export
|
|
3
|
+
export type JSONSchemaRef = JSONSchema | boolean;
|
|
4
4
|
export interface JSONSchema {
|
|
5
5
|
id?: string;
|
|
6
6
|
$id?: string;
|
|
@@ -1,6 +1,11 @@
|
|
|
1
|
-
import { Document, LineCounter } from 'yaml';
|
|
1
|
+
import { Alias, Document, LineCounter } from 'yaml';
|
|
2
2
|
import { ASTNode, YamlNode } from '../jsonASTTypes';
|
|
3
|
-
|
|
3
|
+
type NodeRange = [number, number, number];
|
|
4
|
+
export declare const aliasDepth: {
|
|
5
|
+
maxRefCount: number;
|
|
6
|
+
currentRefDepth: number;
|
|
7
|
+
aliasResolutionCache: Map<Alias, ASTNode>;
|
|
8
|
+
};
|
|
4
9
|
export declare function convertAST(parent: ASTNode, node: YamlNode, doc: Document, lineCounter: LineCounter): ASTNode | undefined;
|
|
5
10
|
export declare function toOffsetLength(range: NodeRange): [number, number];
|
|
6
11
|
export {};
|
|
@@ -13,16 +13,20 @@
|
|
|
13
13
|
})(function (require, exports) {
|
|
14
14
|
"use strict";
|
|
15
15
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
16
|
-
exports.toOffsetLength = exports.convertAST = void 0;
|
|
16
|
+
exports.toOffsetLength = exports.convertAST = exports.aliasDepth = void 0;
|
|
17
17
|
const yaml_1 = require("yaml");
|
|
18
18
|
const jsonParser07_1 = require("./jsonParser07");
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
19
|
+
// Exported for tests
|
|
20
|
+
exports.aliasDepth = {
|
|
21
|
+
maxRefCount: 1000,
|
|
22
|
+
currentRefDepth: 0,
|
|
23
|
+
aliasResolutionCache: new Map(),
|
|
24
|
+
};
|
|
22
25
|
function convertAST(parent, node, doc, lineCounter) {
|
|
23
26
|
if (!parent) {
|
|
24
27
|
// first invocation
|
|
25
|
-
|
|
28
|
+
exports.aliasDepth.currentRefDepth = 0;
|
|
29
|
+
exports.aliasDepth.aliasResolutionCache = new Map();
|
|
26
30
|
}
|
|
27
31
|
if (!node) {
|
|
28
32
|
return null;
|
|
@@ -39,11 +43,8 @@
|
|
|
39
43
|
if ((0, yaml_1.isScalar)(node)) {
|
|
40
44
|
return convertScalar(node, parent);
|
|
41
45
|
}
|
|
42
|
-
if ((0, yaml_1.isAlias)(node) &&
|
|
43
|
-
|
|
44
|
-
const converted = convertAlias(node, parent, doc, lineCounter);
|
|
45
|
-
seenAlias.delete(node);
|
|
46
|
-
return converted;
|
|
46
|
+
if ((0, yaml_1.isAlias)(node) && exports.aliasDepth.currentRefDepth < exports.aliasDepth.maxRefCount) {
|
|
47
|
+
return convertAlias(node, parent, doc, lineCounter);
|
|
47
48
|
}
|
|
48
49
|
else {
|
|
49
50
|
return;
|
|
@@ -129,16 +130,23 @@
|
|
|
129
130
|
}
|
|
130
131
|
}
|
|
131
132
|
function convertAlias(node, parent, doc, lineCounter) {
|
|
132
|
-
|
|
133
|
+
if (exports.aliasDepth.aliasResolutionCache.has(node)) {
|
|
134
|
+
return exports.aliasDepth.aliasResolutionCache.get(node);
|
|
135
|
+
}
|
|
136
|
+
exports.aliasDepth.currentRefDepth++;
|
|
133
137
|
const resolvedNode = node.resolve(doc);
|
|
138
|
+
let ans;
|
|
134
139
|
if (resolvedNode) {
|
|
135
|
-
|
|
140
|
+
ans = convertAST(parent, resolvedNode, doc, lineCounter);
|
|
136
141
|
}
|
|
137
142
|
else {
|
|
138
143
|
const resultNode = new jsonParser07_1.StringASTNodeImpl(parent, node, ...toOffsetLength(node.range));
|
|
139
144
|
resultNode.value = node.source;
|
|
140
|
-
|
|
145
|
+
ans = resultNode;
|
|
141
146
|
}
|
|
147
|
+
exports.aliasDepth.currentRefDepth--;
|
|
148
|
+
exports.aliasDepth.aliasResolutionCache.set(node, ans);
|
|
149
|
+
return ans;
|
|
142
150
|
}
|
|
143
151
|
function toOffsetLength(range) {
|
|
144
152
|
return [range[0], range[1] - range[0]];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ast-converter.js","sourceRoot":"","sources":["../../../../src/languageservice/parser/ast-converter.ts"],"names":[],"mappings":"AAAA;;;gGAGgG;;;;;;;;;;;;;IAEhG,+BAec;IAEd,iDAQwB;IAIxB,
|
|
1
|
+
{"version":3,"file":"ast-converter.js","sourceRoot":"","sources":["../../../../src/languageservice/parser/ast-converter.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,7 +9,7 @@
|
|
|
9
9
|
if (v !== undefined) module.exports = v;
|
|
10
10
|
}
|
|
11
11
|
else if (typeof define === "function" && define.amd) {
|
|
12
|
-
define(["require", "exports", "../utils/objects", "../utils/schemaUtils", "vscode-json-languageservice", "vscode
|
|
12
|
+
define(["require", "exports", "../utils/objects", "../utils/schemaUtils", "vscode-json-languageservice", "@vscode/l10n", "vscode-uri", "vscode-languageserver-types", "../utils/arrUtils", "../utils/strings", "../services/yamlSchemaService", "../utils/math"], factory);
|
|
13
13
|
}
|
|
14
14
|
})(function (require, exports) {
|
|
15
15
|
"use strict";
|
|
@@ -18,42 +18,40 @@
|
|
|
18
18
|
const objects_1 = require("../utils/objects");
|
|
19
19
|
const schemaUtils_1 = require("../utils/schemaUtils");
|
|
20
20
|
const vscode_json_languageservice_1 = require("vscode-json-languageservice");
|
|
21
|
-
const
|
|
21
|
+
const l10n = require("@vscode/l10n");
|
|
22
22
|
const vscode_uri_1 = require("vscode-uri");
|
|
23
23
|
const vscode_languageserver_types_1 = require("vscode-languageserver-types");
|
|
24
24
|
const arrUtils_1 = require("../utils/arrUtils");
|
|
25
25
|
const strings_1 = require("../utils/strings");
|
|
26
26
|
const yamlSchemaService_1 = require("../services/yamlSchemaService");
|
|
27
27
|
const math_1 = require("../utils/math");
|
|
28
|
-
const localize = nls.loadMessageBundle();
|
|
29
|
-
const MSG_PROPERTY_NOT_ALLOWED = 'Property {0} is not allowed.';
|
|
30
28
|
exports.formats = {
|
|
31
29
|
'color-hex': {
|
|
32
|
-
errorMessage:
|
|
30
|
+
errorMessage: l10n.t('colorHexFormatWarning'),
|
|
33
31
|
pattern: /^#([0-9A-Fa-f]{3,4}|([0-9A-Fa-f]{2}){3,4})$/,
|
|
34
32
|
},
|
|
35
33
|
'date-time': {
|
|
36
|
-
errorMessage:
|
|
34
|
+
errorMessage: l10n.t('dateTimeFormatWarning'),
|
|
37
35
|
pattern: /^(\d{4})-(0[1-9]|1[0-2])-(0[1-9]|[12][0-9]|3[01])T([01][0-9]|2[0-3]):([0-5][0-9]):([0-5][0-9]|60)(\.[0-9]+)?(Z|(\+|-)([01][0-9]|2[0-3]):([0-5][0-9]))$/i,
|
|
38
36
|
},
|
|
39
37
|
date: {
|
|
40
|
-
errorMessage:
|
|
38
|
+
errorMessage: l10n.t('dateFormatWarning'),
|
|
41
39
|
pattern: /^(\d{4})-(0[1-9]|1[0-2])-(0[1-9]|[12][0-9]|3[01])$/i,
|
|
42
40
|
},
|
|
43
41
|
time: {
|
|
44
|
-
errorMessage:
|
|
42
|
+
errorMessage: l10n.t('timeFormatWarning'),
|
|
45
43
|
pattern: /^([01][0-9]|2[0-3]):([0-5][0-9]):([0-5][0-9]|60)(\.[0-9]+)?(Z|(\+|-)([01][0-9]|2[0-3]):([0-5][0-9]))$/i,
|
|
46
44
|
},
|
|
47
45
|
email: {
|
|
48
|
-
errorMessage:
|
|
46
|
+
errorMessage: l10n.t('emailFormatWarning'),
|
|
49
47
|
pattern: /^(([^<>()[\]\\.,;:\s@"]+(\.[^<>()[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/,
|
|
50
48
|
},
|
|
51
49
|
ipv4: {
|
|
52
|
-
errorMessage:
|
|
50
|
+
errorMessage: l10n.t('ipv4FormatWarning'),
|
|
53
51
|
pattern: /^((25[0-5]|(2[0-4]|1\d|[1-9]|)\d)\.?\b){4}$/,
|
|
54
52
|
},
|
|
55
53
|
ipv6: {
|
|
56
|
-
errorMessage:
|
|
54
|
+
errorMessage: l10n.t('ipv6FormatWarning'),
|
|
57
55
|
pattern: /^([0-9a-f]|:){1,4}(:([0-9a-f]{0,4})*){1,7}$/i,
|
|
58
56
|
},
|
|
59
57
|
};
|
|
@@ -282,7 +280,7 @@
|
|
|
282
280
|
this.enumValues = this.enumValues.concat(validationResult.enumValues);
|
|
283
281
|
for (const error of this.problems) {
|
|
284
282
|
if (error.code === vscode_json_languageservice_1.ErrorCode.EnumValueMismatch) {
|
|
285
|
-
error.message =
|
|
283
|
+
error.message = l10n.t('enumWarning', [...new Set(this.enumValues)]
|
|
286
284
|
.map((v) => {
|
|
287
285
|
return JSON.stringify(v);
|
|
288
286
|
})
|
|
@@ -545,8 +543,7 @@
|
|
|
545
543
|
validationResult.problems.push({
|
|
546
544
|
location: { offset: node.offset, length: node.length },
|
|
547
545
|
severity: vscode_languageserver_types_1.DiagnosticSeverity.Warning,
|
|
548
|
-
message: schema.errorMessage ||
|
|
549
|
-
localize('typeArrayMismatchWarning', 'Incorrect type. Expected one of {0}.', schema.type.join(', ')),
|
|
546
|
+
message: schema.errorMessage || l10n.t('typeArrayMismatchWarning', schema.type.join(', ')),
|
|
550
547
|
source: getSchemaSource(schema, originalSchema),
|
|
551
548
|
schemaUri: getSchemaUri(schema, originalSchema),
|
|
552
549
|
});
|
|
@@ -581,7 +578,7 @@
|
|
|
581
578
|
validationResult.problems.push({
|
|
582
579
|
location: { offset: node.offset, length: node.length },
|
|
583
580
|
severity: vscode_languageserver_types_1.DiagnosticSeverity.Warning,
|
|
584
|
-
message:
|
|
581
|
+
message: l10n.t('notSchemaWarning'),
|
|
585
582
|
source: getSchemaSource(schema, originalSchema),
|
|
586
583
|
schemaUri: getSchemaUri(schema, originalSchema),
|
|
587
584
|
});
|
|
@@ -630,7 +627,7 @@
|
|
|
630
627
|
validationResult.problems.push({
|
|
631
628
|
location: { offset: node.offset, length: 1 },
|
|
632
629
|
severity: vscode_languageserver_types_1.DiagnosticSeverity.Warning,
|
|
633
|
-
message:
|
|
630
|
+
message: l10n.t('oneOfWarning'),
|
|
634
631
|
source: getSchemaSource(schema, originalSchema),
|
|
635
632
|
schemaUri: getSchemaUri(schema, originalSchema),
|
|
636
633
|
});
|
|
@@ -675,7 +672,7 @@
|
|
|
675
672
|
subValidationResult.problems.push({
|
|
676
673
|
location: { offset: node.offset, length: node.length },
|
|
677
674
|
severity: vscode_languageserver_types_1.DiagnosticSeverity.Warning,
|
|
678
|
-
message:
|
|
675
|
+
message: l10n.t('ifFilePatternAssociation', filePatternAssociation, options.uri),
|
|
679
676
|
source: getSchemaSource(schema, originalSchema),
|
|
680
677
|
schemaUri: getSchemaUri(schema, originalSchema),
|
|
681
678
|
});
|
|
@@ -713,7 +710,7 @@
|
|
|
713
710
|
severity: vscode_languageserver_types_1.DiagnosticSeverity.Warning,
|
|
714
711
|
code: vscode_json_languageservice_1.ErrorCode.EnumValueMismatch,
|
|
715
712
|
message: schema.errorMessage ||
|
|
716
|
-
|
|
713
|
+
l10n.t('enumWarning', schema.enum
|
|
717
714
|
.map((v) => {
|
|
718
715
|
return JSON.stringify(v);
|
|
719
716
|
})
|
|
@@ -762,7 +759,7 @@
|
|
|
762
759
|
validationResult.problems.push({
|
|
763
760
|
location: { offset: node.offset, length: node.length },
|
|
764
761
|
severity: vscode_languageserver_types_1.DiagnosticSeverity.Warning,
|
|
765
|
-
message:
|
|
762
|
+
message: l10n.t('multipleOfWarning', schema.multipleOf),
|
|
766
763
|
source: getSchemaSource(schema, originalSchema),
|
|
767
764
|
schemaUri: getSchemaUri(schema, originalSchema),
|
|
768
765
|
});
|
|
@@ -788,7 +785,7 @@
|
|
|
788
785
|
validationResult.problems.push({
|
|
789
786
|
location: { offset: node.offset, length: node.length },
|
|
790
787
|
severity: vscode_languageserver_types_1.DiagnosticSeverity.Warning,
|
|
791
|
-
message:
|
|
788
|
+
message: l10n.t('exclusiveMinimumWarning', exclusiveMinimum),
|
|
792
789
|
source: getSchemaSource(schema, originalSchema),
|
|
793
790
|
schemaUri: getSchemaUri(schema, originalSchema),
|
|
794
791
|
});
|
|
@@ -798,7 +795,7 @@
|
|
|
798
795
|
validationResult.problems.push({
|
|
799
796
|
location: { offset: node.offset, length: node.length },
|
|
800
797
|
severity: vscode_languageserver_types_1.DiagnosticSeverity.Warning,
|
|
801
|
-
message:
|
|
798
|
+
message: l10n.t('exclusiveMaximumWarning', exclusiveMaximum),
|
|
802
799
|
source: getSchemaSource(schema, originalSchema),
|
|
803
800
|
schemaUri: getSchemaUri(schema, originalSchema),
|
|
804
801
|
});
|
|
@@ -808,7 +805,7 @@
|
|
|
808
805
|
validationResult.problems.push({
|
|
809
806
|
location: { offset: node.offset, length: node.length },
|
|
810
807
|
severity: vscode_languageserver_types_1.DiagnosticSeverity.Warning,
|
|
811
|
-
message:
|
|
808
|
+
message: l10n.t('minimumWarning', minimum),
|
|
812
809
|
source: getSchemaSource(schema, originalSchema),
|
|
813
810
|
schemaUri: getSchemaUri(schema, originalSchema),
|
|
814
811
|
});
|
|
@@ -818,7 +815,7 @@
|
|
|
818
815
|
validationResult.problems.push({
|
|
819
816
|
location: { offset: node.offset, length: node.length },
|
|
820
817
|
severity: vscode_languageserver_types_1.DiagnosticSeverity.Warning,
|
|
821
|
-
message:
|
|
818
|
+
message: l10n.t('maximumWarning', maximum),
|
|
822
819
|
source: getSchemaSource(schema, originalSchema),
|
|
823
820
|
schemaUri: getSchemaUri(schema, originalSchema),
|
|
824
821
|
});
|
|
@@ -829,7 +826,7 @@
|
|
|
829
826
|
validationResult.problems.push({
|
|
830
827
|
location: { offset: node.offset, length: node.length },
|
|
831
828
|
severity: vscode_languageserver_types_1.DiagnosticSeverity.Warning,
|
|
832
|
-
message:
|
|
829
|
+
message: l10n.t('minLengthWarning', schema.minLength),
|
|
833
830
|
source: getSchemaSource(schema, originalSchema),
|
|
834
831
|
schemaUri: getSchemaUri(schema, originalSchema),
|
|
835
832
|
});
|
|
@@ -838,7 +835,7 @@
|
|
|
838
835
|
validationResult.problems.push({
|
|
839
836
|
location: { offset: node.offset, length: node.length },
|
|
840
837
|
severity: vscode_languageserver_types_1.DiagnosticSeverity.Warning,
|
|
841
|
-
message:
|
|
838
|
+
message: l10n.t('maxLengthWarning', schema.maxLength),
|
|
842
839
|
source: getSchemaSource(schema, originalSchema),
|
|
843
840
|
schemaUri: getSchemaUri(schema, originalSchema),
|
|
844
841
|
});
|
|
@@ -849,9 +846,7 @@
|
|
|
849
846
|
validationResult.problems.push({
|
|
850
847
|
location: { offset: node.offset, length: node.length },
|
|
851
848
|
severity: vscode_languageserver_types_1.DiagnosticSeverity.Warning,
|
|
852
|
-
message: schema.patternErrorMessage ||
|
|
853
|
-
schema.errorMessage ||
|
|
854
|
-
localize('patternWarning', 'String does not match the pattern of "{0}".', schema.pattern),
|
|
849
|
+
message: schema.patternErrorMessage || schema.errorMessage || l10n.t('patternWarning', schema.pattern),
|
|
855
850
|
source: getSchemaSource(schema, originalSchema),
|
|
856
851
|
schemaUri: getSchemaUri(schema, originalSchema),
|
|
857
852
|
});
|
|
@@ -864,13 +859,13 @@
|
|
|
864
859
|
{
|
|
865
860
|
let errorMessage;
|
|
866
861
|
if (!node.value) {
|
|
867
|
-
errorMessage =
|
|
862
|
+
errorMessage = l10n.t('uriEmpty');
|
|
868
863
|
}
|
|
869
864
|
else {
|
|
870
865
|
try {
|
|
871
866
|
const uri = vscode_uri_1.URI.parse(node.value);
|
|
872
867
|
if (!uri.scheme && schema.format === 'uri') {
|
|
873
|
-
errorMessage =
|
|
868
|
+
errorMessage = l10n.t('uriSchemeMissing');
|
|
874
869
|
}
|
|
875
870
|
}
|
|
876
871
|
catch (e) {
|
|
@@ -881,9 +876,7 @@
|
|
|
881
876
|
validationResult.problems.push({
|
|
882
877
|
location: { offset: node.offset, length: node.length },
|
|
883
878
|
severity: vscode_languageserver_types_1.DiagnosticSeverity.Warning,
|
|
884
|
-
message: schema.patternErrorMessage ||
|
|
885
|
-
schema.errorMessage ||
|
|
886
|
-
localize('uriFormatWarning', 'String is not a URI: {0}', errorMessage),
|
|
879
|
+
message: schema.patternErrorMessage || schema.errorMessage || l10n.t('uriFormatWarning', errorMessage),
|
|
887
880
|
source: getSchemaSource(schema, originalSchema),
|
|
888
881
|
schemaUri: getSchemaUri(schema, originalSchema),
|
|
889
882
|
});
|
|
@@ -903,7 +896,7 @@
|
|
|
903
896
|
validationResult.problems.push({
|
|
904
897
|
location: { offset: node.offset, length: node.length },
|
|
905
898
|
severity: vscode_languageserver_types_1.DiagnosticSeverity.Warning,
|
|
906
|
-
message: schema.patternErrorMessage || schema.errorMessage || format.errorMessage,
|
|
899
|
+
message: schema.patternErrorMessage || schema.errorMessage || l10n.t(format.errorMessage),
|
|
907
900
|
source: getSchemaSource(schema, originalSchema),
|
|
908
901
|
schemaUri: getSchemaUri(schema, originalSchema),
|
|
909
902
|
});
|
|
@@ -945,7 +938,7 @@
|
|
|
945
938
|
validationResult.problems.push({
|
|
946
939
|
location: { offset: node.offset, length: node.length },
|
|
947
940
|
severity: vscode_languageserver_types_1.DiagnosticSeverity.Warning,
|
|
948
|
-
message:
|
|
941
|
+
message: l10n.t('additionalItemsWarning', subSchemas.length),
|
|
949
942
|
source: getSchemaSource(schema, originalSchema),
|
|
950
943
|
schemaUri: getSchemaUri(schema, originalSchema),
|
|
951
944
|
});
|
|
@@ -985,7 +978,7 @@
|
|
|
985
978
|
validationResult.problems.push({
|
|
986
979
|
location: { offset: node.offset, length: node.length },
|
|
987
980
|
severity: vscode_languageserver_types_1.DiagnosticSeverity.Warning,
|
|
988
|
-
message: schema.errorMessage ||
|
|
981
|
+
message: schema.errorMessage || l10n.t('requiredItemMissingWarning'),
|
|
989
982
|
source: getSchemaSource(schema, originalSchema),
|
|
990
983
|
schemaUri: getSchemaUri(schema, originalSchema),
|
|
991
984
|
});
|
|
@@ -995,7 +988,7 @@
|
|
|
995
988
|
validationResult.problems.push({
|
|
996
989
|
location: { offset: node.offset, length: node.length },
|
|
997
990
|
severity: vscode_languageserver_types_1.DiagnosticSeverity.Warning,
|
|
998
|
-
message:
|
|
991
|
+
message: l10n.t('minItemsWarning', schema.minItems),
|
|
999
992
|
source: getSchemaSource(schema, originalSchema),
|
|
1000
993
|
schemaUri: getSchemaUri(schema, originalSchema),
|
|
1001
994
|
});
|
|
@@ -1004,7 +997,7 @@
|
|
|
1004
997
|
validationResult.problems.push({
|
|
1005
998
|
location: { offset: node.offset, length: node.length },
|
|
1006
999
|
severity: vscode_languageserver_types_1.DiagnosticSeverity.Warning,
|
|
1007
|
-
message:
|
|
1000
|
+
message: l10n.t('maxItemsWarning', schema.maxItems),
|
|
1008
1001
|
source: getSchemaSource(schema, originalSchema),
|
|
1009
1002
|
schemaUri: getSchemaUri(schema, originalSchema),
|
|
1010
1003
|
});
|
|
@@ -1018,7 +1011,7 @@
|
|
|
1018
1011
|
validationResult.problems.push({
|
|
1019
1012
|
location: { offset: node.offset, length: node.length },
|
|
1020
1013
|
severity: vscode_languageserver_types_1.DiagnosticSeverity.Warning,
|
|
1021
|
-
message:
|
|
1014
|
+
message: l10n.t('uniqueItemsWarning'),
|
|
1022
1015
|
source: getSchemaSource(schema, originalSchema),
|
|
1023
1016
|
schemaUri: getSchemaUri(schema, originalSchema),
|
|
1024
1017
|
});
|
|
@@ -1096,7 +1089,7 @@
|
|
|
1096
1089
|
length: propertyNode.keyNode.length,
|
|
1097
1090
|
},
|
|
1098
1091
|
severity: vscode_languageserver_types_1.DiagnosticSeverity.Warning,
|
|
1099
|
-
message: schema.errorMessage ||
|
|
1092
|
+
message: schema.errorMessage || l10n.t('DisallowedExtraPropWarning', propertyName),
|
|
1100
1093
|
source: getSchemaSource(schema, originalSchema),
|
|
1101
1094
|
schemaUri: getSchemaUri(schema, originalSchema),
|
|
1102
1095
|
});
|
|
@@ -1134,7 +1127,7 @@
|
|
|
1134
1127
|
length: propertyNode.keyNode.length,
|
|
1135
1128
|
},
|
|
1136
1129
|
severity: vscode_languageserver_types_1.DiagnosticSeverity.Warning,
|
|
1137
|
-
message: schema.errorMessage ||
|
|
1130
|
+
message: schema.errorMessage || l10n.t('DisallowedExtraPropWarning', propertyName),
|
|
1138
1131
|
source: getSchemaSource(schema, originalSchema),
|
|
1139
1132
|
schemaUri: getSchemaUri(schema, originalSchema),
|
|
1140
1133
|
});
|
|
@@ -1204,7 +1197,7 @@
|
|
|
1204
1197
|
},
|
|
1205
1198
|
severity: vscode_languageserver_types_1.DiagnosticSeverity.Warning,
|
|
1206
1199
|
code: vscode_json_languageservice_1.ErrorCode.PropertyExpected,
|
|
1207
|
-
message: schema.errorMessage ||
|
|
1200
|
+
message: schema.errorMessage || l10n.t('DisallowedExtraPropWarning', propertyName),
|
|
1208
1201
|
source: getSchemaSource(schema, originalSchema),
|
|
1209
1202
|
schemaUri: getSchemaUri(schema, originalSchema),
|
|
1210
1203
|
};
|
|
@@ -1221,7 +1214,7 @@
|
|
|
1221
1214
|
validationResult.problems.push({
|
|
1222
1215
|
location: { offset: node.offset, length: node.length },
|
|
1223
1216
|
severity: vscode_languageserver_types_1.DiagnosticSeverity.Warning,
|
|
1224
|
-
message:
|
|
1217
|
+
message: l10n.t('MaxPropWarning', schema.maxProperties),
|
|
1225
1218
|
source: getSchemaSource(schema, originalSchema),
|
|
1226
1219
|
schemaUri: getSchemaUri(schema, originalSchema),
|
|
1227
1220
|
});
|
|
@@ -1232,7 +1225,7 @@
|
|
|
1232
1225
|
validationResult.problems.push({
|
|
1233
1226
|
location: { offset: node.offset, length: node.length },
|
|
1234
1227
|
severity: vscode_languageserver_types_1.DiagnosticSeverity.Warning,
|
|
1235
|
-
message:
|
|
1228
|
+
message: l10n.t('MinPropWarning', schema.minProperties),
|
|
1236
1229
|
source: getSchemaSource(schema, originalSchema),
|
|
1237
1230
|
schemaUri: getSchemaUri(schema, originalSchema),
|
|
1238
1231
|
});
|
|
@@ -1249,7 +1242,7 @@
|
|
|
1249
1242
|
validationResult.problems.push({
|
|
1250
1243
|
location: { offset: node.offset, length: node.length },
|
|
1251
1244
|
severity: vscode_languageserver_types_1.DiagnosticSeverity.Warning,
|
|
1252
|
-
message:
|
|
1245
|
+
message: l10n.t('RequiredDependentPropWarning', requiredProp, key),
|
|
1253
1246
|
source: getSchemaSource(schema, originalSchema),
|
|
1254
1247
|
schemaUri: getSchemaUri(schema, originalSchema),
|
|
1255
1248
|
});
|
|
@@ -1375,7 +1368,7 @@
|
|
|
1375
1368
|
return uriString ? [uriString] : [];
|
|
1376
1369
|
}
|
|
1377
1370
|
function getWarningMessage(problemType, args) {
|
|
1378
|
-
return
|
|
1371
|
+
return l10n.t(exports.ProblemTypeMessages[problemType], args.join(' | '));
|
|
1379
1372
|
}
|
|
1380
1373
|
/**
|
|
1381
1374
|
* if callFromAutoComplete than compare value from yaml and value from schema (s.const | s.enum[i])
|