@zzzen/pyright-internal 1.2.0-dev.20231203 → 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 (345) 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 +56 -52
  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 +29 -36
  13. package/dist/analyzer/codeFlowEngine.js.map +1 -1
  14. package/dist/analyzer/constraintSolver.js +3 -5
  15. package/dist/analyzer/constraintSolver.js.map +1 -1
  16. package/dist/analyzer/dataClasses.js +1 -1
  17. package/dist/analyzer/dataClasses.js.map +1 -1
  18. package/dist/analyzer/declaration.d.ts +5 -3
  19. package/dist/analyzer/declaration.js +3 -2
  20. package/dist/analyzer/declaration.js.map +1 -1
  21. package/dist/analyzer/declarationUtils.d.ts +3 -2
  22. package/dist/analyzer/declarationUtils.js +14 -12
  23. package/dist/analyzer/declarationUtils.js.map +1 -1
  24. package/dist/analyzer/enums.js +1 -1
  25. package/dist/analyzer/enums.js.map +1 -1
  26. package/dist/analyzer/importResolver.d.ts +29 -25
  27. package/dist/analyzer/importResolver.js +300 -301
  28. package/dist/analyzer/importResolver.js.map +1 -1
  29. package/dist/analyzer/importResult.d.ts +5 -4
  30. package/dist/analyzer/importResult.js.map +1 -1
  31. package/dist/analyzer/importStatementUtils.d.ts +5 -4
  32. package/dist/analyzer/importStatementUtils.js +23 -22
  33. package/dist/analyzer/importStatementUtils.js.map +1 -1
  34. package/dist/analyzer/namedTuples.js +3 -3
  35. package/dist/analyzer/namedTuples.js.map +1 -1
  36. package/dist/analyzer/packageTypeReport.d.ts +7 -6
  37. package/dist/analyzer/packageTypeReport.js +4 -4
  38. package/dist/analyzer/packageTypeReport.js.map +1 -1
  39. package/dist/analyzer/packageTypeVerifier.js +68 -64
  40. package/dist/analyzer/packageTypeVerifier.js.map +1 -1
  41. package/dist/analyzer/parentDirectoryCache.d.ts +7 -6
  42. package/dist/analyzer/parentDirectoryCache.js +9 -10
  43. package/dist/analyzer/parentDirectoryCache.js.map +1 -1
  44. package/dist/analyzer/parseTreeUtils.d.ts +1 -1
  45. package/dist/analyzer/parseTreeUtils.js +6 -3
  46. package/dist/analyzer/parseTreeUtils.js.map +1 -1
  47. package/dist/analyzer/patternMatching.js +79 -14
  48. package/dist/analyzer/patternMatching.js.map +1 -1
  49. package/dist/analyzer/program.d.ts +27 -26
  50. package/dist/analyzer/program.js +162 -156
  51. package/dist/analyzer/program.js.map +1 -1
  52. package/dist/analyzer/properties.js +3 -3
  53. package/dist/analyzer/properties.js.map +1 -1
  54. package/dist/analyzer/pyTypedUtils.d.ts +3 -2
  55. package/dist/analyzer/pyTypedUtils.js +4 -5
  56. package/dist/analyzer/pyTypedUtils.js.map +1 -1
  57. package/dist/analyzer/pythonPathUtils.d.ts +7 -6
  58. package/dist/analyzer/pythonPathUtils.js +21 -23
  59. package/dist/analyzer/pythonPathUtils.js.map +1 -1
  60. package/dist/analyzer/service.d.ts +24 -23
  61. package/dist/analyzer/service.js +187 -183
  62. package/dist/analyzer/service.js.map +1 -1
  63. package/dist/analyzer/sourceFile.d.ts +4 -5
  64. package/dist/analyzer/sourceFile.js +68 -56
  65. package/dist/analyzer/sourceFile.js.map +1 -1
  66. package/dist/analyzer/sourceFileInfoUtils.js +3 -3
  67. package/dist/analyzer/sourceFileInfoUtils.js.map +1 -1
  68. package/dist/analyzer/sourceMapper.d.ts +11 -10
  69. package/dist/analyzer/sourceMapper.js +59 -62
  70. package/dist/analyzer/sourceMapper.js.map +1 -1
  71. package/dist/analyzer/sourceMapperUtils.d.ts +2 -1
  72. package/dist/analyzer/sourceMapperUtils.js +2 -2
  73. package/dist/analyzer/sourceMapperUtils.js.map +1 -1
  74. package/dist/analyzer/tracePrinter.d.ts +3 -2
  75. package/dist/analyzer/tracePrinter.js +21 -23
  76. package/dist/analyzer/tracePrinter.js.map +1 -1
  77. package/dist/analyzer/typeDocStringUtils.d.ts +2 -1
  78. package/dist/analyzer/typeDocStringUtils.js +14 -17
  79. package/dist/analyzer/typeDocStringUtils.js.map +1 -1
  80. package/dist/analyzer/typeEvaluator.js +172 -102
  81. package/dist/analyzer/typeEvaluator.js.map +1 -1
  82. package/dist/analyzer/typeGuards.js +3 -3
  83. package/dist/analyzer/typeGuards.js.map +1 -1
  84. package/dist/analyzer/typePrinter.d.ts +2 -0
  85. package/dist/analyzer/typePrinter.js +48 -8
  86. package/dist/analyzer/typePrinter.js.map +1 -1
  87. package/dist/analyzer/typeStubWriter.d.ts +2 -1
  88. package/dist/analyzer/typeStubWriter.js +2 -2
  89. package/dist/analyzer/typeStubWriter.js.map +1 -1
  90. package/dist/analyzer/typeUtils.d.ts +4 -2
  91. package/dist/analyzer/typeUtils.js +16 -5
  92. package/dist/analyzer/typeUtils.js.map +1 -1
  93. package/dist/analyzer/typedDicts.js +4 -4
  94. package/dist/analyzer/typedDicts.js.map +1 -1
  95. package/dist/analyzer/types.d.ts +5 -4
  96. package/dist/analyzer/types.js +4 -4
  97. package/dist/analyzer/types.js.map +1 -1
  98. package/dist/backgroundAnalysis.d.ts +1 -2
  99. package/dist/backgroundAnalysis.js +6 -4
  100. package/dist/backgroundAnalysis.js.map +1 -1
  101. package/dist/backgroundAnalysisBase.d.ts +22 -20
  102. package/dist/backgroundAnalysisBase.js +76 -55
  103. package/dist/backgroundAnalysisBase.js.map +1 -1
  104. package/dist/backgroundThreadBase.d.ts +1 -1
  105. package/dist/backgroundThreadBase.js +20 -11
  106. package/dist/backgroundThreadBase.js.map +1 -1
  107. package/dist/commands/createTypeStub.js +3 -2
  108. package/dist/commands/createTypeStub.js.map +1 -1
  109. package/dist/commands/dumpFileDebugInfoCommand.js +21 -20
  110. package/dist/commands/dumpFileDebugInfoCommand.js.map +1 -1
  111. package/dist/commands/quickActionCommand.js +5 -5
  112. package/dist/commands/quickActionCommand.js.map +1 -1
  113. package/dist/common/configOptions.d.ts +14 -13
  114. package/dist/common/configOptions.js +29 -27
  115. package/dist/common/configOptions.js.map +1 -1
  116. package/dist/common/diagnostic.d.ts +6 -5
  117. package/dist/common/diagnostic.js +2 -2
  118. package/dist/common/diagnostic.js.map +1 -1
  119. package/dist/common/diagnosticSink.d.ts +2 -1
  120. package/dist/common/diagnosticSink.js.map +1 -1
  121. package/dist/common/editAction.d.ts +6 -5
  122. package/dist/common/editAction.js +2 -2
  123. package/dist/common/editAction.js.map +1 -1
  124. package/dist/common/envVarUtils.d.ts +2 -1
  125. package/dist/common/envVarUtils.js +20 -28
  126. package/dist/common/envVarUtils.js.map +1 -1
  127. package/dist/common/extensibility.d.ts +19 -19
  128. package/dist/common/extensibility.js.map +1 -1
  129. package/dist/common/fileSystem.d.ts +29 -28
  130. package/dist/common/fileWatcher.d.ts +3 -2
  131. package/dist/common/fileWatcher.js.map +1 -1
  132. package/dist/common/fullAccessHost.d.ts +8 -7
  133. package/dist/common/fullAccessHost.js +21 -16
  134. package/dist/common/fullAccessHost.js.map +1 -1
  135. package/dist/common/host.d.ts +7 -6
  136. package/dist/common/host.js +1 -1
  137. package/dist/common/host.js.map +1 -1
  138. package/dist/common/logTracker.d.ts +2 -1
  139. package/dist/common/logTracker.js +4 -4
  140. package/dist/common/logTracker.js.map +1 -1
  141. package/dist/common/pathUtils.d.ts +1 -28
  142. package/dist/common/pathUtils.js +17 -366
  143. package/dist/common/pathUtils.js.map +1 -1
  144. package/dist/common/realFileSystem.d.ts +7 -3
  145. package/dist/common/realFileSystem.js +78 -60
  146. package/dist/common/realFileSystem.js.map +1 -1
  147. package/dist/common/serviceProviderExtensions.d.ts +2 -1
  148. package/dist/common/serviceProviderExtensions.js +5 -2
  149. package/dist/common/serviceProviderExtensions.js.map +1 -1
  150. package/dist/common/textEditTracker.d.ts +2 -1
  151. package/dist/common/textEditTracker.js +28 -28
  152. package/dist/common/textEditTracker.js.map +1 -1
  153. package/dist/common/textRange.d.ts +2 -1
  154. package/dist/common/textRange.js.map +1 -1
  155. package/dist/common/uri/baseUri.d.ts +51 -0
  156. package/dist/common/uri/baseUri.js +194 -0
  157. package/dist/common/uri/baseUri.js.map +1 -0
  158. package/dist/common/uri/emptyUri.d.ts +32 -0
  159. package/dist/common/uri/emptyUri.js +122 -0
  160. package/dist/common/uri/emptyUri.js.map +1 -0
  161. package/dist/common/uri/fileUri.d.ts +36 -0
  162. package/dist/common/uri/fileUri.js +180 -0
  163. package/dist/common/uri/fileUri.js.map +1 -0
  164. package/dist/common/uri/memoization.d.ts +3 -0
  165. package/dist/common/uri/memoization.js +72 -0
  166. package/dist/common/uri/memoization.js.map +1 -0
  167. package/dist/common/uri/uri.d.ts +50 -0
  168. package/dist/common/uri/uri.js +104 -0
  169. package/dist/common/uri/uri.js.map +1 -0
  170. package/dist/common/uri/uriUtils.d.ts +39 -0
  171. package/dist/common/uri/uriUtils.js +362 -0
  172. package/dist/common/uri/uriUtils.js.map +1 -0
  173. package/dist/common/uri/webUri.d.ts +36 -0
  174. package/dist/common/uri/webUri.js +207 -0
  175. package/dist/common/uri/webUri.js.map +1 -0
  176. package/dist/common/workspaceEditUtils.d.ts +8 -8
  177. package/dist/common/workspaceEditUtils.js +34 -37
  178. package/dist/common/workspaceEditUtils.js.map +1 -1
  179. package/dist/languageServerBase.d.ts +19 -22
  180. package/dist/languageServerBase.js +91 -95
  181. package/dist/languageServerBase.js.map +1 -1
  182. package/dist/languageService/analyzerServiceExecutor.d.ts +2 -1
  183. package/dist/languageService/analyzerServiceExecutor.js +14 -16
  184. package/dist/languageService/analyzerServiceExecutor.js.map +1 -1
  185. package/dist/languageService/autoImporter.d.ts +11 -9
  186. package/dist/languageService/autoImporter.js +45 -44
  187. package/dist/languageService/autoImporter.js.map +1 -1
  188. package/dist/languageService/callHierarchyProvider.d.ts +3 -2
  189. package/dist/languageService/callHierarchyProvider.js +23 -35
  190. package/dist/languageService/callHierarchyProvider.js.map +1 -1
  191. package/dist/languageService/codeActionProvider.d.ts +2 -1
  192. package/dist/languageService/codeActionProvider.js +8 -10
  193. package/dist/languageService/codeActionProvider.js.map +1 -1
  194. package/dist/languageService/completionProvider.d.ts +7 -6
  195. package/dist/languageService/completionProvider.js +32 -30
  196. package/dist/languageService/completionProvider.js.map +1 -1
  197. package/dist/languageService/completionProviderUtils.d.ts +2 -1
  198. package/dist/languageService/completionProviderUtils.js +1 -1
  199. package/dist/languageService/completionProviderUtils.js.map +1 -1
  200. package/dist/languageService/definitionProvider.d.ts +4 -3
  201. package/dist/languageService/definitionProvider.js +26 -24
  202. package/dist/languageService/definitionProvider.js.map +1 -1
  203. package/dist/languageService/documentHighlightProvider.d.ts +3 -2
  204. package/dist/languageService/documentHighlightProvider.js +3 -3
  205. package/dist/languageService/documentHighlightProvider.js.map +1 -1
  206. package/dist/languageService/documentSymbolCollector.js +8 -7
  207. package/dist/languageService/documentSymbolCollector.js.map +1 -1
  208. package/dist/languageService/documentSymbolProvider.d.ts +5 -4
  209. package/dist/languageService/documentSymbolProvider.js +9 -11
  210. package/dist/languageService/documentSymbolProvider.js.map +1 -1
  211. package/dist/languageService/hoverProvider.d.ts +4 -3
  212. package/dist/languageService/hoverProvider.js +6 -5
  213. package/dist/languageService/hoverProvider.js.map +1 -1
  214. package/dist/languageService/navigationUtils.d.ts +2 -1
  215. package/dist/languageService/navigationUtils.js +2 -3
  216. package/dist/languageService/navigationUtils.js.map +1 -1
  217. package/dist/languageService/quickActions.d.ts +2 -1
  218. package/dist/languageService/quickActions.js +3 -3
  219. package/dist/languageService/quickActions.js.map +1 -1
  220. package/dist/languageService/referencesProvider.d.ts +10 -9
  221. package/dist/languageService/referencesProvider.js +28 -28
  222. package/dist/languageService/referencesProvider.js.map +1 -1
  223. package/dist/languageService/renameProvider.d.ts +4 -3
  224. package/dist/languageService/renameProvider.js +17 -18
  225. package/dist/languageService/renameProvider.js.map +1 -1
  226. package/dist/languageService/signatureHelpProvider.d.ts +3 -2
  227. package/dist/languageService/signatureHelpProvider.js +4 -4
  228. package/dist/languageService/signatureHelpProvider.js.map +1 -1
  229. package/dist/languageService/symbolIndexer.d.ts +2 -1
  230. package/dist/languageService/symbolIndexer.js +1 -1
  231. package/dist/languageService/symbolIndexer.js.map +1 -1
  232. package/dist/languageService/tooltipUtils.js +10 -4
  233. package/dist/languageService/tooltipUtils.js.map +1 -1
  234. package/dist/languageService/workspaceSymbolProvider.d.ts +4 -3
  235. package/dist/languageService/workspaceSymbolProvider.js +10 -11
  236. package/dist/languageService/workspaceSymbolProvider.js.map +1 -1
  237. package/dist/localization/localize.d.ts +1 -0
  238. package/dist/localization/localize.js +1 -0
  239. package/dist/localization/localize.js.map +1 -1
  240. package/dist/localization/package.nls.en-us.json +2 -1
  241. package/dist/pyright.js +18 -17
  242. package/dist/pyright.js.map +1 -1
  243. package/dist/pyrightFileSystem.d.ts +13 -13
  244. package/dist/pyrightFileSystem.js +38 -43
  245. package/dist/pyrightFileSystem.js.map +1 -1
  246. package/dist/readonlyAugmentedFileSystem.d.ts +29 -28
  247. package/dist/readonlyAugmentedFileSystem.js +62 -65
  248. package/dist/readonlyAugmentedFileSystem.js.map +1 -1
  249. package/dist/server.js +21 -20
  250. package/dist/server.js.map +1 -1
  251. package/dist/tests/chainedSourceFiles.test.js +39 -30
  252. package/dist/tests/chainedSourceFiles.test.js.map +1 -1
  253. package/dist/tests/checker.test.js +31 -30
  254. package/dist/tests/checker.test.js.map +1 -1
  255. package/dist/tests/completions.test.js +7 -3
  256. package/dist/tests/completions.test.js.map +1 -1
  257. package/dist/tests/config.test.js +24 -22
  258. package/dist/tests/config.test.js.map +1 -1
  259. package/dist/tests/documentSymbolCollector.test.js +3 -2
  260. package/dist/tests/documentSymbolCollector.test.js.map +1 -1
  261. package/dist/tests/filesystem.test.js +37 -35
  262. package/dist/tests/filesystem.test.js.map +1 -1
  263. package/dist/tests/fourSlashParser.test.js +4 -4
  264. package/dist/tests/fourSlashParser.test.js.map +1 -1
  265. package/dist/tests/fourslash/hover.docstring.alias.fourslash.js +27 -11
  266. package/dist/tests/fourslash/hover.docstring.alias.fourslash.js.map +1 -1
  267. package/dist/tests/harness/fourslash/fourSlashParser.js +2 -2
  268. package/dist/tests/harness/fourslash/fourSlashParser.js.map +1 -1
  269. package/dist/tests/harness/fourslash/testLanguageService.d.ts +4 -5
  270. package/dist/tests/harness/fourslash/testLanguageService.js +9 -15
  271. package/dist/tests/harness/fourslash/testLanguageService.js.map +1 -1
  272. package/dist/tests/harness/fourslash/testState.d.ts +4 -4
  273. package/dist/tests/harness/fourslash/testState.js +91 -51
  274. package/dist/tests/harness/fourslash/testState.js.map +1 -1
  275. package/dist/tests/harness/testAccessHost.d.ts +3 -2
  276. package/dist/tests/harness/testAccessHost.js +2 -1
  277. package/dist/tests/harness/testAccessHost.js.map +1 -1
  278. package/dist/tests/harness/testHost.js +13 -11
  279. package/dist/tests/harness/testHost.js.map +1 -1
  280. package/dist/tests/harness/vfs/factory.d.ts +3 -2
  281. package/dist/tests/harness/vfs/factory.js +5 -4
  282. package/dist/tests/harness/vfs/factory.js.map +1 -1
  283. package/dist/tests/harness/vfs/filesystem.d.ts +32 -31
  284. package/dist/tests/harness/vfs/filesystem.js +47 -49
  285. package/dist/tests/harness/vfs/filesystem.js.map +1 -1
  286. package/dist/tests/harness/vfs/pathValidation.js +1 -10
  287. package/dist/tests/harness/vfs/pathValidation.js.map +1 -1
  288. package/dist/tests/importResolver.test.js +81 -58
  289. package/dist/tests/importResolver.test.js.map +1 -1
  290. package/dist/tests/importStatementUtils.test.js +10 -9
  291. package/dist/tests/importStatementUtils.test.js.map +1 -1
  292. package/dist/tests/ipythonMode.test.js +12 -11
  293. package/dist/tests/ipythonMode.test.js.map +1 -1
  294. package/dist/tests/logger.test.js +2 -1
  295. package/dist/tests/logger.test.js.map +1 -1
  296. package/dist/tests/parseTreeUtils.test.js +2 -1
  297. package/dist/tests/parseTreeUtils.test.js.map +1 -1
  298. package/dist/tests/pathUtils.test.js +3 -138
  299. package/dist/tests/pathUtils.test.js.map +1 -1
  300. package/dist/tests/pyrightFileSystem.test.js +38 -34
  301. package/dist/tests/pyrightFileSystem.test.js.map +1 -1
  302. package/dist/tests/service.test.js +37 -42
  303. package/dist/tests/service.test.js.map +1 -1
  304. package/dist/tests/signatureHelp.test.js +3 -2
  305. package/dist/tests/signatureHelp.test.js.map +1 -1
  306. package/dist/tests/sourceFile.test.js +8 -7
  307. package/dist/tests/sourceFile.test.js.map +1 -1
  308. package/dist/tests/sourceMapperUtils.test.js +13 -6
  309. package/dist/tests/sourceMapperUtils.test.js.map +1 -1
  310. package/dist/tests/testState.test.js +13 -9
  311. package/dist/tests/testState.test.js.map +1 -1
  312. package/dist/tests/testStateUtils.d.ts +2 -5
  313. package/dist/tests/testStateUtils.js +27 -64
  314. package/dist/tests/testStateUtils.js.map +1 -1
  315. package/dist/tests/testUtils.d.ts +3 -5
  316. package/dist/tests/testUtils.js +15 -64
  317. package/dist/tests/testUtils.js.map +1 -1
  318. package/dist/tests/textEditUtil.test.js +4 -3
  319. package/dist/tests/textEditUtil.test.js.map +1 -1
  320. package/dist/tests/typeEvaluator1.test.js +16 -15
  321. package/dist/tests/typeEvaluator1.test.js.map +1 -1
  322. package/dist/tests/typeEvaluator2.test.js +18 -9
  323. package/dist/tests/typeEvaluator2.test.js.map +1 -1
  324. package/dist/tests/typeEvaluator3.test.js +73 -62
  325. package/dist/tests/typeEvaluator3.test.js.map +1 -1
  326. package/dist/tests/typeEvaluator4.test.js +20 -19
  327. package/dist/tests/typeEvaluator4.test.js.map +1 -1
  328. package/dist/tests/typeEvaluator5.test.js +28 -27
  329. package/dist/tests/typeEvaluator5.test.js.map +1 -1
  330. package/dist/tests/typePrinter.test.js +4 -3
  331. package/dist/tests/typePrinter.test.js.map +1 -1
  332. package/dist/tests/uri.test.d.ts +1 -0
  333. package/dist/tests/uri.test.js +695 -0
  334. package/dist/tests/uri.test.js.map +1 -0
  335. package/dist/tests/workspaceEditUtils.test.js +28 -28
  336. package/dist/tests/workspaceEditUtils.test.js.map +1 -1
  337. package/dist/tests/zipfs.test.js +11 -11
  338. package/dist/tests/zipfs.test.js.map +1 -1
  339. package/dist/workspaceFactory.d.ts +13 -14
  340. package/dist/workspaceFactory.js +54 -55
  341. package/dist/workspaceFactory.js.map +1 -1
  342. package/package.json +2 -2
  343. package/dist/common/uriParser.d.ts +0 -24
  344. package/dist/common/uriParser.js +0 -45
  345. package/dist/common/uriParser.js.map +0 -1
@@ -38,6 +38,8 @@ const debug_1 = require("./debug");
38
38
  const host_1 = require("./host");
39
39
  const pathUtils_1 = require("./pathUtils");
40
40
  const pythonVersion_1 = require("./pythonVersion");
41
+ const uri_1 = require("./uri/uri");
42
+ const uriUtils_1 = require("./uri/uriUtils");
41
43
  // preventLocalImports removes the working directory from sys.path.
42
44
  // The -c flag adds it automatically, which can allow some stdlib
43
45
  // modules (like json) to be overridden by other files (like json.py).
@@ -77,32 +79,32 @@ class LimitedAccessHost extends host_1.NoAccessHost {
77
79
  }
78
80
  exports.LimitedAccessHost = LimitedAccessHost;
79
81
  class FullAccessHost extends LimitedAccessHost {
80
- constructor(fs) {
82
+ constructor(serviceProvider) {
81
83
  super();
82
- this.fs = fs;
84
+ this.serviceProvider = serviceProvider;
83
85
  }
84
86
  get kind() {
85
87
  return 0 /* HostKind.FullAccess */;
86
88
  }
87
- static createHost(kind, fs) {
89
+ static createHost(kind, serviceProvider) {
88
90
  switch (kind) {
89
91
  case 2 /* HostKind.NoAccess */:
90
92
  return new host_1.NoAccessHost();
91
93
  case 1 /* HostKind.LimitedAccess */:
92
94
  return new LimitedAccessHost();
93
95
  case 0 /* HostKind.FullAccess */:
94
- return new FullAccessHost(fs);
96
+ return new FullAccessHost(serviceProvider);
95
97
  default:
96
98
  (0, debug_1.assertNever)(kind);
97
99
  }
98
100
  }
99
101
  getPythonSearchPaths(pythonPath, logInfo) {
100
102
  const importFailureInfo = logInfo !== null && logInfo !== void 0 ? logInfo : [];
101
- let result = this._executePythonInterpreter(pythonPath, (p) => this._getSearchPathResultFromInterpreter(this.fs, p, importFailureInfo));
103
+ let result = this._executePythonInterpreter(pythonPath === null || pythonPath === void 0 ? void 0 : pythonPath.getFilePath(), (p) => this._getSearchPathResultFromInterpreter(p, importFailureInfo));
102
104
  if (!result) {
103
105
  result = {
104
106
  paths: [],
105
- prefix: '',
107
+ prefix: undefined,
106
108
  };
107
109
  }
108
110
  importFailureInfo.push(`Received ${result.paths.length} paths from interpreter`);
@@ -115,7 +117,7 @@ class FullAccessHost extends LimitedAccessHost {
115
117
  const importFailureInfo = logInfo !== null && logInfo !== void 0 ? logInfo : [];
116
118
  try {
117
119
  const commandLineArgs = ['-c', extractVersion];
118
- const execOutput = this._executePythonInterpreter(pythonPath, (p) => child_process.execFileSync(p, commandLineArgs, { encoding: 'utf8' }));
120
+ const execOutput = this._executePythonInterpreter(pythonPath === null || pythonPath === void 0 ? void 0 : pythonPath.getFilePath(), (p) => child_process.execFileSync(p, commandLineArgs, { encoding: 'utf8' }));
119
121
  const versionJson = JSON.parse(execOutput);
120
122
  const version = (0, pythonVersion_1.versionFromMajorMinor)(versionJson.major, versionJson.minor);
121
123
  if (version === undefined) {
@@ -136,8 +138,8 @@ class FullAccessHost extends LimitedAccessHost {
136
138
  return new Promise((resolve, reject) => {
137
139
  let stdout = '';
138
140
  let stderr = '';
139
- const commandLineArgs = [script, ...args];
140
- const child = this._executePythonInterpreter(pythonPath, (p) => child_process.spawn(p, commandLineArgs, { cwd }));
141
+ const commandLineArgs = [script.getFilePath(), ...args];
142
+ const child = this._executePythonInterpreter(pythonPath === null || pythonPath === void 0 ? void 0 : pythonPath.getFilePath(), (p) => child_process.spawn(p, commandLineArgs, { cwd }));
141
143
  const tokenWatch = token.onCancellationRequested(() => {
142
144
  if (child) {
143
145
  try {
@@ -199,15 +201,16 @@ class FullAccessHost extends LimitedAccessHost {
199
201
  return execute('python');
200
202
  }
201
203
  }
202
- _getSearchPathResultFromInterpreter(fs, interpreter, importFailureInfo) {
204
+ _getSearchPathResultFromInterpreter(interpreterPath, importFailureInfo) {
203
205
  const result = {
204
206
  paths: [],
205
- prefix: '',
207
+ prefix: undefined,
206
208
  };
207
209
  try {
208
210
  const commandLineArgs = ['-c', extractSys];
209
- importFailureInfo.push(`Executing interpreter: '${interpreter}'`);
210
- const execOutput = child_process.execFileSync(interpreter, commandLineArgs, { encoding: 'utf8' });
211
+ importFailureInfo.push(`Executing interpreter: '${interpreterPath}'`);
212
+ const execOutput = child_process.execFileSync(interpreterPath, commandLineArgs, { encoding: 'utf8' });
213
+ const isCaseSensitive = this.serviceProvider.fs().isCaseSensitive;
211
214
  // Parse the execOutput. It should be a JSON-encoded array of paths.
212
215
  try {
213
216
  const execSplit = JSON.parse(execOutput);
@@ -215,16 +218,18 @@ class FullAccessHost extends LimitedAccessHost {
215
218
  execSplitEntry = execSplitEntry.trim();
216
219
  if (execSplitEntry) {
217
220
  const normalizedPath = (0, pathUtils_1.normalizePath)(execSplitEntry);
221
+ const normalizedUri = uri_1.Uri.file(normalizedPath, isCaseSensitive);
218
222
  // Skip non-existent paths and broken zips/eggs.
219
- if (fs.existsSync(normalizedPath) && (0, pathUtils_1.isDirectory)(fs, normalizedPath)) {
220
- result.paths.push(normalizedPath);
223
+ if (this.serviceProvider.fs().existsSync(normalizedUri) &&
224
+ (0, uriUtils_1.isDirectory)(this.serviceProvider.fs(), normalizedUri)) {
225
+ result.paths.push(normalizedUri);
221
226
  }
222
227
  else {
223
228
  importFailureInfo.push(`Skipping '${normalizedPath}' because it is not a valid directory`);
224
229
  }
225
230
  }
226
231
  }
227
- result.prefix = execSplit.prefix;
232
+ result.prefix = uri_1.Uri.file(execSplit.prefix, isCaseSensitive);
228
233
  if (result.paths.length === 0) {
229
234
  importFailureInfo.push(`Found no valid directories`);
230
235
  }
@@ -1 +1 @@
1
- {"version":3,"file":"fullAccessHost.js","sourceRoot":"","sources":["../../../src/common/fullAccessHost.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"fullAccessHost.js","sourceRoot":"","sources":["../../../src/common/fullAccessHost.ts"],"names":[],"mappings":"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"}
@@ -2,6 +2,7 @@ import { CancellationToken } from 'vscode-languageserver';
2
2
  import { PythonPathResult } from '../analyzer/pythonPathUtils';
3
3
  import { PythonPlatform } from './configOptions';
4
4
  import { PythonVersion } from './pythonVersion';
5
+ import { Uri } from './uri/uri';
5
6
  export declare const enum HostKind {
6
7
  FullAccess = 0,
7
8
  LimitedAccess = 1,
@@ -13,16 +14,16 @@ export interface ScriptOutput {
13
14
  }
14
15
  export interface Host {
15
16
  readonly kind: HostKind;
16
- getPythonSearchPaths(pythonPath?: string, logInfo?: string[]): PythonPathResult;
17
- getPythonVersion(pythonPath?: string, logInfo?: string[]): PythonVersion | undefined;
17
+ getPythonSearchPaths(pythonPath?: Uri, logInfo?: string[]): PythonPathResult;
18
+ getPythonVersion(pythonPath?: Uri, logInfo?: string[]): PythonVersion | undefined;
18
19
  getPythonPlatform(logInfo?: string[]): PythonPlatform | undefined;
19
- runScript(pythonPath: string | undefined, script: string, args: string[], cwd: string, token: CancellationToken): Promise<ScriptOutput>;
20
+ runScript(pythonPath: Uri | undefined, script: Uri, args: string[], cwd: string, token: CancellationToken): Promise<ScriptOutput>;
20
21
  }
21
22
  export declare class NoAccessHost implements Host {
22
23
  get kind(): HostKind;
23
- getPythonSearchPaths(pythonPath?: string, logInfo?: string[]): PythonPathResult;
24
- getPythonVersion(pythonPath?: string, logInfo?: string[]): PythonVersion | undefined;
24
+ getPythonSearchPaths(pythonPath?: Uri, logInfo?: string[]): PythonPathResult;
25
+ getPythonVersion(pythonPath?: Uri, logInfo?: string[]): PythonVersion | undefined;
25
26
  getPythonPlatform(logInfo?: string[]): PythonPlatform | undefined;
26
- runScript(pythonPath: string | undefined, scriptPath: string, args: string[], cwd: string, token: CancellationToken): Promise<ScriptOutput>;
27
+ runScript(pythonPath: Uri | undefined, scriptPath: Uri, args: string[], cwd: string, token: CancellationToken): Promise<ScriptOutput>;
27
28
  }
28
29
  export type HostFactory = () => Host;
@@ -22,7 +22,7 @@ class NoAccessHost {
22
22
  logInfo === null || logInfo === void 0 ? void 0 : logInfo.push('No access to python executable.');
23
23
  return {
24
24
  paths: [],
25
- prefix: '',
25
+ prefix: undefined,
26
26
  };
27
27
  }
28
28
  getPythonVersion(pythonPath, logInfo) {
@@ -1 +1 @@
1
- {"version":3,"file":"host.js","sourceRoot":"","sources":["../../../src/common/host.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;;AAQH,IAAkB,QAIjB;AAJD,WAAkB,QAAQ;IACtB,mDAAU,CAAA;IACV,yDAAa,CAAA;IACb,+CAAQ,CAAA;AACZ,CAAC,EAJiB,QAAQ,wBAAR,QAAQ,QAIzB;AAqBD,MAAa,YAAY;IACrB,IAAI,IAAI;QACJ,iCAAyB;IAC7B,CAAC;IAED,oBAAoB,CAAC,UAAmB,EAAE,OAAkB;QACxD,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,IAAI,CAAC,iCAAiC,CAAC,CAAC;QAEjD,OAAO;YACH,KAAK,EAAE,EAAE;YACT,MAAM,EAAE,EAAE;SACb,CAAC;IACN,CAAC;IAED,gBAAgB,CAAC,UAAmB,EAAE,OAAkB;QACpD,OAAO,SAAS,CAAC;IACrB,CAAC;IAED,iBAAiB,CAAC,OAAkB;QAChC,OAAO,SAAS,CAAC;IACrB,CAAC;IAED,KAAK,CAAC,SAAS,CACX,UAA8B,EAC9B,UAAkB,EAClB,IAAc,EACd,GAAW,EACX,KAAwB;QAExB,OAAO,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC;IACtC,CAAC;CACJ;AA/BD,oCA+BC"}
1
+ {"version":3,"file":"host.js","sourceRoot":"","sources":["../../../src/common/host.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;;AASH,IAAkB,QAIjB;AAJD,WAAkB,QAAQ;IACtB,mDAAU,CAAA;IACV,yDAAa,CAAA;IACb,+CAAQ,CAAA;AACZ,CAAC,EAJiB,QAAQ,wBAAR,QAAQ,QAIzB;AAqBD,MAAa,YAAY;IACrB,IAAI,IAAI;QACJ,iCAAyB;IAC7B,CAAC;IAED,oBAAoB,CAAC,UAAgB,EAAE,OAAkB;QACrD,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,IAAI,CAAC,iCAAiC,CAAC,CAAC;QAEjD,OAAO;YACH,KAAK,EAAE,EAAE;YACT,MAAM,EAAE,SAAS;SACpB,CAAC;IACN,CAAC;IAED,gBAAgB,CAAC,UAAgB,EAAE,OAAkB;QACjD,OAAO,SAAS,CAAC;IACrB,CAAC;IAED,iBAAiB,CAAC,OAAkB;QAChC,OAAO,SAAS,CAAC;IACrB,CAAC;IAED,KAAK,CAAC,SAAS,CACX,UAA2B,EAC3B,UAAe,EACf,IAAc,EACd,GAAW,EACX,KAAwB;QAExB,OAAO,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC;IACtC,CAAC;CACJ;AA/BD,oCA+BC"}
@@ -1,6 +1,7 @@
1
1
  import { ConsoleInterface } from './console';
2
2
  import { ReadOnlyFileSystem } from './fileSystem';
3
- export declare function getPathForLogging(fs: ReadOnlyFileSystem, filepath: string): string;
3
+ import { Uri } from './uri/uri';
4
+ export declare function getPathForLogging(fs: ReadOnlyFileSystem, fileUri: Uri): Uri;
4
5
  export declare class LogTracker {
5
6
  private _console;
6
7
  private _prefix;
@@ -12,11 +12,11 @@ const console_1 = require("./console");
12
12
  const timing_1 = require("./timing");
13
13
  // Consider an operation "long running" if it goes longer than this.
14
14
  const durationThresholdForInfoInMs = 2000;
15
- function getPathForLogging(fs, filepath) {
16
- if (fs.isMappedFilePath(filepath)) {
17
- return fs.getOriginalFilePath(filepath);
15
+ function getPathForLogging(fs, fileUri) {
16
+ if (fs.isMappedUri(fileUri)) {
17
+ return fs.getOriginalUri(fileUri);
18
18
  }
19
- return filepath;
19
+ return fileUri;
20
20
  }
21
21
  exports.getPathForLogging = getPathForLogging;
22
22
  class LogTracker {
@@ -1 +1 @@
1
- {"version":3,"file":"logTracker.js","sourceRoot":"","sources":["../../../src/common/logTracker.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"logTracker.js","sourceRoot":"","sources":["../../../src/common/logTracker.ts"],"names":[],"mappings":"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"}
@@ -1,8 +1,4 @@
1
- /// <reference types="node" />
2
- import type { Dirent } from 'fs';
3
1
  import { GetCanonicalFileName } from './core';
4
- import { ServiceProvider } from './extensibility';
5
- import { FileSystem, ReadOnlyFileSystem, Stats, TempFile } from './fileSystem';
6
2
  export interface FileSpec {
7
3
  wildcardRoot: string;
8
4
  regExp: RegExp;
@@ -18,22 +14,16 @@ export interface FileSystemEntries {
18
14
  files: string[];
19
15
  directories: string[];
20
16
  }
21
- export declare function forEachAncestorDirectory(directory: string, callback: (directory: string) => string | undefined): string | undefined;
22
17
  export declare function getDirectoryPath(pathString: string): string;
23
- export declare function isUri(pathString: string): boolean;
24
18
  /**
25
19
  * Returns length of the root part of a path or URL (i.e. length of "/", "x:/", "//server/").
26
20
  */
27
- export declare function getRootLength(pathString: string, checkUri?: boolean): number;
21
+ export declare function getRootLength(pathString: string, sep?: string): number;
28
22
  export declare function getPathSeparator(pathString: string): string;
29
23
  export declare function getPathComponents(pathString: string): string[];
30
24
  export declare function reducePathComponents(components: readonly string[]): string[];
31
25
  export declare function combinePathComponents(components: string[]): string;
32
26
  export declare function getRelativePath(dirPath: string, relativeTo: string): string | undefined;
33
- export declare function makeDirectories(fs: FileSystem, dirPath: string, startingFromDirPath: string): void;
34
- export declare function getFileSize(fs: ReadOnlyFileSystem, path: string): number;
35
- export declare function fileExists(fs: ReadOnlyFileSystem, path: string): boolean;
36
- export declare function directoryExists(fs: ReadOnlyFileSystem, path: string): boolean;
37
27
  export declare function normalizeSlashes(pathString: string, sep?: string): string;
38
28
  /**
39
29
  * Combines and resolves paths. If a path is absolute, it replaces any previous path. Any
@@ -137,19 +127,11 @@ export declare function getFileExtension(fileName: string, multiDotExtension?: b
137
127
  export declare function getFileName(pathString: string): string;
138
128
  export declare function getShortenedFileName(pathString: string, maxDirLength?: number): string;
139
129
  export declare function stripFileExtension(fileName: string, multiDotExtension?: boolean): string;
140
- export declare function realCasePath(pathString: string, fileSystem: ReadOnlyFileSystem): string;
141
130
  export declare function normalizePath(pathString: string): string;
142
- export declare function isDirectory(fs: ReadOnlyFileSystem, path: string): boolean;
143
- export declare function isFile(fs: ReadOnlyFileSystem, path: string, treatZipDirectoryAsFile?: boolean): boolean;
144
- export declare function tryStat(fs: ReadOnlyFileSystem, path: string): Stats | undefined;
145
- export declare function tryRealpath(fs: ReadOnlyFileSystem, path: string): string | undefined;
146
- export declare function getFileSystemEntries(fs: ReadOnlyFileSystem, path: string): FileSystemEntries;
147
- export declare function getFileSystemEntriesFromDirEntries(dirEntries: Dirent[], fs: ReadOnlyFileSystem, path: string): FileSystemEntries;
148
131
  export declare function getWildcardRegexPattern(rootPath: string, fileSpec: string): string;
149
132
  export declare function isDirectoryWildcardPatternPresent(fileSpec: string): boolean;
150
133
  export declare function getWildcardRoot(rootPath: string, fileSpec: string): string;
151
134
  export declare function hasPythonExtension(path: string): boolean;
152
- export declare function getFileSpec(sp: ServiceProvider, rootPath: string, fileSpec: string): FileSpec;
153
135
  export declare function getRegexEscapedSeparator(pathSep?: string): "/" | "\\\\";
154
136
  /**
155
137
  * Determines whether a path is an absolute disk path (e.g. starts with `/`, or a dos path
@@ -160,12 +142,3 @@ export declare function isRootedDiskPath(path: string): boolean;
160
142
  * Determines whether a path consists only of a path root.
161
143
  */
162
144
  export declare function isDiskPathRoot(path: string): boolean;
163
- export declare function convertUriToPath(fs: ReadOnlyFileSystem, uriString: string): string;
164
- export declare function extractPathFromUri(uriString: string): string;
165
- export declare function convertPathToUri(fs: ReadOnlyFileSystem, path: string): string;
166
- export declare function setTestingMode(underTest: boolean): void;
167
- export declare function isFileSystemCaseSensitive(fs: FileSystem, tmp?: TempFile): boolean;
168
- export declare function isFileSystemCaseSensitiveInternal(fs: FileSystem, tmp: TempFile): boolean;
169
- export declare function getLibraryPathWithoutExtension(libraryFilePath: string): string;
170
- export declare function getDirectoryChangeKind(fs: ReadOnlyFileSystem, oldDirectory: string, newDirectory: string): 'Same' | 'Renamed' | 'Moved';
171
- export declare function deduplicateFolders(listOfFolders: string[][]): string[];