@zzzen/pyright-internal 1.2.0-dev.20231203 → 1.2.0-dev.20231217

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 (360) 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 +67 -62
  7. package/dist/analyzer/binder.js.map +1 -1
  8. package/dist/analyzer/checker.js +43 -33
  9. package/dist/analyzer/checker.js.map +1 -1
  10. package/dist/analyzer/circularDependency.d.ts +3 -2
  11. package/dist/analyzer/circularDependency.js.map +1 -1
  12. package/dist/analyzer/codeFlowEngine.js +47 -47
  13. package/dist/analyzer/codeFlowEngine.js.map +1 -1
  14. package/dist/analyzer/codeFlowTypes.d.ts +0 -1
  15. package/dist/analyzer/codeFlowTypes.js.map +1 -1
  16. package/dist/analyzer/constraintSolver.js +3 -5
  17. package/dist/analyzer/constraintSolver.js.map +1 -1
  18. package/dist/analyzer/dataClasses.js +1 -1
  19. package/dist/analyzer/dataClasses.js.map +1 -1
  20. package/dist/analyzer/declaration.d.ts +5 -3
  21. package/dist/analyzer/declaration.js +3 -2
  22. package/dist/analyzer/declaration.js.map +1 -1
  23. package/dist/analyzer/declarationUtils.d.ts +3 -2
  24. package/dist/analyzer/declarationUtils.js +14 -12
  25. package/dist/analyzer/declarationUtils.js.map +1 -1
  26. package/dist/analyzer/decorators.js +14 -43
  27. package/dist/analyzer/decorators.js.map +1 -1
  28. package/dist/analyzer/enums.js +1 -1
  29. package/dist/analyzer/enums.js.map +1 -1
  30. package/dist/analyzer/importResolver.d.ts +29 -25
  31. package/dist/analyzer/importResolver.js +300 -301
  32. package/dist/analyzer/importResolver.js.map +1 -1
  33. package/dist/analyzer/importResult.d.ts +5 -4
  34. package/dist/analyzer/importResult.js.map +1 -1
  35. package/dist/analyzer/importStatementUtils.d.ts +5 -4
  36. package/dist/analyzer/importStatementUtils.js +23 -22
  37. package/dist/analyzer/importStatementUtils.js.map +1 -1
  38. package/dist/analyzer/namedTuples.js +3 -3
  39. package/dist/analyzer/namedTuples.js.map +1 -1
  40. package/dist/analyzer/packageTypeReport.d.ts +7 -6
  41. package/dist/analyzer/packageTypeReport.js +4 -4
  42. package/dist/analyzer/packageTypeReport.js.map +1 -1
  43. package/dist/analyzer/packageTypeVerifier.js +68 -64
  44. package/dist/analyzer/packageTypeVerifier.js.map +1 -1
  45. package/dist/analyzer/parentDirectoryCache.d.ts +7 -6
  46. package/dist/analyzer/parentDirectoryCache.js +9 -10
  47. package/dist/analyzer/parentDirectoryCache.js.map +1 -1
  48. package/dist/analyzer/parseTreeUtils.d.ts +1 -1
  49. package/dist/analyzer/parseTreeUtils.js +7 -4
  50. package/dist/analyzer/parseTreeUtils.js.map +1 -1
  51. package/dist/analyzer/patternMatching.js +102 -14
  52. package/dist/analyzer/patternMatching.js.map +1 -1
  53. package/dist/analyzer/program.d.ts +27 -26
  54. package/dist/analyzer/program.js +162 -156
  55. package/dist/analyzer/program.js.map +1 -1
  56. package/dist/analyzer/properties.js +6 -3
  57. package/dist/analyzer/properties.js.map +1 -1
  58. package/dist/analyzer/pyTypedUtils.d.ts +3 -2
  59. package/dist/analyzer/pyTypedUtils.js +4 -5
  60. package/dist/analyzer/pyTypedUtils.js.map +1 -1
  61. package/dist/analyzer/pythonPathUtils.d.ts +7 -6
  62. package/dist/analyzer/pythonPathUtils.js +21 -23
  63. package/dist/analyzer/pythonPathUtils.js.map +1 -1
  64. package/dist/analyzer/service.d.ts +24 -23
  65. package/dist/analyzer/service.js +190 -184
  66. package/dist/analyzer/service.js.map +1 -1
  67. package/dist/analyzer/sourceFile.d.ts +4 -5
  68. package/dist/analyzer/sourceFile.js +68 -56
  69. package/dist/analyzer/sourceFile.js.map +1 -1
  70. package/dist/analyzer/sourceFileInfoUtils.js +3 -3
  71. package/dist/analyzer/sourceFileInfoUtils.js.map +1 -1
  72. package/dist/analyzer/sourceMapper.d.ts +11 -10
  73. package/dist/analyzer/sourceMapper.js +61 -63
  74. package/dist/analyzer/sourceMapper.js.map +1 -1
  75. package/dist/analyzer/sourceMapperUtils.d.ts +2 -1
  76. package/dist/analyzer/sourceMapperUtils.js +2 -2
  77. package/dist/analyzer/sourceMapperUtils.js.map +1 -1
  78. package/dist/analyzer/tracePrinter.d.ts +3 -2
  79. package/dist/analyzer/tracePrinter.js +21 -23
  80. package/dist/analyzer/tracePrinter.js.map +1 -1
  81. package/dist/analyzer/typeDocStringUtils.d.ts +2 -1
  82. package/dist/analyzer/typeDocStringUtils.js +14 -17
  83. package/dist/analyzer/typeDocStringUtils.js.map +1 -1
  84. package/dist/analyzer/typeEvaluator.js +259 -152
  85. package/dist/analyzer/typeEvaluator.js.map +1 -1
  86. package/dist/analyzer/typeGuards.d.ts +1 -0
  87. package/dist/analyzer/typeGuards.js +5 -4
  88. package/dist/analyzer/typeGuards.js.map +1 -1
  89. package/dist/analyzer/typePrinter.d.ts +2 -0
  90. package/dist/analyzer/typePrinter.js +48 -8
  91. package/dist/analyzer/typePrinter.js.map +1 -1
  92. package/dist/analyzer/typeStubWriter.d.ts +2 -1
  93. package/dist/analyzer/typeStubWriter.js +2 -2
  94. package/dist/analyzer/typeStubWriter.js.map +1 -1
  95. package/dist/analyzer/typeUtils.d.ts +5 -2
  96. package/dist/analyzer/typeUtils.js +37 -10
  97. package/dist/analyzer/typeUtils.js.map +1 -1
  98. package/dist/analyzer/typedDicts.js +4 -4
  99. package/dist/analyzer/typedDicts.js.map +1 -1
  100. package/dist/analyzer/types.d.ts +10 -6
  101. package/dist/analyzer/types.js +7 -5
  102. package/dist/analyzer/types.js.map +1 -1
  103. package/dist/backgroundAnalysis.d.ts +1 -2
  104. package/dist/backgroundAnalysis.js +6 -4
  105. package/dist/backgroundAnalysis.js.map +1 -1
  106. package/dist/backgroundAnalysisBase.d.ts +22 -20
  107. package/dist/backgroundAnalysisBase.js +76 -55
  108. package/dist/backgroundAnalysisBase.js.map +1 -1
  109. package/dist/backgroundThreadBase.d.ts +1 -1
  110. package/dist/backgroundThreadBase.js +20 -11
  111. package/dist/backgroundThreadBase.js.map +1 -1
  112. package/dist/commands/createTypeStub.js +3 -2
  113. package/dist/commands/createTypeStub.js.map +1 -1
  114. package/dist/commands/dumpFileDebugInfoCommand.js +21 -20
  115. package/dist/commands/dumpFileDebugInfoCommand.js.map +1 -1
  116. package/dist/commands/quickActionCommand.js +5 -5
  117. package/dist/commands/quickActionCommand.js.map +1 -1
  118. package/dist/common/configOptions.d.ts +14 -13
  119. package/dist/common/configOptions.js +29 -27
  120. package/dist/common/configOptions.js.map +1 -1
  121. package/dist/common/diagnostic.d.ts +6 -5
  122. package/dist/common/diagnostic.js +2 -2
  123. package/dist/common/diagnostic.js.map +1 -1
  124. package/dist/common/diagnosticSink.d.ts +2 -1
  125. package/dist/common/diagnosticSink.js.map +1 -1
  126. package/dist/common/editAction.d.ts +6 -5
  127. package/dist/common/editAction.js +2 -2
  128. package/dist/common/editAction.js.map +1 -1
  129. package/dist/common/envVarUtils.d.ts +2 -1
  130. package/dist/common/envVarUtils.js +20 -28
  131. package/dist/common/envVarUtils.js.map +1 -1
  132. package/dist/common/extensibility.d.ts +19 -19
  133. package/dist/common/extensibility.js.map +1 -1
  134. package/dist/common/fileSystem.d.ts +29 -28
  135. package/dist/common/fileWatcher.d.ts +2 -1
  136. package/dist/common/fileWatcher.js.map +1 -1
  137. package/dist/common/fullAccessHost.d.ts +8 -7
  138. package/dist/common/fullAccessHost.js +21 -16
  139. package/dist/common/fullAccessHost.js.map +1 -1
  140. package/dist/common/host.d.ts +7 -6
  141. package/dist/common/host.js +1 -1
  142. package/dist/common/host.js.map +1 -1
  143. package/dist/common/logTracker.d.ts +2 -1
  144. package/dist/common/logTracker.js +4 -4
  145. package/dist/common/logTracker.js.map +1 -1
  146. package/dist/common/pathUtils.d.ts +1 -28
  147. package/dist/common/pathUtils.js +17 -366
  148. package/dist/common/pathUtils.js.map +1 -1
  149. package/dist/common/realFileSystem.d.ts +7 -3
  150. package/dist/common/realFileSystem.js +78 -60
  151. package/dist/common/realFileSystem.js.map +1 -1
  152. package/dist/common/serviceProviderExtensions.d.ts +2 -1
  153. package/dist/common/serviceProviderExtensions.js +5 -2
  154. package/dist/common/serviceProviderExtensions.js.map +1 -1
  155. package/dist/common/textEditTracker.d.ts +2 -1
  156. package/dist/common/textEditTracker.js +28 -28
  157. package/dist/common/textEditTracker.js.map +1 -1
  158. package/dist/common/textRange.d.ts +2 -1
  159. package/dist/common/textRange.js.map +1 -1
  160. package/dist/common/uri/baseUri.d.ts +51 -0
  161. package/dist/common/uri/baseUri.js +194 -0
  162. package/dist/common/uri/baseUri.js.map +1 -0
  163. package/dist/common/uri/emptyUri.d.ts +32 -0
  164. package/dist/common/uri/emptyUri.js +98 -0
  165. package/dist/common/uri/emptyUri.js.map +1 -0
  166. package/dist/common/uri/fileUri.d.ts +36 -0
  167. package/dist/common/uri/fileUri.js +180 -0
  168. package/dist/common/uri/fileUri.js.map +1 -0
  169. package/dist/common/uri/memoization.d.ts +3 -0
  170. package/dist/common/uri/memoization.js +72 -0
  171. package/dist/common/uri/memoization.js.map +1 -0
  172. package/dist/common/uri/uri.d.ts +50 -0
  173. package/dist/common/uri/uri.js +104 -0
  174. package/dist/common/uri/uri.js.map +1 -0
  175. package/dist/common/uri/uriUtils.d.ts +39 -0
  176. package/dist/common/uri/uriUtils.js +362 -0
  177. package/dist/common/uri/uriUtils.js.map +1 -0
  178. package/dist/common/uri/webUri.d.ts +36 -0
  179. package/dist/common/uri/webUri.js +207 -0
  180. package/dist/common/uri/webUri.js.map +1 -0
  181. package/dist/common/workspaceEditUtils.d.ts +8 -8
  182. package/dist/common/workspaceEditUtils.js +35 -38
  183. package/dist/common/workspaceEditUtils.js.map +1 -1
  184. package/dist/languageServerBase.d.ts +19 -22
  185. package/dist/languageServerBase.js +91 -95
  186. package/dist/languageServerBase.js.map +1 -1
  187. package/dist/languageService/analyzerServiceExecutor.d.ts +2 -1
  188. package/dist/languageService/analyzerServiceExecutor.js +14 -16
  189. package/dist/languageService/analyzerServiceExecutor.js.map +1 -1
  190. package/dist/languageService/autoImporter.d.ts +11 -9
  191. package/dist/languageService/autoImporter.js +45 -44
  192. package/dist/languageService/autoImporter.js.map +1 -1
  193. package/dist/languageService/callHierarchyProvider.d.ts +3 -2
  194. package/dist/languageService/callHierarchyProvider.js +23 -35
  195. package/dist/languageService/callHierarchyProvider.js.map +1 -1
  196. package/dist/languageService/codeActionProvider.d.ts +2 -1
  197. package/dist/languageService/codeActionProvider.js +8 -10
  198. package/dist/languageService/codeActionProvider.js.map +1 -1
  199. package/dist/languageService/completionProvider.d.ts +7 -6
  200. package/dist/languageService/completionProvider.js +32 -30
  201. package/dist/languageService/completionProvider.js.map +1 -1
  202. package/dist/languageService/completionProviderUtils.d.ts +2 -1
  203. package/dist/languageService/completionProviderUtils.js +1 -1
  204. package/dist/languageService/completionProviderUtils.js.map +1 -1
  205. package/dist/languageService/definitionProvider.d.ts +4 -3
  206. package/dist/languageService/definitionProvider.js +26 -24
  207. package/dist/languageService/definitionProvider.js.map +1 -1
  208. package/dist/languageService/documentHighlightProvider.d.ts +3 -2
  209. package/dist/languageService/documentHighlightProvider.js +3 -3
  210. package/dist/languageService/documentHighlightProvider.js.map +1 -1
  211. package/dist/languageService/documentSymbolCollector.js +8 -7
  212. package/dist/languageService/documentSymbolCollector.js.map +1 -1
  213. package/dist/languageService/documentSymbolProvider.d.ts +5 -4
  214. package/dist/languageService/documentSymbolProvider.js +9 -11
  215. package/dist/languageService/documentSymbolProvider.js.map +1 -1
  216. package/dist/languageService/hoverProvider.d.ts +4 -3
  217. package/dist/languageService/hoverProvider.js +6 -5
  218. package/dist/languageService/hoverProvider.js.map +1 -1
  219. package/dist/languageService/navigationUtils.d.ts +2 -1
  220. package/dist/languageService/navigationUtils.js +2 -3
  221. package/dist/languageService/navigationUtils.js.map +1 -1
  222. package/dist/languageService/quickActions.d.ts +2 -1
  223. package/dist/languageService/quickActions.js +3 -3
  224. package/dist/languageService/quickActions.js.map +1 -1
  225. package/dist/languageService/referencesProvider.d.ts +10 -9
  226. package/dist/languageService/referencesProvider.js +28 -28
  227. package/dist/languageService/referencesProvider.js.map +1 -1
  228. package/dist/languageService/renameProvider.d.ts +4 -3
  229. package/dist/languageService/renameProvider.js +17 -18
  230. package/dist/languageService/renameProvider.js.map +1 -1
  231. package/dist/languageService/signatureHelpProvider.d.ts +3 -2
  232. package/dist/languageService/signatureHelpProvider.js +4 -4
  233. package/dist/languageService/signatureHelpProvider.js.map +1 -1
  234. package/dist/languageService/symbolIndexer.d.ts +2 -1
  235. package/dist/languageService/symbolIndexer.js +11 -3
  236. package/dist/languageService/symbolIndexer.js.map +1 -1
  237. package/dist/languageService/tooltipUtils.js +10 -4
  238. package/dist/languageService/tooltipUtils.js.map +1 -1
  239. package/dist/languageService/workspaceSymbolProvider.d.ts +4 -3
  240. package/dist/languageService/workspaceSymbolProvider.js +10 -11
  241. package/dist/languageService/workspaceSymbolProvider.js.map +1 -1
  242. package/dist/localization/localize.d.ts +2 -0
  243. package/dist/localization/localize.js +2 -0
  244. package/dist/localization/localize.js.map +1 -1
  245. package/dist/localization/package.nls.en-us.json +3 -1
  246. package/dist/parser/parseNodes.d.ts +1 -0
  247. package/dist/parser/parseNodes.js +1 -0
  248. package/dist/parser/parseNodes.js.map +1 -1
  249. package/dist/parser/parser.js +18 -15
  250. package/dist/parser/parser.js.map +1 -1
  251. package/dist/pyright.js +16 -15
  252. package/dist/pyright.js.map +1 -1
  253. package/dist/pyrightFileSystem.d.ts +13 -13
  254. package/dist/pyrightFileSystem.js +38 -43
  255. package/dist/pyrightFileSystem.js.map +1 -1
  256. package/dist/readonlyAugmentedFileSystem.d.ts +29 -28
  257. package/dist/readonlyAugmentedFileSystem.js +62 -65
  258. package/dist/readonlyAugmentedFileSystem.js.map +1 -1
  259. package/dist/server.js +21 -20
  260. package/dist/server.js.map +1 -1
  261. package/dist/tests/chainedSourceFiles.test.js +39 -30
  262. package/dist/tests/chainedSourceFiles.test.js.map +1 -1
  263. package/dist/tests/checker.test.js +31 -30
  264. package/dist/tests/checker.test.js.map +1 -1
  265. package/dist/tests/classDeclaration.test.d.ts +1 -0
  266. package/dist/tests/classDeclaration.test.js +166 -0
  267. package/dist/tests/classDeclaration.test.js.map +1 -0
  268. package/dist/tests/completions.test.js +7 -3
  269. package/dist/tests/completions.test.js.map +1 -1
  270. package/dist/tests/config.test.js +24 -22
  271. package/dist/tests/config.test.js.map +1 -1
  272. package/dist/tests/documentSymbolCollector.test.js +3 -2
  273. package/dist/tests/documentSymbolCollector.test.js.map +1 -1
  274. package/dist/tests/filesystem.test.js +37 -35
  275. package/dist/tests/filesystem.test.js.map +1 -1
  276. package/dist/tests/fourSlashParser.test.js +4 -4
  277. package/dist/tests/fourSlashParser.test.js.map +1 -1
  278. package/dist/tests/fourslash/hover.docstring.alias.fourslash.js +27 -11
  279. package/dist/tests/fourslash/hover.docstring.alias.fourslash.js.map +1 -1
  280. package/dist/tests/harness/fourslash/fourSlashParser.js +2 -2
  281. package/dist/tests/harness/fourslash/fourSlashParser.js.map +1 -1
  282. package/dist/tests/harness/fourslash/testLanguageService.d.ts +4 -5
  283. package/dist/tests/harness/fourslash/testLanguageService.js +9 -15
  284. package/dist/tests/harness/fourslash/testLanguageService.js.map +1 -1
  285. package/dist/tests/harness/fourslash/testState.d.ts +4 -4
  286. package/dist/tests/harness/fourslash/testState.js +91 -51
  287. package/dist/tests/harness/fourslash/testState.js.map +1 -1
  288. package/dist/tests/harness/fourslash/workspaceEditTestUtils.js +4 -0
  289. package/dist/tests/harness/fourslash/workspaceEditTestUtils.js.map +1 -1
  290. package/dist/tests/harness/testAccessHost.d.ts +3 -2
  291. package/dist/tests/harness/testAccessHost.js +2 -1
  292. package/dist/tests/harness/testAccessHost.js.map +1 -1
  293. package/dist/tests/harness/testHost.js +13 -11
  294. package/dist/tests/harness/testHost.js.map +1 -1
  295. package/dist/tests/harness/vfs/factory.d.ts +3 -2
  296. package/dist/tests/harness/vfs/factory.js +5 -4
  297. package/dist/tests/harness/vfs/factory.js.map +1 -1
  298. package/dist/tests/harness/vfs/filesystem.d.ts +32 -31
  299. package/dist/tests/harness/vfs/filesystem.js +47 -49
  300. package/dist/tests/harness/vfs/filesystem.js.map +1 -1
  301. package/dist/tests/harness/vfs/pathValidation.js +1 -10
  302. package/dist/tests/harness/vfs/pathValidation.js.map +1 -1
  303. package/dist/tests/importResolver.test.js +106 -58
  304. package/dist/tests/importResolver.test.js.map +1 -1
  305. package/dist/tests/importStatementUtils.test.js +10 -9
  306. package/dist/tests/importStatementUtils.test.js.map +1 -1
  307. package/dist/tests/ipythonMode.test.js +12 -11
  308. package/dist/tests/ipythonMode.test.js.map +1 -1
  309. package/dist/tests/logger.test.js +2 -1
  310. package/dist/tests/logger.test.js.map +1 -1
  311. package/dist/tests/parseTreeUtils.test.js +2 -1
  312. package/dist/tests/parseTreeUtils.test.js.map +1 -1
  313. package/dist/tests/pathUtils.test.js +3 -138
  314. package/dist/tests/pathUtils.test.js.map +1 -1
  315. package/dist/tests/pyrightFileSystem.test.js +38 -34
  316. package/dist/tests/pyrightFileSystem.test.js.map +1 -1
  317. package/dist/tests/service.test.js +37 -42
  318. package/dist/tests/service.test.js.map +1 -1
  319. package/dist/tests/signatureHelp.test.js +3 -2
  320. package/dist/tests/signatureHelp.test.js.map +1 -1
  321. package/dist/tests/sourceFile.test.js +8 -7
  322. package/dist/tests/sourceFile.test.js.map +1 -1
  323. package/dist/tests/sourceMapperUtils.test.js +73 -35
  324. package/dist/tests/sourceMapperUtils.test.js.map +1 -1
  325. package/dist/tests/testState.test.js +13 -9
  326. package/dist/tests/testState.test.js.map +1 -1
  327. package/dist/tests/testStateUtils.d.ts +2 -5
  328. package/dist/tests/testStateUtils.js +27 -64
  329. package/dist/tests/testStateUtils.js.map +1 -1
  330. package/dist/tests/testUtils.d.ts +3 -5
  331. package/dist/tests/testUtils.js +15 -64
  332. package/dist/tests/testUtils.js.map +1 -1
  333. package/dist/tests/textEditUtil.test.js +4 -3
  334. package/dist/tests/textEditUtil.test.js.map +1 -1
  335. package/dist/tests/typeEvaluator1.test.js +16 -15
  336. package/dist/tests/typeEvaluator1.test.js.map +1 -1
  337. package/dist/tests/typeEvaluator2.test.js +22 -9
  338. package/dist/tests/typeEvaluator2.test.js.map +1 -1
  339. package/dist/tests/typeEvaluator3.test.js +86 -63
  340. package/dist/tests/typeEvaluator3.test.js.map +1 -1
  341. package/dist/tests/typeEvaluator4.test.js +29 -20
  342. package/dist/tests/typeEvaluator4.test.js.map +1 -1
  343. package/dist/tests/typeEvaluator5.test.js +28 -27
  344. package/dist/tests/typeEvaluator5.test.js.map +1 -1
  345. package/dist/tests/typePrinter.test.js +4 -3
  346. package/dist/tests/typePrinter.test.js.map +1 -1
  347. package/dist/tests/uri.test.d.ts +1 -0
  348. package/dist/tests/uri.test.js +695 -0
  349. package/dist/tests/uri.test.js.map +1 -0
  350. package/dist/tests/workspaceEditUtils.test.js +28 -28
  351. package/dist/tests/workspaceEditUtils.test.js.map +1 -1
  352. package/dist/tests/zipfs.test.js +11 -11
  353. package/dist/tests/zipfs.test.js.map +1 -1
  354. package/dist/workspaceFactory.d.ts +13 -14
  355. package/dist/workspaceFactory.js +54 -55
  356. package/dist/workspaceFactory.js.map +1 -1
  357. package/package.json +2 -2
  358. package/dist/common/uriParser.d.ts +0 -24
  359. package/dist/common/uriParser.js +0 -45
  360. package/dist/common/uriParser.js.map +0 -1
@@ -1,11 +1,10 @@
1
1
  import { ImportResolver } from './analyzer/importResolver';
2
2
  import { BackgroundAnalysisBase, BackgroundAnalysisRunnerBase } from './backgroundAnalysisBase';
3
3
  import { ConfigOptions } from './common/configOptions';
4
- import { ConsoleInterface } from './common/console';
5
4
  import { Host } from './common/host';
6
5
  import { ServiceProvider } from './common/serviceProvider';
7
6
  export declare class BackgroundAnalysis extends BackgroundAnalysisBase {
8
- constructor(console: ConsoleInterface);
7
+ constructor(serviceProvider: ServiceProvider);
9
8
  }
10
9
  export declare class BackgroundAnalysisRunner extends BackgroundAnalysisRunnerBase {
11
10
  constructor(serviceProvider: ServiceProvider);
@@ -13,11 +13,13 @@ const importResolver_1 = require("./analyzer/importResolver");
13
13
  const backgroundAnalysisBase_1 = require("./backgroundAnalysisBase");
14
14
  const cancellationUtils_1 = require("./common/cancellationUtils");
15
15
  const fullAccessHost_1 = require("./common/fullAccessHost");
16
+ const uriUtils_1 = require("./common/uri/uriUtils");
16
17
  class BackgroundAnalysis extends backgroundAnalysisBase_1.BackgroundAnalysisBase {
17
- constructor(console) {
18
- super(console);
18
+ constructor(serviceProvider) {
19
+ var _a, _b;
20
+ super(serviceProvider.console());
19
21
  const initialData = {
20
- rootDirectory: global.__rootDirectory,
22
+ rootUri: (_b = (_a = (0, uriUtils_1.getRootUri)(serviceProvider.fs().isCaseSensitive)) === null || _a === void 0 ? void 0 : _a.toString()) !== null && _b !== void 0 ? _b : '',
21
23
  cancellationFolderName: (0, cancellationUtils_1.getCancellationFolderName)(),
22
24
  runner: undefined,
23
25
  };
@@ -32,7 +34,7 @@ class BackgroundAnalysisRunner extends backgroundAnalysisBase_1.BackgroundAnalys
32
34
  super(serviceProvider);
33
35
  }
34
36
  createHost() {
35
- return new fullAccessHost_1.FullAccessHost(this.fs);
37
+ return new fullAccessHost_1.FullAccessHost(this.getServiceProvider());
36
38
  }
37
39
  createImportResolver(serviceProvider, options, host) {
38
40
  return new importResolver_1.ImportResolver(serviceProvider, options, host);
@@ -1 +1 @@
1
- {"version":3,"file":"backgroundAnalysis.js","sourceRoot":"","sources":["../../src/backgroundAnalysis.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;;AAEH,mDAAwC;AAExC,8DAA2D;AAC3D,qEAAgG;AAEhG,kEAAuE;AAGvE,4DAAyD;AAIzD,MAAa,kBAAmB,SAAQ,+CAAsB;IAC1D,YAAY,OAAyB;QACjC,KAAK,CAAC,OAAO,CAAC,CAAC;QAEf,MAAM,WAAW,GAAuB;YACpC,aAAa,EAAG,MAAc,CAAC,eAAyB;YACxD,sBAAsB,EAAE,IAAA,6CAAyB,GAAE;YACnD,MAAM,EAAE,SAAS;SACpB,CAAC;QAEF,gEAAgE;QAChE,MAAM,MAAM,GAAG,IAAI,uBAAM,CAAC,UAAU,EAAE,EAAE,UAAU,EAAE,WAAW,EAAE,CAAC,CAAC;QACnE,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IACvB,CAAC;CACJ;AAdD,gDAcC;AAED,MAAa,wBAAyB,SAAQ,qDAA4B;IACtE,YAAY,eAAgC;QACxC,KAAK,CAAC,eAAe,CAAC,CAAC;IAC3B,CAAC;IAEkB,UAAU;QACzB,OAAO,IAAI,+BAAc,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IACvC,CAAC;IAEkB,oBAAoB,CACnC,eAAgC,EAChC,OAAsB,EACtB,IAAU;QAEV,OAAO,IAAI,+BAAc,CAAC,eAAe,EAAE,OAAO,EAAE,IAAI,CAAC,CAAC;IAC9D,CAAC;CACJ;AAhBD,4DAgBC"}
1
+ {"version":3,"file":"backgroundAnalysis.js","sourceRoot":"","sources":["../../src/backgroundAnalysis.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;;AAEH,mDAAwC;AAExC,8DAA2D;AAC3D,qEAAgG;AAEhG,kEAAuE;AAEvE,4DAAyD;AAGzD,oDAAmD;AAEnD,MAAa,kBAAmB,SAAQ,+CAAsB;IAC1D,YAAY,eAAgC;;QACxC,KAAK,CAAC,eAAe,CAAC,OAAO,EAAE,CAAC,CAAC;QAEjC,MAAM,WAAW,GAAuB;YACpC,OAAO,EAAE,MAAA,MAAA,IAAA,qBAAU,EAAC,eAAe,CAAC,EAAE,EAAE,CAAC,eAAe,CAAC,0CAAE,QAAQ,EAAE,mCAAI,EAAE;YAC3E,sBAAsB,EAAE,IAAA,6CAAyB,GAAE;YACnD,MAAM,EAAE,SAAS;SACpB,CAAC;QAEF,gEAAgE;QAChE,MAAM,MAAM,GAAG,IAAI,uBAAM,CAAC,UAAU,EAAE,EAAE,UAAU,EAAE,WAAW,EAAE,CAAC,CAAC;QACnE,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IACvB,CAAC;CACJ;AAdD,gDAcC;AAED,MAAa,wBAAyB,SAAQ,qDAA4B;IACtE,YAAY,eAAgC;QACxC,KAAK,CAAC,eAAe,CAAC,CAAC;IAC3B,CAAC;IAEkB,UAAU;QACzB,OAAO,IAAI,+BAAc,CAAC,IAAI,CAAC,kBAAkB,EAAE,CAAC,CAAC;IACzD,CAAC;IAEkB,oBAAoB,CACnC,eAAgC,EAChC,OAAsB,EACtB,IAAU;QAEV,OAAO,IAAI,+BAAc,CAAC,eAAe,EAAE,OAAO,EAAE,IAAI,CAAC,CAAC;IAC9D,CAAC;CACJ;AAhBD,4DAgBC"}
@@ -2,6 +2,7 @@
2
2
  import { CancellationToken } from 'vscode-languageserver';
3
3
  import { MessagePort, Worker } from 'worker_threads';
4
4
  import { AnalysisCompleteCallback, AnalysisResults } from './analyzer/analysis';
5
+ import { BackgroundAnalysisProgram, InvalidatedReason } from './analyzer/backgroundAnalysisProgram';
5
6
  import { ImportResolver } from './analyzer/importResolver';
6
7
  import { OpenFileOptions, Program } from './analyzer/program';
7
8
  import { BackgroundThreadBase } from './backgroundThreadBase';
@@ -10,9 +11,9 @@ import { ConsoleInterface, LogLevel } from './common/console';
10
11
  import { Diagnostic } from './common/diagnostic';
11
12
  import { Host, HostKind } from './common/host';
12
13
  import { LogTracker } from './common/logTracker';
13
- import { Range } from './common/textRange';
14
- import { BackgroundAnalysisProgram, InvalidatedReason } from './analyzer/backgroundAnalysisProgram';
15
14
  import { ServiceProvider } from './common/serviceProvider';
15
+ import { Range } from './common/textRange';
16
+ import { Uri } from './common/uri/uri';
16
17
  export declare class BackgroundAnalysisBase {
17
18
  protected console: ConsoleInterface;
18
19
  private _worker;
@@ -21,19 +22,19 @@ export declare class BackgroundAnalysisBase {
21
22
  setCompletionCallback(callback?: AnalysisCompleteCallback): void;
22
23
  setImportResolver(importResolver: ImportResolver): void;
23
24
  setConfigOptions(configOptions: ConfigOptions): void;
24
- setTrackedFiles(filePaths: string[]): void;
25
+ setTrackedFiles(fileUris: Uri[]): void;
25
26
  setAllowedThirdPartyImports(importNames: string[]): void;
26
27
  ensurePartialStubPackages(executionRoot: string | undefined): void;
27
- setFileOpened(filePath: string, version: number | null, contents: string, options: OpenFileOptions): void;
28
- updateChainedFilePath(filePath: string, chainedFilePath: string | undefined): void;
29
- setFileClosed(filePath: string, isTracked?: boolean): void;
30
- addInterimFile(filePath: string): void;
28
+ setFileOpened(fileUri: Uri, version: number | null, contents: string, options: OpenFileOptions): void;
29
+ updateChainedUri(fileUri: Uri, chainedUri: Uri | undefined): void;
30
+ setFileClosed(fileUri: Uri, isTracked?: boolean): void;
31
+ addInterimFile(fileUri: Uri): void;
31
32
  markAllFilesDirty(evenIfContentsAreSame: boolean): void;
32
- markFilesDirty(filePaths: string[], evenIfContentsAreSame: boolean): void;
33
+ markFilesDirty(fileUris: Uri[], evenIfContentsAreSame: boolean): void;
33
34
  startAnalysis(program: BackgroundAnalysisProgram, token: CancellationToken): void;
34
- analyzeFile(filePath: string, token: CancellationToken): Promise<boolean>;
35
- getDiagnosticsForRange(filePath: string, range: Range, token: CancellationToken): Promise<Diagnostic[]>;
36
- writeTypeStub(targetImportPath: string, targetIsSingleFile: boolean, stubPath: string, token: CancellationToken): Promise<any>;
35
+ analyzeFile(fileUri: Uri, token: CancellationToken): Promise<boolean>;
36
+ getDiagnosticsForRange(fileUri: Uri, range: Range, token: CancellationToken): Promise<Diagnostic[]>;
37
+ writeTypeStub(targetImportPath: Uri, targetIsSingleFile: boolean, stubPath: Uri, token: CancellationToken): Promise<any>;
37
38
  invalidateAndForceReanalysis(reason: InvalidatedReason): void;
38
39
  restart(): void;
39
40
  shutdown(): void;
@@ -49,6 +50,7 @@ export declare abstract class BackgroundAnalysisRunnerBase extends BackgroundThr
49
50
  private _program;
50
51
  protected importResolver: ImportResolver;
51
52
  protected logTracker: LogTracker;
53
+ protected isCaseSensitive: boolean;
52
54
  protected constructor(serviceProvider: ServiceProvider);
53
55
  get program(): Program;
54
56
  start(): void;
@@ -57,19 +59,19 @@ export declare abstract class BackgroundAnalysisRunnerBase extends BackgroundThr
57
59
  protected abstract createImportResolver(serviceProvider: ServiceProvider, options: ConfigOptions, host: Host): ImportResolver;
58
60
  protected handleAnalyze(port: MessagePort, cancellationId: string, token: CancellationToken): void;
59
61
  protected handleResumeAnalysis(port: MessagePort, cancellationId: string, token: CancellationToken): void;
60
- protected handleAnalyzeFile(filePath: string, token: CancellationToken): boolean;
61
- protected handleGetDiagnosticsForRange(filePath: string, range: Range, token: CancellationToken): Diagnostic[];
62
+ protected handleAnalyzeFile(fileUri: string, token: CancellationToken): boolean;
63
+ protected handleGetDiagnosticsForRange(fileUri: string, range: Range, token: CancellationToken): Diagnostic[];
62
64
  protected handleWriteTypeStub(targetImportPath: string, targetIsSingleFile: boolean, stubPath: string, token: CancellationToken): void;
63
65
  protected handleSetImportResolver(hostKind: HostKind): void;
64
66
  protected handleSetConfigOptions(configOptions: ConfigOptions): void;
65
- protected handleSetTrackedFiles(filePaths: string[]): void;
67
+ protected handleSetTrackedFiles(fileUris: string[]): void;
66
68
  protected handleSetAllowedThirdPartyImports(importNames: string[]): void;
67
69
  protected handleEnsurePartialStubPackages(executionRoot: string | undefined): void;
68
- protected handleSetFileOpened(filePath: string, version: number | null, contents: string, options: OpenFileOptions | undefined): void;
69
- protected handleUpdateChainedFilePath(filePath: string, chainedFilePath: string | undefined): void;
70
- protected handleSetFileClosed(filePath: string, isTracked: boolean | undefined): void;
71
- protected handleAddInterimFile(filePath: string): void;
72
- protected handleMarkFilesDirty(filePaths: string[], evenIfContentsAreSame: boolean): void;
70
+ protected handleSetFileOpened(fileUri: string, version: number | null, contents: string, options: OpenFileOptions | undefined): void;
71
+ protected handleUpdateChainedfileUri(fileUri: string, chainedfileUri: string | undefined): void;
72
+ protected handleSetFileClosed(fileUri: string, isTracked: boolean | undefined): void;
73
+ protected handleAddInterimFile(fileUri: string): void;
74
+ protected handleMarkFilesDirty(fileUris: string[], evenIfContentsAreSame: boolean): void;
73
75
  protected handleMarkAllFilesDirty(evenIfContentsAreSame: boolean): void;
74
76
  protected handleInvalidateAndForceReanalysis(reason: InvalidatedReason): void;
75
77
  protected handleRestart(): void;
@@ -80,7 +82,7 @@ export declare abstract class BackgroundAnalysisRunnerBase extends BackgroundThr
80
82
  private _reportDiagnostics;
81
83
  private _analysisPaused;
82
84
  }
83
- export type AnalysisRequestKind = 'analyze' | 'resumeAnalysis' | 'setConfigOptions' | 'setTrackedFiles' | 'setAllowedThirdPartyImports' | 'ensurePartialStubPackages' | 'setFileOpened' | 'updateChainedFilePath' | 'setFileClosed' | 'markAllFilesDirty' | 'markFilesDirty' | 'invalidateAndForceReanalysis' | 'restart' | 'getDiagnosticsForRange' | 'writeTypeStub' | 'setImportResolver' | 'shutdown' | 'addInterimFile' | 'analyzeFile';
85
+ export type AnalysisRequestKind = 'analyze' | 'resumeAnalysis' | 'setConfigOptions' | 'setTrackedFiles' | 'setAllowedThirdPartyImports' | 'ensurePartialStubPackages' | 'setFileOpened' | 'updateChainedFileUri' | 'setFileClosed' | 'markAllFilesDirty' | 'markFilesDirty' | 'invalidateAndForceReanalysis' | 'restart' | 'getDiagnosticsForRange' | 'writeTypeStub' | 'setImportResolver' | 'shutdown' | 'addInterimFile' | 'analyzeFile';
84
86
  export interface AnalysisRequest {
85
87
  requestType: AnalysisRequestKind;
86
88
  data: any;
@@ -42,6 +42,7 @@ const debug = __importStar(require("./common/debug"));
42
42
  const diagnostic_1 = require("./common/diagnostic");
43
43
  const fileBasedCancellationUtils_1 = require("./common/fileBasedCancellationUtils");
44
44
  const logTracker_1 = require("./common/logTracker");
45
+ const uri_1 = require("./common/uri/uri");
45
46
  class BackgroundAnalysisBase {
46
47
  constructor(console) {
47
48
  this.console = console;
@@ -57,8 +58,8 @@ class BackgroundAnalysisBase {
57
58
  setConfigOptions(configOptions) {
58
59
  this.enqueueRequest({ requestType: 'setConfigOptions', data: configOptions });
59
60
  }
60
- setTrackedFiles(filePaths) {
61
- this.enqueueRequest({ requestType: 'setTrackedFiles', data: filePaths });
61
+ setTrackedFiles(fileUris) {
62
+ this.enqueueRequest({ requestType: 'setTrackedFiles', data: fileUris.map((f) => f.toString()) });
62
63
  }
63
64
  setAllowedThirdPartyImports(importNames) {
64
65
  this.enqueueRequest({ requestType: 'setAllowedThirdPartyImports', data: importNames });
@@ -66,44 +67,44 @@ class BackgroundAnalysisBase {
66
67
  ensurePartialStubPackages(executionRoot) {
67
68
  this.enqueueRequest({ requestType: 'ensurePartialStubPackages', data: { executionRoot } });
68
69
  }
69
- setFileOpened(filePath, version, contents, options) {
70
+ setFileOpened(fileUri, version, contents, options) {
70
71
  this.enqueueRequest({
71
72
  requestType: 'setFileOpened',
72
- data: { filePath, version, contents, options },
73
+ data: { fileUri: fileUri.toString(), version, contents, options },
73
74
  });
74
75
  }
75
- updateChainedFilePath(filePath, chainedFilePath) {
76
+ updateChainedUri(fileUri, chainedUri) {
76
77
  this.enqueueRequest({
77
- requestType: 'updateChainedFilePath',
78
- data: { filePath, chainedFilePath },
78
+ requestType: 'updateChainedFileUri',
79
+ data: { fileUri: fileUri.toString(), chainedUri: chainedUri === null || chainedUri === void 0 ? void 0 : chainedUri.toString() },
79
80
  });
80
81
  }
81
- setFileClosed(filePath, isTracked) {
82
- this.enqueueRequest({ requestType: 'setFileClosed', data: { filePath, isTracked } });
82
+ setFileClosed(fileUri, isTracked) {
83
+ this.enqueueRequest({ requestType: 'setFileClosed', data: { fileUri: fileUri.toString(), isTracked } });
83
84
  }
84
- addInterimFile(filePath) {
85
- this.enqueueRequest({ requestType: 'addInterimFile', data: { filePath } });
85
+ addInterimFile(fileUri) {
86
+ this.enqueueRequest({ requestType: 'addInterimFile', data: { fileUri: fileUri.toString() } });
86
87
  }
87
88
  markAllFilesDirty(evenIfContentsAreSame) {
88
89
  this.enqueueRequest({ requestType: 'markAllFilesDirty', data: { evenIfContentsAreSame } });
89
90
  }
90
- markFilesDirty(filePaths, evenIfContentsAreSame) {
91
+ markFilesDirty(fileUris, evenIfContentsAreSame) {
91
92
  this.enqueueRequest({
92
93
  requestType: 'markFilesDirty',
93
- data: { filePaths, evenIfContentsAreSame },
94
+ data: { fileUris: fileUris.map((f) => f.toString()), evenIfContentsAreSame },
94
95
  });
95
96
  }
96
97
  startAnalysis(program, token) {
97
98
  this._startOrResumeAnalysis('analyze', program, token);
98
99
  }
99
- async analyzeFile(filePath, token) {
100
+ async analyzeFile(fileUri, token) {
100
101
  (0, cancellationUtils_1.throwIfCancellationRequested)(token);
101
102
  const { port1, port2 } = new worker_threads_1.MessageChannel();
102
103
  const waiter = (0, backgroundThreadBase_1.getBackgroundWaiter)(port1);
103
104
  const cancellationId = (0, cancellationUtils_1.getCancellationTokenId)(token);
104
105
  this.enqueueRequest({
105
106
  requestType: 'analyzeFile',
106
- data: { filePath, cancellationId },
107
+ data: { fileUri: fileUri.toString(), cancellationId },
107
108
  port: port2,
108
109
  });
109
110
  const result = await waiter;
@@ -111,14 +112,14 @@ class BackgroundAnalysisBase {
111
112
  port1.close();
112
113
  return result;
113
114
  }
114
- async getDiagnosticsForRange(filePath, range, token) {
115
+ async getDiagnosticsForRange(fileUri, range, token) {
115
116
  (0, cancellationUtils_1.throwIfCancellationRequested)(token);
116
117
  const { port1, port2 } = new worker_threads_1.MessageChannel();
117
118
  const waiter = (0, backgroundThreadBase_1.getBackgroundWaiter)(port1);
118
119
  const cancellationId = (0, cancellationUtils_1.getCancellationTokenId)(token);
119
120
  this.enqueueRequest({
120
121
  requestType: 'getDiagnosticsForRange',
121
- data: { filePath, range, cancellationId },
122
+ data: { fileUri: fileUri.toString(), range, cancellationId },
122
123
  port: port2,
123
124
  });
124
125
  const result = await waiter;
@@ -133,7 +134,12 @@ class BackgroundAnalysisBase {
133
134
  const cancellationId = (0, cancellationUtils_1.getCancellationTokenId)(token);
134
135
  this.enqueueRequest({
135
136
  requestType: 'writeTypeStub',
136
- data: { targetImportPath, targetIsSingleFile, stubPath, cancellationId },
137
+ data: {
138
+ targetImportPath: targetImportPath.toString(),
139
+ targetIsSingleFile,
140
+ stubPath: stubPath.toString(),
141
+ cancellationId,
142
+ },
137
143
  port: port2,
138
144
  });
139
145
  await waiter;
@@ -220,10 +226,11 @@ exports.BackgroundAnalysisBase = BackgroundAnalysisBase;
220
226
  class BackgroundAnalysisRunnerBase extends backgroundThreadBase_1.BackgroundThreadBase {
221
227
  constructor(serviceProvider) {
222
228
  super(worker_threads_1.workerData, serviceProvider);
229
+ this.isCaseSensitive = true;
223
230
  // Stash the base directory into a global variable.
224
231
  const data = worker_threads_1.workerData;
225
- this.log(console_1.LogLevel.Info, `Background analysis(${worker_threads_1.threadId}) root directory: ${data.rootDirectory}`);
226
- this._configOptions = new configOptions_1.ConfigOptions(data.rootDirectory);
232
+ this.log(console_1.LogLevel.Info, `Background analysis(${worker_threads_1.threadId}) root directory: ${data.rootUri}`);
233
+ this._configOptions = new configOptions_1.ConfigOptions(uri_1.Uri.parse(data.rootUri, serviceProvider.fs().isCaseSensitive));
227
234
  this.importResolver = this.createImportResolver(serviceProvider, this._configOptions, this.createHost());
228
235
  const console = this.getConsole();
229
236
  this.logTracker = new logTracker_1.LogTracker(console, `BG(${worker_threads_1.threadId})`);
@@ -260,17 +267,17 @@ class BackgroundAnalysisRunnerBase extends backgroundThreadBase_1.BackgroundThre
260
267
  }
261
268
  case 'analyzeFile': {
262
269
  (0, backgroundThreadBase_1.run)(() => {
263
- const { filePath, cancellationId } = msg.data;
270
+ const { fileUri, cancellationId } = msg.data;
264
271
  const token = (0, fileBasedCancellationUtils_1.getCancellationTokenFromId)(cancellationId);
265
- return this.handleAnalyzeFile(filePath, token);
272
+ return this.handleAnalyzeFile(fileUri, token);
266
273
  }, msg.port);
267
274
  break;
268
275
  }
269
276
  case 'getDiagnosticsForRange': {
270
277
  (0, backgroundThreadBase_1.run)(() => {
271
- const { filePath, range, cancellationId } = msg.data;
278
+ const { fileUri, range, cancellationId } = msg.data;
272
279
  const token = (0, fileBasedCancellationUtils_1.getCancellationTokenFromId)(cancellationId);
273
- return this.handleGetDiagnosticsForRange(filePath, range, token);
280
+ return this.handleGetDiagnosticsForRange(fileUri, range, token);
274
281
  }, msg.port);
275
282
  break;
276
283
  }
@@ -304,23 +311,23 @@ class BackgroundAnalysisRunnerBase extends backgroundThreadBase_1.BackgroundThre
304
311
  break;
305
312
  }
306
313
  case 'setFileOpened': {
307
- const { filePath, version, contents, options } = msg.data;
308
- this.handleSetFileOpened(filePath, version, contents, options);
314
+ const { fileUri, version, contents, options } = msg.data;
315
+ this.handleSetFileOpened(fileUri, version, contents, options);
309
316
  break;
310
317
  }
311
- case 'updateChainedFilePath': {
312
- const { filePath, chainedFilePath } = msg.data;
313
- this.handleUpdateChainedFilePath(filePath, chainedFilePath);
318
+ case 'updateChainedFileUri': {
319
+ const { fileUri, chainedUri } = msg.data;
320
+ this.handleUpdateChainedfileUri(fileUri, chainedUri);
314
321
  break;
315
322
  }
316
323
  case 'setFileClosed': {
317
- const { filePath, isTracked } = msg.data;
318
- this.handleSetFileClosed(filePath, isTracked);
324
+ const { fileUri, isTracked } = msg.data;
325
+ this.handleSetFileClosed(fileUri, isTracked);
319
326
  break;
320
327
  }
321
328
  case 'addInterimFile': {
322
- const { filePath } = msg.data;
323
- this.handleAddInterimFile(filePath);
329
+ const { fileUri } = msg.data;
330
+ this.handleAddInterimFile(fileUri);
324
331
  break;
325
332
  }
326
333
  case 'markAllFilesDirty': {
@@ -329,8 +336,8 @@ class BackgroundAnalysisRunnerBase extends backgroundThreadBase_1.BackgroundThre
329
336
  break;
330
337
  }
331
338
  case 'markFilesDirty': {
332
- const { filePaths, evenIfContentsAreSame } = msg.data;
333
- this.handleMarkFilesDirty(filePaths, evenIfContentsAreSame);
339
+ const { fileUris, evenIfContentsAreSame } = msg.data;
340
+ this.handleMarkFilesDirty(fileUris, evenIfContentsAreSame);
334
341
  break;
335
342
  }
336
343
  case 'invalidateAndForceReanalysis': {
@@ -380,18 +387,18 @@ class BackgroundAnalysisRunnerBase extends backgroundThreadBase_1.BackgroundThre
380
387
  this.analysisDone(port, cancellationId);
381
388
  }
382
389
  }
383
- handleAnalyzeFile(filePath, token) {
390
+ handleAnalyzeFile(fileUri, token) {
384
391
  (0, cancellationUtils_1.throwIfCancellationRequested)(token);
385
- return this.program.analyzeFile(filePath, token);
392
+ return this.program.analyzeFile(uri_1.Uri.parse(fileUri, this.isCaseSensitive), token);
386
393
  }
387
- handleGetDiagnosticsForRange(filePath, range, token) {
394
+ handleGetDiagnosticsForRange(fileUri, range, token) {
388
395
  (0, cancellationUtils_1.throwIfCancellationRequested)(token);
389
- return this.program.getDiagnosticsForRange(filePath, range);
396
+ return this.program.getDiagnosticsForRange(uri_1.Uri.parse(fileUri, this.isCaseSensitive), range);
390
397
  }
391
398
  handleWriteTypeStub(targetImportPath, targetIsSingleFile, stubPath, token) {
392
399
  (0, analysis_1.analyzeProgram)(this.program,
393
400
  /* maxTime */ undefined, this._configOptions, analysis_1.nullCallback, this.getConsole(), token);
394
- this.program.writeTypeStub(targetImportPath, targetIsSingleFile, stubPath, token);
401
+ this.program.writeTypeStub(uri_1.Uri.parse(targetImportPath, this.isCaseSensitive), targetIsSingleFile, uri_1.Uri.parse(stubPath, this.isCaseSensitive), token);
395
402
  }
396
403
  handleSetImportResolver(hostKind) {
397
404
  this.importResolver = this.createImportResolver(this.getServiceProvider(), this._configOptions, this.createHost());
@@ -403,8 +410,8 @@ class BackgroundAnalysisRunnerBase extends backgroundThreadBase_1.BackgroundThre
403
410
  this.program.setConfigOptions(this._configOptions);
404
411
  this.program.setImportResolver(this.importResolver);
405
412
  }
406
- handleSetTrackedFiles(filePaths) {
407
- const diagnostics = this.program.setTrackedFiles(filePaths);
413
+ handleSetTrackedFiles(fileUris) {
414
+ const diagnostics = this.program.setTrackedFiles(fileUris.map((f) => uri_1.Uri.parse(f, this.isCaseSensitive)));
408
415
  this._reportDiagnostics(diagnostics, this.program.getFilesToAnalyzeCount(), 0);
409
416
  }
410
417
  handleSetAllowedThirdPartyImports(importNames) {
@@ -416,21 +423,21 @@ class BackgroundAnalysisRunnerBase extends backgroundThreadBase_1.BackgroundThre
416
423
  this.importResolver.ensurePartialStubPackages(execEnv);
417
424
  }
418
425
  }
419
- handleSetFileOpened(filePath, version, contents, options) {
420
- this.program.setFileOpened(filePath, version, contents, options);
426
+ handleSetFileOpened(fileUri, version, contents, options) {
427
+ this.program.setFileOpened(uri_1.Uri.parse(fileUri, this.isCaseSensitive), version, contents, options);
421
428
  }
422
- handleUpdateChainedFilePath(filePath, chainedFilePath) {
423
- this.program.updateChainedFilePath(filePath, chainedFilePath);
429
+ handleUpdateChainedfileUri(fileUri, chainedfileUri) {
430
+ this.program.updateChainedUri(uri_1.Uri.parse(fileUri, this.isCaseSensitive), chainedfileUri ? uri_1.Uri.parse(chainedfileUri, this.isCaseSensitive) : undefined);
424
431
  }
425
- handleSetFileClosed(filePath, isTracked) {
426
- const diagnostics = this.program.setFileClosed(filePath, isTracked);
432
+ handleSetFileClosed(fileUri, isTracked) {
433
+ const diagnostics = this.program.setFileClosed(uri_1.Uri.parse(fileUri, this.isCaseSensitive), isTracked);
427
434
  this._reportDiagnostics(diagnostics, this.program.getFilesToAnalyzeCount(), 0);
428
435
  }
429
- handleAddInterimFile(filePath) {
430
- this.program.addInterimFile(filePath);
436
+ handleAddInterimFile(fileUri) {
437
+ this.program.addInterimFile(uri_1.Uri.parse(fileUri, this.isCaseSensitive));
431
438
  }
432
- handleMarkFilesDirty(filePaths, evenIfContentsAreSame) {
433
- this.program.markFilesDirty(filePaths, evenIfContentsAreSame);
439
+ handleMarkFilesDirty(fileUris, evenIfContentsAreSame) {
440
+ this.program.markFilesDirty(fileUris.map((f) => uri_1.Uri.parse(f, this.isCaseSensitive)), evenIfContentsAreSame);
434
441
  }
435
442
  handleMarkAllFilesDirty(evenIfContentsAreSame) {
436
443
  this.program.markAllFilesDirty(evenIfContentsAreSame);
@@ -454,7 +461,21 @@ class BackgroundAnalysisRunnerBase extends backgroundThreadBase_1.BackgroundThre
454
461
  port.postMessage({ requestType: 'analysisDone', data: cancellationId });
455
462
  }
456
463
  onAnalysisCompletion(port, result) {
457
- port.postMessage({ requestType: 'analysisResult', data: result });
464
+ // Result URIs can't be sent in current form as they contain methods on
465
+ // them. This causes a DataCloneError when posting.
466
+ // See https://stackoverflow.com/questions/68467946/datacloneerror-the-object-could-not-be-cloned-firefox-browser
467
+ // We turn them back into JSON so we can use Uri.fromJsonObj on the other side.
468
+ const postableResults = {
469
+ ...result,
470
+ diagnostics: result.diagnostics.map((d) => {
471
+ return {
472
+ ...d,
473
+ fileUri: JSON.parse(JSON.stringify(d.fileUri)),
474
+ diagnostics: convertDiagnostics(d.diagnostics),
475
+ };
476
+ }),
477
+ };
478
+ port.postMessage({ requestType: 'analysisResult', data: postableResults });
458
479
  }
459
480
  _onMessageWrapper(msg) {
460
481
  try {
@@ -494,7 +515,7 @@ exports.BackgroundAnalysisRunnerBase = BackgroundAnalysisRunnerBase;
494
515
  function convertAnalysisResults(result) {
495
516
  result.diagnostics = result.diagnostics.map((f) => {
496
517
  return {
497
- filePath: f.filePath,
518
+ fileUri: uri_1.Uri.fromJsonObj(f.fileUri),
498
519
  version: f.version,
499
520
  diagnostics: convertDiagnostics(f.diagnostics),
500
521
  };
@@ -516,7 +537,7 @@ function convertDiagnostics(diagnostics) {
516
537
  }
517
538
  if (d._relatedInfo) {
518
539
  for (const info of d._relatedInfo) {
519
- diag.addRelatedInfo(info.message, info.filePath, info.range);
540
+ diag.addRelatedInfo(info.message, JSON.parse(JSON.stringify(info.uri)), info.range);
520
541
  }
521
542
  }
522
543
  return diag;
@@ -1 +1 @@
1
- {"version":3,"file":"backgroundAnalysisBase.js","sourceRoot":"","sources":["../../src/backgroundAnalysisBase.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"backgroundAnalysisBase.js","sourceRoot":"","sources":["../../src/backgroundAnalysisBase.ts"],"names":[],"mappings":"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"}
@@ -28,7 +28,7 @@ export interface MessagePoster {
28
28
  export declare function run<T = any>(code: () => T, port: MessagePoster): void;
29
29
  export declare function getBackgroundWaiter<T>(port: MessagePort): Promise<T>;
30
30
  export interface InitializationData {
31
- rootDirectory: string;
31
+ rootUri: string;
32
32
  cancellationFolderName: string | undefined;
33
33
  runner: string | undefined;
34
34
  title?: string;
@@ -40,6 +40,7 @@ const realFileSystem_1 = require("./common/realFileSystem");
40
40
  const serviceProvider_1 = require("./common/serviceProvider");
41
41
  require("./common/serviceProviderExtensions");
42
42
  const serviceProviderExtensions_1 = require("./common/serviceProviderExtensions");
43
+ const uri_1 = require("./common/uri/uri");
43
44
  class BackgroundConsole {
44
45
  // We always generate logs in the background. For the foreground,
45
46
  // we'll decide based on user setting whether.
@@ -66,8 +67,6 @@ exports.BackgroundConsole = BackgroundConsole;
66
67
  class BackgroundThreadBase {
67
68
  constructor(data, serviceProvider) {
68
69
  (0, cancellationUtils_1.setCancellationFolderName)(data.cancellationFolderName);
69
- // Stash the base directory into a global variable.
70
- global.__rootDirectory = data.rootDirectory;
71
70
  // Make sure there's a file system and a console interface.
72
71
  this._serviceProvider = serviceProvider !== null && serviceProvider !== void 0 ? serviceProvider : new serviceProvider_1.ServiceProvider();
73
72
  if (!this._serviceProvider.tryGet(serviceProviderExtensions_1.ServiceKeys.console)) {
@@ -77,8 +76,10 @@ class BackgroundThreadBase {
77
76
  this._serviceProvider.add(serviceProviderExtensions_1.ServiceKeys.fs, (0, realFileSystem_1.createFromRealFileSystem)(this.getConsole()));
78
77
  }
79
78
  if (!this._serviceProvider.tryGet(serviceProviderExtensions_1.ServiceKeys.tempFile)) {
80
- this._serviceProvider.add(serviceProviderExtensions_1.ServiceKeys.tempFile, new realFileSystem_1.RealTempFile());
79
+ this._serviceProvider.add(serviceProviderExtensions_1.ServiceKeys.tempFile, new realFileSystem_1.RealTempFile(this._serviceProvider.fs().isCaseSensitive));
81
80
  }
81
+ // Stash the base directory into a global variable.
82
+ global.__rootDirectory = uri_1.Uri.parse(data.rootUri, this._serviceProvider.fs().isCaseSensitive).getFilePath();
82
83
  }
83
84
  get fs() {
84
85
  return this._serviceProvider.fs();
@@ -100,18 +101,19 @@ class BackgroundThreadBase {
100
101
  }
101
102
  exports.BackgroundThreadBase = BackgroundThreadBase;
102
103
  function createConfigOptionsFrom(jsonObject) {
103
- const configOptions = new configOptions_1.ConfigOptions(jsonObject.projectRoot);
104
+ var _a, _b;
105
+ const configOptions = new configOptions_1.ConfigOptions(uri_1.Uri.fromJsonObj(jsonObject.projectRoot));
104
106
  const getFileSpec = (fileSpec) => {
105
107
  return {
106
- wildcardRoot: fileSpec.wildcardRoot,
108
+ wildcardRoot: uri_1.Uri.fromJsonObj(fileSpec.wildcardRoot),
107
109
  regExp: new RegExp(fileSpec.regExp.source, fileSpec.regExp.flags),
108
110
  hasDirectoryWildcard: fileSpec.hasDirectoryWildcard,
109
111
  };
110
112
  };
111
113
  configOptions.pythonEnvironmentName = jsonObject.pythonEnvironmentName;
112
- configOptions.pythonPath = jsonObject.pythonPath;
113
- configOptions.typeshedPath = jsonObject.typeshedPath;
114
- configOptions.stubPath = jsonObject.stubPath;
114
+ configOptions.pythonPath = uri_1.Uri.fromJsonObj(jsonObject.pythonPath);
115
+ configOptions.typeshedPath = uri_1.Uri.fromJsonObj(jsonObject.typeshedPath);
116
+ configOptions.stubPath = uri_1.Uri.fromJsonObj(jsonObject.stubPath);
115
117
  configOptions.autoExcludeVenv = jsonObject.autoExcludeVenv;
116
118
  configOptions.verboseOutput = jsonObject.verboseOutput;
117
119
  configOptions.defineConstant = new Map(jsonObject.defineConstant);
@@ -119,13 +121,20 @@ function createConfigOptionsFrom(jsonObject) {
119
121
  configOptions.useLibraryCodeForTypes = jsonObject.useLibraryCodeForTypes;
120
122
  configOptions.internalTestMode = jsonObject.internalTestMode;
121
123
  configOptions.indexGenerationMode = jsonObject.indexGenerationMode;
122
- configOptions.venvPath = jsonObject.venvPath;
124
+ configOptions.venvPath = uri_1.Uri.fromJsonObj(jsonObject.venvPath);
123
125
  configOptions.venv = jsonObject.venv;
124
126
  configOptions.defaultPythonVersion = jsonObject.defaultPythonVersion;
125
127
  configOptions.defaultPythonPlatform = jsonObject.defaultPythonPlatform;
126
- configOptions.defaultExtraPaths = jsonObject.defaultExtraPaths;
128
+ configOptions.defaultExtraPaths = (_a = jsonObject.defaultExtraPaths) === null || _a === void 0 ? void 0 : _a.map((p) => uri_1.Uri.fromJsonObj(p));
127
129
  configOptions.diagnosticRuleSet = jsonObject.diagnosticRuleSet;
128
- configOptions.executionEnvironments = jsonObject.executionEnvironments;
130
+ configOptions.executionEnvironments = (_b = jsonObject.executionEnvironments) === null || _b === void 0 ? void 0 : _b.map((e) => {
131
+ var _a;
132
+ return {
133
+ ...e,
134
+ root: uri_1.Uri.fromJsonObj(e.root),
135
+ extraPaths: (_a = e.extraPaths) === null || _a === void 0 ? void 0 : _a.map((p) => uri_1.Uri.fromJsonObj(p)),
136
+ };
137
+ });
129
138
  configOptions.autoImportCompletions = jsonObject.autoImportCompletions;
130
139
  configOptions.indexing = jsonObject.indexing;
131
140
  configOptions.taskListTokens = jsonObject.taskListTokens;