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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (202) hide show
  1. package/dist/analyzer/checker.d.ts +2 -0
  2. package/dist/analyzer/checker.js +64 -14
  3. package/dist/analyzer/checker.js.map +1 -1
  4. package/dist/analyzer/codeFlowEngine.js +2 -2
  5. package/dist/analyzer/codeFlowEngine.js.map +1 -1
  6. package/dist/analyzer/constraintSolver.js +6 -0
  7. package/dist/analyzer/constraintSolver.js.map +1 -1
  8. package/dist/analyzer/dataClasses.js +2 -2
  9. package/dist/analyzer/dataClasses.js.map +1 -1
  10. package/dist/analyzer/decorators.js +9 -9
  11. package/dist/analyzer/decorators.js.map +1 -1
  12. package/dist/analyzer/importResolver.d.ts +2 -2
  13. package/dist/analyzer/importResolver.js +93 -24
  14. package/dist/analyzer/importResolver.js.map +1 -1
  15. package/dist/analyzer/operations.js +4 -3
  16. package/dist/analyzer/operations.js.map +1 -1
  17. package/dist/analyzer/parseTreeUtils.js +37 -0
  18. package/dist/analyzer/parseTreeUtils.js.map +1 -1
  19. package/dist/analyzer/patternMatching.js +4 -4
  20. package/dist/analyzer/patternMatching.js.map +1 -1
  21. package/dist/analyzer/program.js +1 -1
  22. package/dist/analyzer/program.js.map +1 -1
  23. package/dist/analyzer/protocols.js +27 -20
  24. package/dist/analyzer/protocols.js.map +1 -1
  25. package/dist/analyzer/service.d.ts +1 -1
  26. package/dist/analyzer/service.js +7 -6
  27. package/dist/analyzer/service.js.map +1 -1
  28. package/dist/analyzer/sourceFile.d.ts +2 -2
  29. package/dist/analyzer/sourceFile.js +5 -5
  30. package/dist/analyzer/sourceFile.js.map +1 -1
  31. package/dist/analyzer/sourceFileInfoUtils.js +1 -1
  32. package/dist/analyzer/sourceFileInfoUtils.js.map +1 -1
  33. package/dist/analyzer/typeEvaluator.js +228 -133
  34. package/dist/analyzer/typeEvaluator.js.map +1 -1
  35. package/dist/analyzer/typeEvaluatorTypes.d.ts +4 -3
  36. package/dist/analyzer/typeEvaluatorTypes.js +2 -4
  37. package/dist/analyzer/typeEvaluatorTypes.js.map +1 -1
  38. package/dist/analyzer/typeGuards.js +14 -9
  39. package/dist/analyzer/typeGuards.js.map +1 -1
  40. package/dist/analyzer/typeUtils.d.ts +2 -1
  41. package/dist/analyzer/typeUtils.js +13 -0
  42. package/dist/analyzer/typeUtils.js.map +1 -1
  43. package/dist/analyzer/types.d.ts +9 -5
  44. package/dist/analyzer/types.js +38 -23
  45. package/dist/analyzer/types.js.map +1 -1
  46. package/dist/backgroundAnalysisBase.d.ts +12 -11
  47. package/dist/backgroundAnalysisBase.js +60 -64
  48. package/dist/backgroundAnalysisBase.js.map +1 -1
  49. package/dist/backgroundThreadBase.d.ts +6 -5
  50. package/dist/backgroundThreadBase.js +63 -60
  51. package/dist/backgroundThreadBase.js.map +1 -1
  52. package/dist/commands/quickActionCommand.js +1 -1
  53. package/dist/commands/quickActionCommand.js.map +1 -1
  54. package/dist/common/cancellationUtils.d.ts +6 -3
  55. package/dist/common/cancellationUtils.js +29 -5
  56. package/dist/common/cancellationUtils.js.map +1 -1
  57. package/dist/common/commandUtils.d.ts +2 -0
  58. package/dist/common/commandUtils.js +24 -0
  59. package/dist/common/commandUtils.js.map +1 -0
  60. package/dist/common/extensibility.d.ts +7 -6
  61. package/dist/common/extensibility.js.map +1 -1
  62. package/dist/common/fileBasedCancellationUtils.js +19 -13
  63. package/dist/common/fileBasedCancellationUtils.js.map +1 -1
  64. package/dist/common/fullAccessHost.d.ts +1 -1
  65. package/dist/common/fullAccessHost.js +2 -2
  66. package/dist/common/fullAccessHost.js.map +1 -1
  67. package/dist/common/host.d.ts +2 -2
  68. package/dist/common/host.js.map +1 -1
  69. package/dist/common/realFileSystem.js +8 -8
  70. package/dist/common/realFileSystem.js.map +1 -1
  71. package/dist/common/serviceProvider.js +8 -1
  72. package/dist/common/serviceProvider.js.map +1 -1
  73. package/dist/common/uri/baseUri.d.ts +4 -1
  74. package/dist/common/uri/baseUri.js +7 -1
  75. package/dist/common/uri/baseUri.js.map +1 -1
  76. package/dist/common/uri/emptyUri.d.ts +3 -0
  77. package/dist/common/uri/emptyUri.js +9 -0
  78. package/dist/common/uri/emptyUri.js.map +1 -1
  79. package/dist/common/uri/fileUri.d.ts +2 -0
  80. package/dist/common/uri/fileUri.js +6 -0
  81. package/dist/common/uri/fileUri.js.map +1 -1
  82. package/dist/common/uri/memoization.js +1 -1
  83. package/dist/common/uri/memoization.js.map +1 -1
  84. package/dist/common/uri/uri.d.ts +4 -1
  85. package/dist/common/uri/uri.js +5 -2
  86. package/dist/common/uri/uri.js.map +1 -1
  87. package/dist/common/uri/uriUtils.d.ts +2 -0
  88. package/dist/common/uri/uriUtils.js +18 -1
  89. package/dist/common/uri/uriUtils.js.map +1 -1
  90. package/dist/common/uri/webUri.d.ts +2 -0
  91. package/dist/common/uri/webUri.js +7 -1
  92. package/dist/common/uri/webUri.js.map +1 -1
  93. package/dist/common/workspaceEditUtils.d.ts +6 -5
  94. package/dist/common/workspaceEditUtils.js +18 -17
  95. package/dist/common/workspaceEditUtils.js.map +1 -1
  96. package/dist/languageServerBase.d.ts +1 -0
  97. package/dist/languageServerBase.js +28 -25
  98. package/dist/languageServerBase.js.map +1 -1
  99. package/dist/languageService/analyzerServiceExecutor.d.ts +1 -2
  100. package/dist/languageService/analyzerServiceExecutor.js +6 -5
  101. package/dist/languageService/analyzerServiceExecutor.js.map +1 -1
  102. package/dist/languageService/autoImporter.js +3 -3
  103. package/dist/languageService/autoImporter.js.map +1 -1
  104. package/dist/languageService/callHierarchyProvider.js +9 -7
  105. package/dist/languageService/callHierarchyProvider.js.map +1 -1
  106. package/dist/languageService/codeActionProvider.js +3 -2
  107. package/dist/languageService/codeActionProvider.js.map +1 -1
  108. package/dist/languageService/completionProvider.d.ts +2 -4
  109. package/dist/languageService/completionProvider.js +14 -18
  110. package/dist/languageService/completionProvider.js.map +1 -1
  111. package/dist/languageService/documentSymbolProvider.js +5 -4
  112. package/dist/languageService/documentSymbolProvider.js.map +1 -1
  113. package/dist/languageService/navigationUtils.js +2 -1
  114. package/dist/languageService/navigationUtils.js.map +1 -1
  115. package/dist/languageService/renameProvider.js +2 -2
  116. package/dist/languageService/renameProvider.js.map +1 -1
  117. package/dist/languageService/workspaceSymbolProvider.js +2 -1
  118. package/dist/languageService/workspaceSymbolProvider.js.map +1 -1
  119. package/dist/localization/localize.d.ts +5 -4
  120. package/dist/localization/localize.js +3 -2
  121. package/dist/localization/localize.js.map +1 -1
  122. package/dist/localization/package.nls.cs.json +19 -4
  123. package/dist/localization/package.nls.de.json +19 -4
  124. package/dist/localization/package.nls.en-us.json +3 -2
  125. package/dist/localization/package.nls.es.json +19 -4
  126. package/dist/localization/package.nls.fr.json +18 -3
  127. package/dist/localization/package.nls.it.json +19 -4
  128. package/dist/localization/package.nls.ja.json +19 -4
  129. package/dist/localization/package.nls.ko.json +19 -4
  130. package/dist/localization/package.nls.pl.json +19 -4
  131. package/dist/localization/package.nls.pt-br.json +19 -4
  132. package/dist/localization/package.nls.qps-ploc.json +19 -4
  133. package/dist/localization/package.nls.ru.json +18 -3
  134. package/dist/localization/package.nls.tr.json +19 -4
  135. package/dist/localization/package.nls.zh-cn.json +19 -4
  136. package/dist/localization/package.nls.zh-tw.json +19 -4
  137. package/dist/parser/parser.d.ts +0 -3
  138. package/dist/parser/parser.js.map +1 -1
  139. package/dist/parser/tokenizer.d.ts +2 -4
  140. package/dist/parser/tokenizer.js +5 -6
  141. package/dist/parser/tokenizer.js.map +1 -1
  142. package/dist/parser/tokenizerTypes.d.ts +2 -2
  143. package/dist/parser/tokenizerTypes.js.map +1 -1
  144. package/dist/pyright.js +3 -3
  145. package/dist/pyright.js.map +1 -1
  146. package/dist/tests/chainedSourceFiles.test.js +8 -8
  147. package/dist/tests/chainedSourceFiles.test.js.map +1 -1
  148. package/dist/tests/completions.test.js +3 -3
  149. package/dist/tests/completions.test.js.map +1 -1
  150. package/dist/tests/config.test.js +10 -2
  151. package/dist/tests/config.test.js.map +1 -1
  152. package/dist/tests/filesystem.test.js +4 -4
  153. package/dist/tests/filesystem.test.js.map +1 -1
  154. package/dist/tests/fourSlashParser.test.js +22 -8
  155. package/dist/tests/fourSlashParser.test.js.map +1 -1
  156. package/dist/tests/fourslash/rename.multipleDecl.fourslash.d.ts +1 -1
  157. package/dist/tests/harness/fourslash/fourSlashParser.js +4 -0
  158. package/dist/tests/harness/fourslash/fourSlashParser.js.map +1 -1
  159. package/dist/tests/harness/fourslash/fourSlashTypes.d.ts +3 -0
  160. package/dist/tests/harness/fourslash/fourSlashTypes.js.map +1 -1
  161. package/dist/tests/harness/fourslash/testState.d.ts +13 -0
  162. package/dist/tests/harness/fourslash/testState.js +13 -8
  163. package/dist/tests/harness/fourslash/testState.js.map +1 -1
  164. package/dist/tests/harness/vfs/factory.d.ts +1 -1
  165. package/dist/tests/harness/vfs/factory.js +4 -4
  166. package/dist/tests/harness/vfs/factory.js.map +1 -1
  167. package/dist/tests/importStatementUtils.test.js +1 -1
  168. package/dist/tests/importStatementUtils.test.js.map +1 -1
  169. package/dist/tests/ipythonMode.test.js +11 -12
  170. package/dist/tests/ipythonMode.test.js.map +1 -1
  171. package/dist/tests/serialization.test.d.ts +2 -0
  172. package/dist/tests/serialization.test.js +88 -0
  173. package/dist/tests/serialization.test.js.map +1 -0
  174. package/dist/tests/service.test.js +1 -1
  175. package/dist/tests/service.test.js.map +1 -1
  176. package/dist/tests/signatureHelp.test.js +2 -3
  177. package/dist/tests/signatureHelp.test.js.map +1 -1
  178. package/dist/tests/sourceFile.test.js +3 -3
  179. package/dist/tests/sourceFile.test.js.map +1 -1
  180. package/dist/tests/sourceMapperUtils.test.js +2 -2
  181. package/dist/tests/sourceMapperUtils.test.js.map +1 -1
  182. package/dist/tests/testState.test.js +1 -1
  183. package/dist/tests/testState.test.js.map +1 -1
  184. package/dist/tests/testStateUtils.js +2 -2
  185. package/dist/tests/testStateUtils.js.map +1 -1
  186. package/dist/tests/textEditUtil.test.js +1 -2
  187. package/dist/tests/textEditUtil.test.js.map +1 -1
  188. package/dist/tests/typeEvaluator1.test.js +12 -0
  189. package/dist/tests/typeEvaluator1.test.js.map +1 -1
  190. package/dist/tests/typeEvaluator2.test.js +6 -6
  191. package/dist/tests/typeEvaluator2.test.js.map +1 -1
  192. package/dist/tests/typeEvaluator3.test.js +6 -0
  193. package/dist/tests/typeEvaluator3.test.js.map +1 -1
  194. package/dist/tests/typeEvaluator4.test.js +4 -4
  195. package/dist/tests/typeEvaluator4.test.js.map +1 -1
  196. package/dist/tests/uri.test.js +30 -7
  197. package/dist/tests/uri.test.js.map +1 -1
  198. package/dist/tests/workspaceEditUtils.test.js +8 -8
  199. package/dist/tests/workspaceEditUtils.test.js.map +1 -1
  200. package/dist/workspaceFactory.js +1 -1
  201. package/dist/workspaceFactory.js.map +1 -1
  202. package/package.json +2 -1
package/dist/backgroundThreadBase.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"backgroundThreadBase.js","sourceRoot":"","sources":["../../src/backgroundThreadBase.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"backgroundThreadBase.js","sourceRoot":"","sources":["../../src/backgroundThreadBase.ts"],"names":[],"mappings":"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"}
package/dist/commands/quickActionCommand.js CHANGED
@@ -26,7 +26,7 @@ class QuickActionCommand {
26
26
  const editActions = workspace.service.run((p) => {
27
27
  return (0, quickActions_1.performQuickAction)(p, docUri, params.command, otherArgs, token);
28
28
  }, token);
29
- return (0, workspaceEditUtils_1.convertToWorkspaceEdit)((0, workspaceEditUtils_1.convertToFileTextEdits)(docUri, editActions !== null && editActions !== void 0 ? editActions : []));
29
+ return (0, workspaceEditUtils_1.convertToWorkspaceEdit)(workspace.service.fs, (0, workspaceEditUtils_1.convertToFileTextEdits)(docUri, editActions !== null && editActions !== void 0 ? editActions : []));
30
30
  }
31
31
  }
32
32
  }
package/dist/commands/quickActionCommand.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"quickActionCommand.js","sourceRoot":"","sources":["../../../src/commands/quickActionCommand.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;;AAIH,2CAAwC;AACxC,qEAA8F;AAE9F,kEAAqE;AAIrE,MAAa,kBAAkB;IAC3B,YAAoB,GAA4B;QAA5B,QAAG,GAAH,GAAG,CAAyB;IAAG,CAAC;IAEpD,KAAK,CAAC,OAAO,CAAC,MAA4B,EAAE,KAAwB;QAChE,IAAI,MAAM,CAAC,SAAS,IAAI,MAAM,CAAC,SAAS,CAAC,MAAM,IAAI,CAAC,EAAE;YAClD,MAAM,MAAM,GAAG,SAAG,CAAC,KAAK,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,CAAW,EAAE,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC;YAC1F,MAAM,SAAS,GAAG,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;YAC5C,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,mBAAmB,CAAC,MAAM,CAAC,CAAC;YAE7D,IAAI,MAAM,CAAC,OAAO,0DAA0B,IAAI,SAAS,CAAC,sBAAsB,EAAE;gBAC9E,OAAO,EAAE,CAAC;aACb;YAED,MAAM,WAAW,GAAG,SAAS,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;gBAC5C,OAAO,IAAA,iCAAkB,EAAC,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,OAAO,EAAE,SAAS,EAAE,KAAK,CAAC,CAAC;YAC3E,CAAC,EAAE,KAAK,CAAC,CAAC;YAEV,OAAO,IAAA,2CAAsB,EAAC,IAAA,2CAAsB,EAAC,MAAM,EAAE,WAAW,aAAX,WAAW,cAAX,WAAW,GAAI,EAAE,CAAC,CAAC,CAAC;SACpF;IACL,CAAC;CACJ;AApBD,gDAoBC"}
1
+ {"version":3,"file":"quickActionCommand.js","sourceRoot":"","sources":["../../../src/commands/quickActionCommand.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;;AAIH,2CAAwC;AACxC,qEAA8F;AAE9F,kEAAqE;AAIrE,MAAa,kBAAkB;IAC3B,YAAoB,GAA4B;QAA5B,QAAG,GAAH,GAAG,CAAyB;IAAG,CAAC;IAEpD,KAAK,CAAC,OAAO,CAAC,MAA4B,EAAE,KAAwB;QAChE,IAAI,MAAM,CAAC,SAAS,IAAI,MAAM,CAAC,SAAS,CAAC,MAAM,IAAI,CAAC,EAAE;YAClD,MAAM,MAAM,GAAG,SAAG,CAAC,KAAK,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,CAAW,EAAE,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC;YAC1F,MAAM,SAAS,GAAG,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;YAC5C,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,mBAAmB,CAAC,MAAM,CAAC,CAAC;YAE7D,IAAI,MAAM,CAAC,OAAO,0DAA0B,IAAI,SAAS,CAAC,sBAAsB,EAAE;gBAC9E,OAAO,EAAE,CAAC;aACb;YAED,MAAM,WAAW,GAAG,SAAS,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;gBAC5C,OAAO,IAAA,iCAAkB,EAAC,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,OAAO,EAAE,SAAS,EAAE,KAAK,CAAC,CAAC;YAC3E,CAAC,EAAE,KAAK,CAAC,CAAC;YAEV,OAAO,IAAA,2CAAsB,EAAC,SAAS,CAAC,OAAO,CAAC,EAAE,EAAE,IAAA,2CAAsB,EAAC,MAAM,EAAE,WAAW,aAAX,WAAW,cAAX,WAAW,GAAI,EAAE,CAAC,CAAC,CAAC;SAC1G;IACL,CAAC;CACJ;AApBD,gDAoBC"}
package/dist/common/cancellationUtils.d.ts CHANGED
@@ -1,5 +1,6 @@
1
1
  import { AbstractCancellationTokenSource, Event } from 'vscode-jsonrpc';
2
2
  import { CancellationToken, ResponseError } from 'vscode-languageserver';
3
+ import { Uri } from './uri/uri';
3
4
  export interface CancellationProvider {
4
5
  createCancellationTokenSource(): AbstractCancellationTokenSource;
5
6
  }
@@ -17,13 +18,14 @@ export declare class DefaultCancellationProvider implements CancellationProvider
17
18
  }
18
19
  export declare function getCancellationTokenId(token: CancellationToken): string | undefined;
19
20
  export declare class FileBasedToken implements CancellationToken {
20
- readonly cancellationFilePath: string;
21
21
  private _fs;
22
+ cancellationFilePath: Uri;
22
23
  protected isCancelled: boolean;
23
24
  private _emitter;
24
- constructor(cancellationFilePath: string, _fs: {
25
- statSync(filePath: string): void;
25
+ constructor(cancellationId: string, _fs: {
26
+ statSync(fileUri: Uri): void;
26
27
  });
28
+ get id(): string;
27
29
  get isCancellationRequested(): boolean;
28
30
  get onCancellationRequested(): Event<any>;
29
31
  cancel(): void;
@@ -31,3 +33,4 @@ export declare class FileBasedToken implements CancellationToken {
31
33
  private _disposeEmitter;
32
34
  private _pipeExists;
33
35
  }
36
+ export declare function raceCancellation<T>(token?: CancellationToken, ...promises: Promise<T>[]): Promise<T>;
package/dist/common/cancellationUtils.js CHANGED
@@ -7,10 +7,11 @@
7
7
  * Helper methods relating to cancellation.
8
8
  */
9
9
  Object.defineProperty(exports, "__esModule", { value: true });
10
- exports.FileBasedToken = exports.getCancellationTokenId = exports.DefaultCancellationProvider = exports.CancelAfter = exports.throwIfCancellationRequested = exports.OperationCanceledException = exports.setCancellationFolderName = exports.getCancellationFolderName = void 0;
10
+ exports.raceCancellation = exports.FileBasedToken = exports.getCancellationTokenId = exports.DefaultCancellationProvider = exports.CancelAfter = exports.throwIfCancellationRequested = exports.OperationCanceledException = exports.setCancellationFolderName = exports.getCancellationFolderName = void 0;
11
11
  const vscode_jsonrpc_1 = require("vscode-jsonrpc");
12
12
  const vscode_languageserver_1 = require("vscode-languageserver");
13
13
  const core_1 = require("./core");
14
+ const uri_1 = require("./uri/uri");
14
15
  let cancellationFolderName;
15
16
  function getCancellationFolderName() {
16
17
  return cancellationFolderName;
@@ -61,15 +62,17 @@ class DefaultCancellationProvider {
61
62
  }
62
63
  exports.DefaultCancellationProvider = DefaultCancellationProvider;
63
64
  function getCancellationTokenId(token) {
64
- return token instanceof FileBasedToken ? token.cancellationFilePath : undefined;
65
+ return token instanceof FileBasedToken ? token.id : undefined;
65
66
  }
66
67
  exports.getCancellationTokenId = getCancellationTokenId;
67
68
  class FileBasedToken {
68
- constructor(cancellationFilePath, _fs) {
69
- this.cancellationFilePath = cancellationFilePath;
69
+ constructor(cancellationId, _fs) {
70
70
  this._fs = _fs;
71
71
  this.isCancelled = false;
72
- // empty
72
+ this.cancellationFilePath = uri_1.Uri.file(cancellationId);
73
+ }
74
+ get id() {
75
+ return this.cancellationFilePath.toString();
73
76
  }
74
77
  get isCancellationRequested() {
75
78
  if (this.isCancelled) {
@@ -137,4 +140,25 @@ class CancellationThrottle {
137
140
  }
138
141
  }
139
142
  CancellationThrottle._lastCheckTimestamp = 0;
143
+ async function raceCancellation(token, ...promises) {
144
+ if (!token) {
145
+ return Promise.race(promises);
146
+ }
147
+ if (token.isCancellationRequested) {
148
+ throw new OperationCanceledException();
149
+ }
150
+ return new Promise((resolve, reject) => {
151
+ if (token.isCancellationRequested) {
152
+ return reject(new OperationCanceledException());
153
+ }
154
+ const disposable = token.onCancellationRequested(() => {
155
+ disposable.dispose();
156
+ reject(new OperationCanceledException());
157
+ });
158
+ Promise.race(promises)
159
+ .then(resolve, reject)
160
+ .finally(() => disposable.dispose());
161
+ });
162
+ }
163
+ exports.raceCancellation = raceCancellation;
140
164
  //# sourceMappingURL=cancellationUtils.js.map
package/dist/common/cancellationUtils.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"cancellationUtils.js","sourceRoot":"","sources":["../../../src/common/cancellationUtils.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"cancellationUtils.js","sourceRoot":"","sources":["../../../src/common/cancellationUtils.ts"],"names":[],"mappings":"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"}
package/dist/common/commandUtils.d.ts ADDED
@@ -0,0 +1,2 @@
1
+ import { Command } from 'vscode-languageserver-types';
2
+ export declare function createCommand(title: string, command: string, ...args: any[]): Command;
package/dist/common/commandUtils.js ADDED
@@ -0,0 +1,24 @@
1
+ "use strict";
2
+ /*
3
+ * commandUtils.ts
4
+ * Copyright (c) Microsoft Corporation.
5
+ * Licensed under the MIT license.
6
+ *
7
+ * Utilities for working with LSP commands.
8
+ */
9
+ Object.defineProperty(exports, "__esModule", { value: true });
10
+ exports.createCommand = void 0;
11
+ const vscode_languageserver_types_1 = require("vscode-languageserver-types");
12
+ const uri_1 = require("./uri/uri");
13
+ function createCommand(title, command, ...args) {
14
+ // Make sure if any of the args are URIs, we convert them to strings.
15
+ const convertedArgs = args.map((arg) => {
16
+ if (uri_1.Uri.isUri(arg)) {
17
+ return arg.toString();
18
+ }
19
+ return arg;
20
+ });
21
+ return vscode_languageserver_types_1.Command.create(title, command, ...convertedArgs);
22
+ }
23
+ exports.createCommand = createCommand;
24
+ //# sourceMappingURL=commandUtils.js.map
package/dist/common/commandUtils.js.map ADDED
@@ -0,0 +1 @@
1
+ {"version":3,"file":"commandUtils.js","sourceRoot":"","sources":["../../../src/common/commandUtils.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;;AAEH,6EAAsD;AACtD,mCAAgC;AAEhC,SAAgB,aAAa,CAAC,KAAa,EAAE,OAAe,EAAE,GAAG,IAAW;IACxE,qEAAqE;IACrE,MAAM,aAAa,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE;QACnC,IAAI,SAAG,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE;YAChB,OAAO,GAAG,CAAC,QAAQ,EAAE,CAAC;SACzB;QACD,OAAO,GAAG,CAAC;IACf,CAAC,CAAC,CAAC;IACH,OAAO,qCAAO,CAAC,MAAM,CAAC,KAAK,EAAE,OAAO,EAAE,GAAG,aAAa,CAAC,CAAC;AAC5D,CAAC;AATD,sCASC"}
package/dist/common/extensibility.d.ts CHANGED
@@ -18,6 +18,7 @@ import { Range } from './textRange';
18
18
  import { Uri } from './uri/uri';
19
19
  export interface SourceFile {
20
20
  isStubFile(): boolean;
21
+ isTypingStubFile(): boolean;
21
22
  isThirdPartyPyTypedPresent(): boolean;
22
23
  getIPythonMode(): IPythonMode;
23
24
  getUri(): Uri;
@@ -71,9 +72,9 @@ export interface EditableProgram extends ProgramView {
71
72
  updateChainedUri(fileUri: Uri, chainedUri: Uri | undefined): void;
72
73
  }
73
74
  export interface ProgramMutator {
74
- addInterimFile(file: string): void;
75
- setFileOpened(fileUri: Uri, version: number | null, contents: string, ipythonMode: IPythonMode, chainedFilePath?: string, realFilePath?: string): void;
76
- updateOpenFileContents(path: string, version: number | null, contents: string, ipythonMode: IPythonMode, realFilePath?: string): void;
75
+ addInterimFile(fileUri: Uri): void;
76
+ setFileOpened(fileUri: Uri, version: number | null, contents: string, ipythonMode: IPythonMode, chainedFilePath?: Uri): void;
77
+ updateOpenFileContents(path: Uri, version: number | null, contents: string, ipythonMode: IPythonMode): void;
77
78
  }
78
79
  export declare enum ReferenceUseCase {
79
80
  Rename = 0,
@@ -97,9 +98,9 @@ export interface SymbolUsageProvider {
97
98
  appendDeclarationsAt(context: ParseNode, from: readonly Declaration[], to: Declaration[]): void;
98
99
  }
99
100
  export interface StatusMutationListener {
100
- fileDirty?: (fileUri: Uri) => void;
101
- clearCache?: () => void;
102
- updateSettings?: <T extends ServerSettings>(settings: T) => void;
101
+ onFileDirty?: (fileUri: Uri) => void;
102
+ onClearCache?: () => void;
103
+ onUpdateSettings?: <T extends ServerSettings>(settings: T) => void;
103
104
  }
104
105
  export interface DebugInfoInspector {
105
106
  getCycleDetail(program: ProgramView, fileInfo: SourceFileInfo): string;
package/dist/common/extensibility.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"extensibility.js","sourceRoot":"","sources":["../../../src/common/extensibility.ts"],"names":[],"mappings":";AAAA;;;;;;EAME;;;AA2HF,IAAY,gBAGX;AAHD,WAAY,gBAAgB;IACxB,2DAAM,CAAA;IACN,mEAAU,CAAA;AACd,CAAC,EAHW,gBAAgB,gCAAhB,gBAAgB,QAG3B"}
1
+ {"version":3,"file":"extensibility.js","sourceRoot":"","sources":["../../../src/common/extensibility.ts"],"names":[],"mappings":";AAAA;;;;;;EAME;;;AAsHF,IAAY,gBAGX;AAHD,WAAY,gBAAgB;IACxB,2DAAM,CAAA;IACN,mEAAU,CAAA;AACd,CAAC,EAHW,gBAAgB,gCAAhB,gBAAgB,QAG3B"}
package/dist/common/fileBasedCancellationUtils.js CHANGED
@@ -37,9 +37,15 @@ const path = __importStar(require("path"));
37
37
  const vscode_jsonrpc_1 = require("vscode-jsonrpc");
38
38
  const vscode_languageserver_1 = require("vscode-languageserver");
39
39
  const cancellationUtils_1 = require("./cancellationUtils");
40
+ const uri_1 = require("./uri/uri");
41
+ class StatSyncFromFs {
42
+ statSync(uri) {
43
+ return fs.statSync(uri.getFilePath());
44
+ }
45
+ }
40
46
  class OwningFileToken extends cancellationUtils_1.FileBasedToken {
41
- constructor(cancellationFilePath) {
42
- super(cancellationFilePath, fs);
47
+ constructor(cancellationId) {
48
+ super(cancellationId, new StatSyncFromFs());
43
49
  this._disposed = false;
44
50
  }
45
51
  get isCancellationRequested() {
@@ -60,7 +66,7 @@ class OwningFileToken extends cancellationUtils_1.FileBasedToken {
60
66
  }
61
67
  _createPipe() {
62
68
  try {
63
- fs.writeFileSync(this.cancellationFilePath, '', { flag: 'w' });
69
+ fs.writeFileSync(this.cancellationFilePath.getFilePath(), '', { flag: 'w' });
64
70
  }
65
71
  catch {
66
72
  // Ignore the exception.
@@ -68,7 +74,7 @@ class OwningFileToken extends cancellationUtils_1.FileBasedToken {
68
74
  }
69
75
  _removePipe() {
70
76
  try {
71
- fs.unlinkSync(this.cancellationFilePath);
77
+ fs.unlinkSync(this.cancellationFilePath.getFilePath());
72
78
  }
73
79
  catch {
74
80
  // Ignore the exception.
@@ -76,16 +82,16 @@ class OwningFileToken extends cancellationUtils_1.FileBasedToken {
76
82
  }
77
83
  }
78
84
  class FileBasedCancellationTokenSource {
79
- constructor(_cancellationFilePath, _ownFile = false) {
80
- this._cancellationFilePath = _cancellationFilePath;
85
+ constructor(_cancellationId, _ownFile = false) {
86
+ this._cancellationId = _cancellationId;
81
87
  this._ownFile = _ownFile;
82
88
  }
83
89
  get token() {
84
90
  if (!this._token) {
85
91
  // Be lazy and create the token only when actually needed.
86
92
  this._token = this._ownFile
87
- ? new OwningFileToken(this._cancellationFilePath)
88
- : new cancellationUtils_1.FileBasedToken(this._cancellationFilePath, fs);
93
+ ? new OwningFileToken(this._cancellationId)
94
+ : new cancellationUtils_1.FileBasedToken(this._cancellationId, new StatSyncFromFs());
89
95
  }
90
96
  return this._token;
91
97
  }
@@ -118,15 +124,15 @@ class FileBasedCancellationTokenSource {
118
124
  function getCancellationFolderPath(folderName) {
119
125
  return path.join(os.tmpdir(), 'python-languageserver-cancellation', folderName);
120
126
  }
121
- function getCancellationFilePath(folderName, id) {
122
- return path.join(getCancellationFolderPath(folderName), `cancellation-${String(id)}.tmp`);
127
+ function getCancellationFileUri(folderName, id) {
128
+ return uri_1.Uri.file(path.join(getCancellationFolderPath(folderName), `cancellation-${String(id)}.tmp`)).toString();
123
129
  }
124
130
  class FileCancellationReceiverStrategy {
125
131
  constructor(folderName) {
126
132
  this.folderName = folderName;
127
133
  }
128
134
  createCancellationTokenSource(id) {
129
- return new FileBasedCancellationTokenSource(getCancellationFilePath(this.folderName, id));
135
+ return new FileBasedCancellationTokenSource(getCancellationFileUri(this.folderName, id));
130
136
  }
131
137
  }
132
138
  function getCancellationStrategyFromArgv(argv) {
@@ -169,7 +175,7 @@ function getCancellationTokenFromId(cancellationId) {
169
175
  if (!cancellationId) {
170
176
  return vscode_languageserver_1.CancellationToken.None;
171
177
  }
172
- return new cancellationUtils_1.FileBasedToken(cancellationId, fs);
178
+ return new cancellationUtils_1.FileBasedToken(cancellationId, new StatSyncFromFs());
173
179
  }
174
180
  exports.getCancellationTokenFromId = getCancellationTokenFromId;
175
181
  let cancellationSourceId = 0;
@@ -185,7 +191,7 @@ class FileBasedCancellationProvider {
185
191
  // Return regular cancellation token source.
186
192
  return new vscode_jsonrpc_1.CancellationTokenSource();
187
193
  }
188
- return new FileBasedCancellationTokenSource(getCancellationFilePath(folderName, `${this._prefix}-${String(cancellationSourceId++)}`),
194
+ return new FileBasedCancellationTokenSource(getCancellationFileUri(folderName, `${this._prefix}-${String(cancellationSourceId++)}`),
189
195
  /* ownFile */ true);
190
196
  }
191
197
  }
package/dist/common/fileBasedCancellationUtils.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"fileBasedCancellationUtils.js","sourceRoot":"","sources":["../../../src/common/fileBasedCancellationUtils.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"fileBasedCancellationUtils.js","sourceRoot":"","sources":["../../../src/common/fileBasedCancellationUtils.ts"],"names":[],"mappings":"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"}
package/dist/common/fullAccessHost.d.ts CHANGED
@@ -16,7 +16,7 @@ export declare class FullAccessHost extends LimitedAccessHost {
16
16
  static createHost(kind: HostKind, serviceProvider: ServiceProvider): NoAccessHost;
17
17
  getPythonSearchPaths(pythonPath?: Uri, logInfo?: string[]): PythonPathResult;
18
18
  getPythonVersion(pythonPath?: Uri, logInfo?: string[]): PythonVersion | undefined;
19
- runScript(pythonPath: Uri | undefined, script: Uri, args: string[], cwd: string, token: CancellationToken): Promise<ScriptOutput>;
19
+ runScript(pythonPath: Uri | undefined, script: Uri, args: string[], cwd: Uri, token: CancellationToken): Promise<ScriptOutput>;
20
20
  private _executePythonInterpreter;
21
21
  private _getSearchPathResultFromInterpreter;
22
22
  }
package/dist/common/fullAccessHost.js CHANGED
@@ -139,14 +139,14 @@ class FullAccessHost extends LimitedAccessHost {
139
139
  let stdout = '';
140
140
  let stderr = '';
141
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 }));
142
+ const child = this._executePythonInterpreter(pythonPath === null || pythonPath === void 0 ? void 0 : pythonPath.getFilePath(), (p) => child_process.spawn(p, commandLineArgs, { cwd: cwd.getFilePath() }));
143
143
  const tokenWatch = token.onCancellationRequested(() => {
144
144
  if (child) {
145
145
  try {
146
146
  if (child.pid && child.exitCode === null) {
147
147
  if (process.platform === 'win32') {
148
148
  // Windows doesn't support SIGTERM, so execute taskkill to kill the process
149
- child_process.execSync(`taskkill /pid ${child.pid} /T /F`);
149
+ child_process.execSync(`taskkill /pid ${child.pid} /T /F > NUL 2>&1`);
150
150
  }
151
151
  else {
152
152
  process.kill(child.pid);
package/dist/common/fullAccessHost.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"fullAccessHost.js","sourceRoot":"","sources":["../../../src/common/fullAccessHost.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;;;;;;;;;;;;;;;;;;;;;;;;;AAEH,6DAA+C;AAI/C,2DAA+F;AAC/F,mDAAiD;AACjD,mCAAsC;AACtC,iCAA8D;AAC9D,2CAA4C;AAC5C,mDAAuE;AAEvE,mCAAgC;AAChC,6CAA6C;AAE7C,mEAAmE;AACnE,iEAAiE;AACjE,sEAAsE;AACtE,MAAM,oBAAoB,GAAG;IACzB,yBAAyB;IACzB,6DAA6D;IAC7D,8BAA8B;IAC9B,kDAAkD;IAClD,wEAAwE;CAC3E,CAAC;AAEF,MAAM,UAAU,GAAG;IACf,GAAG,oBAAoB;IACvB,kBAAkB;IAClB,oEAAoE;CACvE,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AAEb,MAAM,cAAc,GAAG;IACnB,GAAG,oBAAoB;IACvB,kBAAkB;IAClB,mFAAmF;CACtF,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AAEb,MAAa,iBAAkB,SAAQ,mBAAY;IAC/C,IAAa,IAAI;QACb,sCAA8B;IAClC,CAAC;IAEQ,iBAAiB,CAAC,OAAkB;QACzC,IAAI,OAAO,CAAC,QAAQ,KAAK,QAAQ,EAAE;YAC/B,OAAO,8BAAc,CAAC,MAAM,CAAC;SAChC;aAAM,IAAI,OAAO,CAAC,QAAQ,KAAK,OAAO,EAAE;YACrC,OAAO,8BAAc,CAAC,KAAK,CAAC;SAC/B;aAAM,IAAI,OAAO,CAAC,QAAQ,KAAK,OAAO,EAAE;YACrC,OAAO,8BAAc,CAAC,OAAO,CAAC;SACjC;QAED,OAAO,SAAS,CAAC;IACrB,CAAC;CACJ;AAhBD,8CAgBC;AAED,MAAa,cAAe,SAAQ,iBAAiB;IACjD,YAAsB,eAAgC;QAClD,KAAK,EAAE,CAAC;QADU,oBAAe,GAAf,eAAe,CAAiB;IAEtD,CAAC;IAED,IAAa,IAAI;QACb,mCAA2B;IAC/B,CAAC;IAED,MAAM,CAAC,UAAU,CAAC,IAAc,EAAE,eAAgC;QAC9D,QAAQ,IAAI,EAAE;YACV;gBACI,OAAO,IAAI,mBAAY,EAAE,CAAC;YAC9B;gBACI,OAAO,IAAI,iBAAiB,EAAE,CAAC;YACnC;gBACI,OAAO,IAAI,cAAc,CAAC,eAAe,CAAC,CAAC;YAC/C;gBACI,IAAA,mBAAW,EAAC,IAAI,CAAC,CAAC;SACzB;IACL,CAAC;IAEQ,oBAAoB,CAAC,UAAgB,EAAE,OAAkB;QAC9D,MAAM,iBAAiB,GAAG,OAAO,aAAP,OAAO,cAAP,OAAO,GAAI,EAAE,CAAC;QACxC,IAAI,MAAM,GAAG,IAAI,CAAC,yBAAyB,CAAC,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,WAAW,EAAE,EAAE,CAAC,CAAC,EAAE,EAAE,CACzE,IAAI,CAAC,mCAAmC,CAAC,CAAC,EAAE,iBAAiB,CAAC,CACjE,CAAC;QAEF,IAAI,CAAC,MAAM,EAAE;YACT,MAAM,GAAG;gBACL,KAAK,EAAE,EAAE;gBACT,MAAM,EAAE,SAAS;aACpB,CAAC;SACL;QAED,iBAAiB,CAAC,IAAI,CAAC,YAAY,MAAM,CAAC,KAAK,CAAC,MAAM,yBAAyB,CAAC,CAAC;QACjF,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;YAC1B,iBAAiB,CAAC,IAAI,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC;QACxC,CAAC,CAAC,CAAC;QAEH,OAAO,MAAM,CAAC;IAClB,CAAC;IAEQ,gBAAgB,CAAC,UAAgB,EAAE,OAAkB;QAC1D,MAAM,iBAAiB,GAAG,OAAO,aAAP,OAAO,cAAP,OAAO,GAAI,EAAE,CAAC;QAExC,IAAI;YACA,MAAM,eAAe,GAAa,CAAC,IAAI,EAAE,cAAc,CAAC,CAAC;YACzD,MAAM,UAAU,GAAG,IAAI,CAAC,yBAAyB,CAAC,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,WAAW,EAAE,EAAE,CAAC,CAAC,EAAE,EAAE,CAC/E,aAAa,CAAC,YAAY,CAAC,CAAC,EAAE,eAAe,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,CACvE,CAAC;YAEF,MAAM,WAAW,GAAqC,IAAI,CAAC,KAAK,CAAC,UAAW,CAAC,CAAC;YAC9E,MAAM,OAAO,GAAG,IAAA,qCAAqB,EAAC,WAAW,CAAC,KAAK,EAAE,WAAW,CAAC,KAAK,CAAC,CAAC;YAC5E,IAAI,OAAO,KAAK,SAAS,EAAE;gBACvB,iBAAiB,CAAC,IAAI,CAClB,kBAAkB,WAAW,CAAC,KAAK,IAAI,WAAW,CAAC,KAAK,kCAAkC,CAC7F,CAAC;gBACF,OAAO,SAAS,CAAC;aACpB;YAED,OAAO,OAAO,CAAC;SAClB;QAAC,MAAM;YACJ,iBAAiB,CAAC,IAAI,CAAC,+CAA+C,CAAC,CAAC;YACxE,OAAO,SAAS,CAAC;SACpB;IACL,CAAC;IAEQ,SAAS,CACd,UAA2B,EAC3B,MAAW,EACX,IAAc,EACd,GAAW,EACX,KAAwB;QAExB,0DAA0D;QAC1D,IAAA,gDAA4B,EAAC,KAAK,CAAC,CAAC;QAEpC,+BAA+B;QAC/B,OAAO,IAAI,OAAO,CAAqC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YACvE,IAAI,MAAM,GAAG,EAAE,CAAC;YAChB,IAAI,MAAM,GAAG,EAAE,CAAC;YAChB,MAAM,eAAe,GAAG,CAAC,MAAM,CAAC,WAAW,EAAE,EAAE,GAAG,IAAI,CAAC,CAAC;YAExD,MAAM,KAAK,GAAG,IAAI,CAAC,yBAAyB,CAAC,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,WAAW,EAAE,EAAE,CAAC,CAAC,EAAE,EAAE,CAC1E,aAAa,CAAC,KAAK,CAAC,CAAC,EAAE,eAAe,EAAE,EAAE,GAAG,EAAE,CAAC,CACnD,CAAC;YACF,MAAM,UAAU,GAAG,KAAK,CAAC,uBAAuB,CAAC,GAAG,EAAE;gBAClD,IAAI,KAAK,EAAE;oBACP,IAAI;wBACA,IAAI,KAAK,CAAC,GAAG,IAAI,KAAK,CAAC,QAAQ,KAAK,IAAI,EAAE;4BACtC,IAAI,OAAO,CAAC,QAAQ,KAAK,OAAO,EAAE;gCAC9B,2EAA2E;gCAC3E,aAAa,CAAC,QAAQ,CAAC,iBAAiB,KAAK,CAAC,GAAG,QAAQ,CAAC,CAAC;6BAC9D;iCAAM;gCACH,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;6BAC3B;yBACJ;qBACJ;oBAAC,MAAM;wBACJ,UAAU;qBACb;iBACJ;gBACD,MAAM,CAAC,IAAI,8CAA0B,EAAE,CAAC,CAAC;YAC7C,CAAC,CAAC,CAAC;YACH,IAAI,KAAK,EAAE;gBACP,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;gBAC5D,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;gBAC5D,KAAK,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,CAAC,EAAE,EAAE;oBACpB,UAAU,CAAC,OAAO,EAAE,CAAC;oBACrB,MAAM,CAAC,CAAC,CAAC,CAAC;gBACd,CAAC,CAAC,CAAC;gBACH,KAAK,CAAC,EAAE,CAAC,MAAM,EAAE,GAAG,EAAE;oBAClB,UAAU,CAAC,OAAO,EAAE,CAAC;oBACrB,OAAO,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;gBAChC,CAAC,CAAC,CAAC;aACN;iBAAM;gBACH,UAAU,CAAC,OAAO,EAAE,CAAC;gBACrB,MAAM,CAAC,IAAI,KAAK,CAAC,+CAA+C,MAAM,EAAE,CAAC,CAAC,CAAC;aAC9E;QACL,CAAC,CAAC,CAAC;IACP,CAAC;IAEO,yBAAyB,CAC7B,UAA8B,EAC9B,OAAwC;QAExC,IAAI,UAAU,EAAE;YACZ,OAAO,OAAO,CAAC,UAAU,CAAC,CAAC;SAC9B;aAAM;YACH,IAAI,MAAqB,CAAC;YAC1B,IAAI;gBACA,wEAAwE;gBACxE,uEAAuE;gBACvE,4EAA4E;gBAC5E,IAAI,OAAO,CAAC,QAAQ,KAAK,OAAO,EAAE;oBAC9B,MAAM,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC;iBAC/B;aACJ;YAAC,MAAM;gBACJ,4BAA4B;aAC/B;YAED,IAAI,MAAM,KAAK,SAAS,EAAE;gBACtB,OAAO,MAAM,CAAC;aACjB;YAED,sEAAsE;YACtE,OAAO,OAAO,CAAC,QAAQ,CAAC,CAAC;SAC5B;IACL,CAAC;IAEO,mCAAmC,CACvC,eAAuB,EACvB,iBAA2B;QAE3B,MAAM,MAAM,GAAqB;YAC7B,KAAK,EAAE,EAAE;YACT,MAAM,EAAE,SAAS;SACpB,CAAC;QAEF,IAAI;YACA,MAAM,eAAe,GAAa,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;YACrD,iBAAiB,CAAC,IAAI,CAAC,2BAA2B,eAAe,GAAG,CAAC,CAAC;YACtE,MAAM,UAAU,GAAG,aAAa,CAAC,YAAY,CAAC,eAAe,EAAE,eAAe,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,CAAC;YACtG,MAAM,eAAe,GAAG,IAAI,CAAC,eAAe,CAAC,EAAE,EAAE,CAAC,eAAe,CAAC;YAElE,oEAAoE;YACpE,IAAI;gBACA,MAAM,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;gBACzC,KAAK,IAAI,cAAc,IAAI,SAAS,CAAC,IAAI,EAAE;oBACvC,cAAc,GAAG,cAAc,CAAC,IAAI,EAAE,CAAC;oBACvC,IAAI,cAAc,EAAE;wBAChB,MAAM,cAAc,GAAG,IAAA,yBAAa,EAAC,cAAc,CAAC,CAAC;wBACrD,MAAM,aAAa,GAAG,SAAG,CAAC,IAAI,CAAC,cAAc,EAAE,eAAe,CAAC,CAAC;wBAChE,gDAAgD;wBAChD,IACI,IAAI,CAAC,eAAe,CAAC,EAAE,EAAE,CAAC,UAAU,CAAC,aAAa,CAAC;4BACnD,IAAA,sBAAW,EAAC,IAAI,CAAC,eAAe,CAAC,EAAE,EAAE,EAAE,aAAa,CAAC,EACvD;4BACE,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;yBACpC;6BAAM;4BACH,iBAAiB,CAAC,IAAI,CAAC,aAAa,cAAc,uCAAuC,CAAC,CAAC;yBAC9F;qBACJ;iBACJ;gBAED,MAAM,CAAC,MAAM,GAAG,SAAG,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,eAAe,CAAC,CAAC;gBAE5D,IAAI,MAAM,CAAC,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE;oBAC3B,iBAAiB,CAAC,IAAI,CAAC,4BAA4B,CAAC,CAAC;iBACxD;aACJ;YAAC,OAAO,GAAG,EAAE;gBACV,iBAAiB,CAAC,IAAI,CAAC,4BAA4B,UAAU,GAAG,CAAC,CAAC;gBAClE,MAAM,GAAG,CAAC;aACb;SACJ;QAAC,MAAM;YACJ,OAAO,SAAS,CAAC;SACpB;QAED,OAAO,MAAM,CAAC;IAClB,CAAC;CACJ;AAxMD,wCAwMC"}
1
+ {"version":3,"file":"fullAccessHost.js","sourceRoot":"","sources":["../../../src/common/fullAccessHost.ts"],"names":[],"mappings":"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"}
package/dist/common/host.d.ts CHANGED
@@ -17,13 +17,13 @@ export interface Host {
17
17
  getPythonSearchPaths(pythonPath?: Uri, logInfo?: string[]): PythonPathResult;
18
18
  getPythonVersion(pythonPath?: Uri, logInfo?: string[]): PythonVersion | undefined;
19
19
  getPythonPlatform(logInfo?: string[]): PythonPlatform | undefined;
20
- runScript(pythonPath: Uri | undefined, script: Uri, args: string[], cwd: string, token: CancellationToken): Promise<ScriptOutput>;
20
+ runScript(pythonPath: Uri | undefined, script: Uri, args: string[], cwd: Uri, token: CancellationToken): Promise<ScriptOutput>;
21
21
  }
22
22
  export declare class NoAccessHost implements Host {
23
23
  get kind(): HostKind;
24
24
  getPythonSearchPaths(pythonPath?: Uri, logInfo?: string[]): PythonPathResult;
25
25
  getPythonVersion(pythonPath?: Uri, logInfo?: string[]): PythonVersion | undefined;
26
26
  getPythonPlatform(logInfo?: string[]): PythonPlatform | undefined;
27
- runScript(pythonPath: Uri | undefined, scriptPath: Uri, args: string[], cwd: string, token: CancellationToken): Promise<ScriptOutput>;
27
+ runScript(pythonPath: Uri | undefined, scriptPath: Uri, args: string[], cwd: Uri, token: CancellationToken): Promise<ScriptOutput>;
28
28
  }
29
29
  export type HostFactory = () => Host;
package/dist/common/host.js.map CHANGED
@@ -1 +1 @@
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
+ {"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,GAAQ,EACR,KAAwB;QAExB,OAAO,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC;IACtC,CAAC;CACJ;AA/BD,oCA+BC"}
package/dist/common/realFileSystem.js CHANGED
@@ -365,17 +365,17 @@ class RealFileSystem {
365
365
  if (!this.existsSync(uri)) {
366
366
  return uri;
367
367
  }
368
- // If it does exist, skip this for symlinks.
369
- const path = uri.getFilePath();
370
- const stat = fs.lstatSync(path);
371
- if (stat.isSymbolicLink()) {
372
- return uri;
373
- }
374
368
  // realpathSync.native will return casing as in OS rather than
375
369
  // trying to preserve casing given.
376
- const realCase = fs.realpathSync.native(path);
370
+ const realCase = fs.realpathSync.native(uri.getFilePath());
371
+ // If the original and real case paths differ by anything other than case,
372
+ // then there's a symbolic link or something of that sort involved. Return
373
+ // the original path instead.
374
+ if (uri.getFilePath().toLowerCase() !== realCase.toLowerCase()) {
375
+ return uri;
376
+ }
377
377
  // On UNC mapped drives we want to keep the original drive letter.
378
- if ((0, pathUtils_1.getRootLength)(realCase) !== (0, pathUtils_1.getRootLength)(path)) {
378
+ if ((0, pathUtils_1.getRootLength)(realCase) !== (0, pathUtils_1.getRootLength)(uri.getFilePath())) {
379
379
  return uri;
380
380
  }
381
381
  return uri_1.Uri.file(realCase, this._isCaseSensitive);
package/dist/common/realFileSystem.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"realFileSystem.js","sourceRoot":"","sources":["../../../src/common/realFileSystem.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"realFileSystem.js","sourceRoot":"","sources":["../../../src/common/realFileSystem.ts"],"names":[],"mappings":"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"}
package/dist/common/serviceProvider.js CHANGED
@@ -100,7 +100,14 @@ class ServiceProvider {
100
100
  }
101
101
  clone() {
102
102
  const serviceProvider = new ServiceProvider();
103
- this._container.forEach((value, key) => serviceProvider._container.set(key, value));
103
+ this._container.forEach((value, key) => {
104
+ if (key.kind === 'group') {
105
+ serviceProvider._container.set(key, [...(value !== null && value !== void 0 ? value : [])]);
106
+ }
107
+ else {
108
+ serviceProvider._container.set(key, value);
109
+ }
110
+ });
104
111
  return serviceProvider;
105
112
  }
106
113
  _addGroupService(key, newValue) {
package/dist/common/serviceProvider.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"serviceProvider.js","sourceRoot":"","sources":["../../../src/common/serviceProvider.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;;;;;;;;;;;;;;;;;;;;;;;;;AAEH,uDAAqE;AACrE,+CAAiC;AAEjC,MAAe,WAAW;CAEzB;AAED;;GAEG;AACH,6DAA6D;AAC7D,MAAa,UAAc,SAAQ,WAAW;IAA9C;;QACa,SAAI,GAAG,WAAW,CAAC;IAChC,CAAC;CAAA;AAFD,gCAEC;AAED;;GAEG;AACH,6DAA6D;AAC7D,MAAa,eAAmB,SAAQ,WAAW;IAAnD;;QACa,SAAI,GAAG,OAAO,CAAC;IAC5B,CAAC;CAAA;AAFD,0CAEC;AAID,MAAa,eAAe;IAA5B;QACY,eAAU,GAAG,IAAI,GAAG,EAAoB,CAAC;IAmFrD,CAAC;IA/EG,GAAG,CAAI,GAAsB,EAAE,KAAoB;QAC/C,IAAI,GAAG,CAAC,IAAI,KAAK,OAAO,EAAE;YACtB,IAAI,CAAC,gBAAgB,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;YAClC,OAAO;SACV;QAED,IAAI,GAAG,CAAC,IAAI,KAAK,WAAW,EAAE;YAC1B,IAAI,KAAK,KAAK,SAAS,EAAE;gBACrB,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;aACnC;iBAAM;gBACH,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;aACpB;YACD,OAAO;SACV;QAED,KAAK,CAAC,WAAW,CAAC,GAAG,EAAE,oBAAoB,OAAO,GAAG,EAAE,CAAC,CAAC;IAC7D,CAAC;IAID,MAAM,CAAI,GAAsB,EAAE,KAAS;QACvC,IAAI,GAAG,CAAC,IAAI,KAAK,OAAO,EAAE;YACtB,IAAI,CAAC,mBAAmB,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;YACrC,OAAO;SACV;QAED,IAAI,GAAG,CAAC,IAAI,KAAK,WAAW,EAAE;YAC1B,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;YAC5B,OAAO;SACV;QAED,KAAK,CAAC,WAAW,CAAC,GAAG,EAAE,oBAAoB,OAAO,GAAG,EAAE,CAAC,CAAC;IAC7D,CAAC;IAID,MAAM,CAAI,GAAsB;QAC5B,OAAO,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IACpC,CAAC;IAID,GAAG,CAAI,GAAsB;QACzB,MAAM,KAAK,GAAG,GAAG,CAAC,IAAI,KAAK,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QACzE,IAAI,KAAK,KAAK,SAAS,EAAE;YACrB,MAAM,IAAI,KAAK,CAAC,+CAA+C,GAAG,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;SACpF;QAED,OAAO,KAAK,CAAC;IACjB,CAAC;IAED,KAAK;QACD,MAAM,eAAe,GAAG,IAAI,eAAe,EAAE,CAAC;QAC9C,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,GAAG,EAAE,EAAE,CAAC,eAAe,CAAC,UAAU,CAAC,GAAG,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC,CAAC;QAEpF,OAAO,eAAe,CAAC;IAC3B,CAAC;IAEO,gBAAgB,CAAI,GAAuB,EAAE,QAAuB;QACxE,uCAAuC;QACvC,MAAM,QAAQ,GAAG,IAAI,CAAC,MAAM,CAAC,GAAG,CAAoB,CAAC;QACrD,IAAI,QAAQ,KAAK,SAAS,EAAE;YACxB,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC;YACrC,OAAO;SACV;QAED,IAAI,QAAQ,KAAK,SAAS,EAAE;YACxB,IAAA,6BAAW,EAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;SACnC;IACL,CAAC;IAEO,mBAAmB,CAAI,GAAuB,EAAE,QAAW;QAC/D,MAAM,QAAQ,GAAG,IAAI,CAAC,MAAM,CAAC,GAAG,CAAQ,CAAC;QACzC,IAAI,QAAQ,KAAK,SAAS,EAAE;YACxB,OAAO;SACV;QAED,IAAA,qCAAmB,EAAC,QAAQ,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,QAAQ,CAAC,CAAC;IACzD,CAAC;CACJ;AApFD,0CAoFC"}
1
+ {"version":3,"file":"serviceProvider.js","sourceRoot":"","sources":["../../../src/common/serviceProvider.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;;;;;;;;;;;;;;;;;;;;;;;;;AAEH,uDAAqE;AACrE,+CAAiC;AAEjC,MAAe,WAAW;CAEzB;AAED;;GAEG;AACH,6DAA6D;AAC7D,MAAa,UAAc,SAAQ,WAAW;IAA9C;;QACa,SAAI,GAAG,WAAW,CAAC;IAChC,CAAC;CAAA;AAFD,gCAEC;AAED;;GAEG;AACH,6DAA6D;AAC7D,MAAa,eAAmB,SAAQ,WAAW;IAAnD;;QACa,SAAI,GAAG,OAAO,CAAC;IAC5B,CAAC;CAAA;AAFD,0CAEC;AAID,MAAa,eAAe;IAA5B;QACY,eAAU,GAAG,IAAI,GAAG,EAAoB,CAAC;IAyFrD,CAAC;IArFG,GAAG,CAAI,GAAsB,EAAE,KAAoB;QAC/C,IAAI,GAAG,CAAC,IAAI,KAAK,OAAO,EAAE;YACtB,IAAI,CAAC,gBAAgB,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;YAClC,OAAO;SACV;QAED,IAAI,GAAG,CAAC,IAAI,KAAK,WAAW,EAAE;YAC1B,IAAI,KAAK,KAAK,SAAS,EAAE;gBACrB,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;aACnC;iBAAM;gBACH,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;aACpB;YACD,OAAO;SACV;QAED,KAAK,CAAC,WAAW,CAAC,GAAG,EAAE,oBAAoB,OAAO,GAAG,EAAE,CAAC,CAAC;IAC7D,CAAC;IAID,MAAM,CAAI,GAAsB,EAAE,KAAS;QACvC,IAAI,GAAG,CAAC,IAAI,KAAK,OAAO,EAAE;YACtB,IAAI,CAAC,mBAAmB,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;YACrC,OAAO;SACV;QAED,IAAI,GAAG,CAAC,IAAI,KAAK,WAAW,EAAE;YAC1B,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;YAC5B,OAAO;SACV;QAED,KAAK,CAAC,WAAW,CAAC,GAAG,EAAE,oBAAoB,OAAO,GAAG,EAAE,CAAC,CAAC;IAC7D,CAAC;IAID,MAAM,CAAI,GAAsB;QAC5B,OAAO,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IACpC,CAAC;IAID,GAAG,CAAI,GAAsB;QACzB,MAAM,KAAK,GAAG,GAAG,CAAC,IAAI,KAAK,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QACzE,IAAI,KAAK,KAAK,SAAS,EAAE;YACrB,MAAM,IAAI,KAAK,CAAC,+CAA+C,GAAG,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;SACpF;QAED,OAAO,KAAK,CAAC;IACjB,CAAC;IAED,KAAK;QACD,MAAM,eAAe,GAAG,IAAI,eAAe,EAAE,CAAC;QAC9C,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,GAAG,EAAE,EAAE;YACnC,IAAI,GAAG,CAAC,IAAI,KAAK,OAAO,EAAE;gBACtB,eAAe,CAAC,UAAU,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,GAAG,CAAC,KAAK,aAAL,KAAK,cAAL,KAAK,GAAI,EAAE,CAAC,CAAC,CAAC,CAAC;aAC3D;iBAAM;gBACH,eAAe,CAAC,UAAU,CAAC,GAAG,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;aAC9C;QACL,CAAC,CAAC,CAAC;QAEH,OAAO,eAAe,CAAC;IAC3B,CAAC;IAEO,gBAAgB,CAAI,GAAuB,EAAE,QAAuB;QACxE,uCAAuC;QACvC,MAAM,QAAQ,GAAG,IAAI,CAAC,MAAM,CAAC,GAAG,CAAoB,CAAC;QACrD,IAAI,QAAQ,KAAK,SAAS,EAAE;YACxB,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC;YACrC,OAAO;SACV;QAED,IAAI,QAAQ,KAAK,SAAS,EAAE;YACxB,IAAA,6BAAW,EAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;SACnC;IACL,CAAC;IAEO,mBAAmB,CAAI,GAAuB,EAAE,QAAW;QAC/D,MAAM,QAAQ,GAAG,IAAI,CAAC,MAAM,CAAC,GAAG,CAAQ,CAAC;QACzC,IAAI,QAAQ,KAAK,SAAS,EAAE;YACxB,OAAO;SACV;QAED,IAAA,qCAAmB,EAAC,QAAQ,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,QAAQ,CAAC,CAAC;IACzD,CAAC;CACJ;AA1FD,0CA0FC"}
package/dist/common/uri/baseUri.d.ts CHANGED
@@ -6,7 +6,7 @@ export declare abstract class BaseUri implements Uri {
6
6
  abstract get scheme(): string;
7
7
  abstract get isCaseSensitive(): boolean;
8
8
  abstract get fileName(): string;
9
- get fileNameWithoutExtension(): string;
9
+ get fileNameWithoutExtensions(): string;
10
10
  abstract get lastExtension(): string;
11
11
  abstract get root(): Uri;
12
12
  get packageUri(): Uri;
@@ -14,6 +14,7 @@ export declare abstract class BaseUri implements Uri {
14
14
  get initPyUri(): Uri;
15
15
  get initPyiUri(): Uri;
16
16
  get pytypedUri(): Uri;
17
+ abstract get fragment(): string;
17
18
  isEmpty(): boolean;
18
19
  abstract toString(): string;
19
20
  abstract toUserVisibleString(): string;
@@ -21,6 +22,8 @@ export declare abstract class BaseUri implements Uri {
21
22
  replaceExtension(ext: string): Uri;
22
23
  addExtension(ext: string): Uri;
23
24
  hasExtension(ext: string): boolean;
25
+ containsExtension(ext: string): boolean;
26
+ abstract withFragment(fragment: string): Uri;
24
27
  abstract addPath(extra: string): Uri;
25
28
  abstract getDirectory(): Uri;
26
29
  getRootPathLength(): number;
package/dist/common/uri/baseUri.js CHANGED
@@ -19,7 +19,7 @@ class BaseUri {
19
19
  return this._key;
20
20
  }
21
21
  // Returns just the fileName without any extensions
22
- get fileNameWithoutExtension() {
22
+ get fileNameWithoutExtensions() {
23
23
  const fileName = this.fileName;
24
24
  const index = fileName.lastIndexOf('.');
25
25
  if (index > 0) {
@@ -71,6 +71,12 @@ class BaseUri {
71
71
  ? this.lastExtension === ext
72
72
  : this.lastExtension.toLowerCase() === ext.toLowerCase();
73
73
  }
74
+ containsExtension(ext) {
75
+ const fileName = this.fileName;
76
+ // Use a regex so we keep the . on the front of the extension.
77
+ const extensions = fileName.split(/(?=\.)/g);
78
+ return extensions.some((e) => (this.isCaseSensitive ? e === ext : e.toLowerCase() === ext.toLowerCase()));
79
+ }
74
80
  getRootPathLength() {
75
81
  return this.getRootPath().length;
76
82
  }