@zzzen/pyright-internal 1.2.0-dev.20231126 → 1.2.0-dev.20231210

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 (383) hide show
  1. package/dist/analyzer/analyzerFileInfo.d.ts +4 -3
  2. package/dist/analyzer/analyzerFileInfo.js.map +1 -1
  3. package/dist/analyzer/backgroundAnalysisProgram.d.ts +15 -14
  4. package/dist/analyzer/backgroundAnalysisProgram.js +38 -38
  5. package/dist/analyzer/backgroundAnalysisProgram.js.map +1 -1
  6. package/dist/analyzer/binder.js +59 -52
  7. package/dist/analyzer/binder.js.map +1 -1
  8. package/dist/analyzer/checker.d.ts +4 -1
  9. package/dist/analyzer/checker.js +189 -42
  10. package/dist/analyzer/checker.js.map +1 -1
  11. package/dist/analyzer/circularDependency.d.ts +3 -2
  12. package/dist/analyzer/circularDependency.js.map +1 -1
  13. package/dist/analyzer/codeFlowEngine.js +36 -36
  14. package/dist/analyzer/codeFlowEngine.js.map +1 -1
  15. package/dist/analyzer/commentUtils.js +7 -0
  16. package/dist/analyzer/commentUtils.js.map +1 -1
  17. package/dist/analyzer/constraintSolver.js +14 -5
  18. package/dist/analyzer/constraintSolver.js.map +1 -1
  19. package/dist/analyzer/constructors.js +2 -1
  20. package/dist/analyzer/constructors.js.map +1 -1
  21. package/dist/analyzer/dataClasses.js +58 -47
  22. package/dist/analyzer/dataClasses.js.map +1 -1
  23. package/dist/analyzer/declaration.d.ts +5 -3
  24. package/dist/analyzer/declaration.js +3 -2
  25. package/dist/analyzer/declaration.js.map +1 -1
  26. package/dist/analyzer/declarationUtils.d.ts +3 -2
  27. package/dist/analyzer/declarationUtils.js +14 -12
  28. package/dist/analyzer/declarationUtils.js.map +1 -1
  29. package/dist/analyzer/enums.js +1 -1
  30. package/dist/analyzer/enums.js.map +1 -1
  31. package/dist/analyzer/importResolver.d.ts +29 -25
  32. package/dist/analyzer/importResolver.js +300 -301
  33. package/dist/analyzer/importResolver.js.map +1 -1
  34. package/dist/analyzer/importResult.d.ts +5 -4
  35. package/dist/analyzer/importResult.js.map +1 -1
  36. package/dist/analyzer/importStatementUtils.d.ts +5 -4
  37. package/dist/analyzer/importStatementUtils.js +23 -22
  38. package/dist/analyzer/importStatementUtils.js.map +1 -1
  39. package/dist/analyzer/namedTuples.js +3 -3
  40. package/dist/analyzer/namedTuples.js.map +1 -1
  41. package/dist/analyzer/operations.js +16 -14
  42. package/dist/analyzer/operations.js.map +1 -1
  43. package/dist/analyzer/packageTypeReport.d.ts +7 -6
  44. package/dist/analyzer/packageTypeReport.js +4 -4
  45. package/dist/analyzer/packageTypeReport.js.map +1 -1
  46. package/dist/analyzer/packageTypeVerifier.js +68 -64
  47. package/dist/analyzer/packageTypeVerifier.js.map +1 -1
  48. package/dist/analyzer/parentDirectoryCache.d.ts +7 -6
  49. package/dist/analyzer/parentDirectoryCache.js +9 -10
  50. package/dist/analyzer/parentDirectoryCache.js.map +1 -1
  51. package/dist/analyzer/parseTreeUtils.d.ts +1 -1
  52. package/dist/analyzer/parseTreeUtils.js +6 -3
  53. package/dist/analyzer/parseTreeUtils.js.map +1 -1
  54. package/dist/analyzer/patternMatching.js +79 -14
  55. package/dist/analyzer/patternMatching.js.map +1 -1
  56. package/dist/analyzer/program.d.ts +27 -26
  57. package/dist/analyzer/program.js +162 -156
  58. package/dist/analyzer/program.js.map +1 -1
  59. package/dist/analyzer/properties.js +3 -3
  60. package/dist/analyzer/properties.js.map +1 -1
  61. package/dist/analyzer/protocols.js +27 -13
  62. package/dist/analyzer/protocols.js.map +1 -1
  63. package/dist/analyzer/pyTypedUtils.d.ts +3 -2
  64. package/dist/analyzer/pyTypedUtils.js +4 -5
  65. package/dist/analyzer/pyTypedUtils.js.map +1 -1
  66. package/dist/analyzer/pythonPathUtils.d.ts +7 -6
  67. package/dist/analyzer/pythonPathUtils.js +21 -23
  68. package/dist/analyzer/pythonPathUtils.js.map +1 -1
  69. package/dist/analyzer/service.d.ts +24 -23
  70. package/dist/analyzer/service.js +187 -183
  71. package/dist/analyzer/service.js.map +1 -1
  72. package/dist/analyzer/sourceFile.d.ts +4 -5
  73. package/dist/analyzer/sourceFile.js +68 -56
  74. package/dist/analyzer/sourceFile.js.map +1 -1
  75. package/dist/analyzer/sourceFileInfoUtils.js +3 -3
  76. package/dist/analyzer/sourceFileInfoUtils.js.map +1 -1
  77. package/dist/analyzer/sourceMapper.d.ts +11 -10
  78. package/dist/analyzer/sourceMapper.js +59 -62
  79. package/dist/analyzer/sourceMapper.js.map +1 -1
  80. package/dist/analyzer/sourceMapperUtils.d.ts +2 -1
  81. package/dist/analyzer/sourceMapperUtils.js +2 -2
  82. package/dist/analyzer/sourceMapperUtils.js.map +1 -1
  83. package/dist/analyzer/tracePrinter.d.ts +3 -2
  84. package/dist/analyzer/tracePrinter.js +21 -23
  85. package/dist/analyzer/tracePrinter.js.map +1 -1
  86. package/dist/analyzer/typeDocStringUtils.d.ts +2 -1
  87. package/dist/analyzer/typeDocStringUtils.js +14 -17
  88. package/dist/analyzer/typeDocStringUtils.js.map +1 -1
  89. package/dist/analyzer/typeEvaluator.js +298 -231
  90. package/dist/analyzer/typeEvaluator.js.map +1 -1
  91. package/dist/analyzer/typeEvaluatorTypes.d.ts +1 -1
  92. package/dist/analyzer/typeEvaluatorTypes.js +1 -1
  93. package/dist/analyzer/typeEvaluatorTypes.js.map +1 -1
  94. package/dist/analyzer/typeGuards.js +3 -3
  95. package/dist/analyzer/typeGuards.js.map +1 -1
  96. package/dist/analyzer/typePrinter.d.ts +2 -0
  97. package/dist/analyzer/typePrinter.js +48 -8
  98. package/dist/analyzer/typePrinter.js.map +1 -1
  99. package/dist/analyzer/typeStubWriter.d.ts +2 -1
  100. package/dist/analyzer/typeStubWriter.js +2 -2
  101. package/dist/analyzer/typeStubWriter.js.map +1 -1
  102. package/dist/analyzer/typeUtils.d.ts +5 -3
  103. package/dist/analyzer/typeUtils.js +32 -17
  104. package/dist/analyzer/typeUtils.js.map +1 -1
  105. package/dist/analyzer/typeVarContext.d.ts +2 -0
  106. package/dist/analyzer/typeVarContext.js +27 -0
  107. package/dist/analyzer/typeVarContext.js.map +1 -1
  108. package/dist/analyzer/typedDicts.js +6 -36
  109. package/dist/analyzer/typedDicts.js.map +1 -1
  110. package/dist/analyzer/types.d.ts +8 -12
  111. package/dist/analyzer/types.js +13 -20
  112. package/dist/analyzer/types.js.map +1 -1
  113. package/dist/backgroundAnalysis.d.ts +1 -2
  114. package/dist/backgroundAnalysis.js +6 -4
  115. package/dist/backgroundAnalysis.js.map +1 -1
  116. package/dist/backgroundAnalysisBase.d.ts +22 -20
  117. package/dist/backgroundAnalysisBase.js +76 -55
  118. package/dist/backgroundAnalysisBase.js.map +1 -1
  119. package/dist/backgroundThreadBase.d.ts +1 -1
  120. package/dist/backgroundThreadBase.js +20 -11
  121. package/dist/backgroundThreadBase.js.map +1 -1
  122. package/dist/commands/commandController.js +1 -2
  123. package/dist/commands/commandController.js.map +1 -1
  124. package/dist/commands/commands.d.ts +0 -1
  125. package/dist/commands/commands.js +0 -1
  126. package/dist/commands/commands.js.map +1 -1
  127. package/dist/commands/createTypeStub.js +3 -2
  128. package/dist/commands/createTypeStub.js.map +1 -1
  129. package/dist/commands/dumpFileDebugInfoCommand.js +21 -20
  130. package/dist/commands/dumpFileDebugInfoCommand.js.map +1 -1
  131. package/dist/commands/quickActionCommand.js +5 -5
  132. package/dist/commands/quickActionCommand.js.map +1 -1
  133. package/dist/common/configOptions.d.ts +15 -13
  134. package/dist/common/configOptions.js +120 -30
  135. package/dist/common/configOptions.js.map +1 -1
  136. package/dist/common/diagnostic.d.ts +6 -9
  137. package/dist/common/diagnostic.js +2 -2
  138. package/dist/common/diagnostic.js.map +1 -1
  139. package/dist/common/diagnosticSink.d.ts +2 -1
  140. package/dist/common/diagnosticSink.js.map +1 -1
  141. package/dist/common/editAction.d.ts +6 -5
  142. package/dist/common/editAction.js +2 -2
  143. package/dist/common/editAction.js.map +1 -1
  144. package/dist/common/envVarUtils.d.ts +2 -1
  145. package/dist/common/envVarUtils.js +20 -28
  146. package/dist/common/envVarUtils.js.map +1 -1
  147. package/dist/common/extensibility.d.ts +19 -19
  148. package/dist/common/extensibility.js.map +1 -1
  149. package/dist/common/fileSystem.d.ts +29 -28
  150. package/dist/common/fileWatcher.d.ts +3 -2
  151. package/dist/common/fileWatcher.js.map +1 -1
  152. package/dist/common/fullAccessHost.d.ts +8 -7
  153. package/dist/common/fullAccessHost.js +21 -16
  154. package/dist/common/fullAccessHost.js.map +1 -1
  155. package/dist/common/host.d.ts +7 -6
  156. package/dist/common/host.js +1 -1
  157. package/dist/common/host.js.map +1 -1
  158. package/dist/common/logTracker.d.ts +2 -1
  159. package/dist/common/logTracker.js +4 -4
  160. package/dist/common/logTracker.js.map +1 -1
  161. package/dist/common/pathUtils.d.ts +1 -28
  162. package/dist/common/pathUtils.js +17 -366
  163. package/dist/common/pathUtils.js.map +1 -1
  164. package/dist/common/realFileSystem.d.ts +7 -3
  165. package/dist/common/realFileSystem.js +78 -60
  166. package/dist/common/realFileSystem.js.map +1 -1
  167. package/dist/common/serviceProviderExtensions.d.ts +2 -1
  168. package/dist/common/serviceProviderExtensions.js +5 -2
  169. package/dist/common/serviceProviderExtensions.js.map +1 -1
  170. package/dist/common/textEditTracker.d.ts +2 -1
  171. package/dist/common/textEditTracker.js +28 -28
  172. package/dist/common/textEditTracker.js.map +1 -1
  173. package/dist/common/textRange.d.ts +2 -1
  174. package/dist/common/textRange.js.map +1 -1
  175. package/dist/common/uri/baseUri.d.ts +51 -0
  176. package/dist/common/uri/baseUri.js +194 -0
  177. package/dist/common/uri/baseUri.js.map +1 -0
  178. package/dist/common/uri/emptyUri.d.ts +32 -0
  179. package/dist/common/uri/emptyUri.js +122 -0
  180. package/dist/common/uri/emptyUri.js.map +1 -0
  181. package/dist/common/uri/fileUri.d.ts +36 -0
  182. package/dist/common/uri/fileUri.js +180 -0
  183. package/dist/common/uri/fileUri.js.map +1 -0
  184. package/dist/common/uri/memoization.d.ts +3 -0
  185. package/dist/common/uri/memoization.js +72 -0
  186. package/dist/common/uri/memoization.js.map +1 -0
  187. package/dist/common/uri/uri.d.ts +50 -0
  188. package/dist/common/uri/uri.js +104 -0
  189. package/dist/common/uri/uri.js.map +1 -0
  190. package/dist/common/uri/uriUtils.d.ts +39 -0
  191. package/dist/common/uri/uriUtils.js +362 -0
  192. package/dist/common/uri/uriUtils.js.map +1 -0
  193. package/dist/common/uri/webUri.d.ts +36 -0
  194. package/dist/common/uri/webUri.js +207 -0
  195. package/dist/common/uri/webUri.js.map +1 -0
  196. package/dist/common/workspaceEditUtils.d.ts +8 -8
  197. package/dist/common/workspaceEditUtils.js +34 -37
  198. package/dist/common/workspaceEditUtils.js.map +1 -1
  199. package/dist/languageServerBase.d.ts +19 -22
  200. package/dist/languageServerBase.js +91 -95
  201. package/dist/languageServerBase.js.map +1 -1
  202. package/dist/languageService/analyzerServiceExecutor.d.ts +2 -1
  203. package/dist/languageService/analyzerServiceExecutor.js +14 -16
  204. package/dist/languageService/analyzerServiceExecutor.js.map +1 -1
  205. package/dist/languageService/autoImporter.d.ts +11 -9
  206. package/dist/languageService/autoImporter.js +45 -44
  207. package/dist/languageService/autoImporter.js.map +1 -1
  208. package/dist/languageService/callHierarchyProvider.d.ts +3 -2
  209. package/dist/languageService/callHierarchyProvider.js +23 -35
  210. package/dist/languageService/callHierarchyProvider.js.map +1 -1
  211. package/dist/languageService/codeActionProvider.d.ts +2 -1
  212. package/dist/languageService/codeActionProvider.js +8 -24
  213. package/dist/languageService/codeActionProvider.js.map +1 -1
  214. package/dist/languageService/completionProvider.d.ts +7 -6
  215. package/dist/languageService/completionProvider.js +32 -30
  216. package/dist/languageService/completionProvider.js.map +1 -1
  217. package/dist/languageService/completionProviderUtils.d.ts +2 -1
  218. package/dist/languageService/completionProviderUtils.js +1 -1
  219. package/dist/languageService/completionProviderUtils.js.map +1 -1
  220. package/dist/languageService/definitionProvider.d.ts +4 -3
  221. package/dist/languageService/definitionProvider.js +26 -24
  222. package/dist/languageService/definitionProvider.js.map +1 -1
  223. package/dist/languageService/documentHighlightProvider.d.ts +3 -2
  224. package/dist/languageService/documentHighlightProvider.js +3 -3
  225. package/dist/languageService/documentHighlightProvider.js.map +1 -1
  226. package/dist/languageService/documentSymbolCollector.js +8 -7
  227. package/dist/languageService/documentSymbolCollector.js.map +1 -1
  228. package/dist/languageService/documentSymbolProvider.d.ts +5 -4
  229. package/dist/languageService/documentSymbolProvider.js +9 -11
  230. package/dist/languageService/documentSymbolProvider.js.map +1 -1
  231. package/dist/languageService/hoverProvider.d.ts +4 -3
  232. package/dist/languageService/hoverProvider.js +6 -5
  233. package/dist/languageService/hoverProvider.js.map +1 -1
  234. package/dist/languageService/navigationUtils.d.ts +2 -1
  235. package/dist/languageService/navigationUtils.js +2 -3
  236. package/dist/languageService/navigationUtils.js.map +1 -1
  237. package/dist/languageService/quickActions.d.ts +2 -2
  238. package/dist/languageService/quickActions.js +3 -83
  239. package/dist/languageService/quickActions.js.map +1 -1
  240. package/dist/languageService/referencesProvider.d.ts +10 -9
  241. package/dist/languageService/referencesProvider.js +28 -28
  242. package/dist/languageService/referencesProvider.js.map +1 -1
  243. package/dist/languageService/renameProvider.d.ts +4 -3
  244. package/dist/languageService/renameProvider.js +17 -18
  245. package/dist/languageService/renameProvider.js.map +1 -1
  246. package/dist/languageService/signatureHelpProvider.d.ts +3 -2
  247. package/dist/languageService/signatureHelpProvider.js +4 -4
  248. package/dist/languageService/signatureHelpProvider.js.map +1 -1
  249. package/dist/languageService/symbolIndexer.d.ts +2 -1
  250. package/dist/languageService/symbolIndexer.js +1 -1
  251. package/dist/languageService/symbolIndexer.js.map +1 -1
  252. package/dist/languageService/tooltipUtils.js +10 -4
  253. package/dist/languageService/tooltipUtils.js.map +1 -1
  254. package/dist/languageService/workspaceSymbolProvider.d.ts +4 -3
  255. package/dist/languageService/workspaceSymbolProvider.js +10 -11
  256. package/dist/languageService/workspaceSymbolProvider.js.map +1 -1
  257. package/dist/localization/localize.d.ts +13 -9
  258. package/dist/localization/localize.js +7 -4
  259. package/dist/localization/localize.js.map +1 -1
  260. package/dist/localization/package.nls.cs.json +0 -4
  261. package/dist/localization/package.nls.de.json +0 -4
  262. package/dist/localization/package.nls.en-us.json +9 -6
  263. package/dist/localization/package.nls.es.json +2 -6
  264. package/dist/localization/package.nls.fr.json +0 -4
  265. package/dist/localization/package.nls.it.json +0 -4
  266. package/dist/localization/package.nls.ja.json +0 -4
  267. package/dist/localization/package.nls.ko.json +0 -4
  268. package/dist/localization/package.nls.pl.json +0 -4
  269. package/dist/localization/package.nls.pt-br.json +0 -4
  270. package/dist/localization/package.nls.qps-ploc.json +0 -4
  271. package/dist/localization/package.nls.ru.json +0 -4
  272. package/dist/localization/package.nls.tr.json +0 -4
  273. package/dist/localization/package.nls.zh-cn.json +0 -4
  274. package/dist/localization/package.nls.zh-tw.json +0 -4
  275. package/dist/pyright.js +18 -17
  276. package/dist/pyright.js.map +1 -1
  277. package/dist/pyrightFileSystem.d.ts +13 -13
  278. package/dist/pyrightFileSystem.js +39 -44
  279. package/dist/pyrightFileSystem.js.map +1 -1
  280. package/dist/readonlyAugmentedFileSystem.d.ts +29 -28
  281. package/dist/readonlyAugmentedFileSystem.js +68 -61
  282. package/dist/readonlyAugmentedFileSystem.js.map +1 -1
  283. package/dist/server.js +22 -21
  284. package/dist/server.js.map +1 -1
  285. package/dist/tests/chainedSourceFiles.test.js +39 -30
  286. package/dist/tests/chainedSourceFiles.test.js.map +1 -1
  287. package/dist/tests/checker.test.js +38 -29
  288. package/dist/tests/checker.test.js.map +1 -1
  289. package/dist/tests/completions.test.js +7 -3
  290. package/dist/tests/completions.test.js.map +1 -1
  291. package/dist/tests/config.test.js +24 -22
  292. package/dist/tests/config.test.js.map +1 -1
  293. package/dist/tests/documentSymbolCollector.test.js +3 -2
  294. package/dist/tests/documentSymbolCollector.test.js.map +1 -1
  295. package/dist/tests/filesystem.test.js +37 -35
  296. package/dist/tests/filesystem.test.js.map +1 -1
  297. package/dist/tests/fourSlashParser.test.js +4 -4
  298. package/dist/tests/fourSlashParser.test.js.map +1 -1
  299. package/dist/tests/fourslash/fourslash.d.ts +1 -2
  300. package/dist/tests/fourslash/hover.docstring.alias.fourslash.js +27 -11
  301. package/dist/tests/fourslash/hover.docstring.alias.fourslash.js.map +1 -1
  302. package/dist/tests/harness/fourslash/fourSlashParser.js +2 -2
  303. package/dist/tests/harness/fourslash/fourSlashParser.js.map +1 -1
  304. package/dist/tests/harness/fourslash/testLanguageService.d.ts +4 -5
  305. package/dist/tests/harness/fourslash/testLanguageService.js +9 -15
  306. package/dist/tests/harness/fourslash/testLanguageService.js.map +1 -1
  307. package/dist/tests/harness/fourslash/testState.Consts.d.ts +1 -2
  308. package/dist/tests/harness/fourslash/testState.Consts.js +0 -1
  309. package/dist/tests/harness/fourslash/testState.Consts.js.map +1 -1
  310. package/dist/tests/harness/fourslash/testState.d.ts +4 -4
  311. package/dist/tests/harness/fourslash/testState.js +92 -52
  312. package/dist/tests/harness/fourslash/testState.js.map +1 -1
  313. package/dist/tests/harness/testAccessHost.d.ts +3 -2
  314. package/dist/tests/harness/testAccessHost.js +2 -1
  315. package/dist/tests/harness/testAccessHost.js.map +1 -1
  316. package/dist/tests/harness/testHost.js +13 -11
  317. package/dist/tests/harness/testHost.js.map +1 -1
  318. package/dist/tests/harness/vfs/factory.d.ts +3 -2
  319. package/dist/tests/harness/vfs/factory.js +5 -4
  320. package/dist/tests/harness/vfs/factory.js.map +1 -1
  321. package/dist/tests/harness/vfs/filesystem.d.ts +32 -31
  322. package/dist/tests/harness/vfs/filesystem.js +47 -49
  323. package/dist/tests/harness/vfs/filesystem.js.map +1 -1
  324. package/dist/tests/harness/vfs/pathValidation.js +1 -10
  325. package/dist/tests/harness/vfs/pathValidation.js.map +1 -1
  326. package/dist/tests/importResolver.test.js +81 -58
  327. package/dist/tests/importResolver.test.js.map +1 -1
  328. package/dist/tests/importStatementUtils.test.js +10 -9
  329. package/dist/tests/importStatementUtils.test.js.map +1 -1
  330. package/dist/tests/ipythonMode.test.js +12 -11
  331. package/dist/tests/ipythonMode.test.js.map +1 -1
  332. package/dist/tests/logger.test.js +2 -1
  333. package/dist/tests/logger.test.js.map +1 -1
  334. package/dist/tests/parseTreeUtils.test.js +2 -1
  335. package/dist/tests/parseTreeUtils.test.js.map +1 -1
  336. package/dist/tests/pathUtils.test.js +3 -138
  337. package/dist/tests/pathUtils.test.js.map +1 -1
  338. package/dist/tests/pyrightFileSystem.test.js +76 -25
  339. package/dist/tests/pyrightFileSystem.test.js.map +1 -1
  340. package/dist/tests/service.test.js +37 -42
  341. package/dist/tests/service.test.js.map +1 -1
  342. package/dist/tests/signatureHelp.test.js +3 -2
  343. package/dist/tests/signatureHelp.test.js.map +1 -1
  344. package/dist/tests/sourceFile.test.js +8 -7
  345. package/dist/tests/sourceFile.test.js.map +1 -1
  346. package/dist/tests/sourceMapperUtils.test.js +13 -6
  347. package/dist/tests/sourceMapperUtils.test.js.map +1 -1
  348. package/dist/tests/testState.test.js +13 -9
  349. package/dist/tests/testState.test.js.map +1 -1
  350. package/dist/tests/testStateUtils.d.ts +2 -5
  351. package/dist/tests/testStateUtils.js +27 -64
  352. package/dist/tests/testStateUtils.js.map +1 -1
  353. package/dist/tests/testUtils.d.ts +3 -5
  354. package/dist/tests/testUtils.js +15 -64
  355. package/dist/tests/testUtils.js.map +1 -1
  356. package/dist/tests/textEditUtil.test.js +4 -3
  357. package/dist/tests/textEditUtil.test.js.map +1 -1
  358. package/dist/tests/typeEvaluator1.test.js +23 -19
  359. package/dist/tests/typeEvaluator1.test.js.map +1 -1
  360. package/dist/tests/typeEvaluator2.test.js +21 -12
  361. package/dist/tests/typeEvaluator2.test.js.map +1 -1
  362. package/dist/tests/typeEvaluator3.test.js +84 -70
  363. package/dist/tests/typeEvaluator3.test.js.map +1 -1
  364. package/dist/tests/typeEvaluator4.test.js +26 -21
  365. package/dist/tests/typeEvaluator4.test.js.map +1 -1
  366. package/dist/tests/typeEvaluator5.test.js +36 -31
  367. package/dist/tests/typeEvaluator5.test.js.map +1 -1
  368. package/dist/tests/typePrinter.test.js +4 -3
  369. package/dist/tests/typePrinter.test.js.map +1 -1
  370. package/dist/tests/uri.test.d.ts +1 -0
  371. package/dist/tests/uri.test.js +695 -0
  372. package/dist/tests/uri.test.js.map +1 -0
  373. package/dist/tests/workspaceEditUtils.test.js +28 -28
  374. package/dist/tests/workspaceEditUtils.test.js.map +1 -1
  375. package/dist/tests/zipfs.test.js +11 -11
  376. package/dist/tests/zipfs.test.js.map +1 -1
  377. package/dist/workspaceFactory.d.ts +13 -14
  378. package/dist/workspaceFactory.js +54 -55
  379. package/dist/workspaceFactory.js.map +1 -1
  380. package/package.json +2 -2
  381. package/dist/common/uriParser.d.ts +0 -24
  382. package/dist/common/uriParser.js +0 -45
  383. package/dist/common/uriParser.js.map +0 -1
@@ -9,7 +9,6 @@ exports.convertDocumentRangeToLocation = exports.convertDocumentRangesToLocation
9
9
  * Helper functions for navigating files.
10
10
  */
11
11
  const vscode_languageserver_types_1 = require("vscode-languageserver-types");
12
- const pathUtils_1 = require("../common/pathUtils");
13
12
  function canNavigateToFile(fs, path) {
14
13
  return !fs.isInZip(path);
15
14
  }
@@ -19,10 +18,10 @@ function convertDocumentRangesToLocation(fs, ranges, converter = convertDocument
19
18
  }
20
19
  exports.convertDocumentRangesToLocation = convertDocumentRangesToLocation;
21
20
  function convertDocumentRangeToLocation(fs, range) {
22
- if (!canNavigateToFile(fs, range.path)) {
21
+ if (!canNavigateToFile(fs, range.uri)) {
23
22
  return undefined;
24
23
  }
25
- return vscode_languageserver_types_1.Location.create((0, pathUtils_1.convertPathToUri)(fs, range.path), range.range);
24
+ return vscode_languageserver_types_1.Location.create(range.uri.toString(), range.range);
26
25
  }
27
26
  exports.convertDocumentRangeToLocation = convertDocumentRangeToLocation;
28
27
  //# sourceMappingURL=navigationUtils.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"navigationUtils.js","sourceRoot":"","sources":["../../../src/languageService/navigationUtils.ts"],"names":[],"mappings":";;;AAAA;;;;;;GAMG;AACH,6EAAuD;AAEvD,mDAAuD;AAGvD,SAAgB,iBAAiB,CAAC,EAAsB,EAAE,IAAY;IAClE,OAAO,CAAC,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;AAC7B,CAAC;AAFD,8CAEC;AAED,SAAgB,+BAA+B,CAC3C,EAAsB,EACtB,MAAuB,EACvB,YAAoF,8BAA8B;IAElH,OAAO,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,SAAS,CAAC,EAAE,EAAE,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,CAAe,CAAC;AAC5F,CAAC;AAND,0EAMC;AAED,SAAgB,8BAA8B,CAAC,EAAsB,EAAE,KAAoB;IACvF,IAAI,CAAC,iBAAiB,CAAC,EAAE,EAAE,KAAK,CAAC,IAAI,CAAC,EAAE;QACpC,OAAO,SAAS,CAAC;KACpB;IAED,OAAO,sCAAQ,CAAC,MAAM,CAAC,IAAA,4BAAgB,EAAC,EAAE,EAAE,KAAK,CAAC,IAAI,CAAC,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC;AAC1E,CAAC;AAND,wEAMC"}
1
+ {"version":3,"file":"navigationUtils.js","sourceRoot":"","sources":["../../../src/languageService/navigationUtils.ts"],"names":[],"mappings":";;;AAAA;;;;;;GAMG;AACH,6EAAuD;AAKvD,SAAgB,iBAAiB,CAAC,EAAsB,EAAE,IAAS;IAC/D,OAAO,CAAC,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;AAC7B,CAAC;AAFD,8CAEC;AAED,SAAgB,+BAA+B,CAC3C,EAAsB,EACtB,MAAuB,EACvB,YAAoF,8BAA8B;IAElH,OAAO,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,SAAS,CAAC,EAAE,EAAE,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,CAAe,CAAC;AAC5F,CAAC;AAND,0EAMC;AAED,SAAgB,8BAA8B,CAAC,EAAsB,EAAE,KAAoB;IACvF,IAAI,CAAC,iBAAiB,CAAC,EAAE,EAAE,KAAK,CAAC,GAAG,CAAC,EAAE;QACnC,OAAO,SAAS,CAAC;KACpB;IAED,OAAO,sCAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,QAAQ,EAAE,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC;AAC9D,CAAC;AAND,wEAMC"}
@@ -1,4 +1,4 @@
1
1
  import { CancellationToken } from 'vscode-languageserver';
2
- import { TextEditAction } from '../common/editAction';
3
2
  import { ProgramView } from '../common/extensibility';
4
- export declare function performQuickAction(programView: ProgramView, filePath: string, command: string, args: any[], token: CancellationToken): TextEditAction[];
3
+ import { Uri } from '../common/uri/uri';
4
+ export declare function performQuickAction(programView: ProgramView, uri: Uri, command: string, args: any[], token: CancellationToken): import("../common/editAction").TextEditAction[];
@@ -7,47 +7,18 @@
7
7
  *
8
8
  * Provides support for miscellaneous quick actions.
9
9
  */
10
- var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
11
- if (k2 === undefined) k2 = k;
12
- var desc = Object.getOwnPropertyDescriptor(m, k);
13
- if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
14
- desc = { enumerable: true, get: function() { return m[k]; } };
15
- }
16
- Object.defineProperty(o, k2, desc);
17
- }) : (function(o, m, k, k2) {
18
- if (k2 === undefined) k2 = k;
19
- o[k2] = m[k];
20
- }));
21
- var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
22
- Object.defineProperty(o, "default", { enumerable: true, value: v });
23
- }) : function(o, v) {
24
- o["default"] = v;
25
- });
26
- var __importStar = (this && this.__importStar) || function (mod) {
27
- if (mod && mod.__esModule) return mod;
28
- var result = {};
29
- if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
30
- __setModuleDefault(result, mod);
31
- return result;
32
- };
33
10
  Object.defineProperty(exports, "__esModule", { value: true });
34
11
  exports.performQuickAction = void 0;
35
- const importStatementUtils_1 = require("../analyzer/importStatementUtils");
36
- const ParseTreeUtils = __importStar(require("../analyzer/parseTreeUtils"));
37
- const cancellationUtils_1 = require("../common/cancellationUtils");
38
- const collectionUtils_1 = require("../common/collectionUtils");
39
- const positionUtils_1 = require("../common/positionUtils");
40
- const textRange_1 = require("../common/textRange");
41
12
  const importSorter_1 = require("./importSorter");
42
- function performQuickAction(programView, filePath, command, args, token) {
43
- const sourceFileInfo = programView.getSourceFileInfo(filePath);
13
+ function performQuickAction(programView, uri, command, args, token) {
14
+ const sourceFileInfo = programView.getSourceFileInfo(uri);
44
15
  // This command should be called only for open files, in which
45
16
  // case we should have the file contents already loaded.
46
17
  if (!sourceFileInfo || !sourceFileInfo.isOpenByClient) {
47
18
  return [];
48
19
  }
49
20
  // If we have no completed analysis job, there's nothing to do.
50
- const parseResults = programView.getParseResults(filePath);
21
+ const parseResults = programView.getParseResults(uri);
51
22
  if (!parseResults) {
52
23
  return [];
53
24
  }
@@ -55,58 +26,7 @@ function performQuickAction(programView, filePath, command, args, token) {
55
26
  const importSorter = new importSorter_1.ImportSorter(parseResults, token);
56
27
  return importSorter.sort();
57
28
  }
58
- else if (command === "pyright.addoptionalforparam" /* Commands.addMissingOptionalToParam */) {
59
- if (args.length >= 1) {
60
- const nodeOffset = parseInt(args[0], 10);
61
- return _addMissingOptionalToParam(parseResults, nodeOffset, token);
62
- }
63
- }
64
29
  return [];
65
30
  }
66
31
  exports.performQuickAction = performQuickAction;
67
- // Inserts text into the document to wrap an existing type annotation
68
- // with "Optional[X]".
69
- function _addMissingOptionalToParam(parseResults, offset, token) {
70
- (0, cancellationUtils_1.throwIfCancellationRequested)(token);
71
- let node = ParseTreeUtils.findNodeByOffset(parseResults.parseTree, offset);
72
- while (node) {
73
- if (node.nodeType === 41 /* ParseNodeType.Parameter */) {
74
- break;
75
- }
76
- node = node.parent;
77
- }
78
- if (!node) {
79
- return [];
80
- }
81
- const typeAnnotation = node.typeAnnotation || node.typeAnnotationComment;
82
- if (!typeAnnotation) {
83
- return [];
84
- }
85
- const editActions = [];
86
- const startPos = (0, positionUtils_1.convertOffsetToPosition)(typeAnnotation.start, parseResults.tokenizerOutput.lines);
87
- const endPos = (0, positionUtils_1.convertOffsetToPosition)(textRange_1.TextRange.getEnd(typeAnnotation), parseResults.tokenizerOutput.lines);
88
- editActions.push({
89
- range: { start: startPos, end: startPos },
90
- replacementText: 'Optional[',
91
- });
92
- editActions.push({
93
- range: { start: endPos, end: endPos },
94
- replacementText: ']',
95
- });
96
- // Add the import statement if necessary.
97
- const importStatements = (0, importStatementUtils_1.getTopLevelImports)(parseResults.parseTree);
98
- const importStatement = importStatements.orderedImports.find((imp) => imp.moduleName === 'typing');
99
- // If there's an existing import statement, insert into it.
100
- if (importStatement &&
101
- importStatement.node.nodeType === 22 /* ParseNodeType.ImportFrom */ &&
102
- !importStatement.node.isWildcardImport) {
103
- const additionalEditActions = (0, importStatementUtils_1.getTextEditsForAutoImportSymbolAddition)({ name: 'Optional' }, importStatement, parseResults);
104
- (0, collectionUtils_1.appendArray)(editActions, additionalEditActions);
105
- }
106
- else {
107
- const additionalEditActions = (0, importStatementUtils_1.getTextEditsForAutoImportInsertion)({ name: 'Optional' }, { name: 'typing' }, importStatements, 0 /* ImportGroup.BuiltIn */, parseResults, startPos);
108
- (0, collectionUtils_1.appendArray)(editActions, additionalEditActions);
109
- }
110
- return editActions;
111
- }
112
32
  //# sourceMappingURL=quickActions.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"quickActions.js","sourceRoot":"","sources":["../../../src/languageService/quickActions.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"quickActions.js","sourceRoot":"","sources":["../../../src/languageService/quickActions.ts"],"names":[],"mappings":";AAAA;;;;;;;GAOG;;;AAOH,iDAA8C;AAE9C,SAAgB,kBAAkB,CAC9B,WAAwB,EACxB,GAAQ,EACR,OAAe,EACf,IAAW,EACX,KAAwB;IAExB,MAAM,cAAc,GAAG,WAAW,CAAC,iBAAiB,CAAC,GAAG,CAAC,CAAC;IAE1D,8DAA8D;IAC9D,wDAAwD;IACxD,IAAI,CAAC,cAAc,IAAI,CAAC,cAAc,CAAC,cAAc,EAAE;QACnD,OAAO,EAAE,CAAC;KACb;IAED,+DAA+D;IAC/D,MAAM,YAAY,GAAG,WAAW,CAAC,eAAe,CAAC,GAAG,CAAC,CAAC;IACtD,IAAI,CAAC,YAAY,EAAE;QACf,OAAO,EAAE,CAAC;KACb;IAED,IAAI,OAAO,0DAA0B,EAAE;QACnC,MAAM,YAAY,GAAG,IAAI,2BAAY,CAAC,YAAY,EAAE,KAAK,CAAC,CAAC;QAC3D,OAAO,YAAY,CAAC,IAAI,EAAE,CAAC;KAC9B;IAED,OAAO,EAAE,CAAC;AACd,CAAC;AA3BD,gDA2BC"}
@@ -1,11 +1,12 @@
1
1
  import { CancellationToken, Location, ResultProgressReporter } from 'vscode-languageserver';
2
2
  import { Declaration } from '../analyzer/declaration';
3
3
  import { ProgramView, ReferenceUseCase, SymbolUsageProvider } from '../common/extensibility';
4
+ import { ReadOnlyFileSystem } from '../common/fileSystem';
4
5
  import { DocumentRange, Position } from '../common/textRange';
6
+ import { Uri } from '../common/uri/uri';
5
7
  import { NameNode, ParseNode } from '../parser/parseNodes';
6
8
  import { ParseResults } from '../parser/parser';
7
9
  import { CollectionResult } from './documentSymbolCollector';
8
- import { ReadOnlyFileSystem } from '../common/fileSystem';
9
10
  export type ReferenceCallback = (locations: DocumentRange[]) => void;
10
11
  export declare class ReferencesResult {
11
12
  readonly requiresGlobalSearch: boolean;
@@ -24,24 +25,24 @@ export declare class ReferencesResult {
24
25
  }
25
26
  export declare class FindReferencesTreeWalker {
26
27
  private _program;
27
- private _filePath;
28
+ private _fileUri;
28
29
  private _referencesResult;
29
30
  private _includeDeclaration;
30
31
  private _cancellationToken;
31
32
  private readonly _createDocumentRange;
32
33
  private _parseResults;
33
- constructor(_program: ProgramView, _filePath: string, _referencesResult: ReferencesResult, _includeDeclaration: boolean, _cancellationToken: CancellationToken, _createDocumentRange?: (filePath: string, result: CollectionResult, parseResults: ParseResults) => DocumentRange);
34
+ constructor(_program: ProgramView, _fileUri: Uri, _referencesResult: ReferencesResult, _includeDeclaration: boolean, _cancellationToken: CancellationToken, _createDocumentRange?: (fileUri: Uri, result: CollectionResult, parseResults: ParseResults) => DocumentRange);
34
35
  findReferences(rootNode?: import("../parser/parseNodes").ModuleNode | undefined): DocumentRange[];
35
- static createDocumentRange(filePath: string, result: CollectionResult, parseResults: ParseResults): DocumentRange;
36
+ static createDocumentRange(fileUri: Uri, result: CollectionResult, parseResults: ParseResults): DocumentRange;
36
37
  }
37
38
  export declare class ReferencesProvider {
38
39
  private _program;
39
40
  private _token;
40
41
  private readonly _createDocumentRange?;
41
42
  private readonly _convertToLocation?;
42
- constructor(_program: ProgramView, _token: CancellationToken, _createDocumentRange?: ((filePath: string, result: CollectionResult, parseResults: ParseResults) => DocumentRange) | undefined, _convertToLocation?: ((fs: ReadOnlyFileSystem, ranges: DocumentRange) => Location | undefined) | undefined);
43
- reportReferences(filePath: string, position: Position, includeDeclaration: boolean, resultReporter?: ResultProgressReporter<Location[]>): Location[] | undefined;
44
- addReferencesToResult(filePath: string, includeDeclaration: boolean, referencesResult: ReferencesResult): void;
45
- static getDeclarationForNode(program: ProgramView, filePath: string, node: NameNode, reporter: ReferenceCallback | undefined, useCase: ReferenceUseCase, token: CancellationToken): ReferencesResult | undefined;
46
- static getDeclarationForPosition(program: ProgramView, filePath: string, position: Position, reporter: ReferenceCallback | undefined, useCase: ReferenceUseCase, token: CancellationToken): ReferencesResult | undefined;
43
+ constructor(_program: ProgramView, _token: CancellationToken, _createDocumentRange?: ((fileUri: Uri, result: CollectionResult, parseResults: ParseResults) => DocumentRange) | undefined, _convertToLocation?: ((fs: ReadOnlyFileSystem, ranges: DocumentRange) => Location | undefined) | undefined);
44
+ reportReferences(fileUri: Uri, position: Position, includeDeclaration: boolean, resultReporter?: ResultProgressReporter<Location[]>): Location[] | undefined;
45
+ addReferencesToResult(fileUri: Uri, includeDeclaration: boolean, referencesResult: ReferencesResult): void;
46
+ static getDeclarationForNode(program: ProgramView, fileUri: Uri, node: NameNode, reporter: ReferenceCallback | undefined, useCase: ReferenceUseCase, token: CancellationToken): ReferencesResult | undefined;
47
+ static getDeclarationForPosition(program: ProgramView, fileUri: Uri, position: Position, reporter: ReferenceCallback | undefined, useCase: ReferenceUseCase, token: CancellationToken): ReferencesResult | undefined;
47
48
  }
@@ -40,15 +40,15 @@ const sourceFileInfoUtils_1 = require("../analyzer/sourceFileInfoUtils");
40
40
  const symbolUtils_1 = require("../analyzer/symbolUtils");
41
41
  const types_1 = require("../analyzer/types");
42
42
  const cancellationUtils_1 = require("../common/cancellationUtils");
43
- const core_1 = require("../common/core");
44
43
  const collectionUtils_1 = require("../common/collectionUtils");
44
+ const core_1 = require("../common/core");
45
45
  const debug_1 = require("../common/debug");
46
46
  const extensibility_1 = require("../common/extensibility");
47
47
  const positionUtils_1 = require("../common/positionUtils");
48
+ const serviceProviderExtensions_1 = require("../common/serviceProviderExtensions");
48
49
  const textRange_1 = require("../common/textRange");
49
50
  const documentSymbolCollector_1 = require("./documentSymbolCollector");
50
51
  const navigationUtils_1 = require("./navigationUtils");
51
- const serviceProviderExtensions_1 = require("../common/serviceProviderExtensions");
52
52
  class ReferencesResult {
53
53
  constructor(requiresGlobalSearch, nodeAtOffset, symbolNames, declarations, useCase, providers, _reporter) {
54
54
  this.requiresGlobalSearch = requiresGlobalSearch;
@@ -101,14 +101,14 @@ class ReferencesResult {
101
101
  }
102
102
  exports.ReferencesResult = ReferencesResult;
103
103
  class FindReferencesTreeWalker {
104
- constructor(_program, _filePath, _referencesResult, _includeDeclaration, _cancellationToken, _createDocumentRange = FindReferencesTreeWalker.createDocumentRange) {
104
+ constructor(_program, _fileUri, _referencesResult, _includeDeclaration, _cancellationToken, _createDocumentRange = FindReferencesTreeWalker.createDocumentRange) {
105
105
  this._program = _program;
106
- this._filePath = _filePath;
106
+ this._fileUri = _fileUri;
107
107
  this._referencesResult = _referencesResult;
108
108
  this._includeDeclaration = _includeDeclaration;
109
109
  this._cancellationToken = _cancellationToken;
110
110
  this._createDocumentRange = _createDocumentRange;
111
- this._parseResults = this._program.getParseResults(this._filePath);
111
+ this._parseResults = this._program.getParseResults(this._fileUri);
112
112
  }
113
113
  findReferences(rootNode) {
114
114
  var _a;
@@ -126,14 +126,14 @@ class FindReferencesTreeWalker {
126
126
  for (const result of collector.collect()) {
127
127
  // Is it the same symbol?
128
128
  if (this._includeDeclaration || result.node !== this._referencesResult.nodeAtOffset) {
129
- results.push(this._createDocumentRange(this._filePath, result, this._parseResults));
129
+ results.push(this._createDocumentRange(this._fileUri, result, this._parseResults));
130
130
  }
131
131
  }
132
132
  return results;
133
133
  }
134
- static createDocumentRange(filePath, result, parseResults) {
134
+ static createDocumentRange(fileUri, result, parseResults) {
135
135
  return {
136
- path: filePath,
136
+ uri: fileUri,
137
137
  range: {
138
138
  start: (0, positionUtils_1.convertOffsetToPosition)(result.range.start, parseResults.tokenizerOutput.lines),
139
139
  end: (0, positionUtils_1.convertOffsetToPosition)(textRange_1.TextRange.getEnd(result.range), parseResults.tokenizerOutput.lines),
@@ -150,12 +150,12 @@ class ReferencesProvider {
150
150
  this._convertToLocation = _convertToLocation;
151
151
  // empty
152
152
  }
153
- reportReferences(filePath, position, includeDeclaration, resultReporter) {
154
- const sourceFileInfo = this._program.getSourceFileInfo(filePath);
153
+ reportReferences(fileUri, position, includeDeclaration, resultReporter) {
154
+ const sourceFileInfo = this._program.getSourceFileInfo(fileUri);
155
155
  if (!sourceFileInfo) {
156
156
  return;
157
157
  }
158
- const parseResults = this._program.getParseResults(filePath);
158
+ const parseResults = this._program.getParseResults(fileUri);
159
159
  if (!parseResults) {
160
160
  return;
161
161
  }
@@ -164,13 +164,13 @@ class ReferencesProvider {
164
164
  ? (range) => resultReporter.report((0, navigationUtils_1.convertDocumentRangesToLocation)(this._program.fileSystem, range, this._convertToLocation))
165
165
  : (range) => (0, collectionUtils_1.appendArray)(locations, (0, navigationUtils_1.convertDocumentRangesToLocation)(this._program.fileSystem, range, this._convertToLocation));
166
166
  const invokedFromUserFile = (0, sourceFileInfoUtils_1.isUserCode)(sourceFileInfo);
167
- const referencesResult = ReferencesProvider.getDeclarationForPosition(this._program, filePath, position, reporter, extensibility_1.ReferenceUseCase.References, this._token);
167
+ const referencesResult = ReferencesProvider.getDeclarationForPosition(this._program, fileUri, position, reporter, extensibility_1.ReferenceUseCase.References, this._token);
168
168
  if (!referencesResult) {
169
169
  return;
170
170
  }
171
171
  // Do we need to do a global search as well?
172
172
  if (!referencesResult.requiresGlobalSearch) {
173
- this.addReferencesToResult(sourceFileInfo.sourceFile.getFilePath(), includeDeclaration, referencesResult);
173
+ this.addReferencesToResult(sourceFileInfo.sourceFile.getUri(), includeDeclaration, referencesResult);
174
174
  }
175
175
  for (const curSourceFileInfo of this._program.getSourceFileInfoList()) {
176
176
  (0, cancellationUtils_1.throwIfCancellationRequested)(this._token);
@@ -181,7 +181,7 @@ class ReferencesProvider {
181
181
  // If not, we can skip additional processing for the file.
182
182
  const fileContents = curSourceFileInfo.sourceFile.getFileContent();
183
183
  if (!fileContents || referencesResult.symbolNames.some((s) => fileContents.search(s) >= 0)) {
184
- this.addReferencesToResult(curSourceFileInfo.sourceFile.getFilePath(), includeDeclaration, referencesResult);
184
+ this.addReferencesToResult(curSourceFileInfo.sourceFile.getUri(), includeDeclaration, referencesResult);
185
185
  }
186
186
  // This operation can consume significant memory, so check
187
187
  // for situations where we need to discard the type cache.
@@ -193,20 +193,20 @@ class ReferencesProvider {
193
193
  if (includeDeclaration) {
194
194
  for (const decl of referencesResult.declarations) {
195
195
  (0, cancellationUtils_1.throwIfCancellationRequested)(this._token);
196
- if (referencesResult.locations.some((l) => l.path === decl.path)) {
196
+ if (referencesResult.locations.some((l) => l.uri.equals(decl.uri))) {
197
197
  // Already included.
198
198
  continue;
199
199
  }
200
- const declFileInfo = this._program.getSourceFileInfo(decl.path);
200
+ const declFileInfo = this._program.getSourceFileInfo(decl.uri);
201
201
  if (!declFileInfo) {
202
202
  // The file the declaration belongs to doesn't belong to the program.
203
203
  continue;
204
204
  }
205
205
  const tempResult = new ReferencesResult(referencesResult.requiresGlobalSearch, referencesResult.nodeAtOffset, referencesResult.symbolNames, referencesResult.declarations, referencesResult.useCase, referencesResult.providers);
206
- this.addReferencesToResult(declFileInfo.sourceFile.getFilePath(), includeDeclaration, tempResult);
206
+ this.addReferencesToResult(declFileInfo.sourceFile.getUri(), includeDeclaration, tempResult);
207
207
  for (const loc of tempResult.locations) {
208
208
  // Include declarations only. And throw away any references
209
- if (loc.path === decl.path && (0, textRange_1.doesRangeContain)(decl.range, loc.range)) {
209
+ if (loc.uri.equals(decl.uri) && (0, textRange_1.doesRangeContain)(decl.range, loc.range)) {
210
210
  referencesResult.addLocations(loc);
211
211
  }
212
212
  }
@@ -214,15 +214,15 @@ class ReferencesProvider {
214
214
  }
215
215
  return locations;
216
216
  }
217
- addReferencesToResult(filePath, includeDeclaration, referencesResult) {
218
- const parseResults = this._program.getParseResults(filePath);
217
+ addReferencesToResult(fileUri, includeDeclaration, referencesResult) {
218
+ const parseResults = this._program.getParseResults(fileUri);
219
219
  if (!parseResults) {
220
220
  return;
221
221
  }
222
- const refTreeWalker = new FindReferencesTreeWalker(this._program, filePath, referencesResult, includeDeclaration, this._token, this._createDocumentRange);
222
+ const refTreeWalker = new FindReferencesTreeWalker(this._program, fileUri, referencesResult, includeDeclaration, this._token, this._createDocumentRange);
223
223
  referencesResult.addLocations(...refTreeWalker.findReferences());
224
224
  }
225
- static getDeclarationForNode(program, filePath, node, reporter, useCase, token) {
225
+ static getDeclarationForNode(program, fileUri, node, reporter, useCase, token) {
226
226
  var _a;
227
227
  (0, cancellationUtils_1.throwIfCancellationRequested)(token);
228
228
  const declarations = documentSymbolCollector_1.DocumentSymbolCollector.getDeclarationsForNode(program, node,
@@ -230,7 +230,7 @@ class ReferencesProvider {
230
230
  if (declarations.length === 0) {
231
231
  return undefined;
232
232
  }
233
- const requiresGlobalSearch = isVisibleOutside(program.evaluator, filePath, node, declarations);
233
+ const requiresGlobalSearch = isVisibleOutside(program.evaluator, fileUri, node, declarations);
234
234
  const symbolNames = new Set(declarations.map((d) => (0, declarationUtils_1.getNameFromDeclaration)(d)).filter((n) => !!n));
235
235
  symbolNames.add(node.value);
236
236
  const providers = ((_a = program.serviceProvider.tryGet(serviceProviderExtensions_1.ServiceKeys.symbolUsageProviderFactory)) !== null && _a !== void 0 ? _a : [])
@@ -243,9 +243,9 @@ class ReferencesProvider {
243
243
  });
244
244
  return new ReferencesResult(requiresGlobalSearch, node, Array.from(symbolNames.values()), declarations, useCase, providers, reporter);
245
245
  }
246
- static getDeclarationForPosition(program, filePath, position, reporter, useCase, token) {
246
+ static getDeclarationForPosition(program, fileUri, position, reporter, useCase, token) {
247
247
  (0, cancellationUtils_1.throwIfCancellationRequested)(token);
248
- const parseResults = program.getParseResults(filePath);
248
+ const parseResults = program.getParseResults(fileUri);
249
249
  if (!parseResults) {
250
250
  return undefined;
251
251
  }
@@ -261,11 +261,11 @@ class ReferencesProvider {
261
261
  if (node.nodeType !== 38 /* ParseNodeType.Name */) {
262
262
  return undefined;
263
263
  }
264
- return this.getDeclarationForNode(program, filePath, node, reporter, useCase, token);
264
+ return this.getDeclarationForNode(program, fileUri, node, reporter, useCase, token);
265
265
  }
266
266
  }
267
267
  exports.ReferencesProvider = ReferencesProvider;
268
- function isVisibleOutside(evaluator, currentFilePath, node, declarations) {
268
+ function isVisibleOutside(evaluator, currentUri, node, declarations) {
269
269
  const result = evaluator.lookUpSymbolRecursive(node, node.value, /* honorCodeFlow */ false);
270
270
  if (result && !isExternallyVisible(result.symbol)) {
271
271
  return false;
@@ -278,7 +278,7 @@ function isVisibleOutside(evaluator, currentFilePath, node, declarations) {
278
278
  return declarations.some((decl) => {
279
279
  var _a, _b;
280
280
  // If the declaration is outside of this file, a global search is needed.
281
- if (decl.path !== currentFilePath) {
281
+ if (!decl.uri.equals(currentUri)) {
282
282
  return true;
283
283
  }
284
284
  const evalScope = ParseTreeUtils.getEvaluationScopeNode(decl.node);
@@ -1 +1 @@
1
- {"version":3,"file":"referencesProvider.js","sourceRoot":"","sources":["../../../src/languageService/referencesProvider.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"referencesProvider.js","sourceRoot":"","sources":["../../../src/languageService/referencesProvider.ts"],"names":[],"mappings":"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"}
@@ -1,16 +1,17 @@
1
1
  import { CancellationToken, WorkspaceEdit } from 'vscode-languageserver';
2
2
  import { ProgramView } from '../common/extensibility';
3
3
  import { Position, Range } from '../common/textRange';
4
+ import { Uri } from '../common/uri/uri';
4
5
  import { ReferencesResult } from '../languageService/referencesProvider';
5
6
  export declare class RenameProvider {
6
7
  private _program;
7
- private _filePath;
8
+ private _fileUri;
8
9
  private _position;
9
10
  private _token;
10
11
  private readonly _parseResults;
11
- constructor(_program: ProgramView, _filePath: string, _position: Position, _token: CancellationToken);
12
+ constructor(_program: ProgramView, _fileUri: Uri, _position: Position, _token: CancellationToken);
12
13
  canRenameSymbol(isDefaultWorkspace: boolean, isUntitled: boolean): Range | null;
13
14
  renameSymbol(newName: string, isDefaultWorkspace: boolean, isUntitled: boolean): WorkspaceEdit | null;
14
- static getRenameSymbolMode(program: ProgramView, filePath: string, referencesResult: ReferencesResult, isDefaultWorkspace: boolean, isUntitled: boolean): "none" | "singleFileMode" | "multiFileMode";
15
+ static getRenameSymbolMode(program: ProgramView, fileUri: Uri, referencesResult: ReferencesResult, isDefaultWorkspace: boolean, isUntitled: boolean): "none" | "singleFileMode" | "multiFileMode";
15
16
  private _getReferenceResult;
16
17
  }
@@ -9,20 +9,20 @@
9
9
  */
10
10
  Object.defineProperty(exports, "__esModule", { value: true });
11
11
  exports.RenameProvider = void 0;
12
+ const sourceFileInfoUtils_1 = require("../analyzer/sourceFileInfoUtils");
13
+ const cancellationUtils_1 = require("../common/cancellationUtils");
12
14
  const debug_1 = require("../common/debug");
13
15
  const extensibility_1 = require("../common/extensibility");
14
16
  const positionUtils_1 = require("../common/positionUtils");
15
- const referencesProvider_1 = require("../languageService/referencesProvider");
16
- const sourceFileInfoUtils_1 = require("../analyzer/sourceFileInfoUtils");
17
- const cancellationUtils_1 = require("../common/cancellationUtils");
18
17
  const workspaceEditUtils_1 = require("../common/workspaceEditUtils");
18
+ const referencesProvider_1 = require("../languageService/referencesProvider");
19
19
  class RenameProvider {
20
- constructor(_program, _filePath, _position, _token) {
20
+ constructor(_program, _fileUri, _position, _token) {
21
21
  this._program = _program;
22
- this._filePath = _filePath;
22
+ this._fileUri = _fileUri;
23
23
  this._position = _position;
24
24
  this._token = _token;
25
- this._parseResults = this._program.getParseResults(this._filePath);
25
+ this._parseResults = this._program.getParseResults(this._fileUri);
26
26
  }
27
27
  canRenameSymbol(isDefaultWorkspace, isUntitled) {
28
28
  (0, cancellationUtils_1.throwIfCancellationRequested)(this._token);
@@ -33,7 +33,7 @@ class RenameProvider {
33
33
  if (!referencesResult) {
34
34
  return null;
35
35
  }
36
- const renameMode = RenameProvider.getRenameSymbolMode(this._program, this._filePath, referencesResult, isDefaultWorkspace, isUntitled);
36
+ const renameMode = RenameProvider.getRenameSymbolMode(this._program, this._fileUri, referencesResult, isDefaultWorkspace, isUntitled);
37
37
  if (renameMode === 'none') {
38
38
  return null;
39
39
  }
@@ -51,11 +51,10 @@ class RenameProvider {
51
51
  return null;
52
52
  }
53
53
  const referenceProvider = new referencesProvider_1.ReferencesProvider(this._program, this._token);
54
- const renameMode = RenameProvider.getRenameSymbolMode(this._program, this._filePath, referencesResult, isDefaultWorkspace, isUntitled);
54
+ const renameMode = RenameProvider.getRenameSymbolMode(this._program, this._fileUri, referencesResult, isDefaultWorkspace, isUntitled);
55
55
  switch (renameMode) {
56
56
  case 'singleFileMode':
57
- referenceProvider.addReferencesToResult(this._filePath,
58
- /* includeDeclaration */ true, referencesResult);
57
+ referenceProvider.addReferencesToResult(this._fileUri, /* includeDeclaration */ true, referencesResult);
59
58
  break;
60
59
  case 'multiFileMode': {
61
60
  for (const curSourceFileInfo of this._program.getSourceFileInfoList()) {
@@ -67,7 +66,7 @@ class RenameProvider {
67
66
  if (!referencesResult.symbolNames.some((s) => content.search(s) >= 0)) {
68
67
  continue;
69
68
  }
70
- referenceProvider.addReferencesToResult(curSourceFileInfo.sourceFile.getFilePath(),
69
+ referenceProvider.addReferencesToResult(curSourceFileInfo.sourceFile.getUri(),
71
70
  /* includeDeclaration */ true, referencesResult);
72
71
  }
73
72
  // This operation can consume significant memory, so check
@@ -86,15 +85,15 @@ class RenameProvider {
86
85
  const edits = [];
87
86
  referencesResult.locations.forEach((loc) => {
88
87
  edits.push({
89
- filePath: loc.path,
88
+ fileUri: loc.uri,
90
89
  range: loc.range,
91
90
  replacementText: newName,
92
91
  });
93
92
  });
94
- return (0, workspaceEditUtils_1.convertToWorkspaceEdit)(this._program.fileSystem, { edits, fileOperations: [] });
93
+ return (0, workspaceEditUtils_1.convertToWorkspaceEdit)({ edits, fileOperations: [] });
95
94
  }
96
- static getRenameSymbolMode(program, filePath, referencesResult, isDefaultWorkspace, isUntitled) {
97
- const sourceFileInfo = program.getSourceFileInfo(filePath);
95
+ static getRenameSymbolMode(program, fileUri, referencesResult, isDefaultWorkspace, isUntitled) {
96
+ const sourceFileInfo = program.getSourceFileInfo(fileUri);
98
97
  // We have 2 different cases
99
98
  // Single file mode.
100
99
  // 1. rename on default workspace (ex, standalone file mode).
@@ -108,10 +107,10 @@ class RenameProvider {
108
107
  (userFile && !referencesResult.requiresGlobalSearch) ||
109
108
  (!userFile &&
110
109
  sourceFileInfo.isOpenByClient &&
111
- referencesResult.declarations.every((d) => program.getSourceFileInfo(d.path) === sourceFileInfo))) {
110
+ referencesResult.declarations.every((d) => program.getSourceFileInfo(d.uri) === sourceFileInfo))) {
112
111
  return 'singleFileMode';
113
112
  }
114
- if (!isUntitled && referencesResult.declarations.every((d) => (0, sourceFileInfoUtils_1.isUserCode)(program.getSourceFileInfo(d.path)))) {
113
+ if (!isUntitled && referencesResult.declarations.every((d) => (0, sourceFileInfoUtils_1.isUserCode)(program.getSourceFileInfo(d.uri)))) {
115
114
  return 'multiFileMode';
116
115
  }
117
116
  // Rename is not allowed.
@@ -119,7 +118,7 @@ class RenameProvider {
119
118
  return 'none';
120
119
  }
121
120
  _getReferenceResult() {
122
- const referencesResult = referencesProvider_1.ReferencesProvider.getDeclarationForPosition(this._program, this._filePath, this._position,
121
+ const referencesResult = referencesProvider_1.ReferencesProvider.getDeclarationForPosition(this._program, this._fileUri, this._position,
123
122
  /* reporter */ undefined, extensibility_1.ReferenceUseCase.Rename, this._token);
124
123
  if (!referencesResult) {
125
124
  return undefined;
@@ -1 +1 @@
1
- {"version":3,"file":"renameProvider.js","sourceRoot":"","sources":["../../../src/languageService/renameProvider.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"renameProvider.js","sourceRoot":"","sources":["../../../src/languageService/renameProvider.ts"],"names":[],"mappings":"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"}
@@ -1,9 +1,10 @@
1
1
  import { CancellationToken, MarkupKind, SignatureHelp, SignatureHelpContext } from 'vscode-languageserver';
2
2
  import { ProgramView } from '../common/extensibility';
3
3
  import { Position } from '../common/textRange';
4
+ import { Uri } from '../common/uri/uri';
4
5
  export declare class SignatureHelpProvider {
5
6
  private _program;
6
- private _filePath;
7
+ private _fileUri;
7
8
  private _position;
8
9
  private _format;
9
10
  private _hasSignatureLabelOffsetCapability;
@@ -12,7 +13,7 @@ export declare class SignatureHelpProvider {
12
13
  private _token;
13
14
  private readonly _parseResults;
14
15
  private readonly _sourceMapper;
15
- constructor(_program: ProgramView, _filePath: string, _position: Position, _format: MarkupKind, _hasSignatureLabelOffsetCapability: boolean, _hasActiveParameterCapability: boolean, _context: SignatureHelpContext | undefined, _token: CancellationToken);
16
+ constructor(_program: ProgramView, _fileUri: Uri, _position: Position, _format: MarkupKind, _hasSignatureLabelOffsetCapability: boolean, _hasActiveParameterCapability: boolean, _context: SignatureHelpContext | undefined, _token: CancellationToken);
16
17
  getSignatureHelp(): SignatureHelp | undefined;
17
18
  private get _evaluator();
18
19
  private _getSignatureHelp;