yaml-language-server 1.10.1-e564235.0 → 1.11.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 (254) hide show
  1. package/CHANGELOG.md +24 -0
  2. package/README.md +9 -0
  3. package/eslint-result.sarif +4397 -0
  4. package/lib/esm/languageserver/handlers/languageHandlers.js +4 -1
  5. package/lib/esm/languageserver/handlers/languageHandlers.js.map +1 -1
  6. package/lib/esm/languageserver/handlers/schemaSelectionHandlers.js +44 -60
  7. package/lib/esm/languageserver/handlers/schemaSelectionHandlers.js.map +1 -1
  8. package/lib/esm/languageserver/handlers/settingsHandlers.d.ts +1 -1
  9. package/lib/esm/languageserver/handlers/settingsHandlers.js +161 -183
  10. package/lib/esm/languageserver/handlers/settingsHandlers.js.map +1 -1
  11. package/lib/esm/languageserver/telemetry.d.ts +2 -12
  12. package/lib/esm/languageserver/telemetry.js +1 -1
  13. package/lib/esm/languageserver/telemetry.js.map +1 -1
  14. package/lib/esm/languageservice/jsonSchema.d.ts +1 -0
  15. package/lib/esm/languageservice/parser/jsonParser07.d.ts +17 -1
  16. package/lib/esm/languageservice/parser/jsonParser07.js +66 -24
  17. package/lib/esm/languageservice/parser/jsonParser07.js.map +1 -1
  18. package/lib/esm/languageservice/parser/yaml-documents.js +6 -5
  19. package/lib/esm/languageservice/parser/yaml-documents.js.map +1 -1
  20. package/lib/esm/languageservice/parser/yamlParser07.js +1 -2
  21. package/lib/esm/languageservice/parser/yamlParser07.js.map +1 -1
  22. package/lib/esm/languageservice/services/documentSymbols.d.ts +1 -1
  23. package/lib/esm/languageservice/services/validation/yaml-style.js +2 -3
  24. package/lib/esm/languageservice/services/validation/yaml-style.js.map +1 -1
  25. package/lib/esm/languageservice/services/yamlCodeActions.js +2 -3
  26. package/lib/esm/languageservice/services/yamlCodeActions.js.map +1 -1
  27. package/lib/esm/languageservice/services/yamlCodeLens.d.ts +1 -1
  28. package/lib/esm/languageservice/services/yamlCodeLens.js +23 -34
  29. package/lib/esm/languageservice/services/yamlCodeLens.js.map +1 -1
  30. package/lib/esm/languageservice/services/yamlCommands.js +3 -12
  31. package/lib/esm/languageservice/services/yamlCommands.js.map +1 -1
  32. package/lib/esm/languageservice/services/yamlCompletion.d.ts +4 -3
  33. package/lib/esm/languageservice/services/yamlCompletion.js +444 -418
  34. package/lib/esm/languageservice/services/yamlCompletion.js.map +1 -1
  35. package/lib/esm/languageservice/services/yamlDefinition.d.ts +1 -1
  36. package/lib/esm/languageservice/services/yamlFolding.js +1 -2
  37. package/lib/esm/languageservice/services/yamlFolding.js.map +1 -1
  38. package/lib/esm/languageservice/services/yamlHover.d.ts +1 -1
  39. package/lib/esm/languageservice/services/yamlHover.js +40 -0
  40. package/lib/esm/languageservice/services/yamlHover.js.map +1 -1
  41. package/lib/esm/languageservice/services/yamlLinks.d.ts +1 -1
  42. package/lib/esm/languageservice/services/yamlOnTypeFormatting.js +0 -1
  43. package/lib/esm/languageservice/services/yamlOnTypeFormatting.js.map +1 -1
  44. package/lib/esm/languageservice/services/yamlSchemaService.js +202 -218
  45. package/lib/esm/languageservice/services/yamlSchemaService.js.map +1 -1
  46. package/lib/esm/languageservice/services/yamlValidation.d.ts +1 -1
  47. package/lib/esm/languageservice/services/yamlValidation.js +61 -71
  48. package/lib/esm/languageservice/services/yamlValidation.js.map +1 -1
  49. package/lib/esm/languageservice/telemetry.d.ts +16 -0
  50. package/lib/esm/languageservice/telemetry.js +6 -0
  51. package/lib/esm/languageservice/telemetry.js.map +1 -0
  52. package/lib/esm/languageservice/utils/astUtils.js +2 -6
  53. package/lib/esm/languageservice/utils/astUtils.js.map +1 -1
  54. package/lib/esm/languageservice/utils/indentationGuesser.js +0 -1
  55. package/lib/esm/languageservice/utils/indentationGuesser.js.map +1 -1
  56. package/lib/esm/languageservice/utils/objects.js +1 -2
  57. package/lib/esm/languageservice/utils/objects.js.map +1 -1
  58. package/lib/esm/languageservice/utils/schemaUrls.d.ts +1 -1
  59. package/lib/esm/languageservice/utils/schemaUrls.js +2 -4
  60. package/lib/esm/languageservice/utils/schemaUrls.js.map +1 -1
  61. package/lib/esm/languageservice/utils/schemaUtils.d.ts +2 -0
  62. package/lib/esm/languageservice/utils/schemaUtils.js +10 -7
  63. package/lib/esm/languageservice/utils/schemaUtils.js.map +1 -1
  64. package/lib/esm/languageservice/yamlLanguageService.d.ts +2 -3
  65. package/lib/esm/languageservice/yamlLanguageService.js +0 -1
  66. package/lib/esm/languageservice/yamlLanguageService.js.map +1 -1
  67. package/lib/esm/server.js +5 -4
  68. package/lib/esm/server.js.map +1 -1
  69. package/lib/esm/webworker/yamlServerMain.js +2 -2
  70. package/lib/esm/webworker/yamlServerMain.js.map +1 -1
  71. package/lib/esm/yamlServerInit.d.ts +1 -1
  72. package/lib/umd/languageserver/handlers/languageHandlers.js +4 -1
  73. package/lib/umd/languageserver/handlers/languageHandlers.js.map +1 -1
  74. package/lib/umd/languageserver/handlers/schemaSelectionHandlers.js +44 -60
  75. package/lib/umd/languageserver/handlers/schemaSelectionHandlers.js.map +1 -1
  76. package/lib/umd/languageserver/handlers/settingsHandlers.d.ts +1 -1
  77. package/lib/umd/languageserver/handlers/settingsHandlers.js +161 -183
  78. package/lib/umd/languageserver/handlers/settingsHandlers.js.map +1 -1
  79. package/lib/umd/languageserver/telemetry.d.ts +2 -12
  80. package/lib/umd/languageserver/telemetry.js +3 -3
  81. package/lib/umd/languageserver/telemetry.js.map +1 -1
  82. package/lib/umd/languageservice/jsonSchema.d.ts +1 -0
  83. package/lib/umd/languageservice/parser/jsonParser07.d.ts +17 -1
  84. package/lib/umd/languageservice/parser/jsonParser07.js +67 -25
  85. package/lib/umd/languageservice/parser/jsonParser07.js.map +1 -1
  86. package/lib/umd/languageservice/parser/yaml-documents.js +6 -5
  87. package/lib/umd/languageservice/parser/yaml-documents.js.map +1 -1
  88. package/lib/umd/languageservice/parser/yamlParser07.js +1 -2
  89. package/lib/umd/languageservice/parser/yamlParser07.js.map +1 -1
  90. package/lib/umd/languageservice/services/documentSymbols.d.ts +1 -1
  91. package/lib/umd/languageservice/services/validation/yaml-style.js +2 -3
  92. package/lib/umd/languageservice/services/validation/yaml-style.js.map +1 -1
  93. package/lib/umd/languageservice/services/yamlCodeActions.js +2 -3
  94. package/lib/umd/languageservice/services/yamlCodeActions.js.map +1 -1
  95. package/lib/umd/languageservice/services/yamlCodeLens.d.ts +1 -1
  96. package/lib/umd/languageservice/services/yamlCodeLens.js +23 -34
  97. package/lib/umd/languageservice/services/yamlCodeLens.js.map +1 -1
  98. package/lib/umd/languageservice/services/yamlCommands.js +3 -12
  99. package/lib/umd/languageservice/services/yamlCommands.js.map +1 -1
  100. package/lib/umd/languageservice/services/yamlCompletion.d.ts +4 -3
  101. package/lib/umd/languageservice/services/yamlCompletion.js +443 -417
  102. package/lib/umd/languageservice/services/yamlCompletion.js.map +1 -1
  103. package/lib/umd/languageservice/services/yamlDefinition.d.ts +1 -1
  104. package/lib/umd/languageservice/services/yamlFolding.js +1 -2
  105. package/lib/umd/languageservice/services/yamlFolding.js.map +1 -1
  106. package/lib/umd/languageservice/services/yamlHover.d.ts +1 -1
  107. package/lib/umd/languageservice/services/yamlHover.js +40 -0
  108. package/lib/umd/languageservice/services/yamlHover.js.map +1 -1
  109. package/lib/umd/languageservice/services/yamlLinks.d.ts +1 -1
  110. package/lib/umd/languageservice/services/yamlOnTypeFormatting.js +0 -1
  111. package/lib/umd/languageservice/services/yamlOnTypeFormatting.js.map +1 -1
  112. package/lib/umd/languageservice/services/yamlSchemaService.js +202 -218
  113. package/lib/umd/languageservice/services/yamlSchemaService.js.map +1 -1
  114. package/lib/umd/languageservice/services/yamlValidation.d.ts +1 -1
  115. package/lib/umd/languageservice/services/yamlValidation.js +61 -71
  116. package/lib/umd/languageservice/services/yamlValidation.js.map +1 -1
  117. package/lib/umd/languageservice/telemetry.d.ts +16 -0
  118. package/lib/umd/languageservice/telemetry.js +17 -0
  119. package/lib/umd/languageservice/telemetry.js.map +1 -0
  120. package/lib/umd/languageservice/utils/astUtils.js +2 -6
  121. package/lib/umd/languageservice/utils/astUtils.js.map +1 -1
  122. package/lib/umd/languageservice/utils/indentationGuesser.js +0 -1
  123. package/lib/umd/languageservice/utils/indentationGuesser.js.map +1 -1
  124. package/lib/umd/languageservice/utils/objects.js +1 -2
  125. package/lib/umd/languageservice/utils/objects.js.map +1 -1
  126. package/lib/umd/languageservice/utils/schemaUrls.d.ts +1 -1
  127. package/lib/umd/languageservice/utils/schemaUrls.js +2 -4
  128. package/lib/umd/languageservice/utils/schemaUrls.js.map +1 -1
  129. package/lib/umd/languageservice/utils/schemaUtils.d.ts +2 -0
  130. package/lib/umd/languageservice/utils/schemaUtils.js +13 -8
  131. package/lib/umd/languageservice/utils/schemaUtils.js.map +1 -1
  132. package/lib/umd/languageservice/yamlLanguageService.d.ts +2 -3
  133. package/lib/umd/languageservice/yamlLanguageService.js +0 -1
  134. package/lib/umd/languageservice/yamlLanguageService.js.map +1 -1
  135. package/lib/umd/server.js +4 -3
  136. package/lib/umd/server.js.map +1 -1
  137. package/lib/umd/webworker/yamlServerMain.js +1 -1
  138. package/lib/umd/webworker/yamlServerMain.js.map +1 -1
  139. package/lib/umd/yamlServerInit.d.ts +1 -1
  140. package/out/server/src/languageserver/handlers/languageHandlers.js +4 -1
  141. package/out/server/src/languageserver/handlers/languageHandlers.js.map +1 -1
  142. package/out/server/src/languageserver/handlers/schemaSelectionHandlers.js +44 -60
  143. package/out/server/src/languageserver/handlers/schemaSelectionHandlers.js.map +1 -1
  144. package/out/server/src/languageserver/handlers/settingsHandlers.d.ts +1 -1
  145. package/out/server/src/languageserver/handlers/settingsHandlers.js +161 -183
  146. package/out/server/src/languageserver/handlers/settingsHandlers.js.map +1 -1
  147. package/out/server/src/languageserver/telemetry.d.ts +2 -12
  148. package/out/server/src/languageserver/telemetry.js +3 -3
  149. package/out/server/src/languageserver/telemetry.js.map +1 -1
  150. package/out/server/src/languageservice/jsonSchema.d.ts +1 -0
  151. package/out/server/src/languageservice/parser/jsonParser07.d.ts +17 -1
  152. package/out/server/src/languageservice/parser/jsonParser07.js +66 -24
  153. package/out/server/src/languageservice/parser/jsonParser07.js.map +1 -1
  154. package/out/server/src/languageservice/parser/yaml-documents.js +6 -5
  155. package/out/server/src/languageservice/parser/yaml-documents.js.map +1 -1
  156. package/out/server/src/languageservice/parser/yamlParser07.js +1 -2
  157. package/out/server/src/languageservice/parser/yamlParser07.js.map +1 -1
  158. package/out/server/src/languageservice/services/documentSymbols.d.ts +1 -1
  159. package/out/server/src/languageservice/services/validation/yaml-style.js +2 -3
  160. package/out/server/src/languageservice/services/validation/yaml-style.js.map +1 -1
  161. package/out/server/src/languageservice/services/yamlCodeActions.js +2 -3
  162. package/out/server/src/languageservice/services/yamlCodeActions.js.map +1 -1
  163. package/out/server/src/languageservice/services/yamlCodeLens.d.ts +1 -1
  164. package/out/server/src/languageservice/services/yamlCodeLens.js +23 -34
  165. package/out/server/src/languageservice/services/yamlCodeLens.js.map +1 -1
  166. package/out/server/src/languageservice/services/yamlCommands.js +3 -12
  167. package/out/server/src/languageservice/services/yamlCommands.js.map +1 -1
  168. package/out/server/src/languageservice/services/yamlCompletion.d.ts +4 -3
  169. package/out/server/src/languageservice/services/yamlCompletion.js +443 -417
  170. package/out/server/src/languageservice/services/yamlCompletion.js.map +1 -1
  171. package/out/server/src/languageservice/services/yamlDefinition.d.ts +1 -1
  172. package/out/server/src/languageservice/services/yamlFolding.js +1 -2
  173. package/out/server/src/languageservice/services/yamlFolding.js.map +1 -1
  174. package/out/server/src/languageservice/services/yamlHover.d.ts +1 -1
  175. package/out/server/src/languageservice/services/yamlHover.js +40 -0
  176. package/out/server/src/languageservice/services/yamlHover.js.map +1 -1
  177. package/out/server/src/languageservice/services/yamlLinks.d.ts +1 -1
  178. package/out/server/src/languageservice/services/yamlOnTypeFormatting.js +0 -1
  179. package/out/server/src/languageservice/services/yamlOnTypeFormatting.js.map +1 -1
  180. package/out/server/src/languageservice/services/yamlSchemaService.js +202 -218
  181. package/out/server/src/languageservice/services/yamlSchemaService.js.map +1 -1
  182. package/out/server/src/languageservice/services/yamlValidation.d.ts +1 -1
  183. package/out/server/src/languageservice/services/yamlValidation.js +61 -71
  184. package/out/server/src/languageservice/services/yamlValidation.js.map +1 -1
  185. package/out/server/src/languageservice/telemetry.d.ts +16 -0
  186. package/out/server/src/languageservice/telemetry.js +7 -0
  187. package/out/server/src/languageservice/telemetry.js.map +1 -0
  188. package/out/server/src/languageservice/utils/astUtils.js +2 -6
  189. package/out/server/src/languageservice/utils/astUtils.js.map +1 -1
  190. package/out/server/src/languageservice/utils/indentationGuesser.js +0 -1
  191. package/out/server/src/languageservice/utils/indentationGuesser.js.map +1 -1
  192. package/out/server/src/languageservice/utils/objects.js +1 -2
  193. package/out/server/src/languageservice/utils/objects.js.map +1 -1
  194. package/out/server/src/languageservice/utils/schemaUrls.d.ts +1 -1
  195. package/out/server/src/languageservice/utils/schemaUrls.js +2 -4
  196. package/out/server/src/languageservice/utils/schemaUrls.js.map +1 -1
  197. package/out/server/src/languageservice/utils/schemaUtils.d.ts +2 -0
  198. package/out/server/src/languageservice/utils/schemaUtils.js +13 -8
  199. package/out/server/src/languageservice/utils/schemaUtils.js.map +1 -1
  200. package/out/server/src/languageservice/yamlLanguageService.d.ts +2 -3
  201. package/out/server/src/languageservice/yamlLanguageService.js +0 -1
  202. package/out/server/src/languageservice/yamlLanguageService.js.map +1 -1
  203. package/out/server/src/server.js +4 -3
  204. package/out/server/src/server.js.map +1 -1
  205. package/out/server/src/webworker/yamlServerMain.js +1 -1
  206. package/out/server/src/webworker/yamlServerMain.js.map +1 -1
  207. package/out/server/src/yamlServerInit.d.ts +1 -1
  208. package/out/server/test/autoCompletion.test.js +267 -178
  209. package/out/server/test/autoCompletion.test.js.map +1 -1
  210. package/out/server/test/autoCompletionFix.test.js +380 -119
  211. package/out/server/test/autoCompletionFix.test.js.map +1 -1
  212. package/out/server/test/code-action-schema.test.js +6 -15
  213. package/out/server/test/code-action-schema.test.js.map +1 -1
  214. package/out/server/test/defaultSnippets.test.js +11 -19
  215. package/out/server/test/defaultSnippets.test.js.map +1 -1
  216. package/out/server/test/findLinks.test.js +3 -12
  217. package/out/server/test/findLinks.test.js.map +1 -1
  218. package/out/server/test/hover.test.js +138 -68
  219. package/out/server/test/hover.test.js.map +1 -1
  220. package/out/server/test/integration.test.js +3 -12
  221. package/out/server/test/integration.test.js.map +1 -1
  222. package/out/server/test/jsonParser.test.js +15 -26
  223. package/out/server/test/jsonParser.test.js.map +1 -1
  224. package/out/server/test/multipleDocuments.test.js +3 -12
  225. package/out/server/test/multipleDocuments.test.js.map +1 -1
  226. package/out/server/test/schema.test.js +71 -85
  227. package/out/server/test/schema.test.js.map +1 -1
  228. package/out/server/test/schemaRequestHandler.test.js +9 -18
  229. package/out/server/test/schemaRequestHandler.test.js.map +1 -1
  230. package/out/server/test/schemaSelectionHandlers.test.js +12 -21
  231. package/out/server/test/schemaSelectionHandlers.test.js.map +1 -1
  232. package/out/server/test/schemaValidation.test.js +247 -94
  233. package/out/server/test/schemaValidation.test.js.map +1 -1
  234. package/out/server/test/settingsHandlers.test.js +44 -55
  235. package/out/server/test/settingsHandlers.test.js.map +1 -1
  236. package/out/server/test/telemetry.test.js +1 -1
  237. package/out/server/test/telemetry.test.js.map +1 -1
  238. package/out/server/test/utils/testsTypes.d.ts +3 -2
  239. package/out/server/test/utils/testsTypes.js +1 -1
  240. package/out/server/test/utils/testsTypes.js.map +1 -1
  241. package/out/server/test/utils/verifyError.d.ts +1 -1
  242. package/out/server/test/utils/verifyError.js +22 -20
  243. package/out/server/test/utils/verifyError.js.map +1 -1
  244. package/out/server/test/yamlCodeLens.test.js +34 -31
  245. package/out/server/test/yamlCodeLens.test.js.map +1 -1
  246. package/out/server/test/yamlCommands.test.js +6 -15
  247. package/out/server/test/yamlCommands.test.js.map +1 -1
  248. package/out/server/test/yamlSchema.test.js +9 -18
  249. package/out/server/test/yamlSchema.test.js.map +1 -1
  250. package/out/server/test/yamlSchemaService.test.js +9 -18
  251. package/out/server/test/yamlSchemaService.test.js.map +1 -1
  252. package/out/server/test/yamlValidation.test.js +30 -39
  253. package/out/server/test/yamlValidation.test.js.map +1 -1
  254. package/package.json +10 -9
@@ -4,15 +4,6 @@
4
4
  * Licensed under the MIT License. See License.txt in the project root for license information.
5
5
  *--------------------------------------------------------------------------------------------*/
6
6
  'use strict';
7
- var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
8
- function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
9
- return new (P || (P = Promise))(function (resolve, reject) {
10
- function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
11
- function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
12
- function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
13
- step((generator = generator.apply(thisArg, _arguments || [])).next());
14
- });
15
- };
16
7
  Object.defineProperty(exports, "__esModule", { value: true });
17
8
  exports.YAMLValidation = exports.yamlDiagToLSDiag = void 0;
18
9
  const vscode_languageserver_types_1 = require("vscode-languageserver-types");
@@ -61,72 +52,71 @@ class YAMLValidation {
61
52
  }
62
53
  this.validators.push(new unused_anchors_1.UnusedAnchorsValidator());
63
54
  }
64
- doValidation(textDocument, isKubernetes = false) {
65
- return __awaiter(this, void 0, void 0, function* () {
66
- if (!this.validationEnabled) {
67
- return Promise.resolve([]);
68
- }
69
- const validationResult = [];
70
- try {
71
- const yamlDocument = yaml_documents_1.yamlDocumentsCache.getYamlDocument(textDocument, { customTags: this.customTags, yamlVersion: this.yamlVersion }, true);
72
- let index = 0;
73
- for (const currentYAMLDoc of yamlDocument.documents) {
74
- currentYAMLDoc.isKubernetes = isKubernetes;
75
- currentYAMLDoc.currentDocIndex = index;
76
- currentYAMLDoc.disableAdditionalProperties = this.disableAdditionalProperties;
77
- const validation = yield this.jsonValidation.doValidation(textDocument, currentYAMLDoc);
78
- const syd = currentYAMLDoc;
79
- if (syd.errors.length > 0) {
80
- // TODO: Get rid of these type assertions (shouldn't need them)
81
- validationResult.push(...syd.errors);
82
- }
83
- if (syd.warnings.length > 0) {
84
- validationResult.push(...syd.warnings);
85
- }
86
- validationResult.push(...validation);
87
- validationResult.push(...this.runAdditionalValidators(textDocument, currentYAMLDoc));
88
- index++;
55
+ async doValidation(textDocument, isKubernetes = false) {
56
+ if (!this.validationEnabled) {
57
+ return Promise.resolve([]);
58
+ }
59
+ const validationResult = [];
60
+ try {
61
+ const yamlDocument = yaml_documents_1.yamlDocumentsCache.getYamlDocument(textDocument, { customTags: this.customTags, yamlVersion: this.yamlVersion }, true);
62
+ let index = 0;
63
+ for (const currentYAMLDoc of yamlDocument.documents) {
64
+ currentYAMLDoc.isKubernetes = isKubernetes;
65
+ currentYAMLDoc.currentDocIndex = index;
66
+ currentYAMLDoc.disableAdditionalProperties = this.disableAdditionalProperties;
67
+ currentYAMLDoc.uri = textDocument.uri;
68
+ const validation = await this.jsonValidation.doValidation(textDocument, currentYAMLDoc);
69
+ const syd = currentYAMLDoc;
70
+ if (syd.errors.length > 0) {
71
+ // TODO: Get rid of these type assertions (shouldn't need them)
72
+ validationResult.push(...syd.errors);
89
73
  }
74
+ if (syd.warnings.length > 0) {
75
+ validationResult.push(...syd.warnings);
76
+ }
77
+ validationResult.push(...validation);
78
+ validationResult.push(...this.runAdditionalValidators(textDocument, currentYAMLDoc));
79
+ index++;
90
80
  }
91
- catch (err) {
92
- this.telemetry.sendError('yaml.validation.error', (0, objects_1.convertErrorToTelemetryMsg)(err));
81
+ }
82
+ catch (err) {
83
+ this.telemetry.sendError('yaml.validation.error', { error: (0, objects_1.convertErrorToTelemetryMsg)(err) });
84
+ }
85
+ let previousErr;
86
+ const foundSignatures = new Set();
87
+ const duplicateMessagesRemoved = [];
88
+ for (let err of validationResult) {
89
+ /**
90
+ * A patch ontop of the validation that removes the
91
+ * 'Matches many schemas' error for kubernetes
92
+ * for a better user experience.
93
+ */
94
+ if (isKubernetes && err.message === this.MATCHES_MULTIPLE) {
95
+ continue;
93
96
  }
94
- let previousErr;
95
- const foundSignatures = new Set();
96
- const duplicateMessagesRemoved = [];
97
- for (let err of validationResult) {
98
- /**
99
- * A patch ontop of the validation that removes the
100
- * 'Matches many schemas' error for kubernetes
101
- * for a better user experience.
102
- */
103
- if (isKubernetes && err.message === this.MATCHES_MULTIPLE) {
104
- continue;
105
- }
106
- if (Object.prototype.hasOwnProperty.call(err, 'location')) {
107
- err = (0, exports.yamlDiagToLSDiag)(err, textDocument);
108
- }
109
- if (!err.source) {
110
- err.source = jsonParser07_1.YAML_SOURCE;
111
- }
112
- if (previousErr &&
113
- previousErr.message === err.message &&
114
- previousErr.range.end.line === err.range.start.line &&
115
- Math.abs(previousErr.range.end.character - err.range.end.character) >= 1) {
116
- previousErr.range.end = err.range.end;
117
- continue;
118
- }
119
- else {
120
- previousErr = err;
121
- }
122
- const errSig = err.range.start.line + ' ' + err.range.start.character + ' ' + err.message;
123
- if (!foundSignatures.has(errSig)) {
124
- duplicateMessagesRemoved.push(err);
125
- foundSignatures.add(errSig);
126
- }
97
+ if (Object.prototype.hasOwnProperty.call(err, 'location')) {
98
+ err = (0, exports.yamlDiagToLSDiag)(err, textDocument);
99
+ }
100
+ if (!err.source) {
101
+ err.source = jsonParser07_1.YAML_SOURCE;
127
102
  }
128
- return duplicateMessagesRemoved;
129
- });
103
+ if (previousErr &&
104
+ previousErr.message === err.message &&
105
+ previousErr.range.end.line === err.range.start.line &&
106
+ Math.abs(previousErr.range.end.character - err.range.end.character) >= 1) {
107
+ previousErr.range.end = err.range.end;
108
+ continue;
109
+ }
110
+ else {
111
+ previousErr = err;
112
+ }
113
+ const errSig = err.range.start.line + ' ' + err.range.start.character + ' ' + err.message;
114
+ if (!foundSignatures.has(errSig)) {
115
+ duplicateMessagesRemoved.push(err);
116
+ foundSignatures.add(errSig);
117
+ }
118
+ }
119
+ return duplicateMessagesRemoved;
130
120
  }
131
121
  runAdditionalValidators(document, yarnDoc) {
132
122
  const result = [];
@@ -1 +1 @@
1
- {"version":3,"file":"yamlValidation.js","sourceRoot":"","sources":["../../../../../src/languageservice/services/yamlValidation.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"yamlValidation.js","sourceRoot":"","sources":["../../../../../src/languageservice/services/yamlValidation.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,16 @@
1
+ /**
2
+ * Due to LSP limitation this object must be JSON serializable
3
+ */
4
+ export interface TelemetryEvent {
5
+ name: string;
6
+ type?: string;
7
+ properties?: unknown;
8
+ measures?: unknown;
9
+ traits?: unknown;
10
+ context?: unknown;
11
+ }
12
+ export interface Telemetry {
13
+ send(event: TelemetryEvent): void;
14
+ sendError(name: string, properties: unknown): void;
15
+ sendTrack(name: string, properties: unknown): void;
16
+ }
@@ -0,0 +1,7 @@
1
+ "use strict";
2
+ /*---------------------------------------------------------------------------------------------
3
+ * Copyright (c) Red Hat, Inc. All rights reserved.
4
+ * Licensed under the MIT License. See License.txt in the project root for license information.
5
+ *--------------------------------------------------------------------------------------------*/
6
+ Object.defineProperty(exports, "__esModule", { value: true });
7
+ //# sourceMappingURL=telemetry.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"telemetry.js","sourceRoot":"","sources":["../../../../src/languageservice/telemetry.ts"],"names":[],"mappings":";AAAA;;;gGAGgG"}
@@ -25,10 +25,7 @@ function isMapContainsEmptyPair(map) {
25
25
  return false;
26
26
  }
27
27
  const pair = map.items[0];
28
- if ((0, yaml_1.isScalar)(pair.key) && (0, yaml_1.isScalar)(pair.value) && pair.key.value === '' && !pair.value.value) {
29
- return true;
30
- }
31
- return false;
28
+ return (0, yaml_1.isScalar)(pair.key) && (0, yaml_1.isScalar)(pair.value) && pair.key.value === '' && !pair.value.value;
32
29
  }
33
30
  exports.isMapContainsEmptyPair = isMapContainsEmptyPair;
34
31
  function indexOf(seq, item) {
@@ -50,8 +47,7 @@ function isInComment(tokens, offset) {
50
47
  for (const token of tokens) {
51
48
  if (token.type === 'document') {
52
49
  _visit([], token, (item) => {
53
- var _a;
54
- if (isCollectionItem(item) && ((_a = item.value) === null || _a === void 0 ? void 0 : _a.type) === 'comment') {
50
+ if (isCollectionItem(item) && item.value?.type === 'comment') {
55
51
  if (token.offset <= offset && item.value.source.length + item.value.offset >= offset) {
56
52
  inComment = true;
57
53
  return yaml_1.visit.BREAK;
@@ -1 +1 @@
1
- {"version":3,"file":"astUtils.js","sourceRoot":"","sources":["../../../../../src/languageservice/utils/astUtils.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"astUtils.js","sourceRoot":"","sources":["../../../../../src/languageservice/utils/astUtils.ts"],"names":[],"mappings":"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"}
@@ -75,7 +75,6 @@ function spacesDiff(a, aLength, b, bLength, result) {
75
75
  }
76
76
  if (spacesDiff % tabsDiff === 0) {
77
77
  result.spacesDiff = spacesDiff / tabsDiff;
78
- return;
79
78
  }
80
79
  }
81
80
  function guessIndentation(source, defaultTabSize, defaultInsertSpaces) {
@@ -1 +1 @@
1
- {"version":3,"file":"indentationGuesser.js","sourceRoot":"","sources":["../../../../../src/languageservice/utils/indentationGuesser.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"indentationGuesser.js","sourceRoot":"","sources":["../../../../../src/languageservice/utils/indentationGuesser.ts"],"names":[],"mappings":"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"}
@@ -87,11 +87,10 @@ exports.isIterable = isIterable;
87
87
  * @param err any error
88
88
  */
89
89
  function convertErrorToTelemetryMsg(err) {
90
- var _a;
91
90
  if (!err)
92
91
  return 'null';
93
92
  if (err instanceof Error) {
94
- return (_a = err.stack) !== null && _a !== void 0 ? _a : err.toString();
93
+ return err.stack ?? err.toString();
95
94
  }
96
95
  return err.toString();
97
96
  }
@@ -1 +1 @@
1
- {"version":3,"file":"objects.js","sourceRoot":"","sources":["../../../../../src/languageservice/utils/objects.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"objects.js","sourceRoot":"","sources":["../../../../../src/languageservice/utils/objects.ts"],"names":[],"mappings":"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"}
@@ -1,6 +1,6 @@
1
1
  import { WorkspaceFolder } from 'vscode-languageserver-protocol';
2
2
  import { URI } from 'vscode-uri';
3
- import { Telemetry } from '../../languageserver/telemetry';
3
+ import { Telemetry } from '../telemetry';
4
4
  import { JSONSchema } from '../jsonSchema';
5
5
  export declare const KUBERNETES_SCHEMA_URL = "https://raw.githubusercontent.com/yannh/kubernetes-json-schema/master/v1.22.4-standalone-strict/all.json";
6
6
  export declare const JSON_SCHEMASTORE_URL = "https://www.schemastore.org/api/json/catalog.json";
@@ -55,10 +55,8 @@ function addSchemasForOf(schema, result) {
55
55
  }
56
56
  function addInnerSchemaUrls(schemas, result) {
57
57
  for (const subSchema of schemas) {
58
- if (!(0, objects_1.isBoolean)(subSchema)) {
59
- if (subSchema.url && !result.has(subSchema.url)) {
60
- result.set(subSchema.url, subSchema);
61
- }
58
+ if (!(0, objects_1.isBoolean)(subSchema) && subSchema.url && !result.has(subSchema.url)) {
59
+ result.set(subSchema.url, subSchema);
62
60
  }
63
61
  }
64
62
  }
@@ -1 +1 @@
1
- {"version":3,"file":"schemaUrls.js","sourceRoot":"","sources":["../../../../../src/languageservice/utils/schemaUrls.ts"],"names":[],"mappings":";;;AAIA,uCAAsC;AACtC,mCAAiE;AAEpD,QAAA,qBAAqB,GAChC,0GAA0G,CAAC;AAChG,QAAA,oBAAoB,GAAG,mDAAmD,CAAC;AAExF,SAAgB,cAAc,CAC5B,gBAAmC,EACnC,aAAkB,EAClB,GAAW,EACX,SAAoB;IAEpB,IAAI,GAAG,CAAC,IAAI,EAAE,CAAC,WAAW,EAAE,KAAK,YAAY,EAAE;QAC7C,SAAS,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,wBAAwB,EAAE,UAAU,EAAE,EAAE,UAAU,EAAE,IAAI,EAAE,EAAE,CAAC,CAAC;QACrF,OAAO,6BAAqB,CAAC;KAC9B;SAAM,IAAI,IAAA,sBAAc,EAAC,GAAG,CAAC,EAAE;QAC9B,OAAO,IAAA,8BAAsB,EAAC,gBAAgB,EAAE,aAAa,EAAE,GAAG,CAAC,CAAC;KACrE;SAAM;QACL,OAAO,GAAG,CAAC;KACZ;AACH,CAAC;AAdD,wCAcC;AAED;;;;GAIG;AACH,SAAgB,aAAa,CAAC,MAAkB;IAC9C,MAAM,MAAM,GAAG,IAAI,GAAG,EAAsB,CAAC;IAC7C,IAAI,CAAC,MAAM,EAAE;QACX,OAAO,MAAM,CAAC;KACf;IAED,IAAI,MAAM,CAAC,GAAG,EAAE;QACd,IAAI,MAAM,CAAC,GAAG,CAAC,UAAU,CAAC,iCAAiC,CAAC,EAAE;YAC5D,eAAe,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;SACjC;aAAM;YACL,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;SAChC;KACF;SAAM;QACL,eAAe,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;KACjC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC;AAhBD,sCAgBC;AAED,SAAS,eAAe,CAAC,MAAkB,EAAE,MAA+B;IAC1E,IAAI,MAAM,CAAC,KAAK,EAAE;QAChB,kBAAkB,CAAC,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;KAC1C;IACD,IAAI,MAAM,CAAC,KAAK,EAAE;QAChB,kBAAkB,CAAC,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;KAC1C;IACD,IAAI,MAAM,CAAC,KAAK,EAAE;QAChB,kBAAkB,CAAC,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;KAC1C;AACH,CAAC;AAED,SAAS,kBAAkB,CAAC,OAAwB,EAAE,MAA+B;IACnF,KAAK,MAAM,SAAS,IAAI,OAAO,EAAE;QAC/B,IAAI,CAAC,IAAA,mBAAS,EAAC,SAAS,CAAC,EAAE;YACzB,IAAI,SAAS,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE;gBAC/C,MAAM,CAAC,GAAG,CAAC,SAAS,CAAC,GAAG,EAAE,SAAS,CAAC,CAAC;aACtC;SACF;KACF;AACH,CAAC"}
1
+ {"version":3,"file":"schemaUrls.js","sourceRoot":"","sources":["../../../../../src/languageservice/utils/schemaUrls.ts"],"names":[],"mappings":";;;AAIA,uCAAsC;AACtC,mCAAiE;AAEpD,QAAA,qBAAqB,GAChC,0GAA0G,CAAC;AAChG,QAAA,oBAAoB,GAAG,mDAAmD,CAAC;AAExF,SAAgB,cAAc,CAC5B,gBAAmC,EACnC,aAAkB,EAClB,GAAW,EACX,SAAoB;IAEpB,IAAI,GAAG,CAAC,IAAI,EAAE,CAAC,WAAW,EAAE,KAAK,YAAY,EAAE;QAC7C,SAAS,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,wBAAwB,EAAE,UAAU,EAAE,EAAE,UAAU,EAAE,IAAI,EAAE,EAAE,CAAC,CAAC;QACrF,OAAO,6BAAqB,CAAC;KAC9B;SAAM,IAAI,IAAA,sBAAc,EAAC,GAAG,CAAC,EAAE;QAC9B,OAAO,IAAA,8BAAsB,EAAC,gBAAgB,EAAE,aAAa,EAAE,GAAG,CAAC,CAAC;KACrE;SAAM;QACL,OAAO,GAAG,CAAC;KACZ;AACH,CAAC;AAdD,wCAcC;AAED;;;;GAIG;AACH,SAAgB,aAAa,CAAC,MAAkB;IAC9C,MAAM,MAAM,GAAG,IAAI,GAAG,EAAsB,CAAC;IAC7C,IAAI,CAAC,MAAM,EAAE;QACX,OAAO,MAAM,CAAC;KACf;IAED,IAAI,MAAM,CAAC,GAAG,EAAE;QACd,IAAI,MAAM,CAAC,GAAG,CAAC,UAAU,CAAC,iCAAiC,CAAC,EAAE;YAC5D,eAAe,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;SACjC;aAAM;YACL,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;SAChC;KACF;SAAM;QACL,eAAe,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;KACjC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC;AAhBD,sCAgBC;AAED,SAAS,eAAe,CAAC,MAAkB,EAAE,MAA+B;IAC1E,IAAI,MAAM,CAAC,KAAK,EAAE;QAChB,kBAAkB,CAAC,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;KAC1C;IACD,IAAI,MAAM,CAAC,KAAK,EAAE;QAChB,kBAAkB,CAAC,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;KAC1C;IACD,IAAI,MAAM,CAAC,KAAK,EAAE;QAChB,kBAAkB,CAAC,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;KAC1C;AACH,CAAC;AAED,SAAS,kBAAkB,CAAC,OAAwB,EAAE,MAA+B;IACnF,KAAK,MAAM,SAAS,IAAI,OAAO,EAAE;QAC/B,IAAI,CAAC,IAAA,mBAAS,EAAC,SAAS,CAAC,IAAI,SAAS,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE;YACxE,MAAM,CAAC,GAAG,CAAC,SAAS,CAAC,GAAG,EAAE,SAAS,CAAC,CAAC;SACtC;KACF;AACH,CAAC"}
@@ -15,3 +15,5 @@ export declare function getSchemaTypeName(schema: JSONSchema): string;
15
15
  */
16
16
  export declare function getSchemaRefTypeTitle($ref: string): string;
17
17
  export declare function getSchemaTitle(schema: JSONSchema, url: string): string;
18
+ export declare function isPrimitiveType(schema: JSONSchema): boolean;
19
+ export declare function isAnyOfAllOfOneOfType(schema: JSONSchema): boolean;
@@ -1,6 +1,6 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.getSchemaTitle = exports.getSchemaRefTypeTitle = exports.getSchemaTypeName = void 0;
3
+ exports.isAnyOfAllOfOneOfType = exports.isPrimitiveType = exports.getSchemaTitle = exports.getSchemaRefTypeTitle = exports.getSchemaTypeName = void 0;
4
4
  const vscode_uri_1 = require("vscode-uri");
5
5
  const path = require("path");
6
6
  function getSchemaTypeName(schema) {
@@ -8,15 +8,12 @@ function getSchemaTypeName(schema) {
8
8
  return schema.title;
9
9
  }
10
10
  if (schema.$id) {
11
- const type = getSchemaRefTypeTitle(schema.$id);
12
- return type;
11
+ return getSchemaRefTypeTitle(schema.$id);
13
12
  }
14
13
  if (schema.$ref || schema._$ref) {
15
- const type = getSchemaRefTypeTitle(schema.$ref || schema._$ref);
16
- return type;
14
+ return getSchemaRefTypeTitle(schema.$ref || schema._$ref);
17
15
  }
18
- const typeStr = schema.closestTitle || (Array.isArray(schema.type) ? schema.type.join(' | ') : schema.type); //object
19
- return typeStr;
16
+ return schema.closestTitle || (Array.isArray(schema.type) ? schema.type.join(' | ') : schema.type); //object
20
17
  }
21
18
  exports.getSchemaTypeName = getSchemaTypeName;
22
19
  /**
@@ -52,9 +49,17 @@ function getSchemaTitle(schema, url) {
52
49
  return Object.getOwnPropertyDescriptor(schema, 'name').value + ` (${baseName})`;
53
50
  }
54
51
  else if (schema.title) {
55
- return schema.title + ` (${baseName})`;
52
+ return schema.description ? schema.title + ' - ' + schema.description + ` (${baseName})` : schema.title + ` (${baseName})`;
56
53
  }
57
54
  return baseName;
58
55
  }
59
56
  exports.getSchemaTitle = getSchemaTitle;
57
+ function isPrimitiveType(schema) {
58
+ return schema.type !== 'object' && !isAnyOfAllOfOneOfType(schema);
59
+ }
60
+ exports.isPrimitiveType = isPrimitiveType;
61
+ function isAnyOfAllOfOneOfType(schema) {
62
+ return !!(schema.anyOf || schema.allOf || schema.oneOf);
63
+ }
64
+ exports.isAnyOfAllOfOneOfType = isAnyOfAllOfOneOfType;
60
65
  //# sourceMappingURL=schemaUtils.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"schemaUtils.js","sourceRoot":"","sources":["../../../../../src/languageservice/utils/schemaUtils.ts"],"names":[],"mappings":";;;AAAA,2CAAiC;AAEjC,6BAA6B;AAE7B,SAAgB,iBAAiB,CAAC,MAAkB;IAClD,IAAI,MAAM,CAAC,KAAK,EAAE;QAChB,OAAO,MAAM,CAAC,KAAK,CAAC;KACrB;IACD,IAAI,MAAM,CAAC,GAAG,EAAE;QACd,MAAM,IAAI,GAAG,qBAAqB,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QAC/C,OAAO,IAAI,CAAC;KACb;IACD,IAAI,MAAM,CAAC,IAAI,IAAI,MAAM,CAAC,KAAK,EAAE;QAC/B,MAAM,IAAI,GAAG,qBAAqB,CAAC,MAAM,CAAC,IAAI,IAAI,MAAM,CAAC,KAAK,CAAC,CAAC;QAChE,OAAO,IAAI,CAAC;KACb;IACD,MAAM,OAAO,GAAG,MAAM,CAAC,YAAY,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,QAAQ;IACrH,OAAO,OAAO,CAAC;AACjB,CAAC;AAdD,8CAcC;AAED;;;;;;;;;;;;GAYG;AACH,SAAgB,qBAAqB,CAAC,IAAY;IAChD,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,qCAAqC,CAAC,CAAC;IAChE,IAAI,IAAI,GAAG,CAAC,CAAC,KAAK,IAAI,KAAK,CAAC,CAAC,CAAC,CAAC;IAC/B,IAAI,CAAC,IAAI,EAAE;QACT,IAAI,GAAG,cAAc,CAAC;QACtB,OAAO,CAAC,KAAK,CAAC,SAAS,IAAI,uBAAuB,CAAC,CAAC;KACrD;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AARD,sDAQC;AAED,SAAgB,cAAc,CAAC,MAAkB,EAAE,GAAW;IAC5D,MAAM,GAAG,GAAG,gBAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAC3B,IAAI,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;IACzC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE;QAC7B,QAAQ,IAAI,OAAO,CAAC;KACrB;IACD,IAAI,MAAM,CAAC,wBAAwB,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE;QACnD,OAAO,MAAM,CAAC,wBAAwB,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,KAAK,GAAG,KAAK,QAAQ,GAAG,CAAC;KACjF;SAAM,IAAI,MAAM,CAAC,KAAK,EAAE;QACvB,OAAO,MAAM,CAAC,KAAK,GAAG,KAAK,QAAQ,GAAG,CAAC;KACxC;IAED,OAAO,QAAQ,CAAC;AAClB,CAAC;AAbD,wCAaC"}
1
+ {"version":3,"file":"schemaUtils.js","sourceRoot":"","sources":["../../../../../src/languageservice/utils/schemaUtils.ts"],"names":[],"mappings":";;;AAAA,2CAAiC;AAEjC,6BAA6B;AAE7B,SAAgB,iBAAiB,CAAC,MAAkB;IAClD,IAAI,MAAM,CAAC,KAAK,EAAE;QAChB,OAAO,MAAM,CAAC,KAAK,CAAC;KACrB;IACD,IAAI,MAAM,CAAC,GAAG,EAAE;QACd,OAAO,qBAAqB,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;KAC1C;IACD,IAAI,MAAM,CAAC,IAAI,IAAI,MAAM,CAAC,KAAK,EAAE;QAC/B,OAAO,qBAAqB,CAAC,MAAM,CAAC,IAAI,IAAI,MAAM,CAAC,KAAK,CAAC,CAAC;KAC3D;IACD,OAAO,MAAM,CAAC,YAAY,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,QAAQ;AAC9G,CAAC;AAXD,8CAWC;AAED;;;;;;;;;;;;GAYG;AACH,SAAgB,qBAAqB,CAAC,IAAY;IAChD,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,qCAAqC,CAAC,CAAC;IAChE,IAAI,IAAI,GAAG,CAAC,CAAC,KAAK,IAAI,KAAK,CAAC,CAAC,CAAC,CAAC;IAC/B,IAAI,CAAC,IAAI,EAAE;QACT,IAAI,GAAG,cAAc,CAAC;QACtB,OAAO,CAAC,KAAK,CAAC,SAAS,IAAI,uBAAuB,CAAC,CAAC;KACrD;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AARD,sDAQC;AAED,SAAgB,cAAc,CAAC,MAAkB,EAAE,GAAW;IAC5D,MAAM,GAAG,GAAG,gBAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAC3B,IAAI,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;IACzC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE;QAC7B,QAAQ,IAAI,OAAO,CAAC;KACrB;IACD,IAAI,MAAM,CAAC,wBAAwB,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE;QACnD,OAAO,MAAM,CAAC,wBAAwB,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,KAAK,GAAG,KAAK,QAAQ,GAAG,CAAC;KACjF;SAAM,IAAI,MAAM,CAAC,KAAK,EAAE;QACvB,OAAO,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,GAAG,KAAK,GAAG,MAAM,CAAC,WAAW,GAAG,KAAK,QAAQ,GAAG,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,GAAG,KAAK,QAAQ,GAAG,CAAC;KAC5H;IAED,OAAO,QAAQ,CAAC;AAClB,CAAC;AAbD,wCAaC;AAED,SAAgB,eAAe,CAAC,MAAkB;IAChD,OAAO,MAAM,CAAC,IAAI,KAAK,QAAQ,IAAI,CAAC,qBAAqB,CAAC,MAAM,CAAC,CAAC;AACpE,CAAC;AAFD,0CAEC;AAED,SAAgB,qBAAqB,CAAC,MAAkB;IACtD,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,IAAI,MAAM,CAAC,KAAK,IAAI,MAAM,CAAC,KAAK,CAAC,CAAC;AAC1D,CAAC;AAFD,sDAEC"}
@@ -5,14 +5,13 @@ import { DocumentSymbolsContext } from 'vscode-json-languageservice';
5
5
  import { ClientCapabilities, CodeActionParams, Connection, DocumentOnTypeFormattingParams, DefinitionParams } from 'vscode-languageserver';
6
6
  import { TextDocument } from 'vscode-languageserver-textdocument';
7
7
  import { FoldingRangesContext, SchemaVersions } from './yamlTypes';
8
- import { Telemetry } from '../languageserver/telemetry';
8
+ import { Telemetry } from './telemetry';
9
9
  import { YamlVersion } from './parser/yamlParser07';
10
10
  import { SettingsState } from '../yamlSettings';
11
11
  export declare enum SchemaPriority {
12
12
  SchemaStore = 1,
13
13
  SchemaAssociation = 2,
14
- Settings = 3,
15
- Modeline = 4
14
+ Settings = 3
16
15
  }
17
16
  export interface SchemasSettings {
18
17
  priority?: SchemaPriority;
@@ -27,7 +27,6 @@ var SchemaPriority;
27
27
  SchemaPriority[SchemaPriority["SchemaStore"] = 1] = "SchemaStore";
28
28
  SchemaPriority[SchemaPriority["SchemaAssociation"] = 2] = "SchemaAssociation";
29
29
  SchemaPriority[SchemaPriority["Settings"] = 3] = "Settings";
30
- SchemaPriority[SchemaPriority["Modeline"] = 4] = "Modeline";
31
30
  })(SchemaPriority = exports.SchemaPriority || (exports.SchemaPriority = {}));
32
31
  function getLanguageService(schemaRequestService, workspaceContext, connection, telemetry, yamlSettings, clientCapabilities) {
33
32
  const schemaService = new yamlSchemaService_1.YAMLSchemaService(schemaRequestService, workspaceContext);
@@ -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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"}
@@ -41,8 +41,9 @@ console.error = (arg) => {
41
41
  };
42
42
  const yamlSettings = new yamlSettings_1.SettingsState();
43
43
  const fileSystem = {
44
- readFile: (fsPath, encoding) => {
45
- return fs_1.promises.readFile(fsPath, encoding).then((b) => b.toString());
44
+ readFile: async (fsPath, encoding) => {
45
+ const b = await fs_1.promises.readFile(fsPath, encoding);
46
+ return b.toString();
46
47
  },
47
48
  };
48
49
  /**
@@ -53,6 +54,6 @@ const schemaRequestHandlerWrapper = (connection, uri) => {
53
54
  return (0, schemaRequestHandler_1.schemaRequestHandler)(connection, uri, yamlSettings.workspaceFolders, yamlSettings.workspaceRoot, yamlSettings.useVSCodeContentRequest, fileSystem);
54
55
  };
55
56
  const schemaRequestService = schemaRequestHandlerWrapper.bind(this, connection);
56
- const telemetry = new telemetry_1.Telemetry(connection);
57
+ const telemetry = new telemetry_1.TelemetryImpl(connection);
57
58
  new yamlServerInit_1.YAMLServerInit(connection, yamlSettings, schemaRequestHandler_1.workspaceContext, schemaRequestService, telemetry).start();
58
59
  //# sourceMappingURL=server.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"server.js","sourceRoot":"","sources":["../../../src/server.ts"],"names":[],"mappings":"AAAA;;;;;gGAKgG;AAChG,YAAY,CAAC;;AAEb,qDAA4F;AAC5F,kCAAkC;AAClC,0FAAyG;AACzG,qDAAkD;AAClD,iDAA+C;AAC/C,2BAAoC;AACpC,6DAA6E;AAC7E,0DAAuD;AAEvD,8DAA8D;AAC9D,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,mBAAmB,CAAQ,CAAC,CAAC;AAEpD,sCAAsC;AACtC,IAAI,UAAU,GAAe,IAAI,CAAC;AAElC,IAAI,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,EAAE;IAC1C,UAAU,GAAG,IAAA,uBAAgB,EAAC,uBAAgB,CAAC,GAAG,CAAC,CAAC;CACrD;KAAM;IACL,UAAU,GAAG,IAAA,uBAAgB,GAAE,CAAC;CACjC;AAED,OAAO,CAAC,EAAE,CAAC,mBAAmB,EAAE,CAAC,GAAU,EAAE,EAAE;IAC7C,6DAA6D;IAC7D,UAAU,CAAC,OAAO,CAAC,KAAK,CAAC,IAAA,oCAA0B,EAAC,GAAG,CAAC,CAAC,CAAC;AAC5D,CAAC,CAAC,CAAC;AAEH,OAAO,CAAC,GAAG,GAAG,UAAU,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;AAC9D,OAAO,CAAC,KAAK,GAAG,UAAU,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;AAElE,uHAAuH;AACvH,OAAO,CAAC,KAAK,GAAG,CAAC,GAAG,EAAE,EAAE;IACtB,IAAI,GAAG,KAAK,IAAI,EAAE;QAChB,UAAU,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;KAC9B;SAAM;QACL,UAAU,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;KAC/B;AACH,CAAC,CAAC;AAEF,MAAM,YAAY,GAAG,IAAI,4BAAa,EAAE,CAAC;AAEzC,MAAM,UAAU,GAAG;IACjB,QAAQ,EAAE,CAAC,MAAc,EAAE,QAAiB,EAAE,EAAE;QAC9C,OAAO,aAAE,CAAC,QAAQ,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC;IACjE,CAAC;CACF,CAAC;AAEF;;;GAGG;AACH,MAAM,2BAA2B,GAAG,CAAC,UAAsB,EAAE,GAAW,EAAmB,EAAE;IAC3F,OAAO,IAAA,2CAAoB,EACzB,UAAU,EACV,GAAG,EACH,YAAY,CAAC,gBAAgB,EAC7B,YAAY,CAAC,aAAa,EAC1B,YAAY,CAAC,uBAAuB,EACpC,UAAU,CACX,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,oBAAoB,GAAG,2BAA2B,CAAC,IAAI,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;AAChF,MAAM,SAAS,GAAG,IAAI,qBAAS,CAAC,UAAU,CAAC,CAAC;AAE5C,IAAI,+BAAc,CAAC,UAAU,EAAE,YAAY,EAAE,uCAAgB,EAAE,oBAAoB,EAAE,SAAS,CAAC,CAAC,KAAK,EAAE,CAAC"}
1
+ {"version":3,"file":"server.js","sourceRoot":"","sources":["../../../src/server.ts"],"names":[],"mappings":"AAAA;;;;;gGAKgG;AAChG,YAAY,CAAC;;AAEb,qDAA4F;AAC5F,kCAAkC;AAClC,0FAAyG;AACzG,qDAAkD;AAClD,iDAA+C;AAC/C,2BAAoC;AACpC,6DAA6E;AAC7E,0DAA2D;AAE3D,8DAA8D;AAC9D,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,mBAAmB,CAAQ,CAAC,CAAC;AAEpD,sCAAsC;AACtC,IAAI,UAAU,GAAe,IAAI,CAAC;AAElC,IAAI,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,EAAE;IAC1C,UAAU,GAAG,IAAA,uBAAgB,EAAC,uBAAgB,CAAC,GAAG,CAAC,CAAC;CACrD;KAAM;IACL,UAAU,GAAG,IAAA,uBAAgB,GAAE,CAAC;CACjC;AAED,OAAO,CAAC,EAAE,CAAC,mBAAmB,EAAE,CAAC,GAAU,EAAE,EAAE;IAC7C,6DAA6D;IAC7D,UAAU,CAAC,OAAO,CAAC,KAAK,CAAC,IAAA,oCAA0B,EAAC,GAAG,CAAC,CAAC,CAAC;AAC5D,CAAC,CAAC,CAAC;AAEH,OAAO,CAAC,GAAG,GAAG,UAAU,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;AAC9D,OAAO,CAAC,KAAK,GAAG,UAAU,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;AAElE,uHAAuH;AACvH,OAAO,CAAC,KAAK,GAAG,CAAC,GAAG,EAAE,EAAE;IACtB,IAAI,GAAG,KAAK,IAAI,EAAE;QAChB,UAAU,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;KAC9B;SAAM;QACL,UAAU,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;KAC/B;AACH,CAAC,CAAC;AAEF,MAAM,YAAY,GAAG,IAAI,4BAAa,EAAE,CAAC;AAEzC,MAAM,UAAU,GAAG;IACjB,QAAQ,EAAE,KAAK,EAAE,MAAc,EAAE,QAAiB,EAAE,EAAE;QACpD,MAAM,CAAC,GAAG,MAAM,aAAE,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,IAAA,2CAAoB,EACzB,UAAU,EACV,GAAG,EACH,YAAY,CAAC,gBAAgB,EAC7B,YAAY,CAAC,aAAa,EAC1B,YAAY,CAAC,uBAAuB,EACpC,UAAU,CACX,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,oBAAoB,GAAG,2BAA2B,CAAC,IAAI,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;AAChF,MAAM,SAAS,GAAG,IAAI,yBAAa,CAAC,UAAU,CAAC,CAAC;AAEhD,IAAI,+BAAc,CAAC,UAAU,EAAE,YAAY,EAAE,uCAAgB,EAAE,oBAAoB,EAAE,SAAS,CAAC,CAAC,KAAK,EAAE,CAAC"}
@@ -35,6 +35,6 @@ const schemaRequestHandlerWrapper = (connection, uri) => {
35
35
  return (0, schemaRequestHandler_1.schemaRequestHandler)(connection, uri, yamlSettings.workspaceFolders, yamlSettings.workspaceRoot, yamlSettings.useVSCodeContentRequest, fileSystem);
36
36
  };
37
37
  const schemaRequestService = schemaRequestHandlerWrapper.bind(this, connection);
38
- const telemetry = new telemetry_1.Telemetry(connection);
38
+ const telemetry = new telemetry_1.TelemetryImpl(connection);
39
39
  new yamlServerInit_1.YAMLServerInit(connection, yamlSettings, schemaRequestHandler_1.workspaceContext, schemaRequestService, telemetry).start();
40
40
  //# sourceMappingURL=yamlServerMain.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"yamlServerMain.js","sourceRoot":"","sources":["../../../../src/webworker/yamlServerMain.ts"],"names":[],"mappings":";;AAAA;;;;gGAIgG;AAChG,iEAAgE;AAChE,2DAA6G;AAC7G,2DAAwD;AACxD,2FAA0G;AAC1G,sDAAmD;AACnD,kDAAgD;AAEhD,2DAA2D;AAC3D,IAAU,UAAU,CAInB;AAJD,WAAU,UAAU;IAClB,6DAA6D;IAC7D,wDAAwD;IAC3C,eAAI,GAAoC,IAAI,mCAAW,CAAC,aAAa,CAAC,CAAC;AACtF,CAAC,EAJS,UAAU,KAAV,UAAU,QAInB;AAED,MAAM,aAAa,GAAG,IAAI,8BAAoB,CAAC,UAAU,CAAC,CAAC;AAC3D,MAAM,aAAa,GAAG,IAAI,8BAAoB,CAAC,UAAU,CAAC,CAAC;AAE3D,MAAM,UAAU,GAAG,IAAA,0BAAgB,EAAC,aAAa,EAAE,aAAa,CAAC,CAAC;AAElE,MAAM,YAAY,GAAG,IAAI,4BAAa,EAAE,CAAC;AAEzC,MAAM,UAAU,GAAG;IACjB,QAAQ,EAAE,CAAC,MAAc,EAAE,EAAE;QAC3B,OAAO,UAAU,CAAC,WAAW,CAAC,UAAU,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IACzD,CAAC;CACF,CAAC;AAEF;;;GAGG;AACH,MAAM,2BAA2B,GAAG,CAAC,UAAsB,EAAE,GAAW,EAAmB,EAAE;IAC3F,OAAO,IAAA,2CAAoB,EACzB,UAAU,EACV,GAAG,EACH,YAAY,CAAC,gBAAgB,EAC7B,YAAY,CAAC,aAAa,EAC1B,YAAY,CAAC,uBAAuB,EACpC,UAAU,CACX,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,oBAAoB,GAAG,2BAA2B,CAAC,IAAI,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;AAChF,MAAM,SAAS,GAAG,IAAI,qBAAS,CAAC,UAAU,CAAC,CAAC;AAE5C,IAAI,+BAAc,CAAC,UAAU,EAAE,YAAY,EAAE,uCAAgB,EAAE,oBAAoB,EAAE,SAAS,CAAC,CAAC,KAAK,EAAE,CAAC"}
1
+ {"version":3,"file":"yamlServerMain.js","sourceRoot":"","sources":["../../../../src/webworker/yamlServerMain.ts"],"names":[],"mappings":";;AAAA;;;;gGAIgG;AAChG,iEAAgE;AAChE,2DAA6G;AAC7G,2DAA4D;AAC5D,2FAA0G;AAC1G,sDAAmD;AACnD,kDAAgD;AAEhD,2DAA2D;AAC3D,IAAU,UAAU,CAInB;AAJD,WAAU,UAAU;IAClB,6DAA6D;IAC7D,wDAAwD;IAC3C,eAAI,GAAoC,IAAI,mCAAW,CAAC,aAAa,CAAC,CAAC;AACtF,CAAC,EAJS,UAAU,KAAV,UAAU,QAInB;AAED,MAAM,aAAa,GAAG,IAAI,8BAAoB,CAAC,UAAU,CAAC,CAAC;AAC3D,MAAM,aAAa,GAAG,IAAI,8BAAoB,CAAC,UAAU,CAAC,CAAC;AAE3D,MAAM,UAAU,GAAG,IAAA,0BAAgB,EAAC,aAAa,EAAE,aAAa,CAAC,CAAC;AAElE,MAAM,YAAY,GAAG,IAAI,4BAAa,EAAE,CAAC;AAEzC,MAAM,UAAU,GAAG;IACjB,QAAQ,EAAE,CAAC,MAAc,EAAE,EAAE;QAC3B,OAAO,UAAU,CAAC,WAAW,CAAC,UAAU,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IACzD,CAAC;CACF,CAAC;AAEF;;;GAGG;AACH,MAAM,2BAA2B,GAAG,CAAC,UAAsB,EAAE,GAAW,EAAmB,EAAE;IAC3F,OAAO,IAAA,2CAAoB,EACzB,UAAU,EACV,GAAG,EACH,YAAY,CAAC,gBAAgB,EAC7B,YAAY,CAAC,aAAa,EAC1B,YAAY,CAAC,uBAAuB,EACpC,UAAU,CACX,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,oBAAoB,GAAG,2BAA2B,CAAC,IAAI,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;AAChF,MAAM,SAAS,GAAG,IAAI,yBAAa,CAAC,UAAU,CAAC,CAAC;AAEhD,IAAI,+BAAc,CAAC,UAAU,EAAE,YAAY,EAAE,uCAAgB,EAAE,oBAAoB,EAAE,SAAS,CAAC,CAAC,KAAK,EAAE,CAAC"}
@@ -4,7 +4,7 @@ import { SettingsState } from './yamlSettings';
4
4
  import { LanguageHandlers } from './languageserver/handlers/languageHandlers';
5
5
  import { ValidationHandler } from './languageserver/handlers/validationHandlers';
6
6
  import { SettingsHandler } from './languageserver/handlers/settingsHandlers';
7
- import { Telemetry } from './languageserver/telemetry';
7
+ import { Telemetry } from './languageservice/telemetry';
8
8
  export declare class YAMLServerInit {
9
9
  private readonly connection;
10
10
  private yamlSettings;