@zzzen/pyright-internal 1.2.0-dev.20240107 → 1.2.0-dev.20240114

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 (202) hide show
  1. package/dist/analyzer/checker.d.ts +2 -0
  2. package/dist/analyzer/checker.js +64 -14
  3. package/dist/analyzer/checker.js.map +1 -1
  4. package/dist/analyzer/codeFlowEngine.js +2 -2
  5. package/dist/analyzer/codeFlowEngine.js.map +1 -1
  6. package/dist/analyzer/constraintSolver.js +6 -0
  7. package/dist/analyzer/constraintSolver.js.map +1 -1
  8. package/dist/analyzer/dataClasses.js +2 -2
  9. package/dist/analyzer/dataClasses.js.map +1 -1
  10. package/dist/analyzer/decorators.js +9 -9
  11. package/dist/analyzer/decorators.js.map +1 -1
  12. package/dist/analyzer/importResolver.d.ts +2 -2
  13. package/dist/analyzer/importResolver.js +93 -24
  14. package/dist/analyzer/importResolver.js.map +1 -1
  15. package/dist/analyzer/operations.js +4 -3
  16. package/dist/analyzer/operations.js.map +1 -1
  17. package/dist/analyzer/parseTreeUtils.js +37 -0
  18. package/dist/analyzer/parseTreeUtils.js.map +1 -1
  19. package/dist/analyzer/patternMatching.js +4 -4
  20. package/dist/analyzer/patternMatching.js.map +1 -1
  21. package/dist/analyzer/program.js +1 -1
  22. package/dist/analyzer/program.js.map +1 -1
  23. package/dist/analyzer/protocols.js +27 -20
  24. package/dist/analyzer/protocols.js.map +1 -1
  25. package/dist/analyzer/service.d.ts +1 -1
  26. package/dist/analyzer/service.js +7 -6
  27. package/dist/analyzer/service.js.map +1 -1
  28. package/dist/analyzer/sourceFile.d.ts +2 -2
  29. package/dist/analyzer/sourceFile.js +5 -5
  30. package/dist/analyzer/sourceFile.js.map +1 -1
  31. package/dist/analyzer/sourceFileInfoUtils.js +1 -1
  32. package/dist/analyzer/sourceFileInfoUtils.js.map +1 -1
  33. package/dist/analyzer/typeEvaluator.js +228 -133
  34. package/dist/analyzer/typeEvaluator.js.map +1 -1
  35. package/dist/analyzer/typeEvaluatorTypes.d.ts +4 -3
  36. package/dist/analyzer/typeEvaluatorTypes.js +2 -4
  37. package/dist/analyzer/typeEvaluatorTypes.js.map +1 -1
  38. package/dist/analyzer/typeGuards.js +14 -9
  39. package/dist/analyzer/typeGuards.js.map +1 -1
  40. package/dist/analyzer/typeUtils.d.ts +2 -1
  41. package/dist/analyzer/typeUtils.js +13 -0
  42. package/dist/analyzer/typeUtils.js.map +1 -1
  43. package/dist/analyzer/types.d.ts +9 -5
  44. package/dist/analyzer/types.js +38 -23
  45. package/dist/analyzer/types.js.map +1 -1
  46. package/dist/backgroundAnalysisBase.d.ts +12 -11
  47. package/dist/backgroundAnalysisBase.js +60 -64
  48. package/dist/backgroundAnalysisBase.js.map +1 -1
  49. package/dist/backgroundThreadBase.d.ts +6 -5
  50. package/dist/backgroundThreadBase.js +63 -60
  51. package/dist/backgroundThreadBase.js.map +1 -1
  52. package/dist/commands/quickActionCommand.js +1 -1
  53. package/dist/commands/quickActionCommand.js.map +1 -1
  54. package/dist/common/cancellationUtils.d.ts +6 -3
  55. package/dist/common/cancellationUtils.js +29 -5
  56. package/dist/common/cancellationUtils.js.map +1 -1
  57. package/dist/common/commandUtils.d.ts +2 -0
  58. package/dist/common/commandUtils.js +24 -0
  59. package/dist/common/commandUtils.js.map +1 -0
  60. package/dist/common/extensibility.d.ts +7 -6
  61. package/dist/common/extensibility.js.map +1 -1
  62. package/dist/common/fileBasedCancellationUtils.js +19 -13
  63. package/dist/common/fileBasedCancellationUtils.js.map +1 -1
  64. package/dist/common/fullAccessHost.d.ts +1 -1
  65. package/dist/common/fullAccessHost.js +2 -2
  66. package/dist/common/fullAccessHost.js.map +1 -1
  67. package/dist/common/host.d.ts +2 -2
  68. package/dist/common/host.js.map +1 -1
  69. package/dist/common/realFileSystem.js +8 -8
  70. package/dist/common/realFileSystem.js.map +1 -1
  71. package/dist/common/serviceProvider.js +8 -1
  72. package/dist/common/serviceProvider.js.map +1 -1
  73. package/dist/common/uri/baseUri.d.ts +4 -1
  74. package/dist/common/uri/baseUri.js +7 -1
  75. package/dist/common/uri/baseUri.js.map +1 -1
  76. package/dist/common/uri/emptyUri.d.ts +3 -0
  77. package/dist/common/uri/emptyUri.js +9 -0
  78. package/dist/common/uri/emptyUri.js.map +1 -1
  79. package/dist/common/uri/fileUri.d.ts +2 -0
  80. package/dist/common/uri/fileUri.js +6 -0
  81. package/dist/common/uri/fileUri.js.map +1 -1
  82. package/dist/common/uri/memoization.js +1 -1
  83. package/dist/common/uri/memoization.js.map +1 -1
  84. package/dist/common/uri/uri.d.ts +4 -1
  85. package/dist/common/uri/uri.js +5 -2
  86. package/dist/common/uri/uri.js.map +1 -1
  87. package/dist/common/uri/uriUtils.d.ts +2 -0
  88. package/dist/common/uri/uriUtils.js +18 -1
  89. package/dist/common/uri/uriUtils.js.map +1 -1
  90. package/dist/common/uri/webUri.d.ts +2 -0
  91. package/dist/common/uri/webUri.js +7 -1
  92. package/dist/common/uri/webUri.js.map +1 -1
  93. package/dist/common/workspaceEditUtils.d.ts +6 -5
  94. package/dist/common/workspaceEditUtils.js +18 -17
  95. package/dist/common/workspaceEditUtils.js.map +1 -1
  96. package/dist/languageServerBase.d.ts +1 -0
  97. package/dist/languageServerBase.js +28 -25
  98. package/dist/languageServerBase.js.map +1 -1
  99. package/dist/languageService/analyzerServiceExecutor.d.ts +1 -2
  100. package/dist/languageService/analyzerServiceExecutor.js +6 -5
  101. package/dist/languageService/analyzerServiceExecutor.js.map +1 -1
  102. package/dist/languageService/autoImporter.js +3 -3
  103. package/dist/languageService/autoImporter.js.map +1 -1
  104. package/dist/languageService/callHierarchyProvider.js +9 -7
  105. package/dist/languageService/callHierarchyProvider.js.map +1 -1
  106. package/dist/languageService/codeActionProvider.js +3 -2
  107. package/dist/languageService/codeActionProvider.js.map +1 -1
  108. package/dist/languageService/completionProvider.d.ts +2 -4
  109. package/dist/languageService/completionProvider.js +14 -18
  110. package/dist/languageService/completionProvider.js.map +1 -1
  111. package/dist/languageService/documentSymbolProvider.js +5 -4
  112. package/dist/languageService/documentSymbolProvider.js.map +1 -1
  113. package/dist/languageService/navigationUtils.js +2 -1
  114. package/dist/languageService/navigationUtils.js.map +1 -1
  115. package/dist/languageService/renameProvider.js +2 -2
  116. package/dist/languageService/renameProvider.js.map +1 -1
  117. package/dist/languageService/workspaceSymbolProvider.js +2 -1
  118. package/dist/languageService/workspaceSymbolProvider.js.map +1 -1
  119. package/dist/localization/localize.d.ts +5 -4
  120. package/dist/localization/localize.js +3 -2
  121. package/dist/localization/localize.js.map +1 -1
  122. package/dist/localization/package.nls.cs.json +19 -4
  123. package/dist/localization/package.nls.de.json +19 -4
  124. package/dist/localization/package.nls.en-us.json +3 -2
  125. package/dist/localization/package.nls.es.json +19 -4
  126. package/dist/localization/package.nls.fr.json +18 -3
  127. package/dist/localization/package.nls.it.json +19 -4
  128. package/dist/localization/package.nls.ja.json +19 -4
  129. package/dist/localization/package.nls.ko.json +19 -4
  130. package/dist/localization/package.nls.pl.json +19 -4
  131. package/dist/localization/package.nls.pt-br.json +19 -4
  132. package/dist/localization/package.nls.qps-ploc.json +19 -4
  133. package/dist/localization/package.nls.ru.json +18 -3
  134. package/dist/localization/package.nls.tr.json +19 -4
  135. package/dist/localization/package.nls.zh-cn.json +19 -4
  136. package/dist/localization/package.nls.zh-tw.json +19 -4
  137. package/dist/parser/parser.d.ts +0 -3
  138. package/dist/parser/parser.js.map +1 -1
  139. package/dist/parser/tokenizer.d.ts +2 -4
  140. package/dist/parser/tokenizer.js +5 -6
  141. package/dist/parser/tokenizer.js.map +1 -1
  142. package/dist/parser/tokenizerTypes.d.ts +2 -2
  143. package/dist/parser/tokenizerTypes.js.map +1 -1
  144. package/dist/pyright.js +3 -3
  145. package/dist/pyright.js.map +1 -1
  146. package/dist/tests/chainedSourceFiles.test.js +8 -8
  147. package/dist/tests/chainedSourceFiles.test.js.map +1 -1
  148. package/dist/tests/completions.test.js +3 -3
  149. package/dist/tests/completions.test.js.map +1 -1
  150. package/dist/tests/config.test.js +10 -2
  151. package/dist/tests/config.test.js.map +1 -1
  152. package/dist/tests/filesystem.test.js +4 -4
  153. package/dist/tests/filesystem.test.js.map +1 -1
  154. package/dist/tests/fourSlashParser.test.js +22 -8
  155. package/dist/tests/fourSlashParser.test.js.map +1 -1
  156. package/dist/tests/fourslash/rename.multipleDecl.fourslash.d.ts +1 -1
  157. package/dist/tests/harness/fourslash/fourSlashParser.js +4 -0
  158. package/dist/tests/harness/fourslash/fourSlashParser.js.map +1 -1
  159. package/dist/tests/harness/fourslash/fourSlashTypes.d.ts +3 -0
  160. package/dist/tests/harness/fourslash/fourSlashTypes.js.map +1 -1
  161. package/dist/tests/harness/fourslash/testState.d.ts +13 -0
  162. package/dist/tests/harness/fourslash/testState.js +13 -8
  163. package/dist/tests/harness/fourslash/testState.js.map +1 -1
  164. package/dist/tests/harness/vfs/factory.d.ts +1 -1
  165. package/dist/tests/harness/vfs/factory.js +4 -4
  166. package/dist/tests/harness/vfs/factory.js.map +1 -1
  167. package/dist/tests/importStatementUtils.test.js +1 -1
  168. package/dist/tests/importStatementUtils.test.js.map +1 -1
  169. package/dist/tests/ipythonMode.test.js +11 -12
  170. package/dist/tests/ipythonMode.test.js.map +1 -1
  171. package/dist/tests/serialization.test.d.ts +2 -0
  172. package/dist/tests/serialization.test.js +88 -0
  173. package/dist/tests/serialization.test.js.map +1 -0
  174. package/dist/tests/service.test.js +1 -1
  175. package/dist/tests/service.test.js.map +1 -1
  176. package/dist/tests/signatureHelp.test.js +2 -3
  177. package/dist/tests/signatureHelp.test.js.map +1 -1
  178. package/dist/tests/sourceFile.test.js +3 -3
  179. package/dist/tests/sourceFile.test.js.map +1 -1
  180. package/dist/tests/sourceMapperUtils.test.js +2 -2
  181. package/dist/tests/sourceMapperUtils.test.js.map +1 -1
  182. package/dist/tests/testState.test.js +1 -1
  183. package/dist/tests/testState.test.js.map +1 -1
  184. package/dist/tests/testStateUtils.js +2 -2
  185. package/dist/tests/testStateUtils.js.map +1 -1
  186. package/dist/tests/textEditUtil.test.js +1 -2
  187. package/dist/tests/textEditUtil.test.js.map +1 -1
  188. package/dist/tests/typeEvaluator1.test.js +12 -0
  189. package/dist/tests/typeEvaluator1.test.js.map +1 -1
  190. package/dist/tests/typeEvaluator2.test.js +6 -6
  191. package/dist/tests/typeEvaluator2.test.js.map +1 -1
  192. package/dist/tests/typeEvaluator3.test.js +6 -0
  193. package/dist/tests/typeEvaluator3.test.js.map +1 -1
  194. package/dist/tests/typeEvaluator4.test.js +4 -4
  195. package/dist/tests/typeEvaluator4.test.js.map +1 -1
  196. package/dist/tests/uri.test.js +30 -7
  197. package/dist/tests/uri.test.js.map +1 -1
  198. package/dist/tests/workspaceEditUtils.test.js +8 -8
  199. package/dist/tests/workspaceEditUtils.test.js.map +1 -1
  200. package/dist/workspaceFactory.js +1 -1
  201. package/dist/workspaceFactory.js.map +1 -1
  202. package/package.json +2 -1
@@ -49,6 +49,7 @@ const positionUtils_1 = require("../common/positionUtils");
49
49
  const serviceProviderExtensions_1 = require("../common/serviceProviderExtensions");
50
50
  const textRange_1 = require("../common/textRange");
51
51
  const uri_1 = require("../common/uri/uri");
52
+ const uriUtils_1 = require("../common/uri/uriUtils");
52
53
  const referencesProvider_1 = require("../languageService/referencesProvider");
53
54
  const documentSymbolCollector_1 = require("./documentSymbolCollector");
54
55
  const navigationUtils_1 = require("./navigationUtils");
@@ -89,7 +90,7 @@ class CallHierarchyProvider {
89
90
  const callItem = {
90
91
  name: symbolName,
91
92
  kind: (_a = (0, lspUtils_1.getSymbolKind)(targetDecl, this._evaluator, symbolName)) !== null && _a !== void 0 ? _a : vscode_languageserver_1.SymbolKind.Module,
92
- uri: callItemUri.toString(),
93
+ uri: (0, uriUtils_1.encodeUri)(this._program.fileSystem, callItemUri),
93
94
  range: targetDecl.range,
94
95
  selectionRange: targetDecl.range,
95
96
  };
@@ -176,7 +177,7 @@ class CallHierarchyProvider {
176
177
  if (!parseRoot) {
177
178
  return null;
178
179
  }
179
- const callFinder = new FindOutgoingCallTreeWalker(parseRoot, this._parseResults, this._evaluator, this._token);
180
+ const callFinder = new FindOutgoingCallTreeWalker(this._program.fileSystem, parseRoot, this._parseResults, this._evaluator, this._token);
180
181
  const outgoingCalls = callFinder.findCalls();
181
182
  if (outgoingCalls.length === 0) {
182
183
  return null;
@@ -233,8 +234,9 @@ class CallHierarchyProvider {
233
234
  }
234
235
  exports.CallHierarchyProvider = CallHierarchyProvider;
235
236
  class FindOutgoingCallTreeWalker extends parseTreeWalker_1.ParseTreeWalker {
236
- constructor(_parseRoot, _parseResults, _evaluator, _cancellationToken) {
237
+ constructor(_fs, _parseRoot, _parseResults, _evaluator, _cancellationToken) {
237
238
  super();
239
+ this._fs = _fs;
238
240
  this._parseRoot = _parseRoot;
239
241
  this._parseResults = _parseResults;
240
242
  this._evaluator = _evaluator;
@@ -311,7 +313,7 @@ class FindOutgoingCallTreeWalker extends parseTreeWalker_1.ParseTreeWalker {
311
313
  const callDest = {
312
314
  name: nameNode.value,
313
315
  kind: (_a = (0, lspUtils_1.getSymbolKind)(resolvedDecl, this._evaluator, nameNode.value)) !== null && _a !== void 0 ? _a : vscode_languageserver_1.SymbolKind.Module,
314
- uri: resolvedDecl.uri.toString(),
316
+ uri: (0, uriUtils_1.encodeUri)(this._fs, resolvedDecl.uri),
315
317
  range: resolvedDecl.range,
316
318
  selectionRange: resolvedDecl.range,
317
319
  };
@@ -438,7 +440,7 @@ class FindIncomingCallTreeWalker extends parseTreeWalker_1.ParseTreeWalker {
438
440
  callSource = {
439
441
  name: `(module) ${fileName}`,
440
442
  kind: vscode_languageserver_1.SymbolKind.Module,
441
- uri: this._fileUri.toString(),
443
+ uri: (0, uriUtils_1.encodeUri)(this._program.fileSystem, this._fileUri),
442
444
  range: moduleRange,
443
445
  selectionRange: moduleRange,
444
446
  };
@@ -448,7 +450,7 @@ class FindIncomingCallTreeWalker extends parseTreeWalker_1.ParseTreeWalker {
448
450
  callSource = {
449
451
  name: '(lambda)',
450
452
  kind: vscode_languageserver_1.SymbolKind.Function,
451
- uri: this._fileUri.toString(),
453
+ uri: (0, uriUtils_1.encodeUri)(this._program.fileSystem, this._fileUri),
452
454
  range: lambdaRange,
453
455
  selectionRange: lambdaRange,
454
456
  };
@@ -458,7 +460,7 @@ class FindIncomingCallTreeWalker extends parseTreeWalker_1.ParseTreeWalker {
458
460
  callSource = {
459
461
  name: executionNode.name.value,
460
462
  kind: vscode_languageserver_1.SymbolKind.Function,
461
- uri: this._fileUri.toString(),
463
+ uri: (0, uriUtils_1.encodeUri)(this._program.fileSystem, this._fileUri),
462
464
  range: functionRange,
463
465
  selectionRange: functionRange,
464
466
  };
@@ -1 +1 @@
1
- {"version":3,"file":"callHierarchyProvider.js","sourceRoot":"","sources":["../../../src/languageService/callHierarchyProvider.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"callHierarchyProvider.js","sourceRoot":"","sources":["../../../src/languageService/callHierarchyProvider.ts"],"names":[],"mappings":"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"}
@@ -10,6 +10,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
10
10
  exports.CodeActionProvider = void 0;
11
11
  const vscode_languageserver_1 = require("vscode-languageserver");
12
12
  const cancellationUtils_1 = require("../common/cancellationUtils");
13
+ const commandUtils_1 = require("../common/commandUtils");
13
14
  const workspaceEditUtils_1 = require("../common/workspaceEditUtils");
14
15
  const localize_1 = require("../localization/localize");
15
16
  class CodeActionProvider {
@@ -38,7 +39,7 @@ class CodeActionProvider {
38
39
  .getActions()
39
40
  .find((a) => a.action === "pyright.createtypestub" /* Commands.createTypeStub */);
40
41
  if (action) {
41
- const createTypeStubAction = vscode_languageserver_1.CodeAction.create(localize_1.Localizer.CodeAction.createTypeStubFor().format({ moduleName: action.moduleName }), vscode_languageserver_1.Command.create(localize_1.Localizer.CodeAction.createTypeStub(), "pyright.createtypestub" /* Commands.createTypeStub */, workspace.rootUri.toString(), action.moduleName, fileUri.toString()), vscode_languageserver_1.CodeActionKind.QuickFix);
42
+ const createTypeStubAction = vscode_languageserver_1.CodeAction.create(localize_1.Localizer.CodeAction.createTypeStubFor().format({ moduleName: action.moduleName }), (0, commandUtils_1.createCommand)(localize_1.Localizer.CodeAction.createTypeStub(), "pyright.createtypestub" /* Commands.createTypeStub */, workspace.rootUri.toString(), action.moduleName, fileUri.toString()), vscode_languageserver_1.CodeActionKind.QuickFix);
42
43
  codeActions.push(createTypeStubAction);
43
44
  }
44
45
  }
@@ -65,7 +66,7 @@ class CodeActionProvider {
65
66
  },
66
67
  ],
67
68
  };
68
- const workspaceEdit = (0, workspaceEditUtils_1.convertToWorkspaceEdit)(editActions);
69
+ const workspaceEdit = (0, workspaceEditUtils_1.convertToWorkspaceEdit)(workspace.service.fs, editActions);
69
70
  const renameAction = vscode_languageserver_1.CodeAction.create(title, workspaceEdit, vscode_languageserver_1.CodeActionKind.QuickFix);
70
71
  codeActions.push(renameAction);
71
72
  }
@@ -1 +1 @@
1
- {"version":3,"file":"codeActionProvider.js","sourceRoot":"","sources":["../../../src/languageService/codeActionProvider.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"codeActionProvider.js","sourceRoot":"","sources":["../../../src/languageService/codeActionProvider.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;;AAEH,iEAAsF;AAGtF,mEAA2E;AAC3E,yDAAuD;AAKvD,qEAAsE;AACtE,uDAAqD;AAGrD,MAAa,kBAAkB;IAC3B,MAAM,CAAC,YAAY,CAAC,KAAmC;QACnD,IAAI,CAAC,KAAK,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE;YAC9B,OAAO,IAAI,CAAC;SACf;QAED,iCAAiC;QACjC,OAAO,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC,sCAAc,CAAC,QAAQ,CAAC,CAAC,CAAC;IACpE,CAAC;IACD,MAAM,CAAC,KAAK,CAAC,yBAAyB,CAClC,SAAoB,EACpB,OAAY,EACZ,KAAY,EACZ,KAAmC,EACnC,KAAwB;QAExB,IAAA,gDAA4B,EAAC,KAAK,CAAC,CAAC;QAEpC,MAAM,WAAW,GAAiB,EAAE,CAAC;QAErC,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,EAAE;YAC3B,8DAA8D;YAC9D,OAAO,EAAE,CAAC;SACb;QAED,IAAI,CAAC,SAAS,CAAC,uBAAuB,EAAE;YACpC,MAAM,KAAK,GAAG,MAAM,SAAS,CAAC,OAAO,CAAC,sBAAsB,CAAC,OAAO,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC;YACpF,MAAM,YAAY,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE;gBAClC,MAAM,OAAO,GAAG,CAAC,CAAC,UAAU,EAAE,CAAC;gBAC/B,OAAO,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,2DAA4B,CAAC,CAAC;YAChF,CAAC,CAAC,CAAC;YAEH,IAAI,YAAY,EAAE;gBACd,MAAM,MAAM,GAAG,YAAY;qBACtB,UAAU,EAAG;qBACb,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,2DAA4B,CAA6B,CAAC;gBACnF,IAAI,MAAM,EAAE;oBACR,MAAM,oBAAoB,GAAG,kCAAU,CAAC,MAAM,CAC1C,oBAAS,CAAC,UAAU,CAAC,iBAAiB,EAAE,CAAC,MAAM,CAAC,EAAE,UAAU,EAAE,MAAM,CAAC,UAAU,EAAE,CAAC,EAClF,IAAA,4BAAa,EACT,oBAAS,CAAC,UAAU,CAAC,cAAc,EAAE,0DAErC,SAAS,CAAC,OAAO,CAAC,QAAQ,EAAE,EAC5B,MAAM,CAAC,UAAU,EACjB,OAAO,CAAC,QAAQ,EAAE,CACrB,EACD,sCAAc,CAAC,QAAQ,CAC1B,CAAC;oBACF,WAAW,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC;iBAC1C;aACJ;YAED,MAAM,cAAc,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE;gBACpC,MAAM,OAAO,GAAG,CAAC,CAAC,UAAU,EAAE,CAAC;gBAC/B,OAAO,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,mEAAwC,CAAC,CAAC;YAC5F,CAAC,CAAC,CAAC;YACH,IAAI,cAAc,EAAE;gBAChB,MAAM,MAAM,GAAG,cAAc;qBACxB,UAAU,EAAG;qBACb,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,mEAAwC,CAA6B,CAAC;gBAC/F,IAAI,MAAM,EAAE;oBACR,MAAM,KAAK,GAAG,oBAAS,CAAC,UAAU,CAAC,kBAAkB,EAAE,CAAC,MAAM,CAAC;wBAC3D,OAAO,EAAE,MAAM,CAAC,MAAM,CAAC,oBAAoB,EAAE;wBAC7C,OAAO,EAAE,MAAM,CAAC,MAAM,CAAC,oBAAoB,EAAE;qBAChD,CAAC,CAAC;oBACH,MAAM,WAAW,GAAoB;wBACjC,KAAK,EAAE,EAAE;wBACT,cAAc,EAAE;4BACZ;gCACI,IAAI,EAAE,QAAQ;gCACd,UAAU,EAAE,MAAM,CAAC,MAAM;gCACzB,UAAU,EAAE,MAAM,CAAC,MAAM;6BAC5B;yBACJ;qBACJ,CAAC;oBACF,MAAM,aAAa,GAAG,IAAA,2CAAsB,EAAC,SAAS,CAAC,OAAO,CAAC,EAAE,EAAE,WAAW,CAAC,CAAC;oBAChF,MAAM,YAAY,GAAG,kCAAU,CAAC,MAAM,CAAC,KAAK,EAAE,aAAa,EAAE,sCAAc,CAAC,QAAQ,CAAC,CAAC;oBACtF,WAAW,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;iBAClC;aACJ;SACJ;QAED,OAAO,WAAW,CAAC;IACvB,CAAC;CACJ;AApFD,gDAoFC"}
@@ -15,7 +15,6 @@ import { AutoImportResult } from './autoImporter';
15
15
  import { CompletionDetail, SymbolDetail } from './completionProviderUtils';
16
16
  export interface CompletionItemData {
17
17
  uri: string;
18
- workspaceUri: string;
19
18
  position: Position;
20
19
  autoImportText?: string;
21
20
  symbolLabel?: string;
@@ -32,18 +31,17 @@ export declare const autoImportDetail: string;
32
31
  export declare const indexValueDetail: string;
33
32
  export declare class CompletionProvider {
34
33
  protected readonly program: ProgramView;
35
- private readonly _workspaceRootUri;
36
34
  protected readonly fileUri: Uri;
37
35
  protected readonly position: Position;
38
36
  protected readonly options: CompletionOptions;
39
37
  protected readonly cancellationToken: CancellationToken;
40
38
  private static _mostRecentCompletions;
41
- private _itemToResolve;
42
39
  private _stringLiteralContainer;
43
40
  protected readonly execEnv: ExecutionEnvironment;
44
41
  protected readonly parseResults: ParseResults;
45
42
  protected readonly sourceMapper: SourceMapper;
46
- constructor(program: ProgramView, _workspaceRootUri: Uri, fileUri: Uri, position: Position, options: CompletionOptions, cancellationToken: CancellationToken);
43
+ protected itemToResolve: CompletionItem | undefined;
44
+ constructor(program: ProgramView, fileUri: Uri, position: Position, options: CompletionOptions, cancellationToken: CancellationToken);
47
45
  getCompletions(): CompletionList | null;
48
46
  resolveCompletionItem(completionItem: CompletionItem): void;
49
47
  protected get evaluator(): TypeEvaluator;
@@ -160,9 +160,8 @@ const similarityLimit = 0.25;
160
160
  // We'll remember this many completions in the MRU list.
161
161
  const maxRecentCompletions = 128;
162
162
  class CompletionProvider {
163
- constructor(program, _workspaceRootUri, fileUri, position, options, cancellationToken) {
163
+ constructor(program, fileUri, position, options, cancellationToken) {
164
164
  this.program = program;
165
- this._workspaceRootUri = _workspaceRootUri;
166
165
  this.fileUri = fileUri;
167
166
  this.position = position;
168
167
  this.options = options;
@@ -231,7 +230,7 @@ class CompletionProvider {
231
230
  }
232
231
  return;
233
232
  }
234
- this._itemToResolve = completionItem;
233
+ this.itemToResolve = completionItem;
235
234
  if (!completionItemData.autoImportText) {
236
235
  // Rerun the completion lookup. It will fill in additional information
237
236
  // about the item to be resolved. We'll ignore the rest of the returned
@@ -439,17 +438,17 @@ class CompletionProvider {
439
438
  : undefined;
440
439
  // Are we resolving a completion item? If so, see if this symbol
441
440
  // is the one that we're trying to match.
442
- if (this._itemToResolve) {
443
- const completionItemData = (0, lspUtils_1.fromLSPAny)(this._itemToResolve.data);
441
+ if (this.itemToResolve) {
442
+ const completionItemData = (0, lspUtils_1.fromLSPAny)(this.itemToResolve.data);
444
443
  if (completionItemData.symbolLabel !== name) {
445
444
  // It's not what we are looking for.
446
445
  return;
447
446
  }
447
+ if (this.itemToResolve.additionalTextEdits === undefined &&
448
+ ((_b = detail.edits) === null || _b === void 0 ? void 0 : _b.additionalTextEdits) !== undefined) {
449
+ this.itemToResolve.additionalTextEdits = (0, workspaceEditUtils_1.convertToTextEdits)(detail.edits.additionalTextEdits);
450
+ }
448
451
  if (completionItemData.autoImportText) {
449
- if (completionItemData.autoImportText === (autoImportText === null || autoImportText === void 0 ? void 0 : autoImportText.importText) &&
450
- ((_b = detail.edits) === null || _b === void 0 ? void 0 : _b.additionalTextEdits)) {
451
- this._itemToResolve.additionalTextEdits = (0, workspaceEditUtils_1.convertToTextEdits)(detail.edits.additionalTextEdits);
452
- }
453
452
  return;
454
453
  }
455
454
  // This call can be expensive to perform on every completion item
@@ -466,7 +465,7 @@ class CompletionProvider {
466
465
  boundObjectOrClass: detail.boundObjectOrClass,
467
466
  });
468
467
  if (this.options.format === vscode_languageserver_1.MarkupKind.Markdown || this.options.format === vscode_languageserver_1.MarkupKind.PlainText) {
469
- this._itemToResolve.documentation = (0, completionProviderUtils_1.getCompletionItemDocumentation)(typeDetail, documentation, this.options.format);
468
+ this.itemToResolve.documentation = (0, completionProviderUtils_1.getCompletionItemDocumentation)(typeDetail, documentation, this.options.format);
470
469
  }
471
470
  else {
472
471
  (0, debug_1.fail)(`Unsupported markup type: ${this.options.format}`);
@@ -620,7 +619,6 @@ class CompletionProvider {
620
619
  this.addExtraCommitChar(completionItem);
621
620
  }
622
621
  const completionItemData = {
623
- workspaceUri: this._workspaceRootUri.toString(),
624
622
  uri: this.fileUri.toString(),
625
623
  position: this.position,
626
624
  };
@@ -721,10 +719,10 @@ class CompletionProvider {
721
719
  if ((_d = detail === null || detail === void 0 ? void 0 : detail.edits) === null || _d === void 0 ? void 0 : _d.additionalTextEdits) {
722
720
  completionItem.additionalTextEdits = (0, workspaceEditUtils_1.convertToTextEdits)(detail.edits.additionalTextEdits);
723
721
  // This is for auto import entries from indices which skip symbols.
724
- if (this._itemToResolve) {
725
- const data = (0, lspUtils_1.fromLSPAny)(this._itemToResolve.data);
722
+ if (this.itemToResolve) {
723
+ const data = (0, lspUtils_1.fromLSPAny)(this.itemToResolve.data);
726
724
  if (data.autoImportText === completionItemData.autoImportText) {
727
- this._itemToResolve.additionalTextEdits = completionItem.additionalTextEdits;
725
+ this.itemToResolve.additionalTextEdits = completionItem.additionalTextEdits;
728
726
  }
729
727
  }
730
728
  }
@@ -1409,7 +1407,7 @@ class CompletionProvider {
1409
1407
  });
1410
1408
  // Add auto-import suggestions from other modules.
1411
1409
  // Ignore this check for privates, since they are not imported.
1412
- if (!priorWord.startsWith('_') && !this._itemToResolve) {
1410
+ if (!priorWord.startsWith('_') && !this.itemToResolve) {
1413
1411
  this.addAutoImportCompletions(priorWord, similarityLimit, this.options.lazyEdit, completionMap);
1414
1412
  }
1415
1413
  // Add literal values if appropriate.
@@ -1575,8 +1573,7 @@ class CompletionProvider {
1575
1573
  if (declaration.node) {
1576
1574
  const scopeRoot = ParseTreeUtils.getEvaluationScopeNode(declaration.node);
1577
1575
  // Find the lowest tree to search the symbol.
1578
- if (((_b = ParseTreeUtils.getFileInfoFromNode(startingNode)) === null || _b === void 0 ? void 0 : _b.fileUri) ===
1579
- ((_c = ParseTreeUtils.getFileInfoFromNode(scopeRoot)) === null || _c === void 0 ? void 0 : _c.fileUri)) {
1576
+ if ((_b = ParseTreeUtils.getFileInfoFromNode(startingNode)) === null || _b === void 0 ? void 0 : _b.fileUri.equals((_c = ParseTreeUtils.getFileInfoFromNode(scopeRoot)) === null || _c === void 0 ? void 0 : _c.fileUri)) {
1580
1577
  startingNode = scopeRoot;
1581
1578
  }
1582
1579
  }
@@ -2014,7 +2011,6 @@ class CompletionProvider {
2014
2011
  const completionItem = vscode_languageserver_1.CompletionItem.create(label);
2015
2012
  completionItem.kind = vscode_languageserver_1.CompletionItemKind.Variable;
2016
2013
  const completionItemData = {
2017
- workspaceUri: this._workspaceRootUri.toString(),
2018
2014
  uri: this.fileUri.toString(),
2019
2015
  position: this.position,
2020
2016
  };