@zzzen/pyright-internal 1.2.0-dev.20240324 → 1.2.0-dev.20240407

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 (327) hide show
  1. package/dist/analyzer/analyzerFileInfo.d.ts +0 -1
  2. package/dist/analyzer/analyzerFileInfo.js.map +1 -1
  3. package/dist/analyzer/binder.js +15 -8
  4. package/dist/analyzer/binder.js.map +1 -1
  5. package/dist/analyzer/cacheManager.d.ts +12 -0
  6. package/dist/analyzer/cacheManager.js +63 -3
  7. package/dist/analyzer/cacheManager.js.map +1 -1
  8. package/dist/analyzer/checker.d.ts +2 -3
  9. package/dist/analyzer/checker.js +18 -13
  10. package/dist/analyzer/checker.js.map +1 -1
  11. package/dist/analyzer/codeFlowEngine.js +14 -2
  12. package/dist/analyzer/codeFlowEngine.js.map +1 -1
  13. package/dist/analyzer/codeFlowTypes.d.ts +1 -0
  14. package/dist/analyzer/codeFlowTypes.js.map +1 -1
  15. package/dist/analyzer/constraintSolver.js +20 -3
  16. package/dist/analyzer/constraintSolver.js.map +1 -1
  17. package/dist/analyzer/constructorTransform.js +2 -2
  18. package/dist/analyzer/constructorTransform.js.map +1 -1
  19. package/dist/analyzer/constructors.d.ts +3 -2
  20. package/dist/analyzer/constructors.js +76 -54
  21. package/dist/analyzer/constructors.js.map +1 -1
  22. package/dist/analyzer/dataClasses.js +7 -6
  23. package/dist/analyzer/dataClasses.js.map +1 -1
  24. package/dist/analyzer/declaration.js +1 -1
  25. package/dist/analyzer/declaration.js.map +1 -1
  26. package/dist/analyzer/enums.js +8 -3
  27. package/dist/analyzer/enums.js.map +1 -1
  28. package/dist/analyzer/functionTransform.js +1 -1
  29. package/dist/analyzer/functionTransform.js.map +1 -1
  30. package/dist/analyzer/importResolver.js +19 -17
  31. package/dist/analyzer/importResolver.js.map +1 -1
  32. package/dist/analyzer/importStatementUtils.d.ts +6 -6
  33. package/dist/analyzer/importStatementUtils.js +42 -42
  34. package/dist/analyzer/importStatementUtils.js.map +1 -1
  35. package/dist/analyzer/namedTuples.js +3 -1
  36. package/dist/analyzer/namedTuples.js.map +1 -1
  37. package/dist/analyzer/packageTypeVerifier.js +7 -7
  38. package/dist/analyzer/packageTypeVerifier.js.map +1 -1
  39. package/dist/analyzer/parseTreeUtils.d.ts +6 -5
  40. package/dist/analyzer/parseTreeUtils.js +12 -13
  41. package/dist/analyzer/parseTreeUtils.js.map +1 -1
  42. package/dist/analyzer/patternMatching.js +15 -4
  43. package/dist/analyzer/patternMatching.js.map +1 -1
  44. package/dist/analyzer/program.d.ts +5 -10
  45. package/dist/analyzer/program.js +35 -30
  46. package/dist/analyzer/program.js.map +1 -1
  47. package/dist/analyzer/programTypes.d.ts +11 -0
  48. package/dist/analyzer/programTypes.js +11 -0
  49. package/dist/analyzer/programTypes.js.map +1 -0
  50. package/dist/analyzer/properties.js +10 -10
  51. package/dist/analyzer/properties.js.map +1 -1
  52. package/dist/analyzer/protocols.js +5 -5
  53. package/dist/analyzer/protocols.js.map +1 -1
  54. package/dist/analyzer/service.d.ts +3 -2
  55. package/dist/analyzer/service.js +24 -15
  56. package/dist/analyzer/service.js.map +1 -1
  57. package/dist/analyzer/sourceFile.d.ts +5 -3
  58. package/dist/analyzer/sourceFile.js +112 -75
  59. package/dist/analyzer/sourceFile.js.map +1 -1
  60. package/dist/analyzer/sourceFileInfoUtils.js +4 -4
  61. package/dist/analyzer/sourceFileInfoUtils.js.map +1 -1
  62. package/dist/analyzer/sourceMapper.js +6 -6
  63. package/dist/analyzer/symbol.d.ts +4 -1
  64. package/dist/analyzer/symbol.js +10 -0
  65. package/dist/analyzer/symbol.js.map +1 -1
  66. package/dist/analyzer/symbolUtils.d.ts +1 -0
  67. package/dist/analyzer/symbolUtils.js +11 -1
  68. package/dist/analyzer/symbolUtils.js.map +1 -1
  69. package/dist/analyzer/tracePrinter.js +2 -2
  70. package/dist/analyzer/tracePrinter.js.map +1 -1
  71. package/dist/analyzer/typeDocStringUtils.js +1 -1
  72. package/dist/analyzer/typeDocStringUtils.js.map +1 -1
  73. package/dist/analyzer/typeEvaluator.js +159 -73
  74. package/dist/analyzer/typeEvaluator.js.map +1 -1
  75. package/dist/analyzer/typeGuards.js +16 -9
  76. package/dist/analyzer/typeGuards.js.map +1 -1
  77. package/dist/analyzer/typeStubWriter.js +1 -1
  78. package/dist/analyzer/typeStubWriter.js.map +1 -1
  79. package/dist/analyzer/typeUtils.d.ts +2 -2
  80. package/dist/analyzer/typeUtils.js +33 -20
  81. package/dist/analyzer/typeUtils.js.map +1 -1
  82. package/dist/analyzer/typedDicts.js +32 -20
  83. package/dist/analyzer/typedDicts.js.map +1 -1
  84. package/dist/analyzer/types.d.ts +5 -1
  85. package/dist/analyzer/types.js +20 -0
  86. package/dist/analyzer/types.js.map +1 -1
  87. package/dist/backgroundAnalysis.d.ts +1 -0
  88. package/dist/backgroundAnalysis.js +6 -2
  89. package/dist/backgroundAnalysis.js.map +1 -1
  90. package/dist/backgroundAnalysisBase.d.ts +2 -1
  91. package/dist/backgroundAnalysisBase.js +6 -1
  92. package/dist/backgroundAnalysisBase.js.map +1 -1
  93. package/dist/backgroundThreadBase.d.ts +1 -0
  94. package/dist/backgroundThreadBase.js +19 -10
  95. package/dist/backgroundThreadBase.js.map +1 -1
  96. package/dist/commands/commandController.d.ts +2 -1
  97. package/dist/commands/commandController.js +3 -0
  98. package/dist/commands/commandController.js.map +1 -1
  99. package/dist/commands/createTypeStub.d.ts +1 -1
  100. package/dist/commands/createTypeStub.js +3 -3
  101. package/dist/commands/createTypeStub.js.map +1 -1
  102. package/dist/commands/dumpFileDebugInfoCommand.d.ts +1 -1
  103. package/dist/commands/dumpFileDebugInfoCommand.js +5 -5
  104. package/dist/commands/dumpFileDebugInfoCommand.js.map +1 -1
  105. package/dist/commands/quickActionCommand.d.ts +1 -1
  106. package/dist/commands/quickActionCommand.js +2 -2
  107. package/dist/commands/quickActionCommand.js.map +1 -1
  108. package/dist/commands/restartServer.d.ts +1 -1
  109. package/dist/common/cancellationUtils.js +2 -2
  110. package/dist/common/cancellationUtils.js.map +1 -1
  111. package/dist/common/caseSensitivityDetector.d.ts +6 -0
  112. package/dist/common/caseSensitivityDetector.js +18 -0
  113. package/dist/common/caseSensitivityDetector.js.map +1 -0
  114. package/dist/common/commandLineOptions.d.ts +3 -2
  115. package/dist/common/commandLineOptions.js.map +1 -1
  116. package/dist/common/commandUtils.js +1 -1
  117. package/dist/common/commandUtils.js.map +1 -1
  118. package/dist/common/configOptions.js +3 -3
  119. package/dist/common/configOptions.js.map +1 -1
  120. package/dist/common/envVarUtils.d.ts +1 -0
  121. package/dist/common/envVarUtils.js +42 -7
  122. package/dist/common/envVarUtils.js.map +1 -1
  123. package/dist/common/extensibility.d.ts +4 -3
  124. package/dist/common/extensibility.js.map +1 -1
  125. package/dist/common/fileBasedCancellationUtils.js +2 -2
  126. package/dist/common/fileBasedCancellationUtils.js.map +1 -1
  127. package/dist/common/fileSystem.d.ts +0 -1
  128. package/dist/common/fileSystem.js.map +1 -1
  129. package/dist/common/fullAccessHost.js +4 -3
  130. package/dist/common/fullAccessHost.js.map +1 -1
  131. package/dist/common/languageServerInterface.d.ts +62 -0
  132. package/dist/common/languageServerInterface.js +10 -0
  133. package/dist/common/languageServerInterface.js.map +1 -0
  134. package/dist/common/realFileSystem.d.ts +8 -4
  135. package/dist/common/realFileSystem.js +56 -17
  136. package/dist/common/realFileSystem.js.map +1 -1
  137. package/dist/common/serviceKeys.d.ts +21 -0
  138. package/dist/common/serviceKeys.js +26 -0
  139. package/dist/common/serviceKeys.js.map +1 -0
  140. package/dist/common/serviceProviderExtensions.d.ts +3 -15
  141. package/dist/common/serviceProviderExtensions.js +23 -27
  142. package/dist/common/serviceProviderExtensions.js.map +1 -1
  143. package/dist/common/textEditTracker.d.ts +5 -5
  144. package/dist/common/textEditTracker.js +35 -35
  145. package/dist/common/textEditTracker.js.map +1 -1
  146. package/dist/common/uri/constantUri.d.ts +36 -0
  147. package/dist/common/uri/constantUri.js +112 -0
  148. package/dist/common/uri/constantUri.js.map +1 -0
  149. package/dist/common/uri/emptyUri.d.ts +3 -31
  150. package/dist/common/uri/emptyUri.js +3 -84
  151. package/dist/common/uri/emptyUri.js.map +1 -1
  152. package/dist/common/uri/fileUri.d.ts +1 -0
  153. package/dist/common/uri/fileUri.js +3 -2
  154. package/dist/common/uri/fileUri.js.map +1 -1
  155. package/dist/common/uri/uri.d.ts +11 -3
  156. package/dist/common/uri/uri.js +31 -20
  157. package/dist/common/uri/uri.js.map +1 -1
  158. package/dist/common/uri/uriUtils.d.ts +11 -5
  159. package/dist/common/uri/uriUtils.js +31 -53
  160. package/dist/common/uri/uriUtils.js.map +1 -1
  161. package/dist/common/workspaceEditUtils.js +4 -4
  162. package/dist/common/workspaceEditUtils.js.map +1 -1
  163. package/dist/languageServerBase.d.ts +11 -59
  164. package/dist/languageServerBase.js +18 -8
  165. package/dist/languageServerBase.js.map +1 -1
  166. package/dist/languageService/analyzerServiceExecutor.d.ts +1 -1
  167. package/dist/languageService/analyzerServiceExecutor.js +4 -5
  168. package/dist/languageService/analyzerServiceExecutor.js.map +1 -1
  169. package/dist/languageService/autoImporter.d.ts +3 -3
  170. package/dist/languageService/autoImporter.js +2 -1
  171. package/dist/languageService/autoImporter.js.map +1 -1
  172. package/dist/languageService/callHierarchyProvider.js +6 -6
  173. package/dist/languageService/callHierarchyProvider.js.map +1 -1
  174. package/dist/languageService/codeActionProvider.js +43 -42
  175. package/dist/languageService/codeActionProvider.js.map +1 -1
  176. package/dist/languageService/completionProvider.d.ts +2 -2
  177. package/dist/languageService/completionProvider.js +10 -11
  178. package/dist/languageService/completionProvider.js.map +1 -1
  179. package/dist/languageService/definitionProvider.js +3 -3
  180. package/dist/languageService/definitionProvider.js.map +1 -1
  181. package/dist/languageService/documentHighlightProvider.js +2 -2
  182. package/dist/languageService/documentHighlightProvider.js.map +1 -1
  183. package/dist/languageService/documentSymbolCollector.js +3 -3
  184. package/dist/languageService/documentSymbolCollector.js.map +1 -1
  185. package/dist/languageService/documentSymbolProvider.d.ts +3 -2
  186. package/dist/languageService/documentSymbolProvider.js +4 -3
  187. package/dist/languageService/documentSymbolProvider.js.map +1 -1
  188. package/dist/languageService/hoverProvider.js +2 -2
  189. package/dist/languageService/hoverProvider.js.map +1 -1
  190. package/dist/languageService/importSorter.d.ts +2 -2
  191. package/dist/languageService/importSorter.js +1 -1
  192. package/dist/languageService/importSorter.js.map +1 -1
  193. package/dist/languageService/referencesProvider.d.ts +4 -4
  194. package/dist/languageService/referencesProvider.js +4 -4
  195. package/dist/languageService/referencesProvider.js.map +1 -1
  196. package/dist/languageService/signatureHelpProvider.js +4 -4
  197. package/dist/languageService/signatureHelpProvider.js.map +1 -1
  198. package/dist/languageService/symbolIndexer.d.ts +5 -2
  199. package/dist/languageService/symbolIndexer.js +21 -11
  200. package/dist/languageService/symbolIndexer.js.map +1 -1
  201. package/dist/languageService/workspaceSymbolProvider.js +2 -2
  202. package/dist/languageService/workspaceSymbolProvider.js.map +1 -1
  203. package/dist/localization/localize.d.ts +3 -0
  204. package/dist/localization/localize.js +22 -16
  205. package/dist/localization/localize.js.map +1 -1
  206. package/dist/localization/package.nls.cs.json +1 -0
  207. package/dist/localization/package.nls.de.json +1 -0
  208. package/dist/localization/package.nls.en-us.json +1 -0
  209. package/dist/localization/package.nls.es.json +1 -0
  210. package/dist/localization/package.nls.fr.json +1 -0
  211. package/dist/localization/package.nls.it.json +1 -0
  212. package/dist/localization/package.nls.ja.json +1 -0
  213. package/dist/localization/package.nls.ko.json +1 -0
  214. package/dist/localization/package.nls.pl.json +1 -0
  215. package/dist/localization/package.nls.pt-br.json +1 -0
  216. package/dist/localization/package.nls.qps-ploc.json +1 -0
  217. package/dist/localization/package.nls.ru.json +1 -0
  218. package/dist/localization/package.nls.tr.json +1 -0
  219. package/dist/localization/package.nls.zh-cn.json +1 -0
  220. package/dist/localization/package.nls.zh-tw.json +1 -0
  221. package/dist/nodeMain.d.ts +1 -1
  222. package/dist/nodeMain.js +2 -2
  223. package/dist/nodeMain.js.map +1 -1
  224. package/dist/parser/parser.d.ts +7 -4
  225. package/dist/parser/parser.js +7 -5
  226. package/dist/parser/parser.js.map +1 -1
  227. package/dist/pyright.js +6 -6
  228. package/dist/pyright.js.map +1 -1
  229. package/dist/pyrightFileSystem.d.ts +3 -1
  230. package/dist/pyrightFileSystem.js +14 -9
  231. package/dist/pyrightFileSystem.js.map +1 -1
  232. package/dist/readonlyAugmentedFileSystem.d.ts +0 -1
  233. package/dist/readonlyAugmentedFileSystem.js +0 -3
  234. package/dist/readonlyAugmentedFileSystem.js.map +1 -1
  235. package/dist/server.d.ts +4 -2
  236. package/dist/server.js +15 -11
  237. package/dist/server.js.map +1 -1
  238. package/dist/tests/cacheManager.test.js +35 -0
  239. package/dist/tests/cacheManager.test.js.map +1 -1
  240. package/dist/tests/chainedSourceFiles.test.js +18 -18
  241. package/dist/tests/chainedSourceFiles.test.js.map +1 -1
  242. package/dist/tests/completions.test.js +4 -4
  243. package/dist/tests/completions.test.js.map +1 -1
  244. package/dist/tests/config.test.js +19 -14
  245. package/dist/tests/config.test.js.map +1 -1
  246. package/dist/tests/documentSymbolCollector.test.js +2 -3
  247. package/dist/tests/documentSymbolCollector.test.js.map +1 -1
  248. package/dist/tests/envVarUtils.test.js +77 -2
  249. package/dist/tests/envVarUtils.test.js.map +1 -1
  250. package/dist/tests/filesystem.test.js +13 -13
  251. package/dist/tests/filesystem.test.js.map +1 -1
  252. package/dist/tests/fourSlashParser.test.js +10 -10
  253. package/dist/tests/fourSlashParser.test.js.map +1 -1
  254. package/dist/tests/harness/fourslash/fourSlashParser.js +12 -10
  255. package/dist/tests/harness/fourslash/fourSlashParser.js.map +1 -1
  256. package/dist/tests/harness/fourslash/fourSlashTypes.d.ts +1 -0
  257. package/dist/tests/harness/fourslash/fourSlashTypes.js.map +1 -1
  258. package/dist/tests/harness/fourslash/testLanguageService.d.ts +3 -2
  259. package/dist/tests/harness/fourslash/testLanguageService.js +2 -2
  260. package/dist/tests/harness/fourslash/testLanguageService.js.map +1 -1
  261. package/dist/tests/harness/fourslash/testState.d.ts +6 -6
  262. package/dist/tests/harness/fourslash/testState.js +42 -37
  263. package/dist/tests/harness/fourslash/testState.js.map +1 -1
  264. package/dist/tests/harness/fourslash/workspaceEditTestUtils.js +1 -1
  265. package/dist/tests/harness/fourslash/workspaceEditTestUtils.js.map +1 -1
  266. package/dist/tests/harness/testHost.d.ts +7 -0
  267. package/dist/tests/harness/testHost.js +33 -14
  268. package/dist/tests/harness/testHost.js.map +1 -1
  269. package/dist/tests/harness/vfs/factory.d.ts +3 -4
  270. package/dist/tests/harness/vfs/factory.js +7 -6
  271. package/dist/tests/harness/vfs/factory.js.map +1 -1
  272. package/dist/tests/harness/vfs/filesystem.d.ts +5 -3
  273. package/dist/tests/harness/vfs/filesystem.js +22 -15
  274. package/dist/tests/harness/vfs/filesystem.js.map +1 -1
  275. package/dist/tests/importResolver.test.js +35 -34
  276. package/dist/tests/importResolver.test.js.map +1 -1
  277. package/dist/tests/importStatementUtils.test.js +9 -10
  278. package/dist/tests/importStatementUtils.test.js.map +1 -1
  279. package/dist/tests/ipythonMode.test.js +1 -1
  280. package/dist/tests/ipythonMode.test.js.map +1 -1
  281. package/dist/tests/logger.test.js +1 -1
  282. package/dist/tests/logger.test.js.map +1 -1
  283. package/dist/tests/lsp/languageServer.js +6 -5
  284. package/dist/tests/lsp/languageServer.js.map +1 -1
  285. package/dist/tests/lsp/languageServerTestUtils.d.ts +1 -1
  286. package/dist/tests/lsp/languageServerTestUtils.js +15 -10
  287. package/dist/tests/lsp/languageServerTestUtils.js.map +1 -1
  288. package/dist/tests/parseTreeUtils.test.js +1 -2
  289. package/dist/tests/parseTreeUtils.test.js.map +1 -1
  290. package/dist/tests/parser.test.js +14 -14
  291. package/dist/tests/parser.test.js.map +1 -1
  292. package/dist/tests/pyrightFileSystem.test.js +6 -5
  293. package/dist/tests/pyrightFileSystem.test.js.map +1 -1
  294. package/dist/tests/serialization.test.js +5 -5
  295. package/dist/tests/serialization.test.js.map +1 -1
  296. package/dist/tests/service.test.js +16 -25
  297. package/dist/tests/service.test.js.map +1 -1
  298. package/dist/tests/signatureHelp.test.js +1 -1
  299. package/dist/tests/signatureHelp.test.js.map +1 -1
  300. package/dist/tests/sourceFile.test.js +8 -5
  301. package/dist/tests/sourceFile.test.js.map +1 -1
  302. package/dist/tests/sourceMapperUtils.test.js +4 -4
  303. package/dist/tests/sourceMapperUtils.test.js.map +1 -1
  304. package/dist/tests/testState.test.js +5 -5
  305. package/dist/tests/testState.test.js.map +1 -1
  306. package/dist/tests/testStateUtils.js +8 -6
  307. package/dist/tests/testStateUtils.js.map +1 -1
  308. package/dist/tests/testUtils.d.ts +4 -8
  309. package/dist/tests/testUtils.js +9 -10
  310. package/dist/tests/testUtils.js.map +1 -1
  311. package/dist/tests/textEditUtil.test.js +3 -3
  312. package/dist/tests/textEditUtil.test.js.map +1 -1
  313. package/dist/tests/typeEvaluator1.test.js +1 -1
  314. package/dist/tests/typeEvaluator1.test.js.map +1 -1
  315. package/dist/tests/typeEvaluator3.test.js +11 -5
  316. package/dist/tests/typeEvaluator3.test.js.map +1 -1
  317. package/dist/tests/typePrinter.test.js.map +1 -1
  318. package/dist/tests/uri.test.js +220 -199
  319. package/dist/tests/uri.test.js.map +1 -1
  320. package/dist/tests/workspaceEditUtils.test.js +7 -7
  321. package/dist/tests/workspaceEditUtils.test.js.map +1 -1
  322. package/dist/tests/zipfs.test.js +7 -5
  323. package/dist/tests/zipfs.test.js.map +1 -1
  324. package/dist/workspaceFactory.d.ts +15 -6
  325. package/dist/workspaceFactory.js +16 -10
  326. package/dist/workspaceFactory.js.map +1 -1
  327. package/package.json +5 -5
@@ -40,13 +40,13 @@ const pathUtils_1 = require("./pathUtils");
40
40
  const fileUri_1 = require("./uri/fileUri");
41
41
  const uri_1 = require("./uri/uri");
42
42
  const uriUtils_1 = require("./uri/uriUtils");
43
+ const crypto_1 = require("./crypto");
43
44
  // Automatically remove files created by tmp at process exit.
44
45
  tmp.setGracefulCleanup();
45
46
  // Callers can specify a different file watcher provider if desired.
46
47
  // By default, we'll use the file watcher based on chokidar.
47
- function createFromRealFileSystem(console, fileWatcherProvider) {
48
- console = console !== null && console !== void 0 ? console : new console_1.NullConsole();
49
- return new RealFileSystem(fileWatcherProvider !== null && fileWatcherProvider !== void 0 ? fileWatcherProvider : fileWatcher_1.nullFileWatcherProvider, console);
48
+ function createFromRealFileSystem(caseSensitiveDetector, console, fileWatcherProvider) {
49
+ return new RealFileSystem(caseSensitiveDetector, console !== null && console !== void 0 ? console : new console_1.NullConsole(), fileWatcherProvider !== null && fileWatcherProvider !== void 0 ? fileWatcherProvider : fileWatcher_1.nullFileWatcherProvider);
50
50
  }
51
51
  exports.createFromRealFileSystem = createFromRealFileSystem;
52
52
  const DOT_ZIP = `.zip`;
@@ -191,14 +191,11 @@ class YarnFS extends fslib_1.PosixFS {
191
191
  }
192
192
  const yarnFS = new YarnFS();
193
193
  class RealFileSystem {
194
- constructor(_fileWatcherProvider, _console) {
195
- this._fileWatcherProvider = _fileWatcherProvider;
194
+ constructor(_caseSensitiveDectector, _console, _fileWatcherProvider) {
195
+ this._caseSensitiveDectector = _caseSensitiveDectector;
196
196
  this._console = _console;
197
- this._isCaseSensitive = true;
198
- this._isCaseSensitive = (0, uriUtils_1.isFileSystemCaseSensitive)(this, new RealTempFile(/* isCaseSensitive */ true));
199
- }
200
- get isCaseSensitive() {
201
- return this._isCaseSensitive;
197
+ this._fileWatcherProvider = _fileWatcherProvider;
198
+ // Empty
202
199
  }
203
200
  existsSync(uri) {
204
201
  if (uri.isEmpty() || !fileUri_1.FileUri.isFileUri(uri)) {
@@ -319,7 +316,7 @@ class RealFileSystem {
319
316
  realpathSync(uri) {
320
317
  try {
321
318
  const path = uri.getFilePath();
322
- return uri_1.Uri.file(yarnFS.realpathSync(path), this._isCaseSensitive);
319
+ return uri_1.Uri.file(yarnFS.realpathSync(path), this._caseSensitiveDectector);
323
320
  }
324
321
  catch (e) {
325
322
  return uri;
@@ -329,7 +326,7 @@ class RealFileSystem {
329
326
  // The entry point to the tool should have set the __rootDirectory
330
327
  // global variable to point to the directory that contains the
331
328
  // typeshed-fallback directory.
332
- return (0, uriUtils_1.getRootUri)(this._isCaseSensitive) || uri_1.Uri.empty();
329
+ return (0, uriUtils_1.getRootUri)(this._caseSensitiveDectector) || uri_1.Uri.empty();
333
330
  }
334
331
  createFileSystemWatcher(paths, listener) {
335
332
  return this._fileWatcherProvider.createFileWatcher(paths.map((p) => p.getFilePath()), listener);
@@ -378,7 +375,7 @@ class RealFileSystem {
378
375
  if ((0, pathUtils_1.getRootLength)(realCase) !== (0, pathUtils_1.getRootLength)(uri.getFilePath())) {
379
376
  return uri;
380
377
  }
381
- return uri_1.Uri.file(realCase, this._isCaseSensitive);
378
+ return uri_1.Uri.file(realCase, this._caseSensitiveDectector);
382
379
  }
383
380
  catch (e) {
384
381
  // Return as it is, if anything failed.
@@ -433,15 +430,15 @@ class WorkspaceFileWatcherProvider {
433
430
  }
434
431
  exports.WorkspaceFileWatcherProvider = WorkspaceFileWatcherProvider;
435
432
  class RealTempFile {
436
- constructor(_isCaseSensitive) {
437
- this._isCaseSensitive = _isCaseSensitive;
433
+ constructor() {
434
+ // Empty
438
435
  }
439
436
  tmpdir() {
440
- return uri_1.Uri.file(this._getTmpDir().name, this._isCaseSensitive);
437
+ return uri_1.Uri.file(this._getTmpDir().name, this);
441
438
  }
442
439
  tmpfile(options) {
443
440
  const f = tmp.fileSync({ dir: this._getTmpDir().name, discardDescriptor: true, ...options });
444
- return uri_1.Uri.file(f.name, this._isCaseSensitive);
441
+ return uri_1.Uri.file(f.name, this);
445
442
  }
446
443
  dispose() {
447
444
  var _a;
@@ -453,12 +450,54 @@ class RealTempFile {
453
450
  // ignore
454
451
  }
455
452
  }
453
+ isCaseSensitive(uri) {
454
+ if (uri.startsWith(fileUri_1.FileUriSchema)) {
455
+ return this._isLocalFileSystemCaseSensitive();
456
+ }
457
+ return true;
458
+ }
459
+ _isLocalFileSystemCaseSensitive() {
460
+ if (this._caseSensitivity === undefined) {
461
+ this._caseSensitivity = this._isFileSystemCaseSensitiveInternal();
462
+ }
463
+ return this._caseSensitivity;
464
+ }
456
465
  _getTmpDir() {
457
466
  if (!this._tmpdir) {
458
467
  this._tmpdir = tmp.dirSync({ prefix: 'pyright' });
459
468
  }
460
469
  return this._tmpdir;
461
470
  }
471
+ _isFileSystemCaseSensitiveInternal() {
472
+ let filePath = undefined;
473
+ try {
474
+ // Make unique file name.
475
+ let name;
476
+ let mangledFilePath;
477
+ do {
478
+ name = `${(0, crypto_1.randomBytesHex)(21)}-a`;
479
+ filePath = (0, pathUtils_1.combinePaths)(this._getTmpDir().name, name);
480
+ mangledFilePath = (0, pathUtils_1.combinePaths)(this._getTmpDir().name, name.toUpperCase());
481
+ } while (fs.existsSync(filePath) || fs.existsSync(mangledFilePath));
482
+ fs.writeFileSync(filePath, '', 'utf8');
483
+ // If file exists, then it is insensitive.
484
+ return !fs.existsSync(mangledFilePath);
485
+ }
486
+ catch (e) {
487
+ return false;
488
+ }
489
+ finally {
490
+ if (filePath) {
491
+ // remove temp file created
492
+ try {
493
+ fs.unlinkSync(filePath);
494
+ }
495
+ catch (e) {
496
+ /* ignored */
497
+ }
498
+ }
499
+ }
500
+ }
462
501
  }
463
502
  exports.RealTempFile = RealTempFile;
464
503
  //# sourceMappingURL=realFileSystem.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"realFileSystem.js","sourceRoot":"","sources":["../../../../../src/common/realFileSystem.ts"],"names":[],"mappings":";AAAA;;;;GAIG;;;;;;;;;;;;;;;;;;;;;;;;;;AAEH,0CAA+G;AAC/G,4CAAgD;AAChD,uCAAyB;AACzB,yCAA2B;AAC3B,mDAA8C;AAE9C,uCAA0D;AAE1D,+CAOuB;AACvB,2CAA4C;AAC5C,2CAAwC;AACxC,mCAAgC;AAChC,6CAAuE;AAEvE,6DAA6D;AAC7D,GAAG,CAAC,kBAAkB,EAAE,CAAC;AAEzB,oEAAoE;AACpE,4DAA4D;AAC5D,SAAgB,wBAAwB,CACpC,OAA0B,EAC1B,mBAAyC;IAEzC,OAAO,GAAG,OAAO,aAAP,OAAO,cAAP,OAAO,GAAI,IAAI,qBAAW,EAAE,CAAC;IACvC,OAAO,IAAI,cAAc,CAAC,mBAAmB,aAAnB,mBAAmB,cAAnB,mBAAmB,GAAI,qCAAuB,EAAE,OAAO,CAAC,CAAC;AACvF,CAAC;AAND,4DAMC;AAED,MAAM,OAAO,GAAG,MAAM,CAAC;AACvB,MAAM,OAAO,GAAG,MAAM,CAAC;AACvB,MAAM,OAAO,GAAG,MAAM,CAAC;AAEvB,6EAA6E;AAC7E,iIAAiI;AACjI,SAAS,cAAc,CAAC,IAAY;IAChC,IAAI,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IAChC,IAAI,GAAG,IAAI,CAAC,EAAE;QACV,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;QAC5B,IAAI,GAAG,IAAI,CAAC,EAAE;YACV,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;YAC5B,IAAI,GAAG,IAAI,CAAC,EAAE;gBACV,OAAO,IAAI,CAAC;aACf;SACJ;KACJ;IAED,8BAA8B;IAC9B,IAAI,IAAI,CAAC,GAAG,GAAG,CAAC,CAAC,KAAK,aAAK,CAAC,GAAG;QAAE,OAAO,IAAI,CAAC;IAE7C,MAAM,WAAW,GAAG,GAAG,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,2CAA2C;IAErF,kFAAkF;IAClF,IAAI,IAAI,CAAC,MAAM,GAAG,WAAW,IAAI,IAAI,CAAC,WAAW,CAAC,KAAK,aAAK,CAAC,GAAG;QAAE,OAAO,IAAI,CAAC;IAE9E,OAAO,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,WAAW,CAAiB,CAAC;AACtD,CAAC;AAED,SAAS,eAAe,CAAC,CAAS;IAC9B,OAAO,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;AAC7E,CAAC;AAED,8FAA8F;AAC9F,MAAM,QAAQ,GAAG;IACb,MAAM,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;IACrC,MAAM,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;IACrC,MAAM,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;CACxC,CAAC;AAEF,SAAS,WAAW,CAAC,EAAwB,EAAE,CAAe;IAC1D,IAAI,EAAsB,CAAC;IAC3B,IAAI;QACA,EAAE,GAAG,EAAE,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;QACzB,MAAM,MAAM,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QAC/B,MAAM,SAAS,GAAG,EAAE,CAAC,QAAQ,CAAC,EAAE,EAAE,MAAM,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;QACnD,IAAI,SAAS,GAAG,CAAC,EAAE;YACf,OAAO,KAAK,CAAC;SAChB;QAED,KAAK,MAAM,KAAK,IAAI,QAAQ,EAAE;YAC1B,IAAI,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE;gBAC7B,OAAO,IAAI,CAAC;aACf;SACJ;QAED,OAAO,KAAK,CAAC;KAChB;IAAC,MAAM;QACJ,OAAO,KAAK,CAAC;KAChB;YAAS;QACN,IAAI,EAAE,KAAK,SAAS,EAAE;YAClB,EAAE,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC;SACpB;KACJ;AACL,CAAC;AAED,yDAAyD;AAEzD,wEAAwE;AACxE,EAAE;AACF,wEAAwE;AACxE,sEAAsE;AACtE,yEAAyE;AACzE,2CAA2C;AAC3C,6DAA6D;AAC7D,kBAAkB;AAClB,MAAM,YAAa,SAAQ,iBAAS;IAOvB,OAAO,CAAC,CAAe;QAC5B,IAAI,IAAI,CAAC,MAAM,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC;YAAE,OAAO,IAAI,CAAC;QAErD,IAAI,QAAQ,GAAG,EAAkB,CAAC;QAElC,OAAO,IAAI,EAAE;YACT,MAAM,WAAW,GAAG,cAAc,CAAC,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC;YAC9D,IAAI,CAAC,WAAW;gBAAE,OAAO,IAAI,CAAC;YAE9B,QAAQ,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,QAAQ,EAAE,WAAW,CAAC,CAAC;YAEtD,IAAI,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,QAAQ,CAAC,KAAK,KAAK,EAAE;gBACpC,IAAI,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;oBAAE,SAAS;gBAExC,IAAI;oBACA,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC,MAAM,EAAE,EAAE;wBAC3C,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;wBAC1B,SAAS;qBACZ;oBAED,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,CAAC,EAAE;wBACrC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;wBAC1B,SAAS;qBACZ;oBAED,IAAI;wBACA,0EAA0E;wBAC1E,kFAAkF;wBAClF,6EAA6E;wBAC7E,4EAA4E;wBAC5E,wEAAwE;wBACxE,gEAAgE;wBAChE,IAAI,CAAC,UAAU,CAAC,QAAQ,EAAE,GAAG,EAAE,GAAE,CAAC,CAAC,CAAC;qBACvC;oBAAC,MAAM;wBACJ,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;wBAC1B,SAAS;qBACZ;iBACJ;gBAAC,MAAM;oBACJ,OAAO,IAAI,CAAC;iBACf;gBAED,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;aAC5B;YAED,OAAO;gBACH,WAAW,EAAE,QAAQ;gBACrB,OAAO,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,oBAAY,CAAC,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAiB,CAAC;aAC7F,CAAC;SACL;IACL,CAAC;IAED,uDAAuD;IACtC,UAAU,CAAI,CAAe,EAAE,MAA2B;QACvE,6DAA6D;QAC7D,kBAAkB;QAClB,OAAO,KAAK,CAAC,UAAU,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC;IACvC,CAAC;CACJ;AAED,wDAAwD;AAExD,MAAM,MAAO,SAAQ,eAAO;IAGxB;QACI,MAAM,YAAY,GAAG,IAAI,YAAY,CAAC;YAClC,MAAM,EAAE,GAAG,EAAE,CAAC,IAAA,sBAAa,GAAE;YAC7B,QAAQ,EAAE,IAAI;YACd,YAAY,EAAE,EAAE;YAChB,gBAAgB,EAAE,IAAI;SACzB,CAAC,CAAC;QAEH,KAAK,CACD,IAAI,iBAAS,CAAC;YACV,MAAM,EAAE,YAAY;SACvB,CAAC,CACL,CAAC;QAEF,IAAI,CAAC,aAAa,GAAG,YAAY,CAAC;IACtC,CAAC;IAED,KAAK,CAAC,CAAa;QACf,OAAO,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC;IAC3D,CAAC;CACJ;AAED,MAAM,MAAM,GAAG,IAAI,MAAM,EAAE,CAAC;AAE5B,MAAM,cAAc;IAEhB,YAAoB,oBAAyC,EAAU,QAA0B;QAA7E,yBAAoB,GAApB,oBAAoB,CAAqB;QAAU,aAAQ,GAAR,QAAQ,CAAkB;QADzF,qBAAgB,GAAG,IAAI,CAAC;QAE5B,IAAI,CAAC,gBAAgB,GAAG,IAAA,oCAAyB,EAAC,IAAI,EAAE,IAAI,YAAY,CAAC,qBAAqB,CAAC,IAAI,CAAC,CAAC,CAAC;IAC1G,CAAC;IAED,IAAI,eAAe;QACf,OAAO,IAAI,CAAC,gBAAgB,CAAC;IACjC,CAAC;IACD,UAAU,CAAC,GAAQ;QACf,IAAI,GAAG,CAAC,OAAO,EAAE,IAAI,CAAC,iBAAO,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE;YAC1C,OAAO,KAAK,CAAC;SAChB;QACD,MAAM,IAAI,GAAG,GAAG,CAAC,WAAW,EAAE,CAAC;QAC/B,IAAI;YACA,0EAA0E;YAC1E,OAAO,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;SAClC;QAAC,MAAM;YACJ,OAAO,KAAK,CAAC;SAChB;IACL,CAAC;IAED,SAAS,CAAC,GAAQ,EAAE,OAAsB;QACtC,MAAM,IAAI,GAAG,GAAG,CAAC,WAAW,EAAE,CAAC;QAC/B,MAAM,CAAC,SAAS,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IACpC,CAAC;IAED,KAAK,CAAC,GAAQ;QACV,MAAM,IAAI,GAAG,GAAG,CAAC,WAAW,EAAE,CAAC;QAC/B,gEAAgE;QAChE,8BAA8B;QAC9B,IAAI,6BAAY,EAAE;YACd,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;SACvB;IACL,CAAC;IAED,WAAW,CAAC,GAAQ;QAChB,MAAM,IAAI,GAAG,GAAG,CAAC,WAAW,EAAE,CAAC;QAC/B,OAAO,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;IACpC,CAAC;IAED,kBAAkB,CAAC,GAAQ;QACvB,MAAM,IAAI,GAAG,GAAG,CAAC,WAAW,EAAE,CAAC;QAC/B,OAAO,MAAM,CAAC,WAAW,CAAC,IAAI,EAAE,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,KAAK,EAAa,EAAE;YAC9E,sCAAsC;YACtC,mGAAmG;YACnG,IAAI,eAAe,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE;gBAC7B,IAAI,KAAK,CAAC,MAAM,EAAE,IAAI,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE;oBACtC,OAAO;wBACH,IAAI,EAAE,KAAK,CAAC,IAAI;wBAChB,MAAM,EAAE,GAAG,EAAE,CAAC,KAAK;wBACnB,WAAW,EAAE,GAAG,EAAE,CAAC,IAAI;wBACvB,aAAa,EAAE,GAAG,EAAE,CAAC,KAAK;wBAC1B,iBAAiB,EAAE,GAAG,EAAE,CAAC,KAAK;wBAC9B,cAAc,EAAE,GAAG,EAAE,CAAC,KAAK;wBAC3B,MAAM,EAAE,GAAG,EAAE,CAAC,KAAK;wBACnB,QAAQ,EAAE,GAAG,EAAE,CAAC,KAAK;qBACxB,CAAC;iBACL;aACJ;YACD,OAAO,KAAK,CAAC;QACjB,CAAC,CAAC,CAAC;IACP,CAAC;IAKD,YAAY,CAAC,GAAQ,EAAE,WAAkC,IAAI;QACzD,MAAM,IAAI,GAAG,GAAG,CAAC,WAAW,EAAE,CAAC;QAC/B,IAAI,QAAQ,KAAK,MAAM,IAAI,QAAQ,KAAK,OAAO,EAAE;YAC7C,OAAO,MAAM,CAAC,YAAY,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;SAC5C;QACD,OAAO,MAAM,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;IACrC,CAAC;IAED,aAAa,CAAC,GAAQ,EAAE,IAAqB,EAAE,QAA+B;QAC1E,MAAM,IAAI,GAAG,GAAG,CAAC,WAAW,EAAE,CAAC;QAC/B,MAAM,CAAC,aAAa,CAAC,IAAI,EAAE,IAAI,EAAE,QAAQ,IAAI,SAAS,CAAC,CAAC;IAC5D,CAAC;IAED,QAAQ,CAAC,GAAQ;QACb,IAAI,iBAAO,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE;YACxB,MAAM,IAAI,GAAG,GAAG,CAAC,WAAW,EAAE,CAAC;YAC/B,MAAM,IAAI,GAAG,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;YACnC,sCAAsC;YACtC,mGAAmG;YACnG,IAAI,eAAe,CAAC,IAAI,CAAC,EAAE;gBACvB,IAAI,IAAI,CAAC,MAAM,EAAE,IAAI,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE;oBACrC,IAAI,CAAC,MAAM,GAAG,GAAG,EAAE,CAAC,KAAK,CAAC;oBAC1B,IAAI,CAAC,WAAW,GAAG,GAAG,EAAE,CAAC,IAAI,CAAC;oBAC7B,IAAY,CAAC,cAAc,GAAG,GAAG,EAAE,CAAC,IAAI,CAAC;oBAC1C,OAAO,IAAI,CAAC;iBACf;aACJ;YACD,OAAO,IAAI,CAAC;SACf;aAAM;YACH,OAAO;gBACH,MAAM,EAAE,GAAG,EAAE,CAAC,KAAK;gBACnB,WAAW,EAAE,GAAG,EAAE,CAAC,KAAK;gBACxB,aAAa,EAAE,GAAG,EAAE,CAAC,KAAK;gBAC1B,iBAAiB,EAAE,GAAG,EAAE,CAAC,KAAK;gBAC9B,cAAc,EAAE,GAAG,EAAE,CAAC,KAAK;gBAC3B,MAAM,EAAE,GAAG,EAAE,CAAC,KAAK;gBACnB,QAAQ,EAAE,GAAG,EAAE,CAAC,KAAK;gBACrB,GAAG,EAAE,CAAC;gBACN,OAAO,EAAE,CAAC;gBACV,OAAO,EAAE,CAAC;gBACV,OAAO,EAAE,CAAC;gBACV,WAAW,EAAE,CAAC;gBACd,IAAI,EAAE,CAAC;gBACP,OAAO,EAAE,CAAC;gBACV,MAAM,EAAE,CAAC;gBACT,GAAG,EAAE,CAAC;gBACN,IAAI,EAAE,CAAC;gBACP,KAAK,EAAE,CAAC;gBACR,GAAG,EAAE,CAAC;gBACN,GAAG,EAAE,CAAC;gBACN,IAAI,EAAE,CAAC;gBACP,KAAK,EAAE,IAAI,IAAI,EAAE;gBACjB,KAAK,EAAE,IAAI,IAAI,EAAE;gBACjB,KAAK,EAAE,IAAI,IAAI,EAAE;gBACjB,SAAS,EAAE,IAAI,IAAI,EAAE;aACxB,CAAC;SACL;IACL,CAAC;IAED,SAAS,CAAC,GAAQ;QACd,MAAM,IAAI,GAAG,GAAG,CAAC,WAAW,EAAE,CAAC;QAC/B,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;IAC3B,CAAC;IAED,UAAU,CAAC,GAAQ;QACf,MAAM,IAAI,GAAG,GAAG,CAAC,WAAW,EAAE,CAAC;QAC/B,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;IAC5B,CAAC;IAED,YAAY,CAAC,GAAQ;QACjB,IAAI;YACA,MAAM,IAAI,GAAG,GAAG,CAAC,WAAW,EAAE,CAAC;YAC/B,OAAO,SAAG,CAAC,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,IAAI,CAAC,EAAE,IAAI,CAAC,gBAAgB,CAAC,CAAC;SACrE;QAAC,OAAO,CAAM,EAAE;YACb,OAAO,GAAG,CAAC;SACd;IACL,CAAC;IAED,aAAa;QACT,kEAAkE;QAClE,8DAA8D;QAC9D,+BAA+B;QAC/B,OAAO,IAAA,qBAAU,EAAC,IAAI,CAAC,gBAAgB,CAAC,IAAI,SAAG,CAAC,KAAK,EAAE,CAAC;IAC5D,CAAC;IAED,uBAAuB,CAAC,KAAY,EAAE,QAAiC;QACnE,OAAO,IAAI,CAAC,oBAAoB,CAAC,iBAAiB,CAC9C,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC,EACjC,QAAQ,CACX,CAAC;IACN,CAAC;IAED,gBAAgB,CAAC,GAAQ;QACrB,MAAM,IAAI,GAAG,GAAG,CAAC,WAAW,EAAE,CAAC;QAC/B,OAAO,MAAM,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAC;IACzC,CAAC;IAED,iBAAiB,CAAC,GAAQ;QACtB,MAAM,IAAI,GAAG,GAAG,CAAC,WAAW,EAAE,CAAC;QAC/B,OAAO,MAAM,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAC;IAC1C,CAAC;IAED,YAAY,CAAC,GAAQ,EAAE,GAAQ;QAC3B,MAAM,OAAO,GAAG,GAAG,CAAC,WAAW,EAAE,CAAC;QAClC,MAAM,QAAQ,GAAG,GAAG,CAAC,WAAW,EAAE,CAAC;QACnC,MAAM,CAAC,YAAY,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;IAC3C,CAAC;IAED,QAAQ,CAAC,GAAQ;QACb,MAAM,IAAI,GAAG,GAAG,CAAC,WAAW,EAAE,CAAC;QAC/B,OAAO,MAAM,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC;IACxC,CAAC;IAED,KAAK,CAAC,YAAY,CAAC,GAAQ,EAAE,QAAwB;QACjD,MAAM,IAAI,GAAG,GAAG,CAAC,WAAW,EAAE,CAAC;QAC/B,IAAI,QAAQ,KAAK,MAAM,IAAI,QAAQ,KAAK,OAAO,EAAE;YAC7C,OAAO,MAAM,CAAC,eAAe,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;SAC/C;QACD,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC;QAClD,OAAO,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;IACrC,CAAC;IAED,YAAY,CAAC,GAAQ;QACjB,IAAI;YACA,+DAA+D;YAC/D,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE;gBACvB,OAAO,GAAG,CAAC;aACd;YAED,8DAA8D;YAC9D,mCAAmC;YACnC,MAAM,QAAQ,GAAG,EAAE,CAAC,YAAY,CAAC,MAAM,CAAC,GAAG,CAAC,WAAW,EAAE,CAAC,CAAC;YAE3D,0EAA0E;YAC1E,0EAA0E;YAC1E,6BAA6B;YAC7B,IAAI,GAAG,CAAC,WAAW,EAAE,CAAC,WAAW,EAAE,KAAK,QAAQ,CAAC,WAAW,EAAE,EAAE;gBAC5D,OAAO,GAAG,CAAC;aACd;YAED,kEAAkE;YAClE,IAAI,IAAA,yBAAa,EAAC,QAAQ,CAAC,KAAK,IAAA,yBAAa,EAAC,GAAG,CAAC,WAAW,EAAE,CAAC,EAAE;gBAC9D,OAAO,GAAG,CAAC;aACd;YAED,OAAO,SAAG,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,gBAAgB,CAAC,CAAC;SACpD;QAAC,OAAO,CAAM,EAAE;YACb,uCAAuC;YACvC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,6CAA6C,GAAG,KAAK,CAAC,EAAE,CAAC,CAAC;YAE5E,OAAO,GAAG,CAAC;SACd;IACL,CAAC;IAED,WAAW,CAAC,GAAQ;QAChB,OAAO,KAAK,CAAC;IACjB,CAAC;IAED,cAAc,CAAC,SAAc;QACzB,OAAO,SAAS,CAAC;IACrB,CAAC;IAED,YAAY,CAAC,WAAgB;QACzB,OAAO,WAAW,CAAC;IACvB,CAAC;IAED,OAAO,CAAC,GAAQ;QACZ,MAAM,IAAI,GAAG,GAAG,CAAC,WAAW,EAAE,CAAC;QAC/B,OAAO,8BAA8B,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAC3E,CAAC;CACJ;AAUD,MAAa,4BAA4B;IAAzC;QACY,kBAAa,GAA2B,EAAE,CAAC;IA+BvD,CAAC;IA7BG,iBAAiB,CAAC,cAAwB,EAAE,QAAiC;QACzE,MAAM,IAAI,GAAG,IAAI,CAAC;QAClB,MAAM,WAAW,GAAyB;YACtC,KAAK;gBACD,sCAAsC;gBACtC,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,KAAK,WAAW,CAAC,CAAC;YACzF,CAAC;YACD,cAAc;YACd,YAAY,EAAE,QAAQ;SACzB,CAAC;QAEF,2BAA2B;QAC3B,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;QAErC,OAAO,WAAW,CAAC;IACvB,CAAC;IAED,YAAY,CAAC,SAA+B,EAAE,OAAY;QACtD,8EAA8E;QAC9E,oFAAoF;QACpF,iFAAiF;QACjF,mFAAmF;QACnF,oEAAoE;QACpE,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;YACnC,IAAI,OAAO,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,EAAE;gBACrF,OAAO,CAAC,YAAY,CAAC,SAAS,EAAE,OAAO,CAAC,WAAW,EAAE,CAAC,CAAC;aAC1D;QACL,CAAC,CAAC,CAAC;IACP,CAAC;CACJ;AAhCD,oEAgCC;AAED,MAAa,YAAY;IAGrB,YAA6B,gBAAyB;QAAzB,qBAAgB,GAAhB,gBAAgB,CAAS;IAAG,CAAC;IAE1D,MAAM;QACF,OAAO,SAAG,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC,gBAAgB,CAAC,CAAC;IACnE,CAAC;IAED,OAAO,CAAC,OAAwB;QAC5B,MAAM,CAAC,GAAG,GAAG,CAAC,QAAQ,CAAC,EAAE,GAAG,EAAE,IAAI,CAAC,UAAU,EAAE,CAAC,IAAI,EAAE,iBAAiB,EAAE,IAAI,EAAE,GAAG,OAAO,EAAE,CAAC,CAAC;QAC7F,OAAO,SAAG,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,EAAE,IAAI,CAAC,gBAAgB,CAAC,CAAC;IACnD,CAAC;IAED,OAAO;;QACH,IAAI;YACA,MAAA,IAAI,CAAC,OAAO,0CAAE,cAAc,EAAE,CAAC;YAC/B,IAAI,CAAC,OAAO,GAAG,SAAS,CAAC;SAC5B;QAAC,MAAM;YACJ,SAAS;SACZ;IACL,CAAC;IAEO,UAAU;QACd,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE;YACf,IAAI,CAAC,OAAO,GAAG,GAAG,CAAC,OAAO,CAAC,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC,CAAC;SACrD;QAED,OAAO,IAAI,CAAC,OAAO,CAAC;IACxB,CAAC;CACJ;AA9BD,oCA8BC"}
1
+ {"version":3,"file":"realFileSystem.js","sourceRoot":"","sources":["../../../../../src/common/realFileSystem.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,21 @@
1
+ import { CacheManager } from '../analyzer/cacheManager';
2
+ import { ISourceFileFactory } from '../analyzer/programTypes';
3
+ import { SupportPartialStubs } from '../pyrightFileSystem';
4
+ import { CaseSensitivityDetector } from './caseSensitivityDetector';
5
+ import { ConsoleInterface } from './console';
6
+ import { DebugInfoInspector, StatusMutationListener, SymbolDefinitionProvider, SymbolUsageProviderFactory } from './extensibility';
7
+ import { FileSystem, TempFile } from './fileSystem';
8
+ import { GroupServiceKey, ServiceKey } from './serviceProvider';
9
+ export declare namespace ServiceKeys {
10
+ const fs: ServiceKey<FileSystem>;
11
+ const console: ServiceKey<ConsoleInterface>;
12
+ const sourceFileFactory: ServiceKey<ISourceFileFactory>;
13
+ const partialStubs: ServiceKey<SupportPartialStubs>;
14
+ const symbolDefinitionProvider: GroupServiceKey<SymbolDefinitionProvider>;
15
+ const symbolUsageProviderFactory: GroupServiceKey<SymbolUsageProviderFactory>;
16
+ const stateMutationListeners: GroupServiceKey<StatusMutationListener>;
17
+ const tempFile: ServiceKey<TempFile>;
18
+ const cacheManager: ServiceKey<CacheManager>;
19
+ const debugInfoInspector: ServiceKey<DebugInfoInspector>;
20
+ const caseSensitivityDetector: ServiceKey<CaseSensitivityDetector>;
21
+ }
@@ -0,0 +1,26 @@
1
+ "use strict";
2
+ /*
3
+ * serviceKeys.ts
4
+ * Copyright (c) Microsoft Corporation.
5
+ * Licensed under the MIT license.
6
+ *
7
+ * Define service keys.
8
+ */
9
+ Object.defineProperty(exports, "__esModule", { value: true });
10
+ exports.ServiceKeys = void 0;
11
+ const serviceProvider_1 = require("./serviceProvider");
12
+ var ServiceKeys;
13
+ (function (ServiceKeys) {
14
+ ServiceKeys.fs = new serviceProvider_1.ServiceKey();
15
+ ServiceKeys.console = new serviceProvider_1.ServiceKey();
16
+ ServiceKeys.sourceFileFactory = new serviceProvider_1.ServiceKey();
17
+ ServiceKeys.partialStubs = new serviceProvider_1.ServiceKey();
18
+ ServiceKeys.symbolDefinitionProvider = new serviceProvider_1.GroupServiceKey();
19
+ ServiceKeys.symbolUsageProviderFactory = new serviceProvider_1.GroupServiceKey();
20
+ ServiceKeys.stateMutationListeners = new serviceProvider_1.GroupServiceKey();
21
+ ServiceKeys.tempFile = new serviceProvider_1.ServiceKey();
22
+ ServiceKeys.cacheManager = new serviceProvider_1.ServiceKey();
23
+ ServiceKeys.debugInfoInspector = new serviceProvider_1.ServiceKey();
24
+ ServiceKeys.caseSensitivityDetector = new serviceProvider_1.ServiceKey();
25
+ })(ServiceKeys || (exports.ServiceKeys = ServiceKeys = {}));
26
+ //# sourceMappingURL=serviceKeys.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"serviceKeys.js","sourceRoot":"","sources":["../../../../../src/common/serviceKeys.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;;AAcH,uDAAgE;AAEhE,IAAiB,WAAW,CAY3B;AAZD,WAAiB,WAAW;IACX,cAAE,GAAG,IAAI,4BAAU,EAAc,CAAC;IAClC,mBAAO,GAAG,IAAI,4BAAU,EAAoB,CAAC;IAC7C,6BAAiB,GAAG,IAAI,4BAAU,EAAsB,CAAC;IACzD,wBAAY,GAAG,IAAI,4BAAU,EAAuB,CAAC;IACrD,oCAAwB,GAAG,IAAI,iCAAe,EAA4B,CAAC;IAC3E,sCAA0B,GAAG,IAAI,iCAAe,EAA8B,CAAC;IAC/E,kCAAsB,GAAG,IAAI,iCAAe,EAA0B,CAAC;IACvE,oBAAQ,GAAG,IAAI,4BAAU,EAAY,CAAC;IACtC,wBAAY,GAAG,IAAI,4BAAU,EAAgB,CAAC;IAC9C,8BAAkB,GAAG,IAAI,4BAAU,EAAsB,CAAC;IAC1D,mCAAuB,GAAG,IAAI,4BAAU,EAA2B,CAAC;AACrF,CAAC,EAZgB,WAAW,2BAAX,WAAW,QAY3B"}
@@ -1,10 +1,9 @@
1
1
  import { CacheManager } from '../analyzer/cacheManager';
2
- import { ISourceFileFactory } from '../analyzer/program';
2
+ import { ISourceFileFactory } from '../analyzer/programTypes';
3
3
  import { SupportPartialStubs } from '../pyrightFileSystem';
4
4
  import { ConsoleInterface } from './console';
5
- import { DebugInfoInspector, StatusMutationListener, SymbolDefinitionProvider, SymbolUsageProviderFactory } from './extensibility';
6
5
  import { FileSystem, TempFile } from './fileSystem';
7
- import { GroupServiceKey, ServiceKey, ServiceProvider } from './serviceProvider';
6
+ import { ServiceProvider } from './serviceProvider';
8
7
  declare module './serviceProvider' {
9
8
  interface ServiceProvider {
10
9
  fs(): FileSystem;
@@ -12,18 +11,7 @@ declare module './serviceProvider' {
12
11
  tmp(): TempFile | undefined;
13
12
  sourceFileFactory(): ISourceFileFactory;
14
13
  partialStubs(): SupportPartialStubs;
14
+ cacheManager(): CacheManager | undefined;
15
15
  }
16
16
  }
17
- export declare namespace ServiceKeys {
18
- const fs: ServiceKey<FileSystem>;
19
- const console: ServiceKey<ConsoleInterface>;
20
- const sourceFileFactory: ServiceKey<ISourceFileFactory>;
21
- const partialStubs: ServiceKey<SupportPartialStubs>;
22
- const symbolDefinitionProvider: GroupServiceKey<SymbolDefinitionProvider>;
23
- const symbolUsageProviderFactory: GroupServiceKey<SymbolUsageProviderFactory>;
24
- const stateMutationListeners: GroupServiceKey<StatusMutationListener>;
25
- const tempFile: ServiceKey<TempFile>;
26
- const cacheManager: ServiceKey<CacheManager>;
27
- const debugInfoInspector: ServiceKey<DebugInfoInspector>;
28
- }
29
17
  export declare function createServiceProvider(...services: any): ServiceProvider;
@@ -1,6 +1,6 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.createServiceProvider = exports.ServiceKeys = void 0;
3
+ exports.createServiceProvider = void 0;
4
4
  /*
5
5
  * serviceProviderExtensions.ts
6
6
  * Copyright (c) Microsoft Corporation.
@@ -9,67 +9,63 @@ exports.createServiceProvider = exports.ServiceKeys = void 0;
9
9
  * Shortcuts to common services.
10
10
  */
11
11
  const cacheManager_1 = require("../analyzer/cacheManager");
12
- const program_1 = require("../analyzer/program");
12
+ const programTypes_1 = require("../analyzer/programTypes");
13
13
  const sourceFile_1 = require("../analyzer/sourceFile");
14
14
  const pyrightFileSystem_1 = require("../pyrightFileSystem");
15
+ const serviceKeys_1 = require("./serviceKeys");
16
+ const caseSensitivityDetector_1 = require("./caseSensitivityDetector");
15
17
  const console_1 = require("./console");
16
18
  const fileSystem_1 = require("./fileSystem");
17
19
  const serviceProvider_1 = require("./serviceProvider");
18
- var ServiceKeys;
19
- (function (ServiceKeys) {
20
- ServiceKeys.fs = new serviceProvider_1.ServiceKey();
21
- ServiceKeys.console = new serviceProvider_1.ServiceKey();
22
- ServiceKeys.sourceFileFactory = new serviceProvider_1.ServiceKey();
23
- ServiceKeys.partialStubs = new serviceProvider_1.ServiceKey();
24
- ServiceKeys.symbolDefinitionProvider = new serviceProvider_1.GroupServiceKey();
25
- ServiceKeys.symbolUsageProviderFactory = new serviceProvider_1.GroupServiceKey();
26
- ServiceKeys.stateMutationListeners = new serviceProvider_1.GroupServiceKey();
27
- ServiceKeys.tempFile = new serviceProvider_1.ServiceKey();
28
- ServiceKeys.cacheManager = new serviceProvider_1.ServiceKey();
29
- ServiceKeys.debugInfoInspector = new serviceProvider_1.ServiceKey();
30
- })(ServiceKeys || (exports.ServiceKeys = ServiceKeys = {}));
31
20
  function createServiceProvider(...services) {
32
21
  const sp = new serviceProvider_1.ServiceProvider();
33
22
  // For known interfaces, register the service.
34
23
  services.forEach((service) => {
35
24
  if (fileSystem_1.FileSystem.is(service)) {
36
- sp.add(ServiceKeys.fs, service);
25
+ sp.add(serviceKeys_1.ServiceKeys.fs, service);
37
26
  }
38
27
  if (console_1.ConsoleInterface.is(service)) {
39
- sp.add(ServiceKeys.console, service);
28
+ sp.add(serviceKeys_1.ServiceKeys.console, service);
40
29
  }
41
- if (program_1.ISourceFileFactory.is(service)) {
42
- sp.add(ServiceKeys.sourceFileFactory, service);
30
+ if (programTypes_1.ISourceFileFactory.is(service)) {
31
+ sp.add(serviceKeys_1.ServiceKeys.sourceFileFactory, service);
43
32
  }
44
33
  if (pyrightFileSystem_1.SupportPartialStubs.is(service)) {
45
- sp.add(ServiceKeys.partialStubs, service);
34
+ sp.add(serviceKeys_1.ServiceKeys.partialStubs, service);
46
35
  }
47
36
  if (fileSystem_1.TempFile.is(service)) {
48
- sp.add(ServiceKeys.tempFile, service);
37
+ sp.add(serviceKeys_1.ServiceKeys.tempFile, service);
38
+ }
39
+ if (caseSensitivityDetector_1.CaseSensitivityDetector.is(service)) {
40
+ sp.add(serviceKeys_1.ServiceKeys.caseSensitivityDetector, service);
49
41
  }
50
42
  if (cacheManager_1.CacheManager.is(service)) {
51
- sp.add(ServiceKeys.cacheManager, service);
43
+ sp.add(serviceKeys_1.ServiceKeys.cacheManager, service);
52
44
  }
53
45
  });
54
46
  return sp;
55
47
  }
56
48
  exports.createServiceProvider = createServiceProvider;
57
49
  serviceProvider_1.ServiceProvider.prototype.fs = function () {
58
- return this.get(ServiceKeys.fs);
50
+ return this.get(serviceKeys_1.ServiceKeys.fs);
59
51
  };
60
52
  serviceProvider_1.ServiceProvider.prototype.console = function () {
61
- return this.get(ServiceKeys.console);
53
+ return this.get(serviceKeys_1.ServiceKeys.console);
62
54
  };
63
55
  serviceProvider_1.ServiceProvider.prototype.partialStubs = function () {
64
- return this.get(ServiceKeys.partialStubs);
56
+ return this.get(serviceKeys_1.ServiceKeys.partialStubs);
65
57
  };
66
58
  serviceProvider_1.ServiceProvider.prototype.tmp = function () {
67
- return this.tryGet(ServiceKeys.tempFile);
59
+ return this.tryGet(serviceKeys_1.ServiceKeys.tempFile);
68
60
  };
69
61
  serviceProvider_1.ServiceProvider.prototype.sourceFileFactory = function () {
70
- const result = this.tryGet(ServiceKeys.sourceFileFactory);
62
+ const result = this.tryGet(serviceKeys_1.ServiceKeys.sourceFileFactory);
71
63
  return result || DefaultSourceFileFactory;
72
64
  };
65
+ serviceProvider_1.ServiceProvider.prototype.cacheManager = function () {
66
+ const result = this.tryGet(serviceKeys_1.ServiceKeys.cacheManager);
67
+ return result;
68
+ };
73
69
  const DefaultSourceFileFactory = {
74
70
  createSourceFile(serviceProvider, fileUri, moduleName, isThirdPartyImport, isThirdPartyPyTypedPresent, editMode, console, logTracker, ipythonMode) {
75
71
  return new sourceFile_1.SourceFile(serviceProvider, fileUri, moduleName, isThirdPartyImport, isThirdPartyPyTypedPresent, editMode, console, logTracker, ipythonMode);
@@ -1 +1 @@
1
- {"version":3,"file":"serviceProviderExtensions.js","sourceRoot":"","sources":["../../../../../src/common/serviceProviderExtensions.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"serviceProviderExtensions.js","sourceRoot":"","sources":["../../../../../src/common/serviceProviderExtensions.ts"],"names":[],"mappings":"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"}
@@ -1,7 +1,7 @@
1
1
  import { CancellationToken } from 'vscode-languageserver';
2
2
  import { ImportGroup, ImportNameInfo, ImportStatements, ModuleNameInfo } from '../analyzer/importStatementUtils';
3
3
  import { ImportAsNode, ImportFromAsNode, ImportFromNode, ParseNode } from '../parser/parseNodes';
4
- import { ParseResults } from '../parser/parser';
4
+ import { ParseFileResults } from '../parser/parser';
5
5
  import { FileEditAction } from './editAction';
6
6
  import { Range, TextRange } from './textRange';
7
7
  import { Uri } from './uri/uri';
@@ -13,15 +13,15 @@ export declare class TextEditTracker {
13
13
  constructor(_mergeOnlyDuplications?: boolean);
14
14
  addEdits(...edits: FileEditAction[]): void;
15
15
  addEdit(fileUri: Uri, range: Range, replacementText: string): void;
16
- addEditWithTextRange(parseResults: ParseResults, range: TextRange, replacementText: string): void;
17
- deleteImportName(parseResults: ParseResults, importToDelete: ImportFromAsNode | ImportAsNode): void;
18
- addOrUpdateImport(parseResults: ParseResults, importStatements: ImportStatements, moduleNameInfo: ModuleNameInfo, importGroup: ImportGroup, importNameInfo?: ImportNameInfo[], updateOptions?: {
16
+ addEditWithTextRange(parseFileResults: ParseFileResults, range: TextRange, replacementText: string): void;
17
+ deleteImportName(parseFileResults: ParseFileResults, importToDelete: ImportFromAsNode | ImportAsNode): void;
18
+ addOrUpdateImport(parseFileResults: ParseFileResults, importStatements: ImportStatements, moduleNameInfo: ModuleNameInfo, importGroup: ImportGroup, importNameInfo?: ImportNameInfo[], updateOptions?: {
19
19
  currentFromImport: ImportFromNode;
20
20
  originalModuleName: string;
21
21
  }): void;
22
22
  removeNodes(...nodes: {
23
23
  node: ParseNode;
24
- parseResults: ParseResults;
24
+ parseFileResults: ParseFileResults;
25
25
  }[]): void;
26
26
  isNodeRemoved(node: ParseNode): boolean;
27
27
  getEdits(token: CancellationToken): FileEditAction[];
@@ -66,25 +66,25 @@ class TextEditTracker {
66
66
  }
67
67
  edits.push({ fileUri: fileUri, range, replacementText });
68
68
  }
69
- addEditWithTextRange(parseResults, range, replacementText) {
70
- const filePath = (0, analyzerNodeInfo_1.getFileInfo)(parseResults.parseTree).fileUri;
71
- const existing = parseResults.text.substr(range.start, range.length);
69
+ addEditWithTextRange(parseFileResults, range, replacementText) {
70
+ const filePath = (0, analyzerNodeInfo_1.getFileInfo)(parseFileResults.parserOutput.parseTree).fileUri;
71
+ const existing = parseFileResults.text.substr(range.start, range.length);
72
72
  if (existing === replacementText) {
73
73
  // No change. Return as it is.
74
74
  return;
75
75
  }
76
- this.addEdit(filePath, (0, positionUtils_1.convertTextRangeToRange)(range, parseResults.tokenizerOutput.lines), replacementText);
76
+ this.addEdit(filePath, (0, positionUtils_1.convertTextRangeToRange)(range, parseFileResults.tokenizerOutput.lines), replacementText);
77
77
  }
78
- deleteImportName(parseResults, importToDelete) {
78
+ deleteImportName(parseFileResults, importToDelete) {
79
79
  // TODO: remove all these manual text handling and merge it to _processNodeRemoved that is
80
80
  // used by remove unused imports.
81
81
  const imports = importToDelete.nodeType === 21 /* ParseNodeType.ImportAs */
82
82
  ? importToDelete.parent.list
83
83
  : importToDelete.parent.imports;
84
- const filePath = (0, analyzerNodeInfo_1.getFileInfo)(parseResults.parseTree).fileUri;
85
- const ranges = (0, importStatementUtils_1.getTextRangeForImportNameDeletion)(parseResults, imports, imports.findIndex((v) => v === importToDelete));
86
- ranges.forEach((r) => this.addEditWithTextRange(parseResults, r, ''));
87
- this._markNodeRemoved(importToDelete, parseResults);
84
+ const filePath = (0, analyzerNodeInfo_1.getFileInfo)(parseFileResults.parserOutput.parseTree).fileUri;
85
+ const ranges = (0, importStatementUtils_1.getTextRangeForImportNameDeletion)(parseFileResults, imports, imports.findIndex((v) => v === importToDelete));
86
+ ranges.forEach((r) => this.addEditWithTextRange(parseFileResults, r, ''));
87
+ this._markNodeRemoved(importToDelete, parseFileResults);
88
88
  // Check whether we have deleted all trailing import names.
89
89
  // If either no trailing import is deleted or handled properly
90
90
  // then, there is nothing to do. otherwise, either delete the whole statement
@@ -101,7 +101,7 @@ class TextEditTracker {
101
101
  // ex) [from x import a, b, c] or [import a]
102
102
  const importStatement = importToDelete.parent;
103
103
  if (importStatement) {
104
- this.addEdit(filePath, ParseTreeUtils.getFullStatementRange(importStatement, parseResults), '');
104
+ this.addEdit(filePath, ParseTreeUtils.getFullStatementRange(importStatement, parseFileResults), '');
105
105
  }
106
106
  }
107
107
  else if (lastImportIndexNotDeleted >= 0 && lastImportIndexNotDeleted < imports.length - 2) {
@@ -109,17 +109,17 @@ class TextEditTracker {
109
109
  // ex) from x import a, [b, c]
110
110
  const start = textRange_1.TextRange.getEnd(imports[lastImportIndexNotDeleted]);
111
111
  const length = textRange_1.TextRange.getEnd(imports[lastImportIndexNotDeleted + 1]) - start;
112
- this.addEditWithTextRange(parseResults, { start, length }, '');
112
+ this.addEditWithTextRange(parseFileResults, { start, length }, '');
113
113
  }
114
114
  }
115
- addOrUpdateImport(parseResults, importStatements, moduleNameInfo, importGroup, importNameInfo, updateOptions) {
115
+ addOrUpdateImport(parseFileResults, importStatements, moduleNameInfo, importGroup, importNameInfo, updateOptions) {
116
116
  // TODO: remove all these manual text handling and merge it to _processNodeRemoved that is
117
117
  // used by remove unused imports.
118
118
  if (importNameInfo &&
119
- this._tryUpdateImport(parseResults, importStatements, moduleNameInfo, importNameInfo, updateOptions)) {
119
+ this._tryUpdateImport(parseFileResults, importStatements, moduleNameInfo, importNameInfo, updateOptions)) {
120
120
  return;
121
121
  }
122
- this._addImport(parseResults, importStatements, moduleNameInfo, importGroup, importNameInfo);
122
+ this._addImport(parseFileResults, importStatements, moduleNameInfo, importGroup, importNameInfo);
123
123
  }
124
124
  removeNodes(...nodes) {
125
125
  this._pendingNodeToRemove.push(...nodes);
@@ -133,11 +133,11 @@ class TextEditTracker {
133
133
  this._results.forEach((v) => (0, collectionUtils_1.appendArray)(edits, v));
134
134
  return edits;
135
135
  }
136
- _addImport(parseResults, importStatements, moduleNameInfo, importGroup, importNameInfo) {
137
- const fileUri = (0, analyzerNodeInfo_1.getFileInfo)(parseResults.parseTree).fileUri;
138
- this.addEdits(...(0, importStatementUtils_1.getTextEditsForAutoImportInsertion)(importNameInfo !== null && importNameInfo !== void 0 ? importNameInfo : [], moduleNameInfo, importStatements, importGroup, parseResults, (0, positionUtils_1.convertOffsetToPosition)(parseResults.parseTree.length, parseResults.tokenizerOutput.lines)).map((e) => ({ fileUri, range: e.range, replacementText: e.replacementText })));
136
+ _addImport(parseFileResults, importStatements, moduleNameInfo, importGroup, importNameInfo) {
137
+ const fileUri = (0, analyzerNodeInfo_1.getFileInfo)(parseFileResults.parserOutput.parseTree).fileUri;
138
+ this.addEdits(...(0, importStatementUtils_1.getTextEditsForAutoImportInsertion)(importNameInfo !== null && importNameInfo !== void 0 ? importNameInfo : [], moduleNameInfo, importStatements, importGroup, parseFileResults, (0, positionUtils_1.convertOffsetToPosition)(parseFileResults.parserOutput.parseTree.length, parseFileResults.tokenizerOutput.lines)).map((e) => ({ fileUri, range: e.range, replacementText: e.replacementText })));
139
139
  }
140
- _tryUpdateImport(parseResults, importStatements, moduleNameInfo, importNameInfo, updateOptions) {
140
+ _tryUpdateImport(parseFileResults, importStatements, moduleNameInfo, importNameInfo, updateOptions) {
141
141
  if (!updateOptions) {
142
142
  return false;
143
143
  }
@@ -148,8 +148,8 @@ class TextEditTracker {
148
148
  if (!imported || imported.node.nodeType !== 22 /* ParseNodeType.ImportFrom */ || imported.node.isWildcardImport) {
149
149
  return false;
150
150
  }
151
- const fileUri = (0, analyzerNodeInfo_1.getFileInfo)(parseResults.parseTree).fileUri;
152
- const edits = (0, importStatementUtils_1.getTextEditsForAutoImportSymbolAddition)(importNameInfo, imported, parseResults);
151
+ const fileUri = (0, analyzerNodeInfo_1.getFileInfo)(parseFileResults.parserOutput.parseTree).fileUri;
152
+ const edits = (0, importStatementUtils_1.getTextEditsForAutoImportSymbolAddition)(importNameInfo, imported, parseFileResults);
153
153
  if (imported.node !== updateOptions.currentFromImport) {
154
154
  // Add what we want to the existing "import from" statement as long as it is not the same import
155
155
  // node we are working on.
@@ -186,7 +186,7 @@ class TextEditTracker {
186
186
  if (importName.alias) {
187
187
  this._nodesRemoved.delete(importName.alias);
188
188
  }
189
- this.addEdit(fileUri, (0, positionUtils_1.convertTextRangeToRange)(importName.name, parseResults.tokenizerOutput.lines), newLastModuleName);
189
+ this.addEdit(fileUri, (0, positionUtils_1.convertTextRangeToRange)(importName.name, parseFileResults.tokenizerOutput.lines), newLastModuleName);
190
190
  return true;
191
191
  }
192
192
  _getDeletionsForSpan(fileUriOrEdit, range) {
@@ -195,7 +195,7 @@ class TextEditTracker {
195
195
  }
196
196
  _removeEdits(fileUriOrEdit, edits) {
197
197
  var _a;
198
- if (uri_1.Uri.isUri(fileUriOrEdit)) {
198
+ if (uri_1.Uri.is(fileUriOrEdit)) {
199
199
  fileUriOrEdit = (_a = this._results.get(fileUriOrEdit.key)) !== null && _a !== void 0 ? _a : [];
200
200
  }
201
201
  (0, collectionUtils_1.removeArrayElements)(fileUriOrEdit, (f) => edits.some((e) => editAction_1.FileEditAction.areEqual(f, e)));
@@ -220,7 +220,7 @@ class TextEditTracker {
220
220
  }
221
221
  _getOverlappingForSpan(fileUriOrEdit, range) {
222
222
  var _a;
223
- if (uri_1.Uri.isUri(fileUriOrEdit)) {
223
+ if (uri_1.Uri.is(fileUriOrEdit)) {
224
224
  fileUriOrEdit = (_a = this._results.get(fileUriOrEdit.key)) !== null && _a !== void 0 ? _a : [];
225
225
  }
226
226
  return fileUriOrEdit.filter((e) => (0, textRange_1.doRangesIntersect)(e.range, range));
@@ -236,7 +236,7 @@ class TextEditTracker {
236
236
  debug.assert(`please add handler for ${peekNodeToRemove.node.nodeType}`);
237
237
  // As a default behavior, we will just remove the node
238
238
  this._pendingNodeToRemove.pop();
239
- const info = (0, analyzerNodeInfo_1.getFileInfo)(peekNodeToRemove.parseResults.parseTree);
239
+ const info = (0, analyzerNodeInfo_1.getFileInfo)(peekNodeToRemove.parseFileResults.parserOutput.parseTree);
240
240
  this.addEdit(info.fileUri, (0, positionUtils_1.convertTextRangeToRange)(peekNodeToRemove.node, info.lines), '');
241
241
  }
242
242
  }
@@ -246,7 +246,7 @@ class TextEditTracker {
246
246
  if (node.nodeType !== 38 /* ParseNodeType.Name */) {
247
247
  return false;
248
248
  }
249
- const module = nodeToRemove.parseResults.parseTree;
249
+ const module = nodeToRemove.parseFileResults.parserOutput.parseTree;
250
250
  const info = (0, analyzerNodeInfo_1.getFileInfo)(module);
251
251
  const importNode = (0, importStatementUtils_1.getContainingImportStatement)(ParseTreeUtils.findNodeByOffset(module, node.start), token);
252
252
  if (!importNode) {
@@ -257,7 +257,7 @@ class TextEditTracker {
257
257
  // 1. check whether all imported names in the import statement is not used.
258
258
  const nodesRemoved = this._pendingNodeToRemove.filter((nodeToRemove) => nameNodes.some((n) => textRange_1.TextRange.overlapsRange(nodeToRemove.node, n)));
259
259
  if (nameNodes.length === nodesRemoved.length) {
260
- this.addEdit(info.fileUri, ParseTreeUtils.getFullStatementRange(importNode, nodeToRemove.parseResults), '');
260
+ this.addEdit(info.fileUri, ParseTreeUtils.getFullStatementRange(importNode, nodeToRemove.parseFileResults), '');
261
261
  // Remove nodes that are handled from queue.
262
262
  this._removeNodesHandled(nodesRemoved);
263
263
  return true;
@@ -274,29 +274,29 @@ class TextEditTracker {
274
274
  // can't find module user wants to remove
275
275
  return false;
276
276
  }
277
- const editSpans = (0, importStatementUtils_1.getTextRangeForImportNameDeletion)(nodeToRemove.parseResults, nameNodes, ...indices);
277
+ const editSpans = (0, importStatementUtils_1.getTextRangeForImportNameDeletion)(nodeToRemove.parseFileResults, nameNodes, ...indices);
278
278
  editSpans.forEach((e) => this.addEdit(info.fileUri, (0, positionUtils_1.convertTextRangeToRange)(e, info.lines), ''));
279
279
  this._removeNodesHandled(nodesRemoved);
280
280
  return true;
281
281
  }
282
282
  _removeNodesHandled(nodesRemoved) {
283
- nodesRemoved.forEach((n) => this._markNodeRemoved(n.node, n.parseResults));
283
+ nodesRemoved.forEach((n) => this._markNodeRemoved(n.node, n.parseFileResults));
284
284
  (0, collectionUtils_1.removeArrayElements)(this._pendingNodeToRemove, (n) => this._nodesRemoved.has(n.node));
285
285
  }
286
- _markNodeRemoved(nodeToDelete, parseResults) {
286
+ _markNodeRemoved(nodeToDelete, parseFileResults) {
287
287
  // Mark that we don't need to process these node again later.
288
- this._nodesRemoved.set(nodeToDelete, parseResults);
288
+ this._nodesRemoved.set(nodeToDelete, parseFileResults);
289
289
  if (nodeToDelete.nodeType === 21 /* ParseNodeType.ImportAs */) {
290
- this._nodesRemoved.set(nodeToDelete.module, parseResults);
291
- nodeToDelete.module.nameParts.forEach((n) => this._nodesRemoved.set(n, parseResults));
290
+ this._nodesRemoved.set(nodeToDelete.module, parseFileResults);
291
+ nodeToDelete.module.nameParts.forEach((n) => this._nodesRemoved.set(n, parseFileResults));
292
292
  if (nodeToDelete.alias) {
293
- this._nodesRemoved.set(nodeToDelete.alias, parseResults);
293
+ this._nodesRemoved.set(nodeToDelete.alias, parseFileResults);
294
294
  }
295
295
  }
296
296
  else if (nodeToDelete.nodeType === 23 /* ParseNodeType.ImportFromAs */) {
297
- this._nodesRemoved.set(nodeToDelete.name, parseResults);
297
+ this._nodesRemoved.set(nodeToDelete.name, parseFileResults);
298
298
  if (nodeToDelete.alias) {
299
- this._nodesRemoved.set(nodeToDelete.alias, parseResults);
299
+ this._nodesRemoved.set(nodeToDelete.alias, parseFileResults);
300
300
  }
301
301
  }
302
302
  }