yaml-language-server 1.19.1-fce910a.0 → 1.19.2

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 (121) hide show
  1. package/CHANGELOG.md +36 -0
  2. package/Dockerfile +2 -2
  3. package/README.md +5 -4
  4. package/l10n/bundle.l10n.de.json +56 -0
  5. package/l10n/bundle.l10n.fr.json +56 -0
  6. package/l10n/bundle.l10n.ja.json +56 -0
  7. package/l10n/bundle.l10n.json +56 -0
  8. package/l10n/bundle.l10n.ko.json +56 -0
  9. package/l10n/bundle.l10n.zh-cn.json +56 -0
  10. package/l10n/bundle.l10n.zh-tw.json +56 -0
  11. package/lib/esm/languageserver/handlers/settingsHandlers.js +2 -0
  12. package/lib/esm/languageserver/handlers/settingsHandlers.js.map +1 -1
  13. package/lib/esm/languageservice/jsonASTTypes.d.ts +2 -2
  14. package/lib/esm/languageservice/jsonSchema.d.ts +1 -1
  15. package/lib/esm/languageservice/parser/ast-converter.d.ts +7 -2
  16. package/lib/esm/languageservice/parser/ast-converter.js +20 -12
  17. package/lib/esm/languageservice/parser/ast-converter.js.map +1 -1
  18. package/lib/esm/languageservice/parser/jsonParser07.js +38 -45
  19. package/lib/esm/languageservice/parser/jsonParser07.js.map +1 -1
  20. package/lib/esm/languageservice/parser/yamlParser07.d.ts +1 -1
  21. package/lib/esm/languageservice/services/validation/unused-anchors.js +3 -2
  22. package/lib/esm/languageservice/services/validation/unused-anchors.js.map +1 -1
  23. package/lib/esm/languageservice/services/validation/yaml-style.js +3 -2
  24. package/lib/esm/languageservice/services/validation/yaml-style.js.map +1 -1
  25. package/lib/esm/languageservice/services/yamlCodeActions.js +9 -8
  26. package/lib/esm/languageservice/services/yamlCodeActions.js.map +1 -1
  27. package/lib/esm/languageservice/services/yamlCompletion.js +40 -38
  28. package/lib/esm/languageservice/services/yamlCompletion.js.map +1 -1
  29. package/lib/esm/languageservice/services/yamlHover.js +11 -4
  30. package/lib/esm/languageservice/services/yamlHover.js.map +1 -1
  31. package/lib/esm/languageservice/services/yamlSchemaService.js +31 -8
  32. package/lib/esm/languageservice/services/yamlSchemaService.js.map +1 -1
  33. package/lib/esm/languageservice/yamlTypes.d.ts +1 -1
  34. package/lib/esm/requestTypes.d.ts +1 -1
  35. package/lib/esm/server.js +0 -3
  36. package/lib/esm/server.js.map +1 -1
  37. package/lib/esm/yamlServerInit.d.ts +2 -1
  38. package/lib/esm/yamlServerInit.js +24 -2
  39. package/lib/esm/yamlServerInit.js.map +1 -1
  40. package/lib/esm/yamlSettings.d.ts +1 -1
  41. package/lib/esm/yamlSettings.js.map +1 -1
  42. package/lib/umd/languageserver/handlers/settingsHandlers.js +2 -0
  43. package/lib/umd/languageserver/handlers/settingsHandlers.js.map +1 -1
  44. package/lib/umd/languageservice/jsonASTTypes.d.ts +2 -2
  45. package/lib/umd/languageservice/jsonSchema.d.ts +1 -1
  46. package/lib/umd/languageservice/parser/ast-converter.d.ts +7 -2
  47. package/lib/umd/languageservice/parser/ast-converter.js +21 -13
  48. package/lib/umd/languageservice/parser/ast-converter.js.map +1 -1
  49. package/lib/umd/languageservice/parser/jsonParser07.js +39 -46
  50. package/lib/umd/languageservice/parser/jsonParser07.js.map +1 -1
  51. package/lib/umd/languageservice/parser/yamlParser07.d.ts +1 -1
  52. package/lib/umd/languageservice/services/validation/unused-anchors.js +4 -3
  53. package/lib/umd/languageservice/services/validation/unused-anchors.js.map +1 -1
  54. package/lib/umd/languageservice/services/validation/yaml-style.js +4 -3
  55. package/lib/umd/languageservice/services/validation/yaml-style.js.map +1 -1
  56. package/lib/umd/languageservice/services/yamlCodeActions.js +10 -9
  57. package/lib/umd/languageservice/services/yamlCodeActions.js.map +1 -1
  58. package/lib/umd/languageservice/services/yamlCompletion.js +41 -39
  59. package/lib/umd/languageservice/services/yamlCompletion.js.map +1 -1
  60. package/lib/umd/languageservice/services/yamlHover.js +12 -5
  61. package/lib/umd/languageservice/services/yamlHover.js.map +1 -1
  62. package/lib/umd/languageservice/services/yamlSchemaService.js +32 -9
  63. package/lib/umd/languageservice/services/yamlSchemaService.js.map +1 -1
  64. package/lib/umd/languageservice/yamlTypes.d.ts +1 -1
  65. package/lib/umd/requestTypes.d.ts +1 -1
  66. package/lib/umd/server.js +1 -4
  67. package/lib/umd/server.js.map +1 -1
  68. package/lib/umd/yamlServerInit.d.ts +2 -1
  69. package/lib/umd/yamlServerInit.js +25 -3
  70. package/lib/umd/yamlServerInit.js.map +1 -1
  71. package/lib/umd/yamlSettings.d.ts +1 -1
  72. package/lib/umd/yamlSettings.js.map +1 -1
  73. package/out/server/src/languageserver/handlers/settingsHandlers.js +2 -0
  74. package/out/server/src/languageserver/handlers/settingsHandlers.js.map +1 -1
  75. package/out/server/src/languageservice/jsonASTTypes.d.ts +2 -2
  76. package/out/server/src/languageservice/jsonSchema.d.ts +1 -1
  77. package/out/server/src/languageservice/parser/ast-converter.d.ts +7 -2
  78. package/out/server/src/languageservice/parser/ast-converter.js +21 -13
  79. package/out/server/src/languageservice/parser/ast-converter.js.map +1 -1
  80. package/out/server/src/languageservice/parser/jsonParser07.js +38 -45
  81. package/out/server/src/languageservice/parser/jsonParser07.js.map +1 -1
  82. package/out/server/src/languageservice/parser/yamlParser07.d.ts +1 -1
  83. package/out/server/src/languageservice/services/validation/unused-anchors.js +3 -2
  84. package/out/server/src/languageservice/services/validation/unused-anchors.js.map +1 -1
  85. package/out/server/src/languageservice/services/validation/yaml-style.js +3 -2
  86. package/out/server/src/languageservice/services/validation/yaml-style.js.map +1 -1
  87. package/out/server/src/languageservice/services/yamlCodeActions.js +9 -8
  88. package/out/server/src/languageservice/services/yamlCodeActions.js.map +1 -1
  89. package/out/server/src/languageservice/services/yamlCompletion.js +40 -38
  90. package/out/server/src/languageservice/services/yamlCompletion.js.map +1 -1
  91. package/out/server/src/languageservice/services/yamlHover.js +11 -4
  92. package/out/server/src/languageservice/services/yamlHover.js.map +1 -1
  93. package/out/server/src/languageservice/services/yamlSchemaService.js +31 -8
  94. package/out/server/src/languageservice/services/yamlSchemaService.js.map +1 -1
  95. package/out/server/src/languageservice/yamlTypes.d.ts +1 -1
  96. package/out/server/src/requestTypes.d.ts +1 -1
  97. package/out/server/src/server.js +0 -3
  98. package/out/server/src/server.js.map +1 -1
  99. package/out/server/src/yamlServerInit.d.ts +2 -1
  100. package/out/server/src/yamlServerInit.js +24 -2
  101. package/out/server/src/yamlServerInit.js.map +1 -1
  102. package/out/server/src/yamlSettings.d.ts +1 -1
  103. package/out/server/src/yamlSettings.js.map +1 -1
  104. package/out/server/test/autoCompletion.test.js +146 -76
  105. package/out/server/test/autoCompletion.test.js.map +1 -1
  106. package/out/server/test/bundlel10n.test.d.ts +1 -0
  107. package/out/server/test/bundlel10n.test.js +72 -0
  108. package/out/server/test/bundlel10n.test.js.map +1 -0
  109. package/out/server/test/hover.test.js +103 -0
  110. package/out/server/test/hover.test.js.map +1 -1
  111. package/out/server/test/utils/testHelper.js +5 -0
  112. package/out/server/test/utils/testHelper.js.map +1 -1
  113. package/out/server/test/utils/verifyError.d.ts +1 -1
  114. package/out/server/test/utils/verifyError.js.map +1 -1
  115. package/out/server/test/yamlCodeActions.test.js +13 -0
  116. package/out/server/test/yamlCodeActions.test.js.map +1 -1
  117. package/out/server/test/yamlParser.test.js +61 -0
  118. package/out/server/test/yamlParser.test.js.map +1 -1
  119. package/out/server/test/yamlSelectionRanges.test.js +1 -1
  120. package/package.json +10 -10
  121. package/eslint-result.sarif +0 -3656
package/lib/umd/languageservice/services/validation/yaml-style.js CHANGED
@@ -4,7 +4,7 @@
4
4
  if (v !== undefined) module.exports = v;
5
5
  }
6
6
  else if (typeof define === "function" && define.amd) {
7
- define(["require", "exports", "vscode-languageserver-types", "yaml"], factory);
7
+ define(["require", "exports", "vscode-languageserver-types", "yaml", "@vscode/l10n"], factory);
8
8
  }
9
9
  })(function (require, exports) {
10
10
  "use strict";
@@ -12,6 +12,7 @@
12
12
  exports.YAMLStyleValidator = void 0;
13
13
  const vscode_languageserver_types_1 = require("vscode-languageserver-types");
14
14
  const yaml_1 = require("yaml");
15
+ const l10n = require("@vscode/l10n");
15
16
  class YAMLStyleValidator {
16
17
  constructor(settings) {
17
18
  this.forbidMapping = settings.flowMapping === 'forbid';
@@ -21,10 +22,10 @@
21
22
  const result = [];
22
23
  (0, yaml_1.visit)(yamlDoc.internalDocument, (key, node) => {
23
24
  if (this.forbidMapping && (0, yaml_1.isMap)(node) && node.srcToken?.type === 'flow-collection') {
24
- result.push(vscode_languageserver_types_1.Diagnostic.create(this.getRangeOf(document, node.srcToken), 'Flow style mapping is forbidden', vscode_languageserver_types_1.DiagnosticSeverity.Error, 'flowMap'));
25
+ result.push(vscode_languageserver_types_1.Diagnostic.create(this.getRangeOf(document, node.srcToken), l10n.t('flowStyleMapForbidden', 'Flow style mapping is forbidden'), vscode_languageserver_types_1.DiagnosticSeverity.Error, 'flowMap'));
25
26
  }
26
27
  if (this.forbidSequence && (0, yaml_1.isSeq)(node) && node.srcToken?.type === 'flow-collection') {
27
- result.push(vscode_languageserver_types_1.Diagnostic.create(this.getRangeOf(document, node.srcToken), 'Flow style sequence is forbidden', vscode_languageserver_types_1.DiagnosticSeverity.Error, 'flowSeq'));
28
+ result.push(vscode_languageserver_types_1.Diagnostic.create(this.getRangeOf(document, node.srcToken), l10n.t('flowStyleSeqForbidden'), vscode_languageserver_types_1.DiagnosticSeverity.Error, 'flowSeq'));
28
29
  }
29
30
  });
30
31
  return result;
package/lib/umd/languageservice/services/validation/yaml-style.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"yaml-style.js","sourceRoot":"","sources":["../../../../../src/languageservice/services/validation/yaml-style.ts"],"names":[],"mappings":";;;;;;;;;;;;IACA,6EAAoF;IACpF,+BAA2C;IAM3C,MAAa,kBAAkB;QAI7B,YAAY,QAA0B;YACpC,IAAI,CAAC,aAAa,GAAG,QAAQ,CAAC,WAAW,KAAK,QAAQ,CAAC;YACvD,IAAI,CAAC,cAAc,GAAG,QAAQ,CAAC,YAAY,KAAK,QAAQ,CAAC;QAC3D,CAAC;QACD,QAAQ,CAAC,QAAsB,EAAE,OAA2B;YAC1D,MAAM,MAAM,GAAG,EAAE,CAAC;YAClB,IAAA,YAAK,EAAC,OAAO,CAAC,gBAAgB,EAAE,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE;gBAC5C,IAAI,IAAI,CAAC,aAAa,IAAI,IAAA,YAAK,EAAC,IAAI,CAAC,IAAI,IAAI,CAAC,QAAQ,EAAE,IAAI,KAAK,iBAAiB,EAAE;oBAClF,MAAM,CAAC,IAAI,CACT,wCAAU,CAAC,MAAM,CACf,IAAI,CAAC,UAAU,CAAC,QAAQ,EAAE,IAAI,CAAC,QAAQ,CAAC,EACxC,iCAAiC,EACjC,gDAAkB,CAAC,KAAK,EACxB,SAAS,CACV,CACF,CAAC;iBACH;gBACD,IAAI,IAAI,CAAC,cAAc,IAAI,IAAA,YAAK,EAAC,IAAI,CAAC,IAAI,IAAI,CAAC,QAAQ,EAAE,IAAI,KAAK,iBAAiB,EAAE;oBACnF,MAAM,CAAC,IAAI,CACT,wCAAU,CAAC,MAAM,CACf,IAAI,CAAC,UAAU,CAAC,QAAQ,EAAE,IAAI,CAAC,QAAQ,CAAC,EACxC,kCAAkC,EAClC,gDAAkB,CAAC,KAAK,EACxB,SAAS,CACV,CACF,CAAC;iBACH;YACH,CAAC,CAAC,CAAC;YACH,OAAO,MAAM,CAAC;QAChB,CAAC;QAEO,UAAU,CAAC,QAAsB,EAAE,IAAoB;YAC7D,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC;YACrC,IAAI,WAAW,GAAG,QAAQ,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;YACjD,WAAW,GAAG,EAAE,SAAS,EAAE,WAAW,CAAC,SAAS,GAAG,CAAC,EAAE,IAAI,EAAE,WAAW,CAAC,IAAI,EAAE,CAAC;YAC/E,OAAO,mCAAK,CAAC,MAAM,CAAC,QAAQ,CAAC,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE,WAAW,CAAC,CAAC;QAC3E,CAAC;KACF;IAzCD,gDAyCC"}
1
+ {"version":3,"file":"yaml-style.js","sourceRoot":"","sources":["../../../../../src/languageservice/services/validation/yaml-style.ts"],"names":[],"mappings":";;;;;;;;;;;;IACA,6EAAoF;IACpF,+BAA2C;IAK3C,qCAAqC;IAErC,MAAa,kBAAkB;QAI7B,YAAY,QAA0B;YACpC,IAAI,CAAC,aAAa,GAAG,QAAQ,CAAC,WAAW,KAAK,QAAQ,CAAC;YACvD,IAAI,CAAC,cAAc,GAAG,QAAQ,CAAC,YAAY,KAAK,QAAQ,CAAC;QAC3D,CAAC;QACD,QAAQ,CAAC,QAAsB,EAAE,OAA2B;YAC1D,MAAM,MAAM,GAAG,EAAE,CAAC;YAClB,IAAA,YAAK,EAAC,OAAO,CAAC,gBAAgB,EAAE,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE;gBAC5C,IAAI,IAAI,CAAC,aAAa,IAAI,IAAA,YAAK,EAAC,IAAI,CAAC,IAAI,IAAI,CAAC,QAAQ,EAAE,IAAI,KAAK,iBAAiB,EAAE;oBAClF,MAAM,CAAC,IAAI,CACT,wCAAU,CAAC,MAAM,CACf,IAAI,CAAC,UAAU,CAAC,QAAQ,EAAE,IAAI,CAAC,QAAQ,CAAC,EACxC,IAAI,CAAC,CAAC,CAAC,uBAAuB,EAAE,iCAAiC,CAAC,EAClE,gDAAkB,CAAC,KAAK,EACxB,SAAS,CACV,CACF,CAAC;iBACH;gBACD,IAAI,IAAI,CAAC,cAAc,IAAI,IAAA,YAAK,EAAC,IAAI,CAAC,IAAI,IAAI,CAAC,QAAQ,EAAE,IAAI,KAAK,iBAAiB,EAAE;oBACnF,MAAM,CAAC,IAAI,CACT,wCAAU,CAAC,MAAM,CACf,IAAI,CAAC,UAAU,CAAC,QAAQ,EAAE,IAAI,CAAC,QAAQ,CAAC,EACxC,IAAI,CAAC,CAAC,CAAC,uBAAuB,CAAC,EAC/B,gDAAkB,CAAC,KAAK,EACxB,SAAS,CACV,CACF,CAAC;iBACH;YACH,CAAC,CAAC,CAAC;YACH,OAAO,MAAM,CAAC;QAChB,CAAC;QAEO,UAAU,CAAC,QAAsB,EAAE,IAAoB;YAC7D,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC;YACrC,IAAI,WAAW,GAAG,QAAQ,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;YACjD,WAAW,GAAG,EAAE,SAAS,EAAE,WAAW,CAAC,SAAS,GAAG,CAAC,EAAE,IAAI,EAAE,WAAW,CAAC,IAAI,EAAE,CAAC;YAC/E,OAAO,mCAAK,CAAC,MAAM,CAAC,QAAQ,CAAC,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE,WAAW,CAAC,CAAC;QAC3E,CAAC;KACF;IAzCD,gDAyCC"}
package/lib/umd/languageservice/services/yamlCodeActions.js CHANGED
@@ -8,7 +8,7 @@
8
8
  if (v !== undefined) module.exports = v;
9
9
  }
10
10
  else if (typeof define === "function" && define.amd) {
11
- define(["require", "exports", "vscode-languageserver-types", "../../commands", "path", "../utils/textBuffer", "../parser/jsonParser07", "../utils/strings", "../utils/arrUtils", "yaml", "../parser/yaml-documents", "../utils/flow-style-rewriter", "lodash", "vscode-json-languageservice"], factory);
11
+ define(["require", "exports", "vscode-languageserver-types", "../../commands", "path", "../utils/textBuffer", "../parser/jsonParser07", "../utils/strings", "../utils/arrUtils", "yaml", "../parser/yaml-documents", "../utils/flow-style-rewriter", "lodash", "vscode-json-languageservice", "@vscode/l10n"], factory);
12
12
  }
13
13
  })(function (require, exports) {
14
14
  "use strict";
@@ -26,6 +26,7 @@
26
26
  const flow_style_rewriter_1 = require("../utils/flow-style-rewriter");
27
27
  const _ = require("lodash");
28
28
  const vscode_json_languageservice_1 = require("vscode-json-languageservice");
29
+ const l10n = require("@vscode/l10n");
29
30
  class YamlCodeActions {
30
31
  constructor(clientCapabilities) {
31
32
  this.clientCapabilities = clientCapabilities;
@@ -67,7 +68,7 @@
67
68
  }
68
69
  const result = [];
69
70
  for (const schemaUri of schemaUriToDiagnostic.keys()) {
70
- const action = vscode_languageserver_types_1.CodeAction.create(`Jump to schema location (${path.basename(schemaUri)})`, vscode_languageserver_types_1.Command.create('JumpToSchema', commands_1.YamlCommands.JUMP_TO_SCHEMA, schemaUri));
71
+ const action = vscode_languageserver_types_1.CodeAction.create(l10n.t('jumpToSchema', path.basename(schemaUri)), vscode_languageserver_types_1.Command.create('JumpToSchema', commands_1.YamlCommands.JUMP_TO_SCHEMA, schemaUri));
71
72
  action.diagnostics = schemaUriToDiagnostic.get(schemaUri);
72
73
  result.push(action);
73
74
  }
@@ -98,7 +99,7 @@
98
99
  if (replacedTabs !== diag.range.end.character - diag.range.start.character) {
99
100
  resultRange = vscode_languageserver_types_1.Range.create(diag.range.start, vscode_languageserver_types_1.Position.create(diag.range.end.line, diag.range.start.character + replacedTabs));
100
101
  }
101
- result.push(vscode_languageserver_types_1.CodeAction.create('Convert Tab to Spaces', createWorkspaceEdit(document.uri, [vscode_languageserver_types_1.TextEdit.replace(resultRange, newText)]), vscode_languageserver_types_1.CodeActionKind.QuickFix));
102
+ result.push(vscode_languageserver_types_1.CodeAction.create(l10n.t('convertToSpace'), createWorkspaceEdit(document.uri, [vscode_languageserver_types_1.TextEdit.replace(resultRange, newText)]), vscode_languageserver_types_1.CodeActionKind.QuickFix));
102
103
  }
103
104
  }
104
105
  if (result.length !== 0) {
@@ -134,7 +135,7 @@
134
135
  }
135
136
  }
136
137
  if (replaceEdits.length > 0) {
137
- result.push(vscode_languageserver_types_1.CodeAction.create('Convert all Tabs to Spaces', createWorkspaceEdit(document.uri, replaceEdits), vscode_languageserver_types_1.CodeActionKind.QuickFix));
138
+ result.push(vscode_languageserver_types_1.CodeAction.create(l10n.t('convertAllSpaceToTab'), createWorkspaceEdit(document.uri, replaceEdits), vscode_languageserver_types_1.CodeActionKind.QuickFix));
138
139
  }
139
140
  }
140
141
  return result;
@@ -149,7 +150,7 @@
149
150
  const lineContent = buffer.getLineContent(range.end.line);
150
151
  const lastWhitespaceChar = (0, strings_1.getFirstNonWhitespaceCharacterAfterOffset)(lineContent, range.end.character);
151
152
  range.end.character = lastWhitespaceChar;
152
- const action = vscode_languageserver_types_1.CodeAction.create(`Delete unused anchor: ${actual}`, createWorkspaceEdit(document.uri, [vscode_languageserver_types_1.TextEdit.del(range)]), vscode_languageserver_types_1.CodeActionKind.QuickFix);
153
+ const action = vscode_languageserver_types_1.CodeAction.create(l10n.t('deleteUnusedAnchor', actual), createWorkspaceEdit(document.uri, [vscode_languageserver_types_1.TextEdit.del(range)]), vscode_languageserver_types_1.CodeActionKind.QuickFix);
153
154
  action.diagnostics = [diag];
154
155
  result.push(action);
155
156
  }
@@ -163,7 +164,7 @@
163
164
  const value = document.getText(diagnostic.range).toLocaleLowerCase();
164
165
  if (value === '"true"' || value === '"false"' || value === "'true'" || value === "'false'") {
165
166
  const newValue = value.includes('true') ? 'true' : 'false';
166
- results.push(vscode_languageserver_types_1.CodeAction.create('Convert to boolean', createWorkspaceEdit(document.uri, [vscode_languageserver_types_1.TextEdit.replace(diagnostic.range, newValue)]), vscode_languageserver_types_1.CodeActionKind.QuickFix));
167
+ results.push(vscode_languageserver_types_1.CodeAction.create(l10n.t('convertToBoolean'), createWorkspaceEdit(document.uri, [vscode_languageserver_types_1.TextEdit.replace(diagnostic.range, newValue)]), vscode_languageserver_types_1.CodeActionKind.QuickFix));
167
168
  }
168
169
  }
169
170
  }
@@ -177,7 +178,7 @@
177
178
  if ((0, yaml_1.isMap)(node.internalNode) || (0, yaml_1.isSeq)(node.internalNode)) {
178
179
  const blockTypeDescription = (0, yaml_1.isMap)(node.internalNode) ? 'map' : 'sequence';
179
180
  const rewriter = new flow_style_rewriter_1.FlowStyleRewriter(this.indentation);
180
- results.push(vscode_languageserver_types_1.CodeAction.create(`Convert to block style ${blockTypeDescription}`, createWorkspaceEdit(document.uri, [vscode_languageserver_types_1.TextEdit.replace(diagnostic.range, rewriter.write(node))]), vscode_languageserver_types_1.CodeActionKind.QuickFix));
181
+ results.push(vscode_languageserver_types_1.CodeAction.create(l10n.t('convertToBlockStyle', 'Convert to block style {0}', blockTypeDescription), createWorkspaceEdit(document.uri, [vscode_languageserver_types_1.TextEdit.replace(diagnostic.range, rewriter.write(node))]), vscode_languageserver_types_1.CodeActionKind.QuickFix));
181
182
  }
182
183
  }
183
184
  }
@@ -242,7 +243,7 @@
242
243
  }
243
244
  }
244
245
  const replaceRange = vscode_languageserver_types_1.Range.create(document.positionAt(node.offset), document.positionAt(node.offset + node.length));
245
- results.push(vscode_languageserver_types_1.CodeAction.create('Fix key order for this map', createWorkspaceEdit(document.uri, [vscode_languageserver_types_1.TextEdit.replace(replaceRange, yaml_1.CST.stringify(sorted.srcToken))]), vscode_languageserver_types_1.CodeActionKind.QuickFix));
246
+ results.push(vscode_languageserver_types_1.CodeAction.create(l10n.t('fixKeyOrderToMap'), createWorkspaceEdit(document.uri, [vscode_languageserver_types_1.TextEdit.replace(replaceRange, yaml_1.CST.stringify(sorted.srcToken))]), vscode_languageserver_types_1.CodeActionKind.QuickFix));
246
247
  }
247
248
  }
248
249
  }
@@ -275,7 +276,7 @@
275
276
  continue;
276
277
  }
277
278
  for (const value of values) {
278
- results.push(vscode_languageserver_types_1.CodeAction.create(value, createWorkspaceEdit(document.uri, [vscode_languageserver_types_1.TextEdit.replace(diagnostic.range, value)]), vscode_languageserver_types_1.CodeActionKind.QuickFix));
279
+ results.push(vscode_languageserver_types_1.CodeAction.create(String(value), createWorkspaceEdit(document.uri, [vscode_languageserver_types_1.TextEdit.replace(diagnostic.range, String(value))]), vscode_languageserver_types_1.CodeActionKind.QuickFix));
279
280
  }
280
281
  }
281
282
  return results;
package/lib/umd/languageservice/services/yamlCodeActions.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"yamlCodeActions.js","sourceRoot":"","sources":["../../../../src/languageservice/services/yamlCodeActions.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"yamlCodeActions.js","sourceRoot":"","sources":["../../../../src/languageservice/services/yamlCodeActions.ts"],"names":[],"mappings":"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"}
package/lib/umd/languageservice/services/yamlCompletion.js CHANGED
@@ -8,7 +8,7 @@
8
8
  if (v !== undefined) module.exports = v;
9
9
  }
10
10
  else if (typeof define === "function" && define.amd) {
11
- define(["require", "exports", "vscode-languageserver-types", "yaml", "../utils/arrUtils", "../utils/indentationGuesser", "../utils/textBuffer", "../utils/json", "../utils/objects", "vscode-nls", "../parser/isKubernetes", "../parser/jsonParser07", "../utils/astUtils", "./modelineUtil", "../utils/schemaUtils"], factory);
11
+ define(["require", "exports", "vscode-languageserver-types", "yaml", "../utils/arrUtils", "../utils/indentationGuesser", "../utils/textBuffer", "../utils/json", "../utils/objects", "../parser/isKubernetes", "../parser/jsonParser07", "../utils/astUtils", "./modelineUtil", "../utils/schemaUtils", "@vscode/l10n"], factory);
12
12
  }
13
13
  })(function (require, exports) {
14
14
  "use strict";
@@ -21,13 +21,12 @@
21
21
  const textBuffer_1 = require("../utils/textBuffer");
22
22
  const json_1 = require("../utils/json");
23
23
  const objects_1 = require("../utils/objects");
24
- const nls = require("vscode-nls");
25
24
  const isKubernetes_1 = require("../parser/isKubernetes");
26
25
  const jsonParser07_1 = require("../parser/jsonParser07");
27
26
  const astUtils_1 = require("../utils/astUtils");
28
27
  const modelineUtil_1 = require("./modelineUtil");
29
28
  const schemaUtils_1 = require("../utils/schemaUtils");
30
- const localize = nls.loadMessageBundle();
29
+ const l10n = require("@vscode/l10n");
31
30
  const doubleQuotesEscapeRegExp = /[\\]+"/g;
32
31
  const parentCompletionKind = vscode_languageserver_types_1.CompletionItemKind.Class;
33
32
  const existingProposeItem = '__';
@@ -258,7 +257,7 @@
258
257
  if (position.line === 0 && position.character === 0 && !(0, modelineUtil_1.isModeline)(lineContent)) {
259
258
  const inlineSchemaCompletion = {
260
259
  kind: vscode_languageserver_types_1.CompletionItemKind.Text,
261
- label: 'Inline schema',
260
+ label: l10n.t('Inline schema'),
262
261
  insertText: '# yaml-language-server: $schema=',
263
262
  insertTextFormat: vscode_languageserver_types_1.InsertTextFormat.PlainText,
264
263
  };
@@ -457,6 +456,9 @@
457
456
  }
458
457
  }
459
458
  }
459
+ const ignoreScalars = textBuffer.getLineContent(overwriteRange.start.line).trim().length === 0 &&
460
+ originalNode &&
461
+ (((0, yaml_1.isScalar)(originalNode) && originalNode.value === null) || (0, yaml_1.isSeq)(originalNode));
460
462
  // completion for object keys
461
463
  if (node && (0, yaml_1.isMap)(node)) {
462
464
  // don't suggest properties that are already present
@@ -468,7 +470,7 @@
468
470
  }
469
471
  }
470
472
  }
471
- this.addPropertyCompletions(schema, currentDoc, node, originalNode, '', collector, textBuffer, overwriteRange, doComplete);
473
+ this.addPropertyCompletions(schema, currentDoc, node, originalNode, '', collector, textBuffer, overwriteRange, doComplete, ignoreScalars);
472
474
  if (!schema && currentWord.length > 0 && text.charAt(offset - currentWord.length - 1) !== '"') {
473
475
  collector.add({
474
476
  kind: vscode_languageserver_types_1.CompletionItemKind.Property,
@@ -480,7 +482,7 @@
480
482
  }
481
483
  // proposals for values
482
484
  const types = {};
483
- this.getValueCompletions(schema, currentDoc, node, offset, document, collector, types, doComplete);
485
+ this.getValueCompletions(schema, currentDoc, node, offset, document, collector, types, doComplete, ignoreScalars);
484
486
  }
485
487
  catch (err) {
486
488
  this.telemetry?.sendError('yaml.completion.error', err);
@@ -594,7 +596,7 @@
594
596
  map.items[0].value.range = node.range;
595
597
  return map;
596
598
  }
597
- addPropertyCompletions(schema, doc, node, originalNode, separatorAfter, collector, textBuffer, overwriteRange, doComplete) {
599
+ addPropertyCompletions(schema, doc, node, originalNode, separatorAfter, collector, textBuffer, overwriteRange, doComplete, ignoreScalars) {
598
600
  const matchingSchemas = doc.getMatchingSchemas(schema.schema, -1, null, doComplete);
599
601
  const existingKey = textBuffer.getText(overwriteRange);
600
602
  const lineContent = textBuffer.getLineContent(overwriteRange.start.line);
@@ -658,7 +660,7 @@
658
660
  textBuffer.getPosition(it.key.range[2]).line === overwriteRange.end.line - 1)) &&
659
661
  pair) {
660
662
  if (Array.isArray(propertySchema.items)) {
661
- this.addSchemaValueCompletions(propertySchema.items[0], separatorAfter, collector, {}, 'property');
663
+ this.addSchemaValueCompletions(propertySchema.items[0], separatorAfter, collector, {}, ignoreScalars, true);
662
664
  }
663
665
  else if (typeof propertySchema.items === 'object' && propertySchema.items.type === 'object') {
664
666
  this.addArrayItemValueCompletion(propertySchema.items, separatorAfter, collector);
@@ -704,7 +706,7 @@
704
706
  // - item1
705
707
  // it will treated as a property key since `:` has been appended
706
708
  if (nodeParent && (0, yaml_1.isSeq)(nodeParent) && (0, schemaUtils_1.isPrimitiveType)(schema.schema)) {
707
- this.addSchemaValueCompletions(schema.schema, separatorAfter, collector, {}, 'property', Array.isArray(nodeParent.items));
709
+ this.addSchemaValueCompletions(schema.schema, separatorAfter, collector, {}, ignoreScalars);
708
710
  }
709
711
  if (schema.schema.propertyNames && schema.schema.additionalProperties && schema.schema.type === 'object') {
710
712
  const propertyNameSchema = (0, jsonParser07_1.asSchema)(schema.schema.propertyNames);
@@ -740,13 +742,13 @@
740
742
  }
741
743
  }
742
744
  }
743
- getValueCompletions(schema, doc, node, offset, document, collector, types, doComplete) {
745
+ getValueCompletions(schema, doc, node, offset, document, collector, types, doComplete, ignoreScalars) {
744
746
  let parentKey = null;
745
747
  if (node && (0, yaml_1.isScalar)(node)) {
746
748
  node = doc.getParent(node);
747
749
  }
748
750
  if (!node) {
749
- this.addSchemaValueCompletions(schema.schema, '', collector, types, 'value');
751
+ this.addSchemaValueCompletions(schema.schema, '', collector, types, false);
750
752
  return;
751
753
  }
752
754
  if ((0, yaml_1.isPair)(node)) {
@@ -772,26 +774,23 @@
772
774
  if (Array.isArray(s.schema.items)) {
773
775
  const index = this.findItemAtOffset(node, document, offset);
774
776
  if (index < s.schema.items.length) {
775
- this.addSchemaValueCompletions(s.schema.items[index], separatorAfter, collector, types, 'value');
777
+ this.addSchemaValueCompletions(s.schema.items[index], separatorAfter, collector, types, false);
776
778
  }
777
779
  }
778
- else if (typeof s.schema.items === 'object' &&
779
- (s.schema.items.type === 'object' || (0, schemaUtils_1.isAnyOfAllOfOneOfType)(s.schema.items))) {
780
- this.addSchemaValueCompletions(s.schema.items, separatorAfter, collector, types, 'value', true);
781
- }
782
780
  else {
783
- this.addSchemaValueCompletions(s.schema.items, separatorAfter, collector, types, 'value');
781
+ this.addSchemaValueCompletions(s.schema.items, separatorAfter, collector, types, ignoreScalars, typeof s.schema.items === 'object' &&
782
+ (s.schema.items.type === 'object' || (0, schemaUtils_1.isAnyOfAllOfOneOfType)(s.schema.items)));
784
783
  }
785
784
  }
786
785
  }
787
786
  if (s.schema.properties) {
788
787
  const propertySchema = s.schema.properties[parentKey];
789
788
  if (propertySchema) {
790
- this.addSchemaValueCompletions(propertySchema, separatorAfter, collector, types, 'value');
789
+ this.addSchemaValueCompletions(propertySchema, separatorAfter, collector, types, ignoreScalars);
791
790
  }
792
791
  }
793
792
  if (s.schema.additionalProperties) {
794
- this.addSchemaValueCompletions(s.schema.additionalProperties, separatorAfter, collector, types, 'value');
793
+ this.addSchemaValueCompletions(s.schema.additionalProperties, separatorAfter, collector, types, ignoreScalars);
795
794
  }
796
795
  }
797
796
  }
@@ -810,10 +809,10 @@
810
809
  //append insertText to documentation
811
810
  const schemaTypeTitle = schemaType ? ' type `' + schemaType + '`' : '';
812
811
  const schemaDescription = schema.description ? ' (' + schema.description + ')' : '';
813
- const documentation = this.getDocumentationWithMarkdownText(`Create an item of an array${schemaTypeTitle}${schemaDescription}`, insertText);
812
+ const documentation = this.getDocumentationWithMarkdownText(l10n.t('create.item.array', schemaTypeTitle, schemaDescription), insertText);
814
813
  collector.add({
815
814
  kind: this.getSuggestionKind(schema.type),
816
- label: '- (array item) ' + (schemaType || index),
815
+ label: l10n.t('array.item') + (schemaType || index),
817
816
  documentation: documentation,
818
817
  insertText: insertText,
819
818
  insertTextFormat: vscode_languageserver_types_1.InsertTextFormat.Snippet,
@@ -1120,28 +1119,27 @@
1120
1119
  }
1121
1120
  return this.getInsertTextForPlainText(value + separatorAfter);
1122
1121
  }
1123
- addSchemaValueCompletions(schema, separatorAfter, collector, types, completionType, isArray) {
1122
+ addSchemaValueCompletions(schema, separatorAfter, collector, types, ignoreScalars = false, addArrayItem = false) {
1124
1123
  if (typeof schema === 'object') {
1125
- this.addEnumValueCompletions(schema, separatorAfter, collector, isArray);
1124
+ this.addEnumValueCompletions(schema, separatorAfter, collector, ignoreScalars);
1126
1125
  this.addDefaultValueCompletions(schema, separatorAfter, collector);
1127
1126
  this.collectTypes(schema, types);
1128
- if (isArray && completionType === 'value' && !(0, schemaUtils_1.isAnyOfAllOfOneOfType)(schema)) {
1129
- // add array only for final types (no anyOf, allOf, oneOf)
1127
+ if (addArrayItem && !(0, schemaUtils_1.isAnyOfAllOfOneOfType)(schema)) {
1130
1128
  this.addArrayItemValueCompletion(schema, separatorAfter, collector);
1131
1129
  }
1132
1130
  if (Array.isArray(schema.allOf)) {
1133
1131
  schema.allOf.forEach((s) => {
1134
- return this.addSchemaValueCompletions(s, separatorAfter, collector, types, completionType, isArray);
1132
+ return this.addSchemaValueCompletions(s, separatorAfter, collector, types, ignoreScalars, addArrayItem);
1135
1133
  });
1136
1134
  }
1137
1135
  if (Array.isArray(schema.anyOf)) {
1138
1136
  schema.anyOf.forEach((s) => {
1139
- return this.addSchemaValueCompletions(s, separatorAfter, collector, types, completionType, isArray);
1137
+ return this.addSchemaValueCompletions(s, separatorAfter, collector, types, ignoreScalars, addArrayItem);
1140
1138
  });
1141
1139
  }
1142
1140
  if (Array.isArray(schema.oneOf)) {
1143
1141
  schema.oneOf.forEach((s) => {
1144
- return this.addSchemaValueCompletions(s, separatorAfter, collector, types, completionType, isArray);
1142
+ return this.addSchemaValueCompletions(s, separatorAfter, collector, types, ignoreScalars, addArrayItem);
1145
1143
  });
1146
1144
  }
1147
1145
  }
@@ -1171,7 +1169,7 @@
1171
1169
  }
1172
1170
  let label;
1173
1171
  if (typeof value == 'object') {
1174
- label = 'Default value';
1172
+ label = l10n.t('Default Value');
1175
1173
  }
1176
1174
  else {
1177
1175
  label = value.toString().replace(doubleQuotesEscapeRegExp, '"');
@@ -1181,7 +1179,7 @@
1181
1179
  label,
1182
1180
  insertText: this.getInsertTextForValue(value, separatorAfter, type),
1183
1181
  insertTextFormat: vscode_languageserver_types_1.InsertTextFormat.Snippet,
1184
- detail: localize('json.suggest.default', 'Default value'),
1182
+ detail: l10n.t('Default Value'),
1185
1183
  });
1186
1184
  hasProposals = true;
1187
1185
  }
@@ -1211,19 +1209,23 @@
1211
1209
  this.addDefaultValueCompletions(schema.items, separatorAfter, collector, arrayDepth + 1);
1212
1210
  }
1213
1211
  }
1214
- addEnumValueCompletions(schema, separatorAfter, collector, isArray) {
1215
- if ((0, objects_1.isDefined)(schema.const) && !isArray) {
1216
- collector.add({
1217
- kind: this.getSuggestionKind(schema.type),
1218
- label: this.getLabelForValue(schema.const),
1219
- insertText: this.getInsertTextForValue(schema.const, separatorAfter, schema.type),
1220
- insertTextFormat: vscode_languageserver_types_1.InsertTextFormat.Snippet,
1221
- documentation: this.fromMarkup(schema.markdownDescription) || schema.description,
1222
- });
1212
+ addEnumValueCompletions(schema, separatorAfter, collector, ignoreScalars) {
1213
+ if ((0, objects_1.isDefined)(schema.const)) {
1214
+ if (!ignoreScalars || typeof schema.const === 'object') {
1215
+ collector.add({
1216
+ kind: this.getSuggestionKind(schema.type),
1217
+ label: this.getLabelForValue(schema.const),
1218
+ insertText: this.getInsertTextForValue(schema.const, separatorAfter, schema.type),
1219
+ insertTextFormat: vscode_languageserver_types_1.InsertTextFormat.Snippet,
1220
+ documentation: this.fromMarkup(schema.markdownDescription) || schema.description,
1221
+ });
1222
+ }
1223
1223
  }
1224
1224
  if (Array.isArray(schema.enum)) {
1225
1225
  for (let i = 0, length = schema.enum.length; i < length; i++) {
1226
1226
  const enm = schema.enum[i];
1227
+ if (ignoreScalars && typeof enm !== 'object')
1228
+ continue;
1227
1229
  let documentation = this.fromMarkup(schema.markdownDescription) || schema.description;
1228
1230
  if (schema.markdownEnumDescriptions && i < schema.markdownEnumDescriptions.length && this.doesSupportMarkdown()) {
1229
1231
  documentation = this.fromMarkup(schema.markdownEnumDescriptions[i]);