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

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 (245) hide show
  1. package/dist/analyzer/binder.d.ts +1 -3
  2. package/dist/analyzer/binder.js +27 -37
  3. package/dist/analyzer/binder.js.map +1 -1
  4. package/dist/analyzer/checker.d.ts +2 -2
  5. package/dist/analyzer/checker.js +345 -351
  6. package/dist/analyzer/checker.js.map +1 -1
  7. package/dist/analyzer/codeFlowEngine.js +2 -2
  8. package/dist/analyzer/codeFlowEngine.js.map +1 -1
  9. package/dist/analyzer/commentUtils.js +7 -7
  10. package/dist/analyzer/commentUtils.js.map +1 -1
  11. package/dist/analyzer/constraintSolver.js +29 -30
  12. package/dist/analyzer/constraintSolver.js.map +1 -1
  13. package/dist/analyzer/constructorTransform.js +10 -11
  14. package/dist/analyzer/constructorTransform.js.map +1 -1
  15. package/dist/analyzer/constructors.d.ts +3 -3
  16. package/dist/analyzer/constructors.js +12 -14
  17. package/dist/analyzer/constructors.js.map +1 -1
  18. package/dist/analyzer/dataClasses.js +17 -17
  19. package/dist/analyzer/dataClasses.js.map +1 -1
  20. package/dist/analyzer/decorators.d.ts +1 -2
  21. package/dist/analyzer/decorators.js +13 -10
  22. package/dist/analyzer/decorators.js.map +1 -1
  23. package/dist/analyzer/enums.d.ts +4 -2
  24. package/dist/analyzer/enums.js +109 -50
  25. package/dist/analyzer/enums.js.map +1 -1
  26. package/dist/analyzer/functionTransform.js +1 -2
  27. package/dist/analyzer/functionTransform.js.map +1 -1
  28. package/dist/analyzer/importResolver.d.ts +2 -2
  29. package/dist/analyzer/importResolver.js +96 -27
  30. package/dist/analyzer/importResolver.js.map +1 -1
  31. package/dist/analyzer/namedTuples.js +8 -7
  32. package/dist/analyzer/namedTuples.js.map +1 -1
  33. package/dist/analyzer/operations.js +19 -21
  34. package/dist/analyzer/operations.js.map +1 -1
  35. package/dist/analyzer/parseTreeUtils.d.ts +1 -1
  36. package/dist/analyzer/parseTreeUtils.js +37 -0
  37. package/dist/analyzer/parseTreeUtils.js.map +1 -1
  38. package/dist/analyzer/patternMatching.js +26 -23
  39. package/dist/analyzer/patternMatching.js.map +1 -1
  40. package/dist/analyzer/program.js +18 -4
  41. package/dist/analyzer/program.js.map +1 -1
  42. package/dist/analyzer/properties.js +8 -8
  43. package/dist/analyzer/properties.js.map +1 -1
  44. package/dist/analyzer/protocols.js +37 -30
  45. package/dist/analyzer/protocols.js.map +1 -1
  46. package/dist/analyzer/service.d.ts +1 -1
  47. package/dist/analyzer/service.js +21 -20
  48. package/dist/analyzer/service.js.map +1 -1
  49. package/dist/analyzer/sourceFile.d.ts +2 -2
  50. package/dist/analyzer/sourceFile.js +17 -17
  51. package/dist/analyzer/sourceFile.js.map +1 -1
  52. package/dist/analyzer/sourceFileInfoUtils.js +1 -1
  53. package/dist/analyzer/sourceFileInfoUtils.js.map +1 -1
  54. package/dist/analyzer/typeEvaluator.js +1042 -875
  55. package/dist/analyzer/typeEvaluator.js.map +1 -1
  56. package/dist/analyzer/typeEvaluatorTypes.d.ts +12 -11
  57. package/dist/analyzer/typeEvaluatorTypes.js +2 -4
  58. package/dist/analyzer/typeEvaluatorTypes.js.map +1 -1
  59. package/dist/analyzer/typeGuards.js +16 -11
  60. package/dist/analyzer/typeGuards.js.map +1 -1
  61. package/dist/analyzer/typePrinter.js +3 -4
  62. package/dist/analyzer/typePrinter.js.map +1 -1
  63. package/dist/analyzer/typeUtils.d.ts +5 -2
  64. package/dist/analyzer/typeUtils.js +19 -0
  65. package/dist/analyzer/typeUtils.js.map +1 -1
  66. package/dist/analyzer/typedDicts.js +30 -34
  67. package/dist/analyzer/typedDicts.js.map +1 -1
  68. package/dist/analyzer/types.d.ts +12 -13
  69. package/dist/analyzer/types.js +49 -61
  70. package/dist/analyzer/types.js.map +1 -1
  71. package/dist/backgroundAnalysisBase.d.ts +12 -11
  72. package/dist/backgroundAnalysisBase.js +60 -64
  73. package/dist/backgroundAnalysisBase.js.map +1 -1
  74. package/dist/backgroundThreadBase.d.ts +6 -5
  75. package/dist/backgroundThreadBase.js +63 -60
  76. package/dist/backgroundThreadBase.js.map +1 -1
  77. package/dist/commands/quickActionCommand.js +1 -1
  78. package/dist/commands/quickActionCommand.js.map +1 -1
  79. package/dist/common/cancellationUtils.d.ts +6 -3
  80. package/dist/common/cancellationUtils.js +29 -5
  81. package/dist/common/cancellationUtils.js.map +1 -1
  82. package/dist/common/commandLineOptions.d.ts +1 -0
  83. package/dist/common/commandLineOptions.js.map +1 -1
  84. package/dist/common/commandUtils.d.ts +2 -0
  85. package/dist/common/commandUtils.js +24 -0
  86. package/dist/common/commandUtils.js.map +1 -0
  87. package/dist/common/configOptions.d.ts +1 -0
  88. package/dist/common/configOptions.js +13 -11
  89. package/dist/common/configOptions.js.map +1 -1
  90. package/dist/common/core.d.ts +1 -1
  91. package/dist/common/core.js.map +1 -1
  92. package/dist/common/extensibility.d.ts +7 -6
  93. package/dist/common/extensibility.js.map +1 -1
  94. package/dist/common/fileBasedCancellationUtils.js +19 -13
  95. package/dist/common/fileBasedCancellationUtils.js.map +1 -1
  96. package/dist/common/fullAccessHost.d.ts +1 -1
  97. package/dist/common/fullAccessHost.js +2 -2
  98. package/dist/common/fullAccessHost.js.map +1 -1
  99. package/dist/common/host.d.ts +2 -2
  100. package/dist/common/host.js.map +1 -1
  101. package/dist/common/realFileSystem.js +8 -8
  102. package/dist/common/realFileSystem.js.map +1 -1
  103. package/dist/common/serviceProvider.js +8 -1
  104. package/dist/common/serviceProvider.js.map +1 -1
  105. package/dist/common/uri/baseUri.d.ts +11 -3
  106. package/dist/common/uri/baseUri.js +54 -25
  107. package/dist/common/uri/baseUri.js.map +1 -1
  108. package/dist/common/uri/emptyUri.d.ts +9 -4
  109. package/dist/common/uri/emptyUri.js +22 -8
  110. package/dist/common/uri/emptyUri.js.map +1 -1
  111. package/dist/common/uri/fileUri.d.ts +14 -4
  112. package/dist/common/uri/fileUri.js +65 -9
  113. package/dist/common/uri/fileUri.js.map +1 -1
  114. package/dist/common/uri/memoization.js +1 -1
  115. package/dist/common/uri/memoization.js.map +1 -1
  116. package/dist/common/uri/uri.d.ts +9 -2
  117. package/dist/common/uri/uri.js +5 -2
  118. package/dist/common/uri/uri.js.map +1 -1
  119. package/dist/common/uri/uriUtils.d.ts +2 -0
  120. package/dist/common/uri/uriUtils.js +21 -4
  121. package/dist/common/uri/uriUtils.js.map +1 -1
  122. package/dist/common/uri/webUri.d.ts +8 -1
  123. package/dist/common/uri/webUri.js +59 -13
  124. package/dist/common/uri/webUri.js.map +1 -1
  125. package/dist/common/workspaceEditUtils.d.ts +6 -5
  126. package/dist/common/workspaceEditUtils.js +18 -17
  127. package/dist/common/workspaceEditUtils.js.map +1 -1
  128. package/dist/languageServerBase.d.ts +2 -0
  129. package/dist/languageServerBase.js +29 -25
  130. package/dist/languageServerBase.js.map +1 -1
  131. package/dist/languageService/analyzerServiceExecutor.d.ts +1 -2
  132. package/dist/languageService/analyzerServiceExecutor.js +8 -5
  133. package/dist/languageService/analyzerServiceExecutor.js.map +1 -1
  134. package/dist/languageService/autoImporter.js +3 -3
  135. package/dist/languageService/autoImporter.js.map +1 -1
  136. package/dist/languageService/callHierarchyProvider.js +9 -7
  137. package/dist/languageService/callHierarchyProvider.js.map +1 -1
  138. package/dist/languageService/codeActionProvider.js +3 -2
  139. package/dist/languageService/codeActionProvider.js.map +1 -1
  140. package/dist/languageService/completionProvider.d.ts +2 -4
  141. package/dist/languageService/completionProvider.js +14 -18
  142. package/dist/languageService/completionProvider.js.map +1 -1
  143. package/dist/languageService/documentSymbolProvider.js +5 -4
  144. package/dist/languageService/documentSymbolProvider.js.map +1 -1
  145. package/dist/languageService/navigationUtils.js +2 -1
  146. package/dist/languageService/navigationUtils.js.map +1 -1
  147. package/dist/languageService/renameProvider.js +2 -2
  148. package/dist/languageService/renameProvider.js.map +1 -1
  149. package/dist/languageService/workspaceSymbolProvider.js +2 -1
  150. package/dist/languageService/workspaceSymbolProvider.js.map +1 -1
  151. package/dist/localization/localize.d.ts +10 -9
  152. package/dist/localization/localize.js +9 -5
  153. package/dist/localization/localize.js.map +1 -1
  154. package/dist/localization/package.nls.cs.json +50 -9
  155. package/dist/localization/package.nls.de.json +51 -10
  156. package/dist/localization/package.nls.en-us.json +11 -9
  157. package/dist/localization/package.nls.es.json +51 -10
  158. package/dist/localization/package.nls.fr.json +50 -9
  159. package/dist/localization/package.nls.it.json +51 -10
  160. package/dist/localization/package.nls.ja.json +51 -10
  161. package/dist/localization/package.nls.ko.json +51 -10
  162. package/dist/localization/package.nls.pl.json +51 -10
  163. package/dist/localization/package.nls.pt-br.json +51 -10
  164. package/dist/localization/package.nls.qps-ploc.json +51 -10
  165. package/dist/localization/package.nls.ru.json +50 -9
  166. package/dist/localization/package.nls.tr.json +51 -10
  167. package/dist/localization/package.nls.zh-cn.json +51 -10
  168. package/dist/localization/package.nls.zh-tw.json +51 -10
  169. package/dist/parser/parser.d.ts +1 -4
  170. package/dist/parser/parser.js +201 -201
  171. package/dist/parser/parser.js.map +1 -1
  172. package/dist/parser/tokenizer.d.ts +2 -4
  173. package/dist/parser/tokenizer.js +5 -6
  174. package/dist/parser/tokenizer.js.map +1 -1
  175. package/dist/parser/tokenizerTypes.d.ts +2 -2
  176. package/dist/parser/tokenizerTypes.js.map +1 -1
  177. package/dist/pyright.js +11 -9
  178. package/dist/pyright.js.map +1 -1
  179. package/dist/pyrightFileSystem.js +2 -2
  180. package/dist/server.js +7 -5
  181. package/dist/server.js.map +1 -1
  182. package/dist/tests/chainedSourceFiles.test.js +8 -8
  183. package/dist/tests/chainedSourceFiles.test.js.map +1 -1
  184. package/dist/tests/completions.test.js +3 -3
  185. package/dist/tests/completions.test.js.map +1 -1
  186. package/dist/tests/config.test.js +14 -6
  187. package/dist/tests/config.test.js.map +1 -1
  188. package/dist/tests/filesystem.test.js +6 -6
  189. package/dist/tests/filesystem.test.js.map +1 -1
  190. package/dist/tests/fourSlashParser.test.js +23 -9
  191. package/dist/tests/fourSlashParser.test.js.map +1 -1
  192. package/dist/tests/fourslash/rename.multipleDecl.fourslash.d.ts +1 -1
  193. package/dist/tests/harness/fourslash/fourSlashParser.js +4 -0
  194. package/dist/tests/harness/fourslash/fourSlashParser.js.map +1 -1
  195. package/dist/tests/harness/fourslash/fourSlashTypes.d.ts +3 -0
  196. package/dist/tests/harness/fourslash/fourSlashTypes.js.map +1 -1
  197. package/dist/tests/harness/fourslash/testLanguageService.js +2 -0
  198. package/dist/tests/harness/fourslash/testLanguageService.js.map +1 -1
  199. package/dist/tests/harness/fourslash/testState.d.ts +13 -0
  200. package/dist/tests/harness/fourslash/testState.js +14 -8
  201. package/dist/tests/harness/fourslash/testState.js.map +1 -1
  202. package/dist/tests/harness/vfs/factory.d.ts +1 -1
  203. package/dist/tests/harness/vfs/factory.js +4 -4
  204. package/dist/tests/harness/vfs/factory.js.map +1 -1
  205. package/dist/tests/importStatementUtils.test.js +1 -1
  206. package/dist/tests/importStatementUtils.test.js.map +1 -1
  207. package/dist/tests/ipythonMode.test.js +21 -22
  208. package/dist/tests/ipythonMode.test.js.map +1 -1
  209. package/dist/tests/localizer.test.js +2 -2
  210. package/dist/tests/localizer.test.js.map +1 -1
  211. package/dist/tests/serialization.test.d.ts +2 -0
  212. package/dist/tests/serialization.test.js +88 -0
  213. package/dist/tests/serialization.test.js.map +1 -0
  214. package/dist/tests/service.test.js +1 -1
  215. package/dist/tests/service.test.js.map +1 -1
  216. package/dist/tests/signatureHelp.test.js +2 -3
  217. package/dist/tests/signatureHelp.test.js.map +1 -1
  218. package/dist/tests/sourceFile.test.js +3 -3
  219. package/dist/tests/sourceFile.test.js.map +1 -1
  220. package/dist/tests/sourceMapperUtils.test.js +2 -2
  221. package/dist/tests/sourceMapperUtils.test.js.map +1 -1
  222. package/dist/tests/testState.test.js +1 -1
  223. package/dist/tests/testState.test.js.map +1 -1
  224. package/dist/tests/testStateUtils.js +2 -2
  225. package/dist/tests/testStateUtils.js.map +1 -1
  226. package/dist/tests/textEditUtil.test.js +1 -2
  227. package/dist/tests/textEditUtil.test.js.map +1 -1
  228. package/dist/tests/typeEvaluator1.test.js +15 -3
  229. package/dist/tests/typeEvaluator1.test.js.map +1 -1
  230. package/dist/tests/typeEvaluator2.test.js +12 -8
  231. package/dist/tests/typeEvaluator2.test.js.map +1 -1
  232. package/dist/tests/typeEvaluator3.test.js +24 -6
  233. package/dist/tests/typeEvaluator3.test.js.map +1 -1
  234. package/dist/tests/typeEvaluator4.test.js +5 -5
  235. package/dist/tests/typeEvaluator4.test.js.map +1 -1
  236. package/dist/tests/typeEvaluator5.test.js +4 -0
  237. package/dist/tests/typeEvaluator5.test.js.map +1 -1
  238. package/dist/tests/uri.test.js +95 -15
  239. package/dist/tests/uri.test.js.map +1 -1
  240. package/dist/tests/workspaceEditUtils.test.js +8 -8
  241. package/dist/tests/workspaceEditUtils.test.js.map +1 -1
  242. package/dist/workspaceFactory.d.ts +1 -0
  243. package/dist/workspaceFactory.js +2 -1
  244. package/dist/workspaceFactory.js.map +1 -1
  245. package/package.json +2 -1
@@ -7,7 +7,7 @@
7
7
  * Utility functions for manipulating URIs.
8
8
  */
9
9
  Object.defineProperty(exports, "__esModule", { value: true });
10
- exports.getRootUri = exports.deduplicateFolders = exports.isFileSystemCaseSensitiveInternal = exports.isFileSystemCaseSensitive = exports.getFileSpec = exports.hasPythonExtension = exports.getWildcardRoot = exports.getWildcardRegexPattern = exports.setTestingMode = exports.getFileSystemEntriesFromDirEntries = exports.getFileSystemEntries = exports.tryRealpath = exports.tryStat = exports.isFile = exports.isDirectory = exports.directoryExists = exports.fileExists = exports.getFileSize = exports.makeDirectories = exports.forEachAncestorDirectory = exports.FileSpec = void 0;
10
+ exports.encodeUri = exports.getRootUri = exports.deduplicateFolders = exports.getDirectoryChangeKind = exports.isFileSystemCaseSensitiveInternal = exports.isFileSystemCaseSensitive = exports.getFileSpec = exports.hasPythonExtension = exports.getWildcardRoot = exports.getWildcardRegexPattern = exports.setTestingMode = exports.getFileSystemEntriesFromDirEntries = exports.getFileSystemEntries = exports.tryRealpath = exports.tryStat = exports.isFile = exports.isDirectory = exports.directoryExists = exports.fileExists = exports.getFileSize = exports.makeDirectories = exports.forEachAncestorDirectory = exports.FileSpec = void 0;
11
11
  const crypto_1 = require("../crypto");
12
12
  const pathUtils_1 = require("../pathUtils");
13
13
  const uri_1 = require("./uri");
@@ -181,7 +181,7 @@ exports.setTestingMode = setTestingMode;
181
181
  // escape characters **, * or ?) and returns a regular expression
182
182
  // that can be used for matching against.
183
183
  function getWildcardRegexPattern(root, fileSpec) {
184
- const absolutePath = root.combinePaths(fileSpec);
184
+ const absolutePath = root.resolvePaths(fileSpec);
185
185
  const pathComponents = Array.from(absolutePath.getPathComponents());
186
186
  const escapedSeparator = (0, pathUtils_1.getRegexEscapedSeparator)('/');
187
187
  const doubleAsteriskRegexFragment = `(${escapedSeparator}[^${escapedSeparator}][^${escapedSeparator}]*)*?`;
@@ -220,7 +220,7 @@ function getWildcardRegexPattern(root, fileSpec) {
220
220
  exports.getWildcardRegexPattern = getWildcardRegexPattern;
221
221
  // Returns the topmost path that contains no wildcard characters.
222
222
  function getWildcardRoot(root, fileSpec) {
223
- const absolutePath = root.combinePaths(fileSpec);
223
+ const absolutePath = root.resolvePaths(fileSpec);
224
224
  // make a copy of the path components so we can modify them.
225
225
  const pathComponents = Array.from(absolutePath.getPathComponents());
226
226
  let wildcardRoot = absolutePath.root;
@@ -236,7 +236,7 @@ function getWildcardRoot(root, fileSpec) {
236
236
  if (/[*?]/.test(component)) {
237
237
  break;
238
238
  }
239
- wildcardRoot = wildcardRoot.combinePaths(component);
239
+ wildcardRoot = wildcardRoot.resolvePaths(component);
240
240
  }
241
241
  }
242
242
  return wildcardRoot;
@@ -324,6 +324,18 @@ function isFileSystemCaseSensitiveInternal(fs, tmp) {
324
324
  }
325
325
  }
326
326
  exports.isFileSystemCaseSensitiveInternal = isFileSystemCaseSensitiveInternal;
327
+ function getDirectoryChangeKind(fs, oldDirectory, newDirectory) {
328
+ if (oldDirectory.equals(newDirectory)) {
329
+ return 'Same';
330
+ }
331
+ const relativePaths = oldDirectory.getRelativePathComponents(newDirectory);
332
+ // 2 means only last folder name has changed.
333
+ if (relativePaths.length === 2 && relativePaths[0] === '..' && relativePaths[1] !== '..') {
334
+ return 'Renamed';
335
+ }
336
+ return 'Moved';
337
+ }
338
+ exports.getDirectoryChangeKind = getDirectoryChangeKind;
327
339
  function deduplicateFolders(listOfFolders) {
328
340
  const foldersToWatch = new Map();
329
341
  listOfFolders.forEach((folders) => {
@@ -359,4 +371,9 @@ function getRootUri(isCaseSensitive) {
359
371
  return undefined;
360
372
  }
361
373
  exports.getRootUri = getRootUri;
374
+ function encodeUri(fs, uri) {
375
+ // Convert to a URI string that the LSP client understands (mapped files are only local to the server).
376
+ return fs.getOriginalUri(uri).toString();
377
+ }
378
+ exports.encodeUri = encodeUri;
362
379
  //# sourceMappingURL=uriUtils.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"uriUtils.js","sourceRoot":"","sources":["../../../../src/common/uri/uriUtils.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"uriUtils.js","sourceRoot":"","sources":["../../../../src/common/uri/uriUtils.ts"],"names":[],"mappings":"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"}
@@ -1,4 +1,4 @@
1
- import { BaseUri } from './baseUri';
1
+ import { BaseUri, JsonObjType } from './baseUri';
2
2
  import { Uri } from './uri';
3
3
  export declare class WebUri extends BaseUri {
4
4
  private readonly _scheme;
@@ -10,6 +10,7 @@ export declare class WebUri extends BaseUri {
10
10
  private constructor();
11
11
  get scheme(): string;
12
12
  get isCaseSensitive(): boolean;
13
+ get fragment(): string;
13
14
  get root(): Uri;
14
15
  get fileName(): string;
15
16
  get lastExtension(): string;
@@ -18,6 +19,7 @@ export declare class WebUri extends BaseUri {
18
19
  toUserVisibleString(): string;
19
20
  static isWebUri(uri: any): uri is WebUri;
20
21
  static fromJsonObj(obj: WebUri): WebUri;
22
+ toJsonObj(): JsonObjType;
21
23
  matchesRegex(regex: RegExp): boolean;
22
24
  addPath(extra: string): Uri;
23
25
  isRoot(): boolean;
@@ -27,8 +29,13 @@ export declare class WebUri extends BaseUri {
27
29
  getPathLength(): number;
28
30
  getPath(): string;
29
31
  getFilePath(): string;
32
+ resolvePaths(...paths: string[]): Uri;
30
33
  combinePaths(...paths: string[]): Uri;
34
+ combinePathsUnsafe(...paths: string[]): Uri;
31
35
  getDirectory(): Uri;
36
+ withFragment(fragment: string): Uri;
37
+ stripExtension(): Uri;
38
+ stripAllExtensions(): Uri;
32
39
  protected getPathComponentsImpl(): string[];
33
40
  protected getRootPath(): string;
34
41
  protected getComparablePath(): string;
@@ -39,6 +39,9 @@ class WebUri extends baseUri_1.BaseUri {
39
39
  // Web URIs are always case sensitive
40
40
  return true;
41
41
  }
42
+ get fragment() {
43
+ return this._fragment;
44
+ }
42
45
  get root() {
43
46
  const rootPath = this.getRootPath();
44
47
  if (rootPath !== this._path) {
@@ -78,6 +81,17 @@ class WebUri extends baseUri_1.BaseUri {
78
81
  static fromJsonObj(obj) {
79
82
  return WebUri.createWebUri(obj._scheme, obj._authority, obj._path, obj._query, obj._fragment, obj._originalString);
80
83
  }
84
+ toJsonObj() {
85
+ return {
86
+ _scheme: this._scheme,
87
+ _authority: this._authority,
88
+ _path: this._path,
89
+ _query: this._query,
90
+ _fragment: this._fragment,
91
+ _originalString: this._originalString,
92
+ _key: this.key,
93
+ };
94
+ }
81
95
  matchesRegex(regex) {
82
96
  return regex.test(this._path);
83
97
  }
@@ -98,21 +112,16 @@ class WebUri extends baseUri_1.BaseUri {
98
112
  return false;
99
113
  }
100
114
  startsWith(other) {
101
- if (!other || !WebUri.isWebUri(other)) {
102
- return false;
103
- }
104
- if (other.isEmpty() !== this.isEmpty()) {
115
+ if ((other === null || other === void 0 ? void 0 : other.scheme) !== this.scheme) {
105
116
  return false;
106
117
  }
107
- if (this.scheme !== other.scheme) {
108
- return false;
109
- }
110
- if (this._path.length >= other._path.length) {
118
+ const otherWebUri = other;
119
+ if (this._path.length >= otherWebUri._path.length) {
111
120
  // Make sure the other ends with a / when comparing longer paths, otherwise we might
112
121
  // say that /a/food is a child of /a/foo.
113
- const otherPath = this._path.length > other._path.length && !(0, pathUtils_1.hasTrailingDirectorySeparator)(other._path)
114
- ? `${other._path}/`
115
- : other._path;
122
+ const otherPath = this._path.length > otherWebUri._path.length && !(0, pathUtils_1.hasTrailingDirectorySeparator)(otherWebUri._path)
123
+ ? `${otherWebUri._path}/`
124
+ : otherWebUri._path;
116
125
  return this._path.startsWith(otherPath);
117
126
  }
118
127
  return false;
@@ -124,9 +133,9 @@ class WebUri extends baseUri_1.BaseUri {
124
133
  return this._path;
125
134
  }
126
135
  getFilePath() {
127
- return '';
136
+ return ''; // Web URIs don't have file paths so this is always empty.
128
137
  }
129
- combinePaths(...paths) {
138
+ resolvePaths(...paths) {
130
139
  // Resolve and combine paths, never want URIs with '..' in the middle.
131
140
  let combined = this.normalizeSlashes((0, pathUtils_1.resolvePaths)(this._path, ...paths));
132
141
  // Make sure to remove any trailing directory chars.
@@ -138,6 +147,23 @@ class WebUri extends baseUri_1.BaseUri {
138
147
  }
139
148
  return this;
140
149
  }
150
+ combinePaths(...paths) {
151
+ if (paths.some((p) => p.includes('..') || p.includes('/') || p === '.')) {
152
+ // This is a slow path that handles paths that contain '..' or '.'.
153
+ return this.resolvePaths(...paths);
154
+ }
155
+ // Paths don't have any thing special that needs to be combined differently, so just
156
+ // use the quick method.
157
+ return this.combinePathsUnsafe(...paths);
158
+ }
159
+ combinePathsUnsafe(...paths) {
160
+ // Combine paths using the quick path implementation.
161
+ const combined = baseUri_1.BaseUri.combinePathElements(this._path, '/', ...paths);
162
+ if (combined !== this._path) {
163
+ return WebUri.createWebUri(this._scheme, this._authority, combined, '', '', undefined);
164
+ }
165
+ return this;
166
+ }
141
167
  getDirectory() {
142
168
  const index = this._path.lastIndexOf('/');
143
169
  if (index > 0) {
@@ -147,6 +173,26 @@ class WebUri extends baseUri_1.BaseUri {
147
173
  return this;
148
174
  }
149
175
  }
176
+ withFragment(fragment) {
177
+ return WebUri.createWebUri(this._scheme, this._authority, this._path, this._query, fragment, undefined);
178
+ }
179
+ stripExtension() {
180
+ const path = this._path;
181
+ const index = path.lastIndexOf('.');
182
+ if (index > 0) {
183
+ return WebUri.createWebUri(this._scheme, this._authority, path.slice(0, index), this._query, this._fragment, undefined);
184
+ }
185
+ return this;
186
+ }
187
+ stripAllExtensions() {
188
+ const path = this._path;
189
+ const sepIndex = path.lastIndexOf('/');
190
+ const index = path.indexOf('.', sepIndex > 0 ? sepIndex : 0);
191
+ if (index > 0) {
192
+ return WebUri.createWebUri(this._scheme, this._authority, path.slice(0, index), this._query, this._fragment, undefined);
193
+ }
194
+ return this;
195
+ }
150
196
  getPathComponentsImpl() {
151
197
  // Get the root path and the rest of the path components.
152
198
  const rootPath = this.getRootPath();
@@ -1 +1 @@
1
- {"version":3,"file":"webUri.js","sourceRoot":"","sources":["../../../../src/common/uri/webUri.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"webUri.js","sourceRoot":"","sources":["../../../../src/common/uri/webUri.ts"],"names":[],"mappings":"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"}
@@ -2,18 +2,19 @@ import { ChangeAnnotation, TextEdit, WorkspaceEdit } from 'vscode-languageserver
2
2
  import { AnalyzerService } from '../analyzer/service';
3
3
  import { FileEditAction, FileEditActions, TextEditAction } from '../common/editAction';
4
4
  import { EditableProgram, SourceFileInfo } from './extensibility';
5
+ import { ReadOnlyFileSystem } from './fileSystem';
5
6
  import { TextRange } from './textRange';
6
7
  import { TextRangeCollection } from './textRangeCollection';
7
8
  import { Uri } from './uri/uri';
8
9
  export declare function convertToTextEdits(editActions: TextEditAction[]): TextEdit[];
9
10
  export declare function convertToFileTextEdits(fileUri: Uri, editActions: TextEditAction[]): FileEditAction[];
10
- export declare function convertToWorkspaceEdit(edits: FileEditAction[]): WorkspaceEdit;
11
- export declare function convertToWorkspaceEdit(edits: FileEditActions): WorkspaceEdit;
12
- export declare function convertToWorkspaceEdit(edits: FileEditActions, changeAnnotations: {
11
+ export declare function convertToWorkspaceEdit(fs: ReadOnlyFileSystem, edits: FileEditAction[]): WorkspaceEdit;
12
+ export declare function convertToWorkspaceEdit(fs: ReadOnlyFileSystem, edits: FileEditActions): WorkspaceEdit;
13
+ export declare function convertToWorkspaceEdit(fs: ReadOnlyFileSystem, edits: FileEditActions, changeAnnotations: {
13
14
  [id: string]: ChangeAnnotation;
14
15
  }, defaultAnnotationId: string): WorkspaceEdit;
15
- export declare function appendToWorkspaceEdit(edits: FileEditAction[], workspaceEdit: WorkspaceEdit): void;
16
+ export declare function appendToWorkspaceEdit(fs: ReadOnlyFileSystem, edits: FileEditAction[], workspaceEdit: WorkspaceEdit): void;
16
17
  export declare function applyTextEditsToString(edits: TextEditAction[], lines: TextRangeCollection<TextRange>, originalText: string): string;
17
18
  export declare function applyWorkspaceEdit(program: EditableProgram, edits: WorkspaceEdit, filesChanged: Map<string, Uri>): void;
18
19
  export declare function applyDocumentChanges(program: EditableProgram, fileInfo: SourceFileInfo, edits: TextEdit[]): void;
19
- export declare function generateWorkspaceEdit(originalService: AnalyzerService, clonedService: AnalyzerService, filesChanged: Map<string, Uri>): WorkspaceEdit;
20
+ export declare function generateWorkspaceEdit(fs: ReadOnlyFileSystem, originalService: AnalyzerService, clonedService: AnalyzerService, filesChanged: Map<string, Uri>): WorkspaceEdit;
@@ -16,6 +16,7 @@ const debug_1 = require("./debug");
16
16
  const positionUtils_1 = require("./positionUtils");
17
17
  const textRange_1 = require("./textRange");
18
18
  const uri_1 = require("./uri/uri");
19
+ const uriUtils_1 = require("./uri/uriUtils");
19
20
  function convertToTextEdits(editActions) {
20
21
  return editActions.map((editAction) => ({
21
22
  range: editAction.range,
@@ -27,18 +28,18 @@ function convertToFileTextEdits(fileUri, editActions) {
27
28
  return editActions.map((a) => ({ fileUri, ...a }));
28
29
  }
29
30
  exports.convertToFileTextEdits = convertToFileTextEdits;
30
- function convertToWorkspaceEdit(edits, changeAnnotations, defaultAnnotationId = 'default') {
31
+ function convertToWorkspaceEdit(fs, edits, changeAnnotations, defaultAnnotationId = 'default') {
31
32
  if ((0, core_1.isArray)(edits)) {
32
- return _convertToWorkspaceEditWithChanges(edits);
33
+ return _convertToWorkspaceEditWithChanges(fs, edits);
33
34
  }
34
- return _convertToWorkspaceEditWithDocumentChanges(edits, changeAnnotations, defaultAnnotationId);
35
+ return _convertToWorkspaceEditWithDocumentChanges(fs, edits, changeAnnotations, defaultAnnotationId);
35
36
  }
36
37
  exports.convertToWorkspaceEdit = convertToWorkspaceEdit;
37
- function appendToWorkspaceEdit(edits, workspaceEdit) {
38
+ function appendToWorkspaceEdit(fs, edits, workspaceEdit) {
38
39
  edits.forEach((edit) => {
39
- const uri = edit.fileUri;
40
- workspaceEdit.changes[uri.toString()] = workspaceEdit.changes[uri.toString()] || [];
41
- workspaceEdit.changes[uri.toString()].push({ range: edit.range, newText: edit.replacementText });
40
+ const uri = (0, uriUtils_1.encodeUri)(fs, edit.fileUri);
41
+ workspaceEdit.changes[uri] = workspaceEdit.changes[uri] || [];
42
+ workspaceEdit.changes[uri].push({ range: edit.range, newText: edit.replacementText });
42
43
  });
43
44
  }
44
45
  exports.appendToWorkspaceEdit = appendToWorkspaceEdit;
@@ -119,7 +120,7 @@ function applyDocumentChanges(program, fileInfo, edits) {
119
120
  });
120
121
  }
121
122
  exports.applyDocumentChanges = applyDocumentChanges;
122
- function generateWorkspaceEdit(originalService, clonedService, filesChanged) {
123
+ function generateWorkspaceEdit(fs, originalService, clonedService, filesChanged) {
123
124
  var _a;
124
125
  // For now, we won't do text diff to find out minimal text changes. instead, we will
125
126
  // consider whole text of the files are changed. In future, we could consider
@@ -137,7 +138,7 @@ function generateWorkspaceEdit(originalService, clonedService, filesChanged) {
137
138
  if (!parseResults) {
138
139
  continue;
139
140
  }
140
- edits.changes[uri.toString()] = [
141
+ edits.changes[(0, uriUtils_1.encodeUri)(fs, uri)] = [
141
142
  {
142
143
  range: (0, positionUtils_1.convertTextRangeToRange)(parseResults.parseTree, parseResults.tokenizerOutput.lines),
143
144
  newText: (_a = final.getFileContent()) !== null && _a !== void 0 ? _a : '',
@@ -147,14 +148,14 @@ function generateWorkspaceEdit(originalService, clonedService, filesChanged) {
147
148
  return edits;
148
149
  }
149
150
  exports.generateWorkspaceEdit = generateWorkspaceEdit;
150
- function _convertToWorkspaceEditWithChanges(edits) {
151
+ function _convertToWorkspaceEditWithChanges(fs, edits) {
151
152
  const workspaceEdit = {
152
153
  changes: {},
153
154
  };
154
- appendToWorkspaceEdit(edits, workspaceEdit);
155
+ appendToWorkspaceEdit(fs, edits, workspaceEdit);
155
156
  return workspaceEdit;
156
157
  }
157
- function _convertToWorkspaceEditWithDocumentChanges(editActions, changeAnnotations, defaultAnnotationId = 'default') {
158
+ function _convertToWorkspaceEditWithDocumentChanges(fs, editActions, changeAnnotations, defaultAnnotationId = 'default') {
158
159
  const workspaceEdit = {
159
160
  documentChanges: [],
160
161
  changeAnnotations: changeAnnotations,
@@ -164,7 +165,7 @@ function _convertToWorkspaceEditWithDocumentChanges(editActions, changeAnnotatio
164
165
  for (const operation of editActions.fileOperations) {
165
166
  switch (operation.kind) {
166
167
  case 'create':
167
- workspaceEdit.documentChanges.push(vscode_languageserver_1.CreateFile.create(operation.fileUri.toString(), /* options */ undefined, defaultAnnotationId));
168
+ workspaceEdit.documentChanges.push(vscode_languageserver_1.CreateFile.create((0, uriUtils_1.encodeUri)(fs, operation.fileUri), /* options */ undefined, defaultAnnotationId));
168
169
  break;
169
170
  case 'rename':
170
171
  case 'delete':
@@ -174,9 +175,9 @@ function _convertToWorkspaceEditWithDocumentChanges(editActions, changeAnnotatio
174
175
  }
175
176
  }
176
177
  // Text edit's file path must refer to original file paths unless it is a new file just created.
177
- const mapPerFile = (0, collectionUtils_1.createMapFromItems)(editActions.edits, (e) => e.fileUri.toString());
178
+ const mapPerFile = (0, collectionUtils_1.createMapFromItems)(editActions.edits, (e) => (0, uriUtils_1.encodeUri)(fs, e.fileUri));
178
179
  for (const [uri, value] of mapPerFile) {
179
- workspaceEdit.documentChanges.push(vscode_languageserver_1.TextDocumentEdit.create({ uri, version: null }, Array.from(value.map((v) => ({
180
+ workspaceEdit.documentChanges.push(vscode_languageserver_1.TextDocumentEdit.create({ uri: uri, version: null }, Array.from(value.map((v) => ({
180
181
  range: v.range,
181
182
  newText: v.replacementText,
182
183
  annotationId: defaultAnnotationId,
@@ -187,11 +188,11 @@ function _convertToWorkspaceEditWithDocumentChanges(editActions, changeAnnotatio
187
188
  case 'create':
188
189
  break;
189
190
  case 'rename':
190
- workspaceEdit.documentChanges.push(vscode_languageserver_1.RenameFile.create(operation.oldFileUri.toString(), operation.newFileUri.toString(),
191
+ workspaceEdit.documentChanges.push(vscode_languageserver_1.RenameFile.create((0, uriUtils_1.encodeUri)(fs, operation.oldFileUri), (0, uriUtils_1.encodeUri)(fs, operation.newFileUri),
191
192
  /* options */ undefined, defaultAnnotationId));
192
193
  break;
193
194
  case 'delete':
194
- workspaceEdit.documentChanges.push(vscode_languageserver_1.DeleteFile.create(operation.fileUri.toString(), /* options */ undefined, defaultAnnotationId));
195
+ workspaceEdit.documentChanges.push(vscode_languageserver_1.DeleteFile.create((0, uriUtils_1.encodeUri)(fs, operation.fileUri), /* options */ undefined, defaultAnnotationId));
195
196
  break;
196
197
  default:
197
198
  (0, debug_1.assertNever)(operation);
@@ -1 +1 @@
1
- {"version":3,"file":"workspaceEditUtils.js","sourceRoot":"","sources":["../../../src/common/workspaceEditUtils.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;;AAEH,iEAQ+B;AAE/B,2FAAkE;AAGlE,uDAAuD;AACvD,iCAAiC;AACjC,mCAAsC;AAEtC,mDAAmF;AACnF,2CAAwC;AAExC,mCAAgC;AAEhC,SAAgB,kBAAkB,CAAC,WAA6B;IAC5D,OAAO,WAAW,CAAC,GAAG,CAAC,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC;QACpC,KAAK,EAAE,UAAU,CAAC,KAAK;QACvB,OAAO,EAAE,UAAU,CAAC,eAAe;KACtC,CAAC,CAAC,CAAC;AACR,CAAC;AALD,gDAKC;AAED,SAAgB,sBAAsB,CAAC,OAAY,EAAE,WAA6B;IAC9E,OAAO,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,OAAO,EAAE,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC;AACvD,CAAC;AAFD,wDAEC;AAWD,SAAgB,sBAAsB,CAClC,KAAyC,EACzC,iBAEC,EACD,mBAAmB,GAAG,SAAS;IAE/B,IAAI,IAAA,cAAO,EAAC,KAAK,CAAC,EAAE;QAChB,OAAO,kCAAkC,CAAC,KAAK,CAAC,CAAC;KACpD;IAED,OAAO,0CAA0C,CAAC,KAAK,EAAE,iBAAiB,EAAE,mBAAmB,CAAC,CAAC;AACrG,CAAC;AAZD,wDAYC;AAED,SAAgB,qBAAqB,CAAC,KAAuB,EAAE,aAA4B;IACvF,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;QACnB,MAAM,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC;QACzB,aAAa,CAAC,OAAQ,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC,GAAG,aAAa,CAAC,OAAQ,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC,IAAI,EAAE,CAAC;QACtF,aAAa,CAAC,OAAQ,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,IAAI,CAAC,KAAK,EAAE,OAAO,EAAE,IAAI,CAAC,eAAe,EAAE,CAAC,CAAC;IACtG,CAAC,CAAC,CAAC;AACP,CAAC;AAND,sDAMC;AAED,SAAgB,sBAAsB,CAClC,KAAuB,EACvB,KAAqC,EACrC,YAAoB;IAEpB,MAAM,eAAe,GAAG,KAAK;SACxB,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;;QAAC,OAAA,CAAC;YACT,KAAK,EAAE,MAAA,IAAA,uCAAuB,EAAC,CAAC,CAAC,KAAK,EAAE,KAAK,CAAC,mCAAI,EAAE,KAAK,EAAE,YAAY,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,EAAE;YAC3F,IAAI,EAAE,CAAC,CAAC,eAAe;SAC1B,CAAC,CAAA;KAAA,CAAC;SACF,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE;QACb,MAAM,MAAM,GAAG,EAAE,CAAC,KAAK,CAAC,KAAK,GAAG,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC;QAC/C,IAAI,MAAM,KAAK,CAAC,EAAE;YACd,OAAO,MAAM,CAAC;SACjB;QAED,OAAO,qBAAS,CAAC,MAAM,CAAC,EAAE,CAAC,KAAK,CAAC,GAAG,qBAAS,CAAC,MAAM,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC;IACnE,CAAC,CAAC,CAAC;IAEP,iCAAiC;IACjC,IAAI,OAAO,GAAG,YAAY,CAAC;IAC3B,KAAK,MAAM,MAAM,IAAI,eAAe,EAAE;QAClC,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,EAAE,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,MAAM,CAAC,IAAI,GAAG,OAAO,CAAC,MAAM,CAAC,qBAAS,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC;KAClH;IAED,OAAO,OAAO,CAAC;AACnB,CAAC;AA1BD,wDA0BC;AAED,SAAgB,kBAAkB,CAAC,OAAwB,EAAE,KAAoB,EAAE,YAA8B;IAC7G,IAAI,KAAK,CAAC,OAAO,EAAE;QACf,KAAK,MAAM,EAAE,IAAI,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE;YAC5C,MAAM,OAAO,GAAG,SAAG,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC,aAAa,CAAC,WAAW,CAAC,eAAe,CAAC,CAAC;YACpF,MAAM,QAAQ,GAAG,OAAO,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAC;YACpD,IAAI,CAAC,QAAQ,IAAI,CAAC,QAAQ,CAAC,SAAS,EAAE;gBAClC,+CAA+C;gBAC/C,SAAS;aACZ;YAED,oBAAoB,CAAC,OAAO,EAAE,QAAQ,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;YAC/C,YAAY,CAAC,GAAG,CAAC,OAAO,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;SAC1C;KACJ;IAED,yCAAyC;IACzC,IAAI,KAAK,CAAC,eAAe,EAAE;QACvB,KAAK,MAAM,MAAM,IAAI,KAAK,CAAC,eAAe,EAAE;YACxC,IAAI,wCAAgB,CAAC,EAAE,CAAC,MAAM,CAAC,EAAE;gBAC7B,MAAM,OAAO,GAAG,SAAG,CAAC,KAAK,CAAC,MAAM,CAAC,YAAY,CAAC,GAAG,EAAE,OAAO,CAAC,aAAa,CAAC,WAAW,CAAC,eAAe,CAAC,CAAC;gBACtG,MAAM,QAAQ,GAAG,OAAO,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAC;gBACpD,IAAI,CAAC,QAAQ,IAAI,CAAC,QAAQ,CAAC,SAAS,EAAE;oBAClC,+CAA+C;oBAC/C,SAAS;iBACZ;gBAED,oBAAoB,CAAC,OAAO,EAAE,QAAQ,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC;gBACtD,YAAY,CAAC,GAAG,CAAC,OAAO,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;aAC1C;YAED,yDAAyD;YACzD,8EAA8E;SACjF;KACJ;AACL,CAAC;AAlCD,gDAkCC;AAED,SAAgB,oBAAoB,CAAC,OAAwB,EAAE,QAAwB,EAAE,KAAiB;;IACtG,IAAI,CAAC,QAAQ,CAAC,cAAc,EAAE;QAC1B,MAAM,WAAW,GAAG,QAAQ,CAAC,UAAU,CAAC,cAAc,EAAE,CAAC;QACzD,OAAO,CAAC,aAAa,CAAC,QAAQ,CAAC,UAAU,CAAC,MAAM,EAAE,EAAE,CAAC,EAAE,WAAW,aAAX,WAAW,cAAX,WAAW,GAAI,EAAE,EAAE;YACtE,SAAS,EAAE,QAAQ,CAAC,SAAS;YAC7B,WAAW,EAAE,QAAQ,CAAC,UAAU,CAAC,cAAc,EAAE;YACjD,cAAc,EAAE,MAAA,QAAQ,CAAC,iBAAiB,0CAAE,UAAU,CAAC,MAAM,EAAE;SAClE,CAAC,CAAC;KACN;IAED,MAAM,OAAO,GAAG,MAAA,QAAQ,CAAC,UAAU,CAAC,gBAAgB,EAAE,mCAAI,CAAC,CAAC;IAC5D,MAAM,OAAO,GAAG,QAAQ,CAAC,UAAU,CAAC,MAAM,EAAE,CAAC;IAC7C,MAAM,QAAQ,GAAG,OAAO,CAAC,WAAW,EAAE,CAAC;IACvC,MAAM,SAAS,GAAG,iDAAY,CAAC,MAAM,CAAC,QAAQ,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAA,QAAQ,CAAC,UAAU,CAAC,mBAAmB,EAAE,mCAAI,EAAE,CAAC,CAAC;IAEpH,OAAO,CAAC,aAAa,CAAC,OAAO,EAAE,OAAO,GAAG,CAAC,EAAE,iDAAY,CAAC,UAAU,CAAC,SAAS,EAAE,KAAK,CAAC,EAAE;QACnF,SAAS,EAAE,QAAQ,CAAC,SAAS;QAC7B,WAAW,EAAE,QAAQ,CAAC,UAAU,CAAC,cAAc,EAAE;QACjD,cAAc,EAAE,MAAA,QAAQ,CAAC,iBAAiB,0CAAE,UAAU,CAAC,MAAM,EAAE;KAClE,CAAC,CAAC;AACP,CAAC;AApBD,oDAoBC;AAED,SAAgB,qBAAqB,CACjC,eAAgC,EAChC,aAA8B,EAC9B,YAA8B;;IAE9B,oFAAoF;IACpF,6EAA6E;IAC7E,8HAA8H;IAC9H,yBAAyB;IACzB,MAAM,KAAK,GAAkB,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC;IAE7C,KAAK,MAAM,GAAG,IAAI,YAAY,CAAC,MAAM,EAAE,EAAE;QACrC,MAAM,QAAQ,GAAG,eAAe,CAAC,yBAAyB,CAAC,OAAO,CAAC,kBAAkB,CAAC,GAAG,CAAC,CAAC;QAC3F,MAAM,KAAK,GAAG,aAAa,CAAC,yBAAyB,CAAC,OAAO,CAAC,kBAAkB,CAAC,GAAG,CAAC,CAAC;QACtF,IAAI,CAAC,QAAQ,IAAI,CAAC,KAAK,EAAE;YACrB,mBAAmB;YACnB,SAAS;SACZ;QAED,MAAM,YAAY,GAAG,QAAQ,CAAC,eAAe,EAAE,CAAC;QAChD,IAAI,CAAC,YAAY,EAAE;YACf,SAAS;SACZ;QAED,KAAK,CAAC,OAAQ,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC,GAAG;YAC7B;gBACI,KAAK,EAAE,IAAA,uCAAuB,EAAC,YAAY,CAAC,SAAS,EAAE,YAAY,CAAC,eAAe,CAAC,KAAK,CAAC;gBAC1F,OAAO,EAAE,MAAA,KAAK,CAAC,cAAc,EAAE,mCAAI,EAAE;aACxC;SACJ,CAAC;KACL;IAED,OAAO,KAAK,CAAC;AACjB,CAAC;AAjCD,sDAiCC;AAED,SAAS,kCAAkC,CAAC,KAAuB;IAC/D,MAAM,aAAa,GAAkB;QACjC,OAAO,EAAE,EAAE;KACd,CAAC;IAEF,qBAAqB,CAAC,KAAK,EAAE,aAAa,CAAC,CAAC;IAC5C,OAAO,aAAa,CAAC;AACzB,CAAC;AAED,SAAS,0CAA0C,CAC/C,WAA4B,EAC5B,iBAEC,EACD,mBAAmB,GAAG,SAAS;IAE/B,MAAM,aAAa,GAAkB;QACjC,eAAe,EAAE,EAAE;QACnB,iBAAiB,EAAE,iBAAiB;KACvC,CAAC;IAEF,6CAA6C;IAC7C,mDAAmD;IACnD,KAAK,MAAM,SAAS,IAAI,WAAW,CAAC,cAAc,EAAE;QAChD,QAAQ,SAAS,CAAC,IAAI,EAAE;YACpB,KAAK,QAAQ;gBACT,aAAa,CAAC,eAAgB,CAAC,IAAI,CAC/B,kCAAU,CAAC,MAAM,CAAC,SAAS,CAAC,OAAO,CAAC,QAAQ,EAAE,EAAE,aAAa,CAAC,SAAS,EAAE,mBAAmB,CAAC,CAChG,CAAC;gBACF,MAAM;YACV,KAAK,QAAQ,CAAC;YACd,KAAK,QAAQ;gBACT,MAAM;YACV;gBACI,IAAA,mBAAW,EAAC,SAAS,CAAC,CAAC;SAC9B;KACJ;IAED,gGAAgG;IAChG,MAAM,UAAU,GAAG,IAAA,oCAAkB,EAAC,WAAW,CAAC,KAAK,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC;IACtF,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,UAAU,EAAE;QACnC,aAAa,CAAC,eAAgB,CAAC,IAAI,CAC/B,wCAAgB,CAAC,MAAM,CACnB,EAAE,GAAG,EAAE,OAAO,EAAE,IAAI,EAAE,EACtB,KAAK,CAAC,IAAI,CACN,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;YACd,KAAK,EAAE,CAAC,CAAC,KAAK;YACd,OAAO,EAAE,CAAC,CAAC,eAAe;YAC1B,YAAY,EAAE,mBAAmB;SACpC,CAAC,CAAC,CACN,CACJ,CACJ,CAAC;KACL;IAED,KAAK,MAAM,SAAS,IAAI,WAAW,CAAC,cAAc,EAAE;QAChD,QAAQ,SAAS,CAAC,IAAI,EAAE;YACpB,KAAK,QAAQ;gBACT,MAAM;YACV,KAAK,QAAQ;gBACT,aAAa,CAAC,eAAgB,CAAC,IAAI,CAC/B,kCAAU,CAAC,MAAM,CACb,SAAS,CAAC,UAAU,CAAC,QAAQ,EAAE,EAC/B,SAAS,CAAC,UAAU,CAAC,QAAQ,EAAE;gBAC/B,aAAa,CAAC,SAAS,EACvB,mBAAmB,CACtB,CACJ,CAAC;gBACF,MAAM;YACV,KAAK,QAAQ;gBACT,aAAa,CAAC,eAAgB,CAAC,IAAI,CAC/B,kCAAU,CAAC,MAAM,CAAC,SAAS,CAAC,OAAO,CAAC,QAAQ,EAAE,EAAE,aAAa,CAAC,SAAS,EAAE,mBAAmB,CAAC,CAChG,CAAC;gBACF,MAAM;YACV;gBACI,IAAA,mBAAW,EAAC,SAAS,CAAC,CAAC;SAC9B;KACJ;IAED,OAAO,aAAa,CAAC;AACzB,CAAC"}
1
+ {"version":3,"file":"workspaceEditUtils.js","sourceRoot":"","sources":["../../../src/common/workspaceEditUtils.ts"],"names":[],"mappings":"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"}
@@ -36,6 +36,7 @@ export interface ServerSettings {
36
36
  typeCheckingMode?: string | undefined;
37
37
  useLibraryCodeForTypes?: boolean | undefined;
38
38
  disableLanguageServices?: boolean | undefined;
39
+ disableTaggedHints?: boolean | undefined;
39
40
  disableOrganizeImports?: boolean | undefined;
40
41
  autoSearchPaths?: boolean | undefined;
41
42
  extraPaths?: Uri[] | undefined;
@@ -256,6 +257,7 @@ export declare abstract class LanguageServerBase implements LanguageServerInterf
256
257
  source: AbstractCancellationTokenSource;
257
258
  }>;
258
259
  protected sendDiagnostics(params: PublishDiagnosticsParams[]): void;
260
+ protected decodeUri(uri: string): Uri;
259
261
  private _setupFileWatcher;
260
262
  private _getCompatibleMarkupKind;
261
263
  private _convertDiagnostics;