@zzzen/pyright-internal 1.2.0-dev.20260621 → 1.2.0-dev.20260705
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.
- package/dist/analyzer/binder.js +51 -5
- package/dist/analyzer/binder.js.map +1 -1
- package/dist/analyzer/checker.js +12 -2
- package/dist/analyzer/checker.js.map +1 -1
- package/dist/analyzer/codeFlowEngine.js +6 -0
- package/dist/analyzer/codeFlowEngine.js.map +1 -1
- package/dist/analyzer/dataClasses.js +7 -0
- package/dist/analyzer/dataClasses.js.map +1 -1
- package/dist/analyzer/docStringUtils.d.ts +1 -0
- package/dist/analyzer/docStringUtils.js +78 -0
- package/dist/analyzer/docStringUtils.js.map +1 -1
- package/dist/analyzer/importResolver.js +69 -4
- package/dist/analyzer/importResolver.js.map +1 -1
- package/dist/analyzer/importStatementUtils.js +19 -1
- package/dist/analyzer/importStatementUtils.js.map +1 -1
- package/dist/analyzer/parseTreeUtils.js +8 -0
- package/dist/analyzer/parseTreeUtils.js.map +1 -1
- package/dist/analyzer/patternMatching.js +44 -0
- package/dist/analyzer/patternMatching.js.map +1 -1
- package/dist/analyzer/program.js +6 -1
- package/dist/analyzer/program.js.map +1 -1
- package/dist/analyzer/pythonPathUtils.js +2 -2
- package/dist/analyzer/pythonPathUtils.js.map +1 -1
- package/dist/analyzer/staticExpressions.js +91 -19
- package/dist/analyzer/staticExpressions.js.map +1 -1
- package/dist/analyzer/typeEvaluator.js +53 -61
- package/dist/analyzer/typeEvaluator.js.map +1 -1
- package/dist/analyzer/typeEvaluatorTypes.d.ts +1 -0
- package/dist/analyzer/typeEvaluatorTypes.js.map +1 -1
- package/dist/analyzer/typeGuards.js +52 -4
- package/dist/analyzer/typeGuards.js.map +1 -1
- package/dist/analyzer/typeUtils.js +10 -4
- package/dist/analyzer/typeUtils.js.map +1 -1
- package/dist/common/docStringService.d.ts +2 -0
- package/dist/common/docStringService.js +5 -1
- package/dist/common/docStringService.js.map +1 -1
- package/dist/common/fullAccessHost.d.ts +2 -1
- package/dist/common/fullAccessHost.js +43 -9
- package/dist/common/fullAccessHost.js.map +1 -1
- package/dist/common/host.d.ts +2 -2
- package/dist/common/host.js +1 -1
- package/dist/common/host.js.map +1 -1
- package/dist/common/uri/fileUri.d.ts +1 -0
- package/dist/common/uri/fileUri.js +20 -0
- package/dist/common/uri/fileUri.js.map +1 -1
- package/dist/common/uri/memoization.js +5 -1
- package/dist/common/uri/memoization.js.map +1 -1
- package/dist/common/uri/uriUtils.d.ts +2 -0
- package/dist/common/uri/uriUtils.js +22 -0
- package/dist/common/uri/uriUtils.js.map +1 -1
- package/dist/languageServerBase.js +6 -1
- package/dist/languageServerBase.js.map +1 -1
- package/dist/languageService/completionProvider.d.ts +6 -0
- package/dist/languageService/completionProvider.js +194 -46
- package/dist/languageService/completionProvider.js.map +1 -1
- package/dist/languageService/completionProviderUtils.d.ts +2 -0
- package/dist/languageService/completionProviderUtils.js.map +1 -1
- package/dist/languageService/documentSymbolCollector.d.ts +15 -1
- package/dist/languageService/documentSymbolCollector.js +64 -41
- package/dist/languageService/documentSymbolCollector.js.map +1 -1
- package/dist/languageService/hoverProvider.js +22 -0
- package/dist/languageService/hoverProvider.js.map +1 -1
- package/dist/languageService/importStatementCandidates.d.ts +16 -0
- package/dist/languageService/importStatementCandidates.js +100 -0
- package/dist/languageService/importStatementCandidates.js.map +1 -0
- package/dist/languageService/referencesProvider.d.ts +16 -9
- package/dist/languageService/referencesProvider.js +188 -32
- package/dist/languageService/referencesProvider.js.map +1 -1
- package/dist/languageService/renameProvider.d.ts +7 -2
- package/dist/languageService/renameProvider.js +45 -17
- package/dist/languageService/renameProvider.js.map +1 -1
- package/dist/localization/localize.d.ts +9 -0
- package/dist/localization/localize.js +5 -0
- package/dist/localization/localize.js.map +1 -1
- package/dist/localization/package.nls.en-us.json +4 -0
- package/dist/parser/parser.js +9 -0
- package/dist/parser/parser.js.map +1 -1
- package/dist/readonlyAugmentedFileSystem.js +13 -6
- package/dist/readonlyAugmentedFileSystem.js.map +1 -1
- package/dist/tests/checker.test.js +4 -0
- package/dist/tests/checker.test.js.map +1 -1
- package/dist/tests/completions.test.js +118 -9
- package/dist/tests/completions.test.js.map +1 -1
- package/dist/tests/docStringReturnExtraction.test.d.ts +1 -0
- package/dist/tests/docStringReturnExtraction.test.js +125 -0
- package/dist/tests/docStringReturnExtraction.test.js.map +1 -0
- package/dist/tests/fourslash/completions.call.unpackedGenericTypedDict.fourslash.d.ts +1 -0
- package/dist/tests/fourslash/completions.call.unpackedGenericTypedDict.fourslash.js +35 -0
- package/dist/tests/fourslash/completions.call.unpackedGenericTypedDict.fourslash.js.map +1 -0
- package/dist/tests/fourslash/completions.keywords.expressionContext.fourslash.d.ts +1 -0
- package/dist/tests/fourslash/completions.keywords.expressionContext.fourslash.js +86 -0
- package/dist/tests/fourslash/completions.keywords.expressionContext.fourslash.js.map +1 -0
- package/dist/tests/fourslash/completions.qualname.fourslash.d.ts +1 -0
- package/dist/tests/fourslash/completions.qualname.fourslash.js +34 -0
- package/dist/tests/fourslash/completions.qualname.fourslash.js.map +1 -0
- package/dist/tests/fourslash/diagnostics.missingModuleSource.compiledModule.fourslash.d.ts +1 -0
- package/dist/tests/fourslash/diagnostics.missingModuleSource.compiledModule.fourslash.js +122 -0
- package/dist/tests/fourslash/diagnostics.missingModuleSource.compiledModule.fourslash.js.map +1 -0
- package/dist/tests/fourslash/import.multipartModuleClassShadow.fourslash.d.ts +1 -0
- package/dist/tests/fourslash/import.multipartModuleClassShadow.fourslash.js +39 -0
- package/dist/tests/fourslash/import.multipartModuleClassShadow.fourslash.js.map +1 -0
- package/dist/tests/harness/testAccessHost.d.ts +1 -1
- package/dist/tests/harness/testAccessHost.js +1 -1
- package/dist/tests/harness/testAccessHost.js.map +1 -1
- package/dist/tests/importResolver.test.js +33 -0
- package/dist/tests/importResolver.test.js.map +1 -1
- package/dist/tests/importStatementUtils.test.js +92 -0
- package/dist/tests/importStatementUtils.test.js.map +1 -1
- package/dist/tests/lsp/languageServerTestUtils.d.ts +1 -1
- package/dist/tests/lsp/languageServerTestUtils.js +1 -1
- package/dist/tests/lsp/languageServerTestUtils.js.map +1 -1
- package/dist/tests/parser.test.js +18 -0
- package/dist/tests/parser.test.js.map +1 -1
- package/dist/tests/pyrightFileSystem.test.js +25 -0
- package/dist/tests/pyrightFileSystem.test.js.map +1 -1
- package/dist/tests/signatureHelp.test.js +73 -0
- package/dist/tests/signatureHelp.test.js.map +1 -1
- package/dist/tests/typeEvaluator1.test.js +4 -0
- package/dist/tests/typeEvaluator1.test.js.map +1 -1
- package/dist/tests/typeEvaluator2.test.js +6 -0
- package/dist/tests/typeEvaluator2.test.js.map +1 -1
- package/dist/tests/typeEvaluator3.test.js +1 -1
- package/dist/tests/typeEvaluator4.test.js +23 -1
- package/dist/tests/typeEvaluator4.test.js.map +1 -1
- package/dist/tests/typeEvaluator6.test.js +20 -0
- package/dist/tests/typeEvaluator6.test.js.map +1 -1
- package/dist/tests/typeEvaluator8.test.js +23 -21
- package/dist/tests/typeEvaluator8.test.js.map +1 -1
- package/dist/types.d.ts +1 -0
- package/package.json +4 -4
|
@@ -72,6 +72,17 @@ const extractVersion = [
|
|
|
72
72
|
'import sys, json',
|
|
73
73
|
'json.dump(tuple(sys.version_info), sys.stdout)',
|
|
74
74
|
].join('; ');
|
|
75
|
+
// A failed chdir into a cwd that exists in the (virtual) FileSystem abstraction but not on the real
|
|
76
|
+
// OS surfaces as a spawn-level ENOENT: the child process never starts, so there is no exit `status`.
|
|
77
|
+
// A genuine interpreter error (process started, then exited non-zero) carries a numeric `status` and
|
|
78
|
+
// must not be treated as an unusable-cwd failure.
|
|
79
|
+
function isUnusableCwdSpawnError(err) {
|
|
80
|
+
if (typeof err !== 'object' || err === null) {
|
|
81
|
+
return false;
|
|
82
|
+
}
|
|
83
|
+
const spawnError = err;
|
|
84
|
+
return spawnError.code === 'ENOENT' && (spawnError.status === undefined || spawnError.status === null);
|
|
85
|
+
}
|
|
75
86
|
class LimitedAccessHost extends host_1.NoAccessHost {
|
|
76
87
|
get kind() {
|
|
77
88
|
return 1 /* HostKind.LimitedAccess */;
|
|
@@ -113,8 +124,8 @@ class FullAccessHost extends LimitedAccessHost {
|
|
|
113
124
|
(0, debug_1.assertNever)(kind);
|
|
114
125
|
}
|
|
115
126
|
}
|
|
116
|
-
getPythonSearchPaths(pythonPath, importLogger) {
|
|
117
|
-
let result = this._executePythonInterpreter(pythonPath?.getFilePath(), (p) => this._getSearchPathResultFromInterpreter(p, importLogger));
|
|
127
|
+
getPythonSearchPaths(pythonPath, importLogger, cwd) {
|
|
128
|
+
let result = this._executePythonInterpreter(pythonPath?.getFilePath(), (p) => this._getSearchPathResultFromInterpreter(p, importLogger, cwd));
|
|
118
129
|
if (!result) {
|
|
119
130
|
result = {
|
|
120
131
|
paths: [],
|
|
@@ -251,6 +262,9 @@ class FullAccessHost extends LimitedAccessHost {
|
|
|
251
262
|
return (process.platform === 'win32' &&
|
|
252
263
|
!!(0, pathUtils_1.getAnyExtensionFromPath)(interpreterPath, ['.bat', '.cmd'], /* ignoreCase */ true));
|
|
253
264
|
}
|
|
265
|
+
getUsableCwdPath(cwd) {
|
|
266
|
+
return (0, uriUtils_1.getUsableUriPath)(this.serviceProvider.fs(), cwd);
|
|
267
|
+
}
|
|
254
268
|
_executePythonInterpreter(pythonPath, execute) {
|
|
255
269
|
if (pythonPath) {
|
|
256
270
|
return execute(pythonPath);
|
|
@@ -281,26 +295,47 @@ class FullAccessHost extends LimitedAccessHost {
|
|
|
281
295
|
* @param commandLineArgs Command line args for interpreter other than the code to execute.
|
|
282
296
|
* @param code Code to execute.
|
|
283
297
|
*/
|
|
284
|
-
_executeCodeInInterpreter(interpreterPath, commandLineArgs, code) {
|
|
298
|
+
_executeCodeInInterpreter(interpreterPath, commandLineArgs, code, cwd) {
|
|
285
299
|
const useShell = this.shouldUseShellToRunInterpreter(interpreterPath);
|
|
286
300
|
if (useShell) {
|
|
287
301
|
code = '"' + code + '"';
|
|
288
302
|
}
|
|
289
303
|
commandLineArgs.push('-c', code);
|
|
290
|
-
const
|
|
304
|
+
const cwdPath = this.getUsableCwdPath(cwd);
|
|
305
|
+
const run = (cwdToUse) => child_process.execFileSync(interpreterPath, commandLineArgs, {
|
|
306
|
+
cwd: cwdToUse,
|
|
291
307
|
encoding: 'utf8',
|
|
292
308
|
shell: useShell,
|
|
293
309
|
});
|
|
294
|
-
|
|
310
|
+
if (cwdPath === undefined) {
|
|
311
|
+
return run(undefined);
|
|
312
|
+
}
|
|
313
|
+
try {
|
|
314
|
+
return run(cwdPath);
|
|
315
|
+
}
|
|
316
|
+
catch (err) {
|
|
317
|
+
// getUsableCwdPath validates the cwd against the FileSystem abstraction, which can be a
|
|
318
|
+
// virtual/mapped filesystem (e.g. a test harness that mounts a workspace root that does not
|
|
319
|
+
// exist on the real OS). The real child process can only chdir into a directory that exists
|
|
320
|
+
// on the real OS, so a missing cwd surfaces as a spawn-level ENOENT (the child never starts).
|
|
321
|
+
// Only that case falls back to the inherited cwd. A genuine interpreter failure (the process
|
|
322
|
+
// started and exited non-zero, e.g. a cwd-relative sitecustomize.py/.pth that raises) must
|
|
323
|
+
// propagate: silently retrying without the cwd would return inherited-cwd paths that callers
|
|
324
|
+
// then cache under the workspace-cwd key, reintroducing the wrong-cwd result.
|
|
325
|
+
if (!isUnusableCwdSpawnError(err)) {
|
|
326
|
+
throw err;
|
|
327
|
+
}
|
|
328
|
+
return run(undefined);
|
|
329
|
+
}
|
|
295
330
|
}
|
|
296
|
-
_getSearchPathResultFromInterpreter(interpreterPath, importLogger) {
|
|
331
|
+
_getSearchPathResultFromInterpreter(interpreterPath, importLogger, cwd) {
|
|
297
332
|
const result = {
|
|
298
333
|
paths: [],
|
|
299
334
|
prefix: undefined,
|
|
300
335
|
};
|
|
301
336
|
try {
|
|
302
337
|
importLogger?.log(`Executing interpreter: '${interpreterPath}'`);
|
|
303
|
-
const execOutput = this._executeCodeInInterpreter(interpreterPath, [], extractSys);
|
|
338
|
+
const execOutput = this._executeCodeInInterpreter(interpreterPath, [], extractSys, cwd);
|
|
304
339
|
const caseDetector = this.serviceProvider.get(serviceKeys_1.ServiceKeys.caseSensitivityDetector);
|
|
305
340
|
// Parse the execOutput. It should be a JSON-encoded array of paths.
|
|
306
341
|
try {
|
|
@@ -311,8 +346,7 @@ class FullAccessHost extends LimitedAccessHost {
|
|
|
311
346
|
const normalizedPath = (0, pathUtils_1.normalizePath)(execSplitEntry);
|
|
312
347
|
const normalizedUri = uri_1.Uri.file(normalizedPath, caseDetector);
|
|
313
348
|
// Skip non-existent paths and broken zips/eggs.
|
|
314
|
-
if (this.serviceProvider.fs()
|
|
315
|
-
(0, uriUtils_1.isDirectory)(this.serviceProvider.fs(), normalizedUri)) {
|
|
349
|
+
if ((0, uriUtils_1.isUsableDirectory)(this.serviceProvider.fs(), normalizedUri)) {
|
|
316
350
|
result.paths.push(normalizedUri);
|
|
317
351
|
}
|
|
318
352
|
else {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fullAccessHost.js","sourceRoot":"","sources":["../../../../../src/common/fullAccessHost.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"fullAccessHost.js","sourceRoot":"","sources":["../../../../../src/common/fullAccessHost.ts"],"names":[],"mappings":"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"}
|
package/dist/common/host.d.ts
CHANGED
|
@@ -41,7 +41,7 @@ export interface SpawnedProcess {
|
|
|
41
41
|
}
|
|
42
42
|
export interface Host {
|
|
43
43
|
readonly kind: HostKind;
|
|
44
|
-
getPythonSearchPaths(pythonPath?: Uri, failureLogger?: ImportLogger): PythonPathResult;
|
|
44
|
+
getPythonSearchPaths(pythonPath?: Uri, failureLogger?: ImportLogger, cwd?: Uri): PythonPathResult;
|
|
45
45
|
getPythonVersion(pythonPath?: Uri, failureLogger?: ImportLogger): PythonVersion | undefined;
|
|
46
46
|
getPythonPlatform(failureLogger?: ImportLogger): PythonPlatform | undefined;
|
|
47
47
|
runScript(pythonPath: Uri | undefined, script: Uri, args: string[], cwd: Uri, token: CancellationToken): Promise<ScriptOutput>;
|
|
@@ -55,7 +55,7 @@ export interface Host {
|
|
|
55
55
|
}
|
|
56
56
|
export declare class NoAccessHost implements Host {
|
|
57
57
|
get kind(): HostKind;
|
|
58
|
-
getPythonSearchPaths(pythonPath?: Uri, failureLogger?: ImportLogger): PythonPathResult;
|
|
58
|
+
getPythonSearchPaths(pythonPath?: Uri, failureLogger?: ImportLogger, cwd?: Uri): PythonPathResult;
|
|
59
59
|
getPythonVersion(pythonPath?: Uri, failureLogger?: ImportLogger): PythonVersion | undefined;
|
|
60
60
|
getPythonPlatform(failureLogger?: ImportLogger): PythonPlatform | undefined;
|
|
61
61
|
runScript(pythonPath: Uri | undefined, scriptPath: Uri, args: string[], cwd: Uri, token: CancellationToken): Promise<ScriptOutput>;
|
package/dist/common/host.js
CHANGED
|
@@ -18,7 +18,7 @@ class NoAccessHost {
|
|
|
18
18
|
get kind() {
|
|
19
19
|
return 2 /* HostKind.NoAccess */;
|
|
20
20
|
}
|
|
21
|
-
getPythonSearchPaths(pythonPath, failureLogger) {
|
|
21
|
+
getPythonSearchPaths(pythonPath, failureLogger, cwd) {
|
|
22
22
|
failureLogger?.log('No access to python executable.');
|
|
23
23
|
return {
|
|
24
24
|
paths: [],
|
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;;;AAUH,IAAkB,QAIjB;AAJD,WAAkB,QAAQ;IACtB,mDAAU,CAAA;IACV,yDAAa,CAAA;IACb,+CAAQ,CAAA;AACZ,CAAC,EAJiB,QAAQ,wBAAR,QAAQ,QAIzB;AAuED,MAAa,YAAY;IACrB,IAAI,IAAI;QACJ,iCAAyB;IAC7B,CAAC;IAED,oBAAoB,CAAC,UAAgB,EAAE,aAA4B;
|
|
1
|
+
{"version":3,"file":"host.js","sourceRoot":"","sources":["../../../../../src/common/host.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;;AAUH,IAAkB,QAIjB;AAJD,WAAkB,QAAQ;IACtB,mDAAU,CAAA;IACV,yDAAa,CAAA;IACb,+CAAQ,CAAA;AACZ,CAAC,EAJiB,QAAQ,wBAAR,QAAQ,QAIzB;AAuED,MAAa,YAAY;IACrB,IAAI,IAAI;QACJ,iCAAyB;IAC7B,CAAC;IAED,oBAAoB,CAAC,UAAgB,EAAE,aAA4B,EAAE,GAAS;QAC1E,aAAa,EAAE,GAAG,CAAC,iCAAiC,CAAC,CAAC;QAEtD,OAAO;YACH,KAAK,EAAE,EAAE;YACT,MAAM,EAAE,SAAS;SACpB,CAAC;IACN,CAAC;IAED,gBAAgB,CAAC,UAAgB,EAAE,aAA4B;QAC3D,OAAO,SAAS,CAAC;IACrB,CAAC;IAED,iBAAiB,CAAC,aAA4B;QAC1C,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;IAED,KAAK,CAAC,UAAU,CACZ,UAA2B,EAC3B,IAAY,EACZ,IAAc,EACd,GAAQ,EACR,KAAwB;QAExB,OAAO,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC;IACtC,CAAC;IAED,YAAY,CAAC,IAAY,EAAE,KAAe,EAAE,QAA6B;QACrE,OAAO,SAAS,CAAC;IACrB,CAAC;CACJ;AA7CD,oCA6CC"}
|
|
@@ -9,6 +9,7 @@ export declare class FileUri extends BaseUri {
|
|
|
9
9
|
private readonly _isCaseSensitive;
|
|
10
10
|
private _formattedString;
|
|
11
11
|
private _normalizedPath;
|
|
12
|
+
private _combineChildren;
|
|
12
13
|
private static _separator;
|
|
13
14
|
protected constructor(key: string, _filePath: string, _query: string, _fragment: string, _originalString: string | undefined, _isCaseSensitive: boolean);
|
|
14
15
|
get scheme(): string;
|
|
@@ -152,6 +152,26 @@ class FileUri extends baseUri_1.BaseUri {
|
|
|
152
152
|
return this;
|
|
153
153
|
}
|
|
154
154
|
combinePaths(...paths) {
|
|
155
|
+
// Fast path: a single simple segment (no '.', '..', or separators) is by far the
|
|
156
|
+
// most common case on the import-resolution hot path. Memoize the resulting child
|
|
157
|
+
// per parent keyed by the short segment, so repeated walks of the same directory
|
|
158
|
+
// tree avoid rebuilding the full child path and the interning cache's long key.
|
|
159
|
+
if (paths.length === 1) {
|
|
160
|
+
const segment = paths[0];
|
|
161
|
+
if (segment.length > 0 &&
|
|
162
|
+
segment !== '.' &&
|
|
163
|
+
!segment.includes('..') &&
|
|
164
|
+
!segment.includes(FileUri._separator) &&
|
|
165
|
+
!segment.includes('/')) {
|
|
166
|
+
const cached = this._combineChildren?.get(segment);
|
|
167
|
+
if (cached) {
|
|
168
|
+
return cached;
|
|
169
|
+
}
|
|
170
|
+
const child = this.combinePathsUnsafe(segment);
|
|
171
|
+
(this._combineChildren ?? (this._combineChildren = new Map())).set(segment, child);
|
|
172
|
+
return child;
|
|
173
|
+
}
|
|
174
|
+
}
|
|
155
175
|
if (paths.some((p) => p.includes('..') || p.includes(FileUri._separator) || p.includes('/') || p === '.')) {
|
|
156
176
|
// This is a slow path that handles paths that contain '..' or '.'.
|
|
157
177
|
return this.resolvePaths(...paths);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fileUri.js","sourceRoot":"","sources":["../../../../../../src/common/uri/fileUri.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;;;;;;;;AAEH,2CAAiC;AACjC,kCAAkC;AAClC,4CAYsB;AACtB,uCAAiD;AACjD,+CAAsF;AAKzE,QAAA,aAAa,GAAG,MAAM,CAAC;AAEpC,MAAa,OAAQ,SAAQ,iBAAO;
|
|
1
|
+
{"version":3,"file":"fileUri.js","sourceRoot":"","sources":["../../../../../../src/common/uri/fileUri.ts"],"names":[],"mappings":"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"}
|
|
@@ -13,7 +13,11 @@ exports.cacheStaticFunc = cacheStaticFunc;
|
|
|
13
13
|
// Cache for static method results with LRU eviction.
|
|
14
14
|
const staticCache = new Map();
|
|
15
15
|
// Max number of static method values that are cached.
|
|
16
|
-
|
|
16
|
+
// Sized to comfortably exceed the distinct-Uri working set of a single import
|
|
17
|
+
// resolution across many extraPaths (monorepos can inject 100+ search roots, each
|
|
18
|
+
// descended a few levels). A smaller cache thrashes: every resolution evicts the
|
|
19
|
+
// previous one's stable prefix Uris, forcing constant re-allocation and GC churn.
|
|
20
|
+
const maxStaticCacheEntries = 8192;
|
|
17
21
|
// Caches the results of a getter property.
|
|
18
22
|
function cacheProperty() {
|
|
19
23
|
return function (target, functionName, descriptor) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"memoization.js","sourceRoot":"","sources":["../../../../../../src/common/uri/memoization.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;
|
|
1
|
+
{"version":3,"file":"memoization.js","sourceRoot":"","sources":["../../../../../../src/common/uri/memoization.ts"],"names":[],"mappings":"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"}
|
|
@@ -27,6 +27,8 @@ export declare function getFileSize(fs: ReadOnlyFileSystem, uri: Uri): number;
|
|
|
27
27
|
export declare function fileExists(fs: ReadOnlyFileSystem, uri: Uri): boolean;
|
|
28
28
|
export declare function directoryExists(fs: ReadOnlyFileSystem, uri: Uri): boolean;
|
|
29
29
|
export declare function isDirectory(fs: ReadOnlyFileSystem, uri: Uri): boolean;
|
|
30
|
+
export declare function isUsableDirectory(fs: ReadOnlyFileSystem, uri: Uri): boolean;
|
|
31
|
+
export declare function getUsableUriPath(fs: ReadOnlyFileSystem, uri: Uri | undefined): string | undefined;
|
|
30
32
|
export declare function isFile(fs: ReadOnlyFileSystem, uri: Uri, treatZipDirectoryAsFile?: boolean): boolean;
|
|
31
33
|
export declare function tryStat(fs: ReadOnlyFileSystem, uri: Uri): Stats | undefined;
|
|
32
34
|
export declare function tryRealpath(fs: ReadOnlyFileSystem, uri: Uri): Uri | undefined;
|
|
@@ -14,6 +14,8 @@ exports.getFileSize = getFileSize;
|
|
|
14
14
|
exports.fileExists = fileExists;
|
|
15
15
|
exports.directoryExists = directoryExists;
|
|
16
16
|
exports.isDirectory = isDirectory;
|
|
17
|
+
exports.isUsableDirectory = isUsableDirectory;
|
|
18
|
+
exports.getUsableUriPath = getUsableUriPath;
|
|
17
19
|
exports.isFile = isFile;
|
|
18
20
|
exports.tryStat = tryStat;
|
|
19
21
|
exports.tryRealpath = tryRealpath;
|
|
@@ -103,6 +105,26 @@ function directoryExists(fs, uri) {
|
|
|
103
105
|
function isDirectory(fs, uri) {
|
|
104
106
|
return tryStat(fs, uri)?.isDirectory() ?? false;
|
|
105
107
|
}
|
|
108
|
+
// True when `uri` resolves to an existing directory on the given file system. `fs` is an explicit
|
|
109
|
+
// parameter so callers that decide a usable cwd/workspace root must name the file system they are
|
|
110
|
+
// validating against, rather than relying on a coincidental match between independent fs handles.
|
|
111
|
+
function isUsableDirectory(fs, uri) {
|
|
112
|
+
return fs.existsSync(uri) && isDirectory(fs, uri);
|
|
113
|
+
}
|
|
114
|
+
// Returns the file-system path of `uri` only when it is usable as a working directory: it is
|
|
115
|
+
// defined, has a non-empty file path, and resolves to an existing directory on `fs`. Otherwise
|
|
116
|
+
// returns undefined. `fs` is explicit so each caller names the file system it validates against
|
|
117
|
+
// when normalizing a cwd / workspace root.
|
|
118
|
+
function getUsableUriPath(fs, uri) {
|
|
119
|
+
if (!uri) {
|
|
120
|
+
return undefined;
|
|
121
|
+
}
|
|
122
|
+
const uriPath = uri.getFilePath();
|
|
123
|
+
if (!uriPath) {
|
|
124
|
+
return undefined;
|
|
125
|
+
}
|
|
126
|
+
return isUsableDirectory(fs, uri) ? uriPath : undefined;
|
|
127
|
+
}
|
|
106
128
|
function isFile(fs, uri, treatZipDirectoryAsFile = false) {
|
|
107
129
|
const stats = tryStat(fs, uri);
|
|
108
130
|
if (stats?.isFile()) {
|
|
@@ -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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"}
|
|
@@ -92,6 +92,7 @@ class LanguageServerBase {
|
|
|
92
92
|
hasDocumentChangeCapability: false,
|
|
93
93
|
hasDocumentAnnotationCapability: false,
|
|
94
94
|
hasCompletionCommitCharCapability: false,
|
|
95
|
+
hasCompletionItemDataDefaultCapability: false,
|
|
95
96
|
hoverContentFormat: vscode_languageserver_1.MarkupKind.PlainText,
|
|
96
97
|
completionDocFormat: vscode_languageserver_1.MarkupKind.PlainText,
|
|
97
98
|
completionSupportsSnippet: false,
|
|
@@ -356,7 +357,10 @@ class LanguageServerBase {
|
|
|
356
357
|
this.client.hasDocumentAnnotationCapability = !!capabilities.workspace?.workspaceEdit?.changeAnnotationSupport;
|
|
357
358
|
this.client.hasCompletionCommitCharCapability =
|
|
358
359
|
!!capabilities.textDocument?.completion?.completionList?.itemDefaults &&
|
|
359
|
-
!!capabilities.textDocument
|
|
360
|
+
!!capabilities.textDocument?.completion?.completionItem?.commitCharactersSupport;
|
|
361
|
+
this.client.hasCompletionItemDataDefaultCapability =
|
|
362
|
+
!!capabilities.textDocument?.completion?.completionList?.itemDefaults?.includes('data') &&
|
|
363
|
+
!!capabilities.textDocument?.completion?.completionList?.applyKindSupport;
|
|
360
364
|
this.client.hoverContentFormat = this._getCompatibleMarkupKind(capabilities.textDocument?.hover?.contentFormat);
|
|
361
365
|
this.client.completionDocFormat = this._getCompatibleMarkupKind(capabilities.textDocument?.completion?.completionItem?.documentationFormat);
|
|
362
366
|
this.client.completionSupportsSnippet = !!capabilities.textDocument?.completion?.completionItem?.snippetSupport;
|
|
@@ -579,6 +583,7 @@ class LanguageServerBase {
|
|
|
579
583
|
snippet: this.client.completionSupportsSnippet,
|
|
580
584
|
lazyEdit: false,
|
|
581
585
|
triggerCharacter: params?.context?.triggerCharacter,
|
|
586
|
+
completionItemDataDefault: this.client.hasCompletionItemDataDefaultCapability,
|
|
582
587
|
}, token).getCompletions();
|
|
583
588
|
this.setCompletionIncomplete(params, completions);
|
|
584
589
|
return completions;
|