yaml-language-server 1.2.2 → 1.3.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.
Files changed (159) hide show
  1. package/CHANGELOG.md +25 -0
  2. package/README.md +10 -1
  3. package/lib/esm/languageserver/handlers/settingsHandlers.js +4 -2
  4. package/lib/esm/languageserver/handlers/settingsHandlers.js.map +1 -1
  5. package/lib/esm/languageservice/parser/ast-converter.js +9 -1
  6. package/lib/esm/languageservice/parser/ast-converter.js.map +1 -1
  7. package/lib/esm/languageservice/parser/jsonParser07.d.ts +2 -2
  8. package/lib/esm/languageservice/parser/jsonParser07.js +74 -25
  9. package/lib/esm/languageservice/parser/jsonParser07.js.map +1 -1
  10. package/lib/esm/languageservice/parser/yaml-documents.d.ts +0 -1
  11. package/lib/esm/languageservice/parser/yaml-documents.js +11 -11
  12. package/lib/esm/languageservice/parser/yaml-documents.js.map +1 -1
  13. package/lib/esm/languageservice/services/documentSymbols.js +3 -2
  14. package/lib/esm/languageservice/services/documentSymbols.js.map +1 -1
  15. package/lib/esm/languageservice/services/yamlCodeActions.d.ts +1 -0
  16. package/lib/esm/languageservice/services/yamlCodeActions.js +14 -0
  17. package/lib/esm/languageservice/services/yamlCodeActions.js.map +1 -1
  18. package/lib/esm/languageservice/services/yamlCodeLens.js +2 -1
  19. package/lib/esm/languageservice/services/yamlCodeLens.js.map +1 -1
  20. package/lib/esm/languageservice/services/yamlCompletion.d.ts +2 -0
  21. package/lib/esm/languageservice/services/yamlCompletion.js +183 -40
  22. package/lib/esm/languageservice/services/yamlCompletion.js.map +1 -1
  23. package/lib/esm/languageservice/services/yamlDefinition.d.ts +6 -1
  24. package/lib/esm/languageservice/services/yamlDefinition.js +23 -17
  25. package/lib/esm/languageservice/services/yamlDefinition.js.map +1 -1
  26. package/lib/esm/languageservice/services/yamlHover.js +2 -1
  27. package/lib/esm/languageservice/services/yamlHover.js.map +1 -1
  28. package/lib/esm/languageservice/services/yamlLinks.js +2 -1
  29. package/lib/esm/languageservice/services/yamlLinks.js.map +1 -1
  30. package/lib/esm/languageservice/services/yamlSchemaService.js +12 -0
  31. package/lib/esm/languageservice/services/yamlSchemaService.js.map +1 -1
  32. package/lib/esm/languageservice/services/yamlValidation.js +2 -1
  33. package/lib/esm/languageservice/services/yamlValidation.js.map +1 -1
  34. package/lib/esm/languageservice/utils/objects.d.ts +5 -0
  35. package/lib/esm/languageservice/utils/objects.js +13 -0
  36. package/lib/esm/languageservice/utils/objects.js.map +1 -1
  37. package/lib/esm/languageservice/utils/schemaUrls.d.ts +1 -1
  38. package/lib/esm/languageservice/utils/schemaUrls.js +1 -1
  39. package/lib/esm/languageservice/yamlLanguageService.d.ts +4 -0
  40. package/lib/esm/languageservice/yamlLanguageService.js +3 -2
  41. package/lib/esm/languageservice/yamlLanguageService.js.map +1 -1
  42. package/lib/esm/server.js +5 -0
  43. package/lib/esm/server.js.map +1 -1
  44. package/lib/esm/yamlSettings.d.ts +2 -0
  45. package/lib/esm/yamlSettings.js +1 -0
  46. package/lib/esm/yamlSettings.js.map +1 -1
  47. package/lib/umd/languageserver/handlers/settingsHandlers.js +5 -3
  48. package/lib/umd/languageserver/handlers/settingsHandlers.js.map +1 -1
  49. package/lib/umd/languageservice/parser/ast-converter.js +9 -1
  50. package/lib/umd/languageservice/parser/ast-converter.js.map +1 -1
  51. package/lib/umd/languageservice/parser/jsonParser07.d.ts +2 -2
  52. package/lib/umd/languageservice/parser/jsonParser07.js +77 -28
  53. package/lib/umd/languageservice/parser/jsonParser07.js.map +1 -1
  54. package/lib/umd/languageservice/parser/yaml-documents.d.ts +0 -1
  55. package/lib/umd/languageservice/parser/yaml-documents.js +10 -10
  56. package/lib/umd/languageservice/parser/yaml-documents.js.map +1 -1
  57. package/lib/umd/languageservice/services/documentSymbols.js +4 -3
  58. package/lib/umd/languageservice/services/documentSymbols.js.map +1 -1
  59. package/lib/umd/languageservice/services/yamlCodeActions.d.ts +1 -0
  60. package/lib/umd/languageservice/services/yamlCodeActions.js +14 -0
  61. package/lib/umd/languageservice/services/yamlCodeActions.js.map +1 -1
  62. package/lib/umd/languageservice/services/yamlCodeLens.js +3 -2
  63. package/lib/umd/languageservice/services/yamlCodeLens.js.map +1 -1
  64. package/lib/umd/languageservice/services/yamlCompletion.d.ts +2 -0
  65. package/lib/umd/languageservice/services/yamlCompletion.js +182 -39
  66. package/lib/umd/languageservice/services/yamlCompletion.js.map +1 -1
  67. package/lib/umd/languageservice/services/yamlDefinition.d.ts +6 -1
  68. package/lib/umd/languageservice/services/yamlDefinition.js +26 -20
  69. package/lib/umd/languageservice/services/yamlDefinition.js.map +1 -1
  70. package/lib/umd/languageservice/services/yamlHover.js +3 -2
  71. package/lib/umd/languageservice/services/yamlHover.js.map +1 -1
  72. package/lib/umd/languageservice/services/yamlLinks.js +3 -2
  73. package/lib/umd/languageservice/services/yamlLinks.js.map +1 -1
  74. package/lib/umd/languageservice/services/yamlSchemaService.js +12 -0
  75. package/lib/umd/languageservice/services/yamlSchemaService.js.map +1 -1
  76. package/lib/umd/languageservice/services/yamlValidation.js +3 -2
  77. package/lib/umd/languageservice/services/yamlValidation.js.map +1 -1
  78. package/lib/umd/languageservice/utils/objects.d.ts +5 -0
  79. package/lib/umd/languageservice/utils/objects.js +15 -1
  80. package/lib/umd/languageservice/utils/objects.js.map +1 -1
  81. package/lib/umd/languageservice/utils/schemaUrls.d.ts +1 -1
  82. package/lib/umd/languageservice/utils/schemaUrls.js +1 -1
  83. package/lib/umd/languageservice/yamlLanguageService.d.ts +4 -0
  84. package/lib/umd/languageservice/yamlLanguageService.js +2 -1
  85. package/lib/umd/languageservice/yamlLanguageService.js.map +1 -1
  86. package/lib/umd/server.js +6 -1
  87. package/lib/umd/server.js.map +1 -1
  88. package/lib/umd/yamlSettings.d.ts +2 -0
  89. package/lib/umd/yamlSettings.js +1 -0
  90. package/lib/umd/yamlSettings.js.map +1 -1
  91. package/out/server/src/languageserver/handlers/settingsHandlers.js +4 -2
  92. package/out/server/src/languageserver/handlers/settingsHandlers.js.map +1 -1
  93. package/out/server/src/languageservice/parser/ast-converter.js +9 -1
  94. package/out/server/src/languageservice/parser/ast-converter.js.map +1 -1
  95. package/out/server/src/languageservice/parser/jsonParser07.d.ts +2 -2
  96. package/out/server/src/languageservice/parser/jsonParser07.js +76 -27
  97. package/out/server/src/languageservice/parser/jsonParser07.js.map +1 -1
  98. package/out/server/src/languageservice/parser/yaml-documents.d.ts +0 -1
  99. package/out/server/src/languageservice/parser/yaml-documents.js +10 -10
  100. package/out/server/src/languageservice/parser/yaml-documents.js.map +1 -1
  101. package/out/server/src/languageservice/services/documentSymbols.js +3 -2
  102. package/out/server/src/languageservice/services/documentSymbols.js.map +1 -1
  103. package/out/server/src/languageservice/services/yamlCodeActions.d.ts +1 -0
  104. package/out/server/src/languageservice/services/yamlCodeActions.js +14 -0
  105. package/out/server/src/languageservice/services/yamlCodeActions.js.map +1 -1
  106. package/out/server/src/languageservice/services/yamlCodeLens.js +2 -1
  107. package/out/server/src/languageservice/services/yamlCodeLens.js.map +1 -1
  108. package/out/server/src/languageservice/services/yamlCompletion.d.ts +2 -0
  109. package/out/server/src/languageservice/services/yamlCompletion.js +181 -38
  110. package/out/server/src/languageservice/services/yamlCompletion.js.map +1 -1
  111. package/out/server/src/languageservice/services/yamlDefinition.d.ts +6 -1
  112. package/out/server/src/languageservice/services/yamlDefinition.js +25 -19
  113. package/out/server/src/languageservice/services/yamlDefinition.js.map +1 -1
  114. package/out/server/src/languageservice/services/yamlHover.js +2 -1
  115. package/out/server/src/languageservice/services/yamlHover.js.map +1 -1
  116. package/out/server/src/languageservice/services/yamlLinks.js +2 -1
  117. package/out/server/src/languageservice/services/yamlLinks.js.map +1 -1
  118. package/out/server/src/languageservice/services/yamlSchemaService.js +12 -0
  119. package/out/server/src/languageservice/services/yamlSchemaService.js.map +1 -1
  120. package/out/server/src/languageservice/services/yamlValidation.js +2 -1
  121. package/out/server/src/languageservice/services/yamlValidation.js.map +1 -1
  122. package/out/server/src/languageservice/utils/objects.d.ts +5 -0
  123. package/out/server/src/languageservice/utils/objects.js +15 -1
  124. package/out/server/src/languageservice/utils/objects.js.map +1 -1
  125. package/out/server/src/languageservice/utils/schemaUrls.d.ts +1 -1
  126. package/out/server/src/languageservice/utils/schemaUrls.js +1 -1
  127. package/out/server/src/languageservice/yamlLanguageService.d.ts +4 -0
  128. package/out/server/src/languageservice/yamlLanguageService.js +2 -1
  129. package/out/server/src/languageservice/yamlLanguageService.js.map +1 -1
  130. package/out/server/src/server.js +5 -0
  131. package/out/server/src/server.js.map +1 -1
  132. package/out/server/src/yamlSettings.d.ts +2 -0
  133. package/out/server/src/yamlSettings.js +1 -0
  134. package/out/server/src/yamlSettings.js.map +1 -1
  135. package/out/server/test/autoCompletion.test.js +410 -74
  136. package/out/server/test/autoCompletion.test.js.map +1 -1
  137. package/out/server/test/autoCompletionFix.test.js +219 -3
  138. package/out/server/test/autoCompletionFix.test.js.map +1 -1
  139. package/out/server/test/code-action-schema.test.d.ts +1 -0
  140. package/out/server/test/code-action-schema.test.js +99 -0
  141. package/out/server/test/code-action-schema.test.js.map +1 -0
  142. package/out/server/test/defaultSnippets.test.js +3 -3
  143. package/out/server/test/defaultSnippets.test.js.map +1 -1
  144. package/out/server/test/hover.test.js +70 -0
  145. package/out/server/test/hover.test.js.map +1 -1
  146. package/out/server/test/integration.test.js +1 -1
  147. package/out/server/test/jsonParser.test.js +23 -13
  148. package/out/server/test/jsonParser.test.js.map +1 -1
  149. package/out/server/test/objects.test.js +16 -0
  150. package/out/server/test/objects.test.js.map +1 -1
  151. package/out/server/test/schema.test.js +18 -0
  152. package/out/server/test/schema.test.js.map +1 -1
  153. package/out/server/test/yamlDefinition.test.js +8 -2
  154. package/out/server/test/yamlDefinition.test.js.map +1 -1
  155. package/out/server/test/yamlParser.test.js +10 -0
  156. package/out/server/test/yamlParser.test.js.map +1 -1
  157. package/out/server/test/yamlSchemaService.test.js +21 -0
  158. package/out/server/test/yamlSchemaService.test.js.map +1 -1
  159. package/package.json +8 -6
package/lib/esm/languageservice/yamlLanguageService.js CHANGED
@@ -18,7 +18,7 @@ import { registerCommands } from './services/yamlCommands';
18
18
  import { YamlCompletion } from './services/yamlCompletion';
19
19
  import { yamlDocumentsCache } from './parser/yaml-documents';
20
20
  import { JSONSchemaSelection } from '../languageserver/handlers/schemaSelectionHandlers';
21
- import { getDefinition } from './services/yamlDefinition';
21
+ import { YamlDefinition } from './services/yamlDefinition';
22
22
  export var SchemaPriority;
23
23
  (function (SchemaPriority) {
24
24
  SchemaPriority[SchemaPriority["SchemaStore"] = 1] = "SchemaStore";
@@ -36,6 +36,7 @@ export function getLanguageService(schemaRequestService, workspaceContext, conne
36
36
  const yamlCodeActions = new YamlCodeActions(clientCapabilities);
37
37
  const yamlCodeLens = new YamlCodeLens(schemaService, telemetry);
38
38
  const yamlLinks = new YamlLinks(telemetry);
39
+ const yamlDefinition = new YamlDefinition(telemetry);
39
40
  new JSONSchemaSelection(schemaService, yamlSettings, connection);
40
41
  // register all commands
41
42
  registerCommands(commandExecutor, connection);
@@ -65,7 +66,7 @@ export function getLanguageService(schemaRequestService, workspaceContext, conne
65
66
  doHover: hover.doHover.bind(hover),
66
67
  findDocumentSymbols: yamlDocumentSymbols.findDocumentSymbols.bind(yamlDocumentSymbols),
67
68
  findDocumentSymbols2: yamlDocumentSymbols.findHierarchicalDocumentSymbols.bind(yamlDocumentSymbols),
68
- doDefinition: getDefinition.bind(getDefinition),
69
+ doDefinition: yamlDefinition.getDefinition.bind(yamlDefinition),
69
70
  resetSchema: (uri) => {
70
71
  return schemaService.onResourceChange(uri);
71
72
  },
package/lib/esm/languageservice/yamlLanguageService.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"yamlLanguageService.js","sourceRoot":"","sources":["../../../src/languageservice/yamlLanguageService.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"yamlLanguageService.js","sourceRoot":"","sources":["../../../src/languageservice/yamlLanguageService.ts"],"names":[],"mappings":"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"}
package/lib/esm/server.js CHANGED
@@ -11,6 +11,7 @@ import { schemaRequestHandler, workspaceContext } from './languageservice/servic
11
11
  import { YAMLServerInit } from './yamlServerInit';
12
12
  import { SettingsState } from './yamlSettings';
13
13
  import { promises as fs } from 'fs';
14
+ import { convertErrorToTelemetryMsg } from './languageservice/utils/objects';
14
15
  // eslint-disable-next-line @typescript-eslint/no-explicit-any
15
16
  nls.config(process.env['VSCODE_NLS_CONFIG']);
16
17
  // Create a connection for the server.
@@ -21,6 +22,10 @@ if (process.argv.indexOf('--stdio') === -1) {
21
22
  else {
22
23
  connection = createConnection();
23
24
  }
25
+ process.on('uncaughtException', (err) => {
26
+ // send all uncaught exception to telemetry with stack traces
27
+ connection.console.error(convertErrorToTelemetryMsg(err));
28
+ });
24
29
  console.log = connection.console.log.bind(connection.console);
25
30
  console.error = connection.console.error.bind(connection.console);
26
31
  //vscode-nls calls console.error(null) in some cases, so we put that in info, to predict sending "null" in to telemetry
package/lib/esm/server.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"server.js","sourceRoot":"","sources":["../../src/server.ts"],"names":[],"mappings":"AAAA;;;;;gGAKgG;AAChG,YAAY,CAAC;AAEb,OAAO,EAAE,gBAAgB,EAAc,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAC5F,OAAO,KAAK,GAAG,MAAM,YAAY,CAAC;AAClC,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;AAEpC,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,gBAAgB,CAAC,gBAAgB,CAAC,GAAG,CAAC,CAAC;CACrD;KAAM;IACL,UAAU,GAAG,gBAAgB,EAAE,CAAC;CACjC;AAED,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,CAAC,MAAc,EAAE,QAAiB,EAAE,EAAE;QAC9C,OAAO,EAAE,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,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;AAEhF,IAAI,cAAc,CAAC,UAAU,EAAE,YAAY,EAAE,gBAAgB,EAAE,oBAAoB,CAAC,CAAC,KAAK,EAAE,CAAC"}
1
+ {"version":3,"file":"server.js","sourceRoot":"","sources":["../../src/server.ts"],"names":[],"mappings":"AAAA;;;;;gGAKgG;AAChG,YAAY,CAAC;AAEb,OAAO,EAAE,gBAAgB,EAAc,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAC5F,OAAO,KAAK,GAAG,MAAM,YAAY,CAAC;AAClC,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;AAE7E,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,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,CAAC,MAAc,EAAE,QAAiB,EAAE,EAAE;QAC9C,OAAO,EAAE,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,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;AAEhF,IAAI,cAAc,CAAC,UAAU,EAAE,YAAY,EAAE,gBAAgB,EAAE,oBAAoB,CAAC,CAAC,KAAK,EAAE,CAAC"}
package/lib/esm/yamlSettings.d.ts CHANGED
@@ -18,6 +18,7 @@ export interface Settings {
18
18
  url: string;
19
19
  enable: boolean;
20
20
  };
21
+ disableDefaultProperties: boolean;
21
22
  disableAdditionalProperties: boolean;
22
23
  maxItemsComputed: number;
23
24
  yamlVersion: YamlVersion;
@@ -53,6 +54,7 @@ export declare class SettingsState {
53
54
  schemaStoreUrl: string;
54
55
  indentation: string | undefined;
55
56
  disableAdditionalProperties: boolean;
57
+ disableDefaultProperties: boolean;
56
58
  maxItemsComputed: number;
57
59
  pendingValidationRequests: {
58
60
  [uri: string]: NodeJS.Timer;
package/lib/esm/yamlSettings.js CHANGED
@@ -25,6 +25,7 @@ export class SettingsState {
25
25
  this.schemaStoreUrl = JSON_SCHEMASTORE_URL;
26
26
  this.indentation = undefined;
27
27
  this.disableAdditionalProperties = false;
28
+ this.disableDefaultProperties = false;
28
29
  this.maxItemsComputed = 5000;
29
30
  // File validation helpers
30
31
  this.pendingValidationRequests = {};
package/lib/esm/yamlSettings.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"yamlSettings.js","sourceRoot":"","sources":["../../src/yamlSettings.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAmD,MAAM,4BAA4B,CAAC;AAK5G,OAAO,EAAE,YAAY,EAAE,MAAM,oCAAoC,CAAC;AAClE,OAAO,EAAE,oBAAoB,EAAE,MAAM,oCAAoC,CAAC;AAqC1E,0DAA0D;AAC1D,MAAM,OAAO,aAAa;IAA1B;QACE,8BAAyB,GAAyB,SAAS,CAAC;QAC5D,uBAAkB,GAA4D,SAAS,CAAC;QACxF,0BAAqB,GAAyB,IAAI,CAAC;QACnD,2BAAsB,GAAG,EAAE,CAAC;QAC5B,gCAA2B,GAAG,EAAE,CAAC;QACjC,uBAAkB,GAAG,IAAI,CAAC;QAC1B,0BAAqB,GAAG;YACtB,WAAW,EAAE,KAAK;YAClB,cAAc,EAAE,IAAI;YACpB,SAAS,EAAE,UAAU;YACrB,UAAU,EAAE,EAAE;YACd,MAAM,EAAE,IAAI;SACa,CAAC;QAC5B,oBAAe,GAAG,IAAI,CAAC;QACvB,yBAAoB,GAAG,IAAI,CAAC;QAC5B,wBAAmB,GAAG,EAAE,CAAC;QACzB,eAAU,GAAG,EAAE,CAAC;QAChB,uBAAkB,GAAG,IAAI,CAAC;QAC1B,mBAAc,GAAG,oBAAoB,CAAC;QACtC,gBAAW,GAAuB,SAAS,CAAC;QAC5C,gCAA2B,GAAG,KAAK,CAAC;QACpC,qBAAgB,GAAG,IAAI,CAAC;QAExB,0BAA0B;QAC1B,8BAAyB,GAAoC,EAAE,CAAC;QAChE,sBAAiB,GAAG,GAAG,CAAC;QAExB,mEAAmE;QACnE,mCAAmC;QACnC,cAAS,GAA0D,IAAI,aAAa,CAAC,YAAY,CAAC,CAAC;QAInG,kBAAa,GAAQ,IAAI,CAAC;QAC1B,qBAAgB,GAAsB,EAAE,CAAC;QACzC,iCAA4B,GAAG,KAAK,CAAC;QACrC,sCAAiC,GAAG,KAAK,CAAC;QAC1C,iCAA4B,GAAG,KAAK,CAAC;QACrC,+BAA0B,GAAG,KAAK,CAAC;QACnC,4BAAuB,GAAG,KAAK,CAAC;QAChC,gBAAW,GAAgB,KAAK,CAAC;QACjC,+BAA0B,GAAG,KAAK,CAAC;QACnC,8CAAyC,GAAG,KAAK,CAAC;IACpD,CAAC;CAAA;AAED,MAAM,OAAO,uBAAwB,SAAQ,aAA2B;IAGtE;QACE,KAAK,CAAC,YAAY,CAAC,CAAC;QAHtB,sBAAiB,GAAG,IAAI,GAAG,EAAwB,CAAC;IAIpD,CAAC;IAED,GAAG,CAAC,GAAW;QACb,OAAO,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IACzC,CAAC;IAED,GAAG,CAAC,YAA0B;QAC5B,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,YAAY,CAAC,GAAG,EAAE,YAAY,CAAC,CAAC;IAC7D,CAAC;CACF"}
1
+ {"version":3,"file":"yamlSettings.js","sourceRoot":"","sources":["../../src/yamlSettings.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAmD,MAAM,4BAA4B,CAAC;AAK5G,OAAO,EAAE,YAAY,EAAE,MAAM,oCAAoC,CAAC;AAClE,OAAO,EAAE,oBAAoB,EAAE,MAAM,oCAAoC,CAAC;AAsC1E,0DAA0D;AAC1D,MAAM,OAAO,aAAa;IAA1B;QACE,8BAAyB,GAAyB,SAAS,CAAC;QAC5D,uBAAkB,GAA4D,SAAS,CAAC;QACxF,0BAAqB,GAAyB,IAAI,CAAC;QACnD,2BAAsB,GAAG,EAAE,CAAC;QAC5B,gCAA2B,GAAG,EAAE,CAAC;QACjC,uBAAkB,GAAG,IAAI,CAAC;QAC1B,0BAAqB,GAAG;YACtB,WAAW,EAAE,KAAK;YAClB,cAAc,EAAE,IAAI;YACpB,SAAS,EAAE,UAAU;YACrB,UAAU,EAAE,EAAE;YACd,MAAM,EAAE,IAAI;SACa,CAAC;QAC5B,oBAAe,GAAG,IAAI,CAAC;QACvB,yBAAoB,GAAG,IAAI,CAAC;QAC5B,wBAAmB,GAAG,EAAE,CAAC;QACzB,eAAU,GAAG,EAAE,CAAC;QAChB,uBAAkB,GAAG,IAAI,CAAC;QAC1B,mBAAc,GAAG,oBAAoB,CAAC;QACtC,gBAAW,GAAuB,SAAS,CAAC;QAC5C,gCAA2B,GAAG,KAAK,CAAC;QACpC,6BAAwB,GAAG,KAAK,CAAC;QACjC,qBAAgB,GAAG,IAAI,CAAC;QAExB,0BAA0B;QAC1B,8BAAyB,GAAoC,EAAE,CAAC;QAChE,sBAAiB,GAAG,GAAG,CAAC;QAExB,mEAAmE;QACnE,mCAAmC;QACnC,cAAS,GAA0D,IAAI,aAAa,CAAC,YAAY,CAAC,CAAC;QAInG,kBAAa,GAAQ,IAAI,CAAC;QAC1B,qBAAgB,GAAsB,EAAE,CAAC;QACzC,iCAA4B,GAAG,KAAK,CAAC;QACrC,sCAAiC,GAAG,KAAK,CAAC;QAC1C,iCAA4B,GAAG,KAAK,CAAC;QACrC,+BAA0B,GAAG,KAAK,CAAC;QACnC,4BAAuB,GAAG,KAAK,CAAC;QAChC,gBAAW,GAAgB,KAAK,CAAC;QACjC,+BAA0B,GAAG,KAAK,CAAC;QACnC,8CAAyC,GAAG,KAAK,CAAC;IACpD,CAAC;CAAA;AAED,MAAM,OAAO,uBAAwB,SAAQ,aAA2B;IAGtE;QACE,KAAK,CAAC,YAAY,CAAC,CAAC;QAHtB,sBAAiB,GAAG,IAAI,GAAG,EAAwB,CAAC;IAIpD,CAAC;IAED,GAAG,CAAC,GAAW;QACb,OAAO,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IACzC,CAAC;IAED,GAAG,CAAC,YAA0B;QAC5B,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,YAAY,CAAC,GAAG,EAAE,YAAY,CAAC,CAAC;IAC7D,CAAC;CACF"}
package/lib/umd/languageserver/handlers/settingsHandlers.js CHANGED
@@ -13,7 +13,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
13
13
  if (v !== undefined) module.exports = v;
14
14
  }
15
15
  else if (typeof define === "function" && define.amd) {
16
- define(["require", "exports", "request-light", "vscode-languageserver", "../../languageservice/utils/paths", "../../languageservice/utils/schemaUrls", "../../languageservice/yamlLanguageService", "../../requestTypes"], factory);
16
+ define(["require", "exports", "request-light", "vscode-languageserver", "../../languageservice/utils/objects", "../../languageservice/utils/paths", "../../languageservice/utils/schemaUrls", "../../languageservice/yamlLanguageService", "../../requestTypes"], factory);
17
17
  }
18
18
  })(function (require, exports) {
19
19
  "use strict";
@@ -25,6 +25,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
25
25
  *--------------------------------------------------------------------------------------------*/
26
26
  const request_light_1 = require("request-light");
27
27
  const vscode_languageserver_1 = require("vscode-languageserver");
28
+ const objects_1 = require("../../languageservice/utils/objects");
28
29
  const paths_1 = require("../../languageservice/utils/paths");
29
30
  const schemaUrls_1 = require("../../languageservice/utils/schemaUrls");
30
31
  const yamlLanguageService_1 = require("../../languageservice/yamlLanguageService");
@@ -45,8 +46,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
45
46
  yield this.connection.client.register(vscode_languageserver_1.DidChangeConfigurationNotification.type, undefined);
46
47
  }
47
48
  catch (err) {
48
- console.warn(err);
49
- this.telemetry.sendError('yaml.settings.error', { error: err });
49
+ this.telemetry.sendError('yaml.settings.error', { error: objects_1.convertErrorToTelemetryMsg(err) });
50
50
  }
51
51
  }
52
52
  this.connection.onDidChangeConfiguration(() => this.pullConfiguration());
@@ -117,6 +117,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
117
117
  }
118
118
  }
119
119
  this.yamlSettings.disableAdditionalProperties = settings.yaml.disableAdditionalProperties;
120
+ this.yamlSettings.disableDefaultProperties = settings.yaml.disableDefaultProperties;
120
121
  }
121
122
  this.yamlSettings.schemaConfigurationSettings = [];
122
123
  if (settings.yamlEditor && settings.yamlEditor['editor.tabSize']) {
@@ -231,6 +232,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
231
232
  format: this.yamlSettings.yamlFormatterSettings.enable,
232
233
  indentation: this.yamlSettings.indentation,
233
234
  disableAdditionalProperties: this.yamlSettings.disableAdditionalProperties,
235
+ disableDefaultProperties: this.yamlSettings.disableDefaultProperties,
234
236
  yamlVersion: this.yamlSettings.yamlVersion,
235
237
  };
236
238
  if (this.yamlSettings.schemaAssociations) {
package/lib/umd/languageserver/handlers/settingsHandlers.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"settingsHandlers.js","sourceRoot":"","sources":["../../../../src/languageserver/handlers/settingsHandlers.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;IAAA;;;oGAGgG;IAChG,iDAAwE;IACxE,iEAAkH;IAClH,6DAA2F;IAC3F,uEAAqH;IACrH,mFAA8G;IAC9G,qDAA6D;IAK7D,MAAa,eAAe;QAC1B,YACmB,UAAsB,EACtB,eAAgC,EAChC,YAA2B,EAC3B,iBAAoC,EACpC,SAAoB;YAJpB,eAAU,GAAV,UAAU,CAAY;YACtB,oBAAe,GAAf,eAAe,CAAiB;YAChC,iBAAY,GAAZ,YAAY,CAAe;YAC3B,sBAAiB,GAAjB,iBAAiB,CAAmB;YACpC,cAAS,GAAT,SAAS,CAAW;QACpC,CAAC;QAEE,gBAAgB;;gBACpB,IAAI,IAAI,CAAC,YAAY,CAAC,0BAA0B,IAAI,IAAI,CAAC,YAAY,CAAC,4BAA4B,EAAE;oBAClG,IAAI;wBACF,0CAA0C;wBAC1C,MAAM,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,QAAQ,CAAC,0DAAkC,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;qBAC3F;oBAAC,OAAO,GAAG,EAAE;wBACZ,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;wBAClB,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,qBAAqB,EAAE,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC,CAAC;qBACjE;iBACF;gBACD,IAAI,CAAC,UAAU,CAAC,wBAAwB,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,iBAAiB,EAAE,CAAC,CAAC;YAC3E,CAAC;SAAA;QAED;;WAEG;QACG,iBAAiB;;;gBACrB,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,gBAAgB,CAAC;oBAC9D,EAAE,OAAO,EAAE,MAAM,EAAE;oBACnB,EAAE,OAAO,EAAE,MAAM,EAAE;oBACnB,EAAE,OAAO,EAAE,QAAQ,EAAE;iBACtB,CAAC,CAAC;gBACH,MAAM,QAAQ,GAAa;oBACzB,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC;oBACf,IAAI,EAAE;wBACJ,KAAK,cAAE,MAAM,CAAC,CAAC,CAAC,0CAAE,KAAK,mCAAI,EAAE;wBAC7B,cAAc,cAAE,MAAM,CAAC,CAAC,CAAC,0CAAE,cAAc,mCAAI,KAAK;qBACnD;oBACD,UAAU,EAAE,MAAM,CAAC,CAAC,CAAC;iBACtB,CAAC;gBACF,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,CAAC;;SACjC;QAEK,gBAAgB,CAAC,QAAkB;;;gBACvC,yBAAqB,CAAC,QAAQ,CAAC,IAAI,IAAI,QAAQ,CAAC,IAAI,CAAC,KAAK,EAAE,QAAQ,CAAC,IAAI,IAAI,QAAQ,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;gBAE3G,IAAI,CAAC,YAAY,CAAC,sBAAsB,GAAG,EAAE,CAAC;gBAC9C,IAAI,QAAQ,CAAC,IAAI,EAAE;oBACjB,IAAI,MAAM,CAAC,SAAS,CAAC,cAAc,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,SAAS,CAAC,EAAE;wBAClE,IAAI,CAAC,YAAY,CAAC,yBAAyB,GAAG,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC;qBACrE;oBACD,IAAI,MAAM,CAAC,SAAS,CAAC,cAAc,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,UAAU,CAAC,EAAE;wBACnE,IAAI,CAAC,YAAY,CAAC,kBAAkB,GAAG,QAAQ,CAAC,IAAI,CAAC,QAAQ,CAAC;qBAC/D;oBACD,IAAI,MAAM,CAAC,SAAS,CAAC,cAAc,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC,EAAE;wBAChE,IAAI,CAAC,YAAY,CAAC,eAAe,GAAG,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC;qBACzD;oBACD,IAAI,MAAM,CAAC,SAAS,CAAC,cAAc,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,YAAY,CAAC,EAAE;wBACrE,IAAI,CAAC,YAAY,CAAC,oBAAoB,GAAG,QAAQ,CAAC,IAAI,CAAC,UAAU,CAAC;qBACnE;oBACD,IAAI,CAAC,YAAY,CAAC,UAAU,GAAG,QAAQ,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,CAAC;oBAExF,IAAI,CAAC,YAAY,CAAC,gBAAgB,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC;oBAE7G,IAAI,QAAQ,CAAC,IAAI,CAAC,WAAW,EAAE;wBAC7B,IAAI,CAAC,YAAY,CAAC,kBAAkB,GAAG,QAAQ,CAAC,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC;wBACxE,IAAI,QAAQ,CAAC,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,MAAM,KAAK,CAAC,EAAE;4BAC9C,IAAI,CAAC,YAAY,CAAC,cAAc,GAAG,QAAQ,CAAC,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC;yBAClE;qBACF;oBAED,IAAI,CAAC,YAAY,CAAC,WAAW,SAAG,QAAQ,CAAC,IAAI,CAAC,WAAW,mCAAI,KAAK,CAAC;oBAEnE,IAAI,QAAQ,CAAC,IAAI,CAAC,MAAM,EAAE;wBACxB,IAAI,CAAC,YAAY,CAAC,qBAAqB,GAAG;4BACxC,SAAS,EAAE,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,SAAS,IAAI,UAAU;4BACvD,UAAU,EAAE,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,UAAU,IAAI,EAAE;yBAClD,CAAC;wBAEF,IAAI,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,WAAW,KAAK,SAAS,EAAE;4BAClD,IAAI,CAAC,YAAY,CAAC,qBAAqB,CAAC,WAAW,GAAG,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC;yBACxF;wBAED,IAAI,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,cAAc,KAAK,SAAS,EAAE;4BACrD,IAAI,CAAC,YAAY,CAAC,qBAAqB,CAAC,cAAc,GAAG,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC;yBAC9F;wBAED,IAAI,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,KAAK,SAAS,EAAE;4BAC7C,IAAI,CAAC,YAAY,CAAC,qBAAqB,CAAC,MAAM,GAAG,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC;yBAC9E;qBACF;oBACD,IAAI,CAAC,YAAY,CAAC,2BAA2B,GAAG,QAAQ,CAAC,IAAI,CAAC,2BAA2B,CAAC;iBAC3F;gBAED,IAAI,CAAC,YAAY,CAAC,2BAA2B,GAAG,EAAE,CAAC;gBAEnD,IAAI,QAAQ,CAAC,UAAU,IAAI,QAAQ,CAAC,UAAU,CAAC,gBAAgB,CAAC,EAAE;oBAChE,IAAI,CAAC,YAAY,CAAC,WAAW,GAAG,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,UAAU,CAAC,gBAAgB,CAAC,CAAC,CAAC;iBACnF;gBAED,KAAK,MAAM,GAAG,IAAI,IAAI,CAAC,YAAY,CAAC,yBAAyB,EAAE;oBAC7D,MAAM,WAAW,GAAG,IAAI,CAAC,YAAY,CAAC,yBAAyB,CAAC,GAAG,CAAC,CAAC;oBAErE,MAAM,SAAS,GAAG;wBAChB,SAAS,EAAE,KAAK,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC;wBACnE,GAAG,EAAE,2BAAc,CAAC,IAAI,CAAC,YAAY,CAAC,gBAAgB,EAAE,IAAI,CAAC,YAAY,CAAC,aAAa,EAAE,GAAG,EAAE,IAAI,CAAC,SAAS,CAAC;qBAC9G,CAAC;oBACF,IAAI,CAAC,YAAY,CAAC,2BAA2B,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;iBAC/D;gBAED,MAAM,IAAI,CAAC,8BAA8B,EAAE,CAAC;gBAC5C,IAAI,CAAC,mBAAmB,EAAE,CAAC;gBAC3B,IAAI,IAAI,CAAC,YAAY,CAAC,0BAA0B,EAAE;oBAChD,IAAI,CAAC,UAAU,CAAC,gBAAgB,CAAC,sCAAuB,CAAC,sBAAsB,EAAE,EAAE,CAAC,CAAC;iBACtF;gBAED,6CAA6C;gBAC7C,IAAI,IAAI,CAAC,YAAY,CAAC,4BAA4B,EAAE;oBAClD,MAAM,eAAe,GAAG,QAAQ,IAAI,QAAQ,CAAC,IAAI,IAAI,QAAQ,CAAC,IAAI,CAAC,MAAM,IAAI,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC;oBAEzG,IAAI,eAAe,EAAE;wBACnB,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,qBAAqB,EAAE;4BAC5C,IAAI,CAAC,YAAY,CAAC,qBAAqB,GAAG,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,QAAQ,CAAC,iDAAyB,CAAC,IAAI,EAAE;gCACxG,gBAAgB,EAAE,CAAC,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC;6BACzC,CAAC,CAAC;yBACJ;qBACF;yBAAM,IAAI,IAAI,CAAC,YAAY,CAAC,qBAAqB,EAAE;wBAClD,IAAI,CAAC,YAAY,CAAC,qBAAqB,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE;4BACjD,OAAO,CAAC,CAAC,OAAO,EAAE,CAAC;wBACrB,CAAC,CAAC,CAAC;wBACH,IAAI,CAAC,YAAY,CAAC,qBAAqB,GAAG,IAAI,CAAC;qBAChD;iBACF;;SACF;QAED;;;;WAIG;QACU,8BAA8B;;gBACzC,MAAM,gBAAgB,GAAG,IAAI,CAAC,YAAY,CAAC,mBAAmB,CAAC,MAAM,KAAK,CAAC,CAAC;gBAC5E,IAAI,cAAc,GAAG,EAAE,CAAC;gBACxB,IAAI,IAAI,CAAC,YAAY,CAAC,cAAc,CAAC,MAAM,KAAK,CAAC,EAAE;oBACjD,cAAc,GAAG,IAAI,CAAC,YAAY,CAAC,cAAc,CAAC;iBACnD;qBAAM;oBACL,cAAc,GAAG,iCAAoB,CAAC;iBACvC;gBAED,IAAI,IAAI,CAAC,YAAY,CAAC,kBAAkB,IAAI,CAAC,gBAAgB,EAAE;oBAC7D,IAAI;wBACF,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,6BAA6B,CAAC,cAAc,CAAC,CAAC;wBAC7E,IAAI,CAAC,YAAY,CAAC,mBAAmB,GAAG,WAAW,CAAC,OAAO,CAAC;wBAC5D,IAAI,CAAC,mBAAmB,EAAE,CAAC;qBAC5B;oBAAC,OAAO,GAAG,EAAE;wBACZ,SAAS;qBACV;iBACF;qBAAM,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,kBAAkB,EAAE;oBAChD,IAAI,CAAC,YAAY,CAAC,mBAAmB,GAAG,EAAE,CAAC;oBAC3C,IAAI,CAAC,mBAAmB,EAAE,CAAC;iBAC5B;YACH,CAAC;SAAA;QAED;;WAEG;QACH,8DAA8D;QACtD,6BAA6B,CAAC,cAAsB;YAC1D,OAAO,mBAAG,CAAC,EAAE,GAAG,EAAE,cAAc,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,EAAE;gBACpD,MAAM,gBAAgB,GAAG;oBACvB,OAAO,EAAE,EAAE;iBACZ,CAAC;gBAEF,yCAAyC;gBACzC,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC;gBAElD,KAAK,MAAM,WAAW,IAAI,OAAO,CAAC,OAAO,EAAE;oBACzC,MAAM,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;oBAE5C,IAAI,MAAM,IAAI,MAAM,CAAC,SAAS,EAAE;wBAC9B,KAAK,MAAM,SAAS,IAAI,MAAM,CAAC,SAAS,EAAE;4BACxC,MAAM,aAAa,GAAW,MAAM,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC;4BAC1D,gFAAgF;4BAChF,IAAI,aAAa,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,IAAI,aAAa,CAAC,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,EAAE;gCACjF,gBAAgB,CAAC,OAAO,CAAC,IAAI,CAAC;oCAC5B,GAAG,EAAE,MAAM,CAAC,GAAG;oCACf,SAAS,EAAE,CAAC,aAAa,CAAC;oCAC1B,QAAQ,EAAE,oCAAc,CAAC,WAAW;oCACpC,IAAI,EAAE,MAAM,CAAC,IAAI;oCACjB,WAAW,EAAE,MAAM,CAAC,WAAW;iCAChC,CAAC,CAAC;6BACJ;yBACF;qBACF;iBACF;gBAED,OAAO,gBAAgB,CAAC;YAC1B,CAAC,CAAC,CAAC;QACL,CAAC;QAED;;;WAGG;QACI,mBAAmB;YACxB,IAAI,gBAAgB,GAAqB;gBACvC,QAAQ,EAAE,IAAI,CAAC,YAAY,CAAC,kBAAkB;gBAC9C,KAAK,EAAE,IAAI,CAAC,YAAY,CAAC,eAAe;gBACxC,UAAU,EAAE,IAAI,CAAC,YAAY,CAAC,oBAAoB;gBAClD,OAAO,EAAE,EAAE;gBACX,UAAU,EAAE,IAAI,CAAC,YAAY,CAAC,UAAU;gBACxC,MAAM,EAAE,IAAI,CAAC,YAAY,CAAC,qBAAqB,CAAC,MAAM;gBACtD,WAAW,EAAE,IAAI,CAAC,YAAY,CAAC,WAAW;gBAC1C,2BAA2B,EAAE,IAAI,CAAC,YAAY,CAAC,2BAA2B;gBAC1E,WAAW,EAAE,IAAI,CAAC,YAAY,CAAC,WAAW;aAC3C,CAAC;YAEF,IAAI,IAAI,CAAC,YAAY,CAAC,kBAAkB,EAAE;gBACxC,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,YAAY,CAAC,kBAAkB,CAAC,EAAE;oBACvD,IAAI,CAAC,YAAY,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAAC,WAAW,EAAE,EAAE;wBAC3D,gBAAgB,GAAG,IAAI,CAAC,gBAAgB,CACtC,WAAW,CAAC,GAAG,EACf,WAAW,CAAC,SAAS,EACrB,WAAW,CAAC,MAAM,EAClB,gBAAgB,EAChB,oCAAc,CAAC,iBAAiB,CACjC,CAAC;oBACJ,CAAC,CAAC,CAAC;iBACJ;qBAAM;oBACL,KAAK,MAAM,GAAG,IAAI,IAAI,CAAC,YAAY,CAAC,kBAAkB,EAAE;wBACtD,MAAM,SAAS,GAAG,IAAI,CAAC,YAAY,CAAC,kBAAkB,CAAC,GAAG,CAAC,CAAC;wBAC5D,gBAAgB,GAAG,IAAI,CAAC,gBAAgB,CAAC,GAAG,EAAE,SAAS,EAAE,IAAI,EAAE,gBAAgB,EAAE,oCAAc,CAAC,iBAAiB,CAAC,CAAC;qBACpH;iBACF;aACF;YAED,IAAI,IAAI,CAAC,YAAY,CAAC,2BAA2B,EAAE;gBACjD,IAAI,CAAC,YAAY,CAAC,2BAA2B,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE;oBAC/D,IAAI,GAAG,GAAG,MAAM,CAAC,GAAG,CAAC;oBACrB,IAAI,CAAC,GAAG,IAAI,MAAM,CAAC,MAAM,EAAE;wBACzB,GAAG,GAAG,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC;qBACxB;oBACD,IAAI,CAAC,GAAG,IAAI,MAAM,CAAC,SAAS,EAAE;wBAC5B,GAAG,GAAG,0BAA0B,GAAG,kBAAkB,CAAC,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;qBACnF;oBACD,IAAI,GAAG,EAAE;wBACP,IAAI,sBAAc,CAAC,GAAG,CAAC,EAAE;4BACvB,GAAG,GAAG,8BAAsB,CAAC,IAAI,CAAC,YAAY,CAAC,gBAAgB,EAAE,IAAI,CAAC,YAAY,CAAC,aAAa,EAAE,GAAG,CAAC,CAAC;yBACxG;wBAED,gBAAgB,GAAG,IAAI,CAAC,gBAAgB,CACtC,GAAG,EACH,MAAM,CAAC,SAAS,EAChB,MAAM,CAAC,MAAM,EACb,gBAAgB,EAChB,oCAAc,CAAC,QAAQ,CACxB,CAAC;qBACH;gBACH,CAAC,CAAC,CAAC;aACJ;YAED,IAAI,IAAI,CAAC,YAAY,CAAC,mBAAmB,EAAE;gBACzC,gBAAgB,CAAC,OAAO,GAAG,gBAAgB,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,mBAAmB,CAAC,CAAC;aACnG;YAED,IAAI,CAAC,eAAe,CAAC,SAAS,CAAC,gBAAgB,CAAC,CAAC;YAEjD,qCAAqC;YACrC,IAAI,CAAC,YAAY,CAAC,SAAS,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,IAAI,CAAC,iBAAiB,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC;QACrG,CAAC;QAED;;;;;;WAMG;QACH,8DAA8D;QACtD,gBAAgB,CACtB,GAAW,EACX,SAAmB,EACnB,MAAe,EACf,gBAAkC,EAClC,aAAqB;YAErB,GAAG,GAAG,2BAAc,CAAC,IAAI,CAAC,YAAY,CAAC,gBAAgB,EAAE,IAAI,CAAC,YAAY,CAAC,aAAa,EAAE,GAAG,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC;YAE/G,IAAI,MAAM,KAAK,IAAI,EAAE;gBACnB,gBAAgB,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,GAAG,EAAE,SAAS,EAAE,SAAS,EAAE,QAAQ,EAAE,aAAa,EAAE,CAAC,CAAC;aACvF;iBAAM;gBACL,gBAAgB,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,GAAG,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,aAAa,EAAE,CAAC,CAAC;aACvG;YAED,IAAI,SAAS,CAAC,WAAW,KAAK,KAAK,IAAI,GAAG,KAAK,kCAAqB,EAAE;gBACpE,SAAS,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;oBACxB,IAAI,CAAC,YAAY,CAAC,sBAAsB,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;gBACrD,CAAC,CAAC,CAAC;aACJ;iBAAM,IAAI,GAAG,KAAK,kCAAqB,EAAE;gBACxC,IAAI,CAAC,YAAY,CAAC,sBAAsB,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;aAC1D;YAED,OAAO,gBAAgB,CAAC;QAC1B,CAAC;KACF;IA/SD,0CA+SC"}
1
+ {"version":3,"file":"settingsHandlers.js","sourceRoot":"","sources":["../../../../src/languageserver/handlers/settingsHandlers.ts"],"names":[],"mappings":"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"}
package/lib/umd/languageservice/parser/ast-converter.js CHANGED
@@ -117,7 +117,15 @@
117
117
  }
118
118
  function convertAlias(node, parent, doc, lineCounter) {
119
119
  refDepth++;
120
- return convertAST(parent, node.resolve(doc), doc, lineCounter);
120
+ const resolvedNode = node.resolve(doc);
121
+ if (resolvedNode) {
122
+ return convertAST(parent, resolvedNode, doc, lineCounter);
123
+ }
124
+ else {
125
+ const resultNode = new jsonParser07_1.StringASTNodeImpl(parent, node, ...toOffsetLength(node.range));
126
+ resultNode.value = node.source;
127
+ return resultNode;
128
+ }
121
129
  }
122
130
  function toOffsetLength(range) {
123
131
  return [range[0], range[1] - range[0]];
package/lib/umd/languageservice/parser/ast-converter.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"ast-converter.js","sourceRoot":"","sources":["../../../../src/languageservice/parser/ast-converter.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"ast-converter.js","sourceRoot":"","sources":["../../../../src/languageservice/parser/ast-converter.ts"],"names":[],"mappings":"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"}
package/lib/umd/languageservice/parser/jsonParser07.d.ts CHANGED
@@ -1,6 +1,6 @@
1
1
  import { JSONSchema, JSONSchemaRef } from '../jsonSchema';
2
2
  import { ASTNode, ObjectASTNode, ArrayASTNode, BooleanASTNode, NumberASTNode, StringASTNode, NullASTNode, PropertyASTNode } from '../jsonASTTypes';
3
- import { ErrorCode, JSONPath } from 'vscode-json-languageservice';
3
+ import { ErrorCode } from 'vscode-json-languageservice';
4
4
  import { DiagnosticSeverity, Range } from 'vscode-languageserver-types';
5
5
  import { TextDocument } from 'vscode-languageserver-textdocument';
6
6
  import { Diagnostic } from 'vscode-languageserver';
@@ -145,8 +145,8 @@ export declare class ValidationResult {
145
145
  }
146
146
  export declare function newJSONDocument(root: ASTNode, diagnostics?: Diagnostic[]): JSONDocument;
147
147
  export declare function getNodeValue(node: ASTNode): any;
148
- export declare function getNodePath(node: ASTNode): JSONPath;
149
148
  export declare function contains(node: ASTNode, offset: number, includeRightBound?: boolean): boolean;
149
+ export declare function findNodeAtOffset(node: ASTNode, offset: number, includeRightBound: boolean): ASTNode;
150
150
  export declare class JSONDocument {
151
151
  readonly root: ASTNode;
152
152
  readonly syntaxErrors: Diagnostic[];
package/lib/umd/languageservice/parser/jsonParser07.js CHANGED
@@ -9,13 +9,12 @@
9
9
  if (v !== undefined) module.exports = v;
10
10
  }
11
11
  else if (typeof define === "function" && define.amd) {
12
- define(["require", "exports", "jsonc-parser", "../utils/objects", "../utils/schemaUtils", "vscode-json-languageservice", "vscode-nls", "vscode-uri", "vscode-languageserver-types", "vscode-languageserver", "../utils/arrUtils", "../utils/strings"], factory);
12
+ define(["require", "exports", "../utils/objects", "../utils/schemaUtils", "vscode-json-languageservice", "vscode-nls", "vscode-uri", "vscode-languageserver-types", "vscode-languageserver", "../utils/arrUtils", "../utils/strings"], factory);
13
13
  }
14
14
  })(function (require, exports) {
15
15
  "use strict";
16
16
  Object.defineProperty(exports, "__esModule", { value: true });
17
- exports.JSONDocument = exports.contains = exports.getNodePath = exports.getNodeValue = exports.newJSONDocument = exports.ValidationResult = exports.EnumMatch = exports.asSchema = exports.ObjectASTNodeImpl = exports.PropertyASTNodeImpl = exports.StringASTNodeImpl = exports.NumberASTNodeImpl = exports.ArrayASTNodeImpl = exports.BooleanASTNodeImpl = exports.NullASTNodeImpl = exports.ASTNodeImpl = exports.ProblemTypeMessages = exports.ProblemType = exports.YAML_SOURCE = exports.formats = void 0;
18
- const Json = require("jsonc-parser");
17
+ exports.JSONDocument = exports.findNodeAtOffset = exports.contains = exports.getNodeValue = exports.newJSONDocument = exports.ValidationResult = exports.EnumMatch = exports.asSchema = exports.ObjectASTNodeImpl = exports.PropertyASTNodeImpl = exports.StringASTNodeImpl = exports.NumberASTNodeImpl = exports.ArrayASTNodeImpl = exports.BooleanASTNodeImpl = exports.NullASTNodeImpl = exports.ASTNodeImpl = exports.ProblemTypeMessages = exports.ProblemType = exports.YAML_SOURCE = exports.formats = void 0;
19
18
  const objects_1 = require("../utils/objects");
20
19
  const schemaUtils_1 = require("../utils/schemaUtils");
21
20
  const vscode_json_languageservice_1 = require("vscode-json-languageservice");
@@ -276,12 +275,12 @@
276
275
  * @param subValidationResult another possible result
277
276
  */
278
277
  mergeWarningGeneric(subValidationResult, problemTypesToMerge) {
279
- var _a, _b;
280
- if ((_a = this.problems) === null || _a === void 0 ? void 0 : _a.length) {
278
+ var _b, _c;
279
+ if ((_b = this.problems) === null || _b === void 0 ? void 0 : _b.length) {
281
280
  for (const problemType of problemTypesToMerge) {
282
281
  const bestResults = this.problems.filter((p) => p.problemType === problemType);
283
282
  for (const bestResult of bestResults) {
284
- const mergingResult = (_b = subValidationResult.problems) === null || _b === void 0 ? void 0 : _b.find((p) => p.problemType === problemType &&
283
+ const mergingResult = (_c = subValidationResult.problems) === null || _c === void 0 ? void 0 : _c.find((p) => p.problemType === problemType &&
285
284
  bestResult.location.offset === p.location.offset &&
286
285
  (problemType !== ProblemType.missingRequiredPropWarning || arrUtils_1.isArrayEqual(p.problemArgs, bestResult.problemArgs)) // missingProp is merged only with same problemArg
287
286
  );
@@ -361,17 +360,53 @@
361
360
  exports.newJSONDocument = newJSONDocument;
362
361
  // eslint-disable-next-line @typescript-eslint/no-explicit-any
363
362
  function getNodeValue(node) {
364
- return Json.getNodeValue(node);
363
+ switch (node.type) {
364
+ case 'array':
365
+ return node.children.map(getNodeValue);
366
+ case 'object': {
367
+ const obj = Object.create(null);
368
+ for (let _i = 0, _a = node.children; _i < _a.length; _i++) {
369
+ const prop = _a[_i];
370
+ const valueNode = prop.children[1];
371
+ if (valueNode) {
372
+ obj[prop.children[0].value] = getNodeValue(valueNode);
373
+ }
374
+ }
375
+ return obj;
376
+ }
377
+ case 'null':
378
+ case 'string':
379
+ case 'number':
380
+ case 'boolean':
381
+ return node.value;
382
+ default:
383
+ return undefined;
384
+ }
365
385
  }
366
386
  exports.getNodeValue = getNodeValue;
367
- function getNodePath(node) {
368
- return Json.getNodePath(node);
369
- }
370
- exports.getNodePath = getNodePath;
371
387
  function contains(node, offset, includeRightBound = false) {
372
388
  return ((offset >= node.offset && offset <= node.offset + node.length) || (includeRightBound && offset === node.offset + node.length));
373
389
  }
374
390
  exports.contains = contains;
391
+ function findNodeAtOffset(node, offset, includeRightBound) {
392
+ if (includeRightBound === void 0) {
393
+ includeRightBound = false;
394
+ }
395
+ if (contains(node, offset, includeRightBound)) {
396
+ const children = node.children;
397
+ if (Array.isArray(children)) {
398
+ for (let i = 0; i < children.length && children[i].offset <= offset; i++) {
399
+ const item = findNodeAtOffset(children[i], offset, includeRightBound);
400
+ if (item) {
401
+ return item;
402
+ }
403
+ }
404
+ }
405
+ return node;
406
+ }
407
+ return undefined;
408
+ }
409
+ exports.findNodeAtOffset = findNodeAtOffset;
375
410
  class JSONDocument {
376
411
  constructor(root, syntaxErrors = [], comments = []) {
377
412
  this.root = root;
@@ -380,7 +415,7 @@
380
415
  }
381
416
  getNodeFromOffset(offset, includeRightBound = false) {
382
417
  if (this.root) {
383
- return Json.findNodeAtOffset(this.root, offset, includeRightBound);
418
+ return findNodeAtOffset(this.root, offset, includeRightBound);
384
419
  }
385
420
  return undefined;
386
421
  }
@@ -516,8 +551,12 @@
516
551
  matchingSchemas.add(ms);
517
552
  }
518
553
  }
519
- const testAlternatives = (alternatives, maxOneMatch) => {
554
+ const testAlternatives = (alternatives, minOneMatch) => {
520
555
  const matches = [];
556
+ let minMatch = 1;
557
+ if (minOneMatch) {
558
+ minMatch = alternatives.length;
559
+ }
521
560
  // remember the best match that is used for error messages
522
561
  let bestMatch = null;
523
562
  for (const subSchemaRef of alternatives) {
@@ -539,14 +578,14 @@
539
578
  bestMatch = alternativeComparison(subValidationResult, bestMatch, subSchema, subMatchingSchemas);
540
579
  }
541
580
  else {
542
- bestMatch = genericComparison(maxOneMatch, subValidationResult, bestMatch, subSchema, subMatchingSchemas);
581
+ bestMatch = genericComparison(minOneMatch, subValidationResult, bestMatch, subSchema, subMatchingSchemas);
543
582
  }
544
583
  }
545
- if (matches.length > 1 && maxOneMatch) {
584
+ if (matches.length > minMatch && minOneMatch) {
546
585
  validationResult.problems.push({
547
586
  location: { offset: node.offset, length: 1 },
548
587
  severity: vscode_languageserver_types_1.DiagnosticSeverity.Warning,
549
- message: localize('oneOfWarning', 'Matches multiple schemas when only one must validate.'),
588
+ message: localize('oneOfWarning', 'Minimum one schema should validate.'),
550
589
  source: getSchemaSource(schema, originalSchema),
551
590
  schemaUri: getSchemaUri(schema, originalSchema),
552
591
  });
@@ -848,12 +887,22 @@
848
887
  else {
849
888
  const itemSchema = asSchema(schema.items);
850
889
  if (itemSchema) {
851
- for (const item of node.items) {
852
- const itemValidationResult = new ValidationResult(isKubernetes);
853
- validate(item, itemSchema, schema, itemValidationResult, matchingSchemas, options);
854
- validationResult.mergePropertyMatch(itemValidationResult);
855
- validationResult.mergeEnumValues(itemValidationResult);
856
- }
890
+ const itemValidationResult = new ValidationResult(isKubernetes);
891
+ node.items.forEach((item) => {
892
+ if (itemSchema.oneOf && itemSchema.oneOf.length === 1) {
893
+ const subSchemaRef = itemSchema.oneOf[0];
894
+ const subSchema = asSchema(subSchemaRef);
895
+ subSchema.title = schema.title;
896
+ validate(item, subSchema, schema, itemValidationResult, matchingSchemas, options);
897
+ validationResult.mergePropertyMatch(itemValidationResult);
898
+ validationResult.mergeEnumValues(itemValidationResult);
899
+ }
900
+ else {
901
+ validate(item, itemSchema, schema, itemValidationResult, matchingSchemas, options);
902
+ validationResult.mergePropertyMatch(itemValidationResult);
903
+ validationResult.mergeEnumValues(itemValidationResult);
904
+ }
905
+ });
857
906
  }
858
907
  }
859
908
  const containsSchema = asSchema(schema.contains);
@@ -908,7 +957,7 @@
908
957
  }
909
958
  }
910
959
  function _validateObjectNode(node, schema, validationResult, matchingSchemas) {
911
- var _a;
960
+ var _b;
912
961
  const seenKeys = Object.create(null);
913
962
  const unprocessedProperties = [];
914
963
  const unprocessedNodes = [...node.properties];
@@ -990,7 +1039,7 @@
990
1039
  }
991
1040
  }
992
1041
  else {
993
- propertySchema.url = (_a = schema.url) !== null && _a !== void 0 ? _a : originalSchema.url;
1042
+ propertySchema.url = (_b = schema.url) !== null && _b !== void 0 ? _b : originalSchema.url;
994
1043
  const propertyValidationResult = new ValidationResult(isKubernetes);
995
1044
  validate(child, propertySchema, schema, propertyValidationResult, matchingSchemas, options);
996
1045
  validationResult.mergePropertyMatch(propertyValidationResult);
@@ -1197,7 +1246,7 @@
1197
1246
  }
1198
1247
  }
1199
1248
  function getSchemaSource(schema, originalSchema) {
1200
- var _a;
1249
+ var _b;
1201
1250
  if (schema) {
1202
1251
  let label;
1203
1252
  if (schema.title) {
@@ -1207,7 +1256,7 @@
1207
1256
  label = originalSchema.title;
1208
1257
  }
1209
1258
  else {
1210
- const uriString = (_a = schema.url) !== null && _a !== void 0 ? _a : originalSchema.url;
1259
+ const uriString = (_b = schema.url) !== null && _b !== void 0 ? _b : originalSchema.url;
1211
1260
  if (uriString) {
1212
1261
  const url = vscode_uri_1.URI.parse(uriString);
1213
1262
  if (url.scheme === 'file') {
@@ -1223,8 +1272,8 @@
1223
1272
  return exports.YAML_SOURCE;
1224
1273
  }
1225
1274
  function getSchemaUri(schema, originalSchema) {
1226
- var _a;
1227
- const uriString = (_a = schema.url) !== null && _a !== void 0 ? _a : originalSchema.url;
1275
+ var _b;
1276
+ const uriString = (_b = schema.url) !== null && _b !== void 0 ? _b : originalSchema.url;
1228
1277
  return uriString ? [uriString] : [];
1229
1278
  }
1230
1279
  function getWarningMessage(problemType, args) {