@zzzen/pyright-internal 1.2.0-dev.20250817 → 1.2.0-dev.20250831
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 +3 -3
- package/dist/analyzer/binder.js.map +1 -1
- package/dist/analyzer/commentUtils.js +5 -1
- package/dist/analyzer/commentUtils.js.map +1 -1
- package/dist/analyzer/constraintTracker.d.ts +2 -2
- package/dist/analyzer/constraintTracker.js +5 -11
- package/dist/analyzer/constraintTracker.js.map +1 -1
- package/dist/analyzer/dataClasses.js +9 -2
- package/dist/analyzer/dataClasses.js.map +1 -1
- package/dist/analyzer/importLogger.d.ts +5 -0
- package/dist/analyzer/importLogger.js +24 -0
- package/dist/analyzer/importLogger.js.map +1 -0
- package/dist/analyzer/importResolver.d.ts +14 -7
- package/dist/analyzer/importResolver.js +188 -159
- package/dist/analyzer/importResolver.js.map +1 -1
- package/dist/analyzer/importResult.d.ts +2 -2
- package/dist/analyzer/importStatementUtils.js +6 -4
- package/dist/analyzer/importStatementUtils.js.map +1 -1
- package/dist/analyzer/operations.js +10 -1
- package/dist/analyzer/operations.js.map +1 -1
- package/dist/analyzer/program.js +18 -16
- package/dist/analyzer/program.js.map +1 -1
- package/dist/analyzer/protocols.js +11 -26
- package/dist/analyzer/protocols.js.map +1 -1
- package/dist/analyzer/pythonPathUtils.d.ts +2 -1
- package/dist/analyzer/pythonPathUtils.js +14 -14
- package/dist/analyzer/pythonPathUtils.js.map +1 -1
- package/dist/analyzer/sentinel.js +3 -0
- package/dist/analyzer/sentinel.js.map +1 -1
- package/dist/analyzer/service.js +9 -10
- package/dist/analyzer/service.js.map +1 -1
- package/dist/analyzer/sourceFile.js +14 -3
- package/dist/analyzer/sourceFile.js.map +1 -1
- package/dist/analyzer/typeEvaluator.js +33 -4
- 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/typeUtils.js +7 -1
- package/dist/analyzer/typeUtils.js.map +1 -1
- package/dist/analyzer/types.d.ts +1 -0
- package/dist/analyzer/types.js.map +1 -1
- package/dist/common/configOptions.js +4 -3
- package/dist/common/configOptions.js.map +1 -1
- package/dist/common/fullAccessHost.d.ts +5 -3
- package/dist/common/fullAccessHost.js +68 -19
- package/dist/common/fullAccessHost.js.map +1 -1
- package/dist/common/host.d.ts +11 -6
- package/dist/common/host.js +7 -4
- package/dist/common/host.js.map +1 -1
- package/dist/common/uri/memoization.js +19 -8
- package/dist/common/uri/memoization.js.map +1 -1
- package/dist/common/uri/uriUtils.d.ts +1 -1
- package/dist/common/uri/uriUtils.js +2 -1
- package/dist/common/uri/uriUtils.js.map +1 -1
- package/dist/common/uri/webUri.js +1 -1
- package/dist/common/uri/webUri.js.map +1 -1
- package/dist/languageService/completionProvider.js +1 -1
- package/dist/languageService/completionProvider.js.map +1 -1
- package/dist/localization/localize.d.ts +4 -0
- package/dist/localization/localize.js +2 -0
- package/dist/localization/localize.js.map +1 -1
- package/dist/localization/package.nls.en-us.json +5 -0
- package/dist/parser/parser.d.ts +1 -1
- package/dist/parser/parser.js +14 -3
- package/dist/parser/parser.js.map +1 -1
- package/dist/parser/tokenizer.js +12 -7
- package/dist/parser/tokenizer.js.map +1 -1
- package/dist/tests/harness/fourslash/testLanguageService.d.ts +1 -1
- package/dist/tests/harness/fourslash/testLanguageService.js.map +1 -1
- package/dist/tests/harness/testAccessHost.d.ts +2 -1
- package/dist/tests/harness/testAccessHost.js +1 -1
- package/dist/tests/harness/testAccessHost.js.map +1 -1
- package/dist/tests/lsp/languageServerTestUtils.d.ts +4 -3
- package/dist/tests/lsp/languageServerTestUtils.js +3 -3
- package/dist/tests/lsp/languageServerTestUtils.js.map +1 -1
- package/dist/tests/parser.test.js +10 -0
- package/dist/tests/parser.test.js.map +1 -1
- package/dist/tests/typeEvaluator3.test.js +1 -1
- package/dist/tests/typeEvaluator5.test.js +1 -1
- package/dist/tests/typeEvaluator6.test.js +1 -5
- package/dist/tests/typeEvaluator6.test.js.map +1 -1
- package/dist/tests/typeEvaluator7.test.js +1 -1
- package/package.json +1 -1
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { CancellationToken } from 'vscode-languageserver';
|
|
2
|
+
import { ImportLogger } from '../analyzer/importLogger';
|
|
2
3
|
import { PythonPathResult } from '../analyzer/pythonPathUtils';
|
|
3
4
|
import { PythonPlatform } from './configOptions';
|
|
4
5
|
import { HostKind, NoAccessHost, ScriptOutput } from './host';
|
|
@@ -7,16 +8,17 @@ import { ServiceProvider } from './serviceProvider';
|
|
|
7
8
|
import { Uri } from './uri/uri';
|
|
8
9
|
export declare class LimitedAccessHost extends NoAccessHost {
|
|
9
10
|
get kind(): HostKind;
|
|
10
|
-
getPythonPlatform(
|
|
11
|
+
getPythonPlatform(importLogger?: ImportLogger): PythonPlatform | undefined;
|
|
11
12
|
}
|
|
12
13
|
export declare class FullAccessHost extends LimitedAccessHost {
|
|
13
14
|
protected serviceProvider: ServiceProvider;
|
|
14
15
|
constructor(serviceProvider: ServiceProvider);
|
|
15
16
|
get kind(): HostKind;
|
|
16
17
|
static createHost(kind: HostKind, serviceProvider: ServiceProvider): NoAccessHost;
|
|
17
|
-
getPythonSearchPaths(pythonPath?: Uri,
|
|
18
|
-
getPythonVersion(pythonPath?: Uri,
|
|
18
|
+
getPythonSearchPaths(pythonPath?: Uri, importLogger?: ImportLogger): PythonPathResult;
|
|
19
|
+
getPythonVersion(pythonPath?: Uri, importLogger?: ImportLogger): PythonVersion | undefined;
|
|
19
20
|
runScript(pythonPath: Uri | undefined, script: Uri, args: string[], cwd: Uri, token: CancellationToken): Promise<ScriptOutput>;
|
|
21
|
+
runSnippet(pythonPath: Uri | undefined, code: string, args: string[], cwd: Uri, token: CancellationToken): Promise<ScriptOutput>;
|
|
20
22
|
protected shouldUseShellToRunInterpreter(interpreterPath: string): boolean;
|
|
21
23
|
private _executePythonInterpreter;
|
|
22
24
|
/**
|
|
@@ -37,11 +37,11 @@ const configOptions_1 = require("./configOptions");
|
|
|
37
37
|
const debug_1 = require("./debug");
|
|
38
38
|
const host_1 = require("./host");
|
|
39
39
|
const pathUtils_1 = require("./pathUtils");
|
|
40
|
+
const processUtils_1 = require("./processUtils");
|
|
40
41
|
const pythonVersion_1 = require("./pythonVersion");
|
|
41
42
|
const serviceKeys_1 = require("./serviceKeys");
|
|
42
43
|
const uri_1 = require("./uri/uri");
|
|
43
44
|
const uriUtils_1 = require("./uri/uriUtils");
|
|
44
|
-
const processUtils_1 = require("./processUtils");
|
|
45
45
|
// preventLocalImports removes the working directory from sys.path.
|
|
46
46
|
// The -c flag adds it automatically, which can allow some stdlib
|
|
47
47
|
// modules (like json) to be overridden by other files (like json.py).
|
|
@@ -66,7 +66,7 @@ class LimitedAccessHost extends host_1.NoAccessHost {
|
|
|
66
66
|
get kind() {
|
|
67
67
|
return 1 /* HostKind.LimitedAccess */;
|
|
68
68
|
}
|
|
69
|
-
getPythonPlatform(
|
|
69
|
+
getPythonPlatform(importLogger) {
|
|
70
70
|
if (process.platform === 'darwin') {
|
|
71
71
|
return configOptions_1.PythonPlatform.Darwin;
|
|
72
72
|
}
|
|
@@ -100,39 +100,37 @@ class FullAccessHost extends LimitedAccessHost {
|
|
|
100
100
|
(0, debug_1.assertNever)(kind);
|
|
101
101
|
}
|
|
102
102
|
}
|
|
103
|
-
getPythonSearchPaths(pythonPath,
|
|
104
|
-
|
|
105
|
-
let result = this._executePythonInterpreter(pythonPath?.getFilePath(), (p) => this._getSearchPathResultFromInterpreter(p, importFailureInfo));
|
|
103
|
+
getPythonSearchPaths(pythonPath, importLogger) {
|
|
104
|
+
let result = this._executePythonInterpreter(pythonPath?.getFilePath(), (p) => this._getSearchPathResultFromInterpreter(p, importLogger));
|
|
106
105
|
if (!result) {
|
|
107
106
|
result = {
|
|
108
107
|
paths: [],
|
|
109
108
|
prefix: undefined,
|
|
110
109
|
};
|
|
111
110
|
}
|
|
112
|
-
|
|
111
|
+
importLogger?.log(`Received ${result.paths.length} paths from interpreter`);
|
|
113
112
|
result.paths.forEach((path) => {
|
|
114
|
-
|
|
113
|
+
importLogger?.log(` ${path}`);
|
|
115
114
|
});
|
|
116
115
|
return result;
|
|
117
116
|
}
|
|
118
|
-
getPythonVersion(pythonPath,
|
|
119
|
-
const importFailureInfo = logInfo ?? [];
|
|
117
|
+
getPythonVersion(pythonPath, importLogger) {
|
|
120
118
|
try {
|
|
121
119
|
const execOutput = this._executePythonInterpreter(pythonPath?.getFilePath(), (p) => this._executeCodeInInterpreter(p, ['-I'], extractVersion));
|
|
122
120
|
const versionJson = JSON.parse(execOutput);
|
|
123
121
|
if (!Array.isArray(versionJson) || versionJson.length < 5) {
|
|
124
|
-
|
|
122
|
+
importLogger?.log(`Python version ${execOutput} from interpreter is unexpected format`);
|
|
125
123
|
return undefined;
|
|
126
124
|
}
|
|
127
125
|
const version = pythonVersion_1.PythonVersion.create(versionJson[0], versionJson[1], versionJson[2], versionJson[3], versionJson[4]);
|
|
128
126
|
if (version === undefined) {
|
|
129
|
-
|
|
127
|
+
importLogger?.log(`Python version ${execOutput} from interpreter is unsupported`);
|
|
130
128
|
return undefined;
|
|
131
129
|
}
|
|
132
130
|
return version;
|
|
133
131
|
}
|
|
134
132
|
catch {
|
|
135
|
-
|
|
133
|
+
importLogger?.log('Unable to get Python version from interpreter');
|
|
136
134
|
return undefined;
|
|
137
135
|
}
|
|
138
136
|
}
|
|
@@ -161,9 +159,9 @@ class FullAccessHost extends LimitedAccessHost {
|
|
|
161
159
|
tokenWatch.dispose();
|
|
162
160
|
reject(e);
|
|
163
161
|
});
|
|
164
|
-
child.on('
|
|
162
|
+
child.on('close', (code) => {
|
|
165
163
|
tokenWatch.dispose();
|
|
166
|
-
resolve({ stdout, stderr });
|
|
164
|
+
resolve({ stdout, stderr, exitCode: code ?? undefined });
|
|
167
165
|
});
|
|
168
166
|
}
|
|
169
167
|
else {
|
|
@@ -172,6 +170,57 @@ class FullAccessHost extends LimitedAccessHost {
|
|
|
172
170
|
}
|
|
173
171
|
});
|
|
174
172
|
}
|
|
173
|
+
runSnippet(pythonPath, code, args, cwd, token) {
|
|
174
|
+
// If it is already cancelled, don't bother to run snippet.
|
|
175
|
+
(0, cancellationUtils_1.throwIfCancellationRequested)(token);
|
|
176
|
+
// What to do about conda here?
|
|
177
|
+
return new Promise((resolve, reject) => {
|
|
178
|
+
const commandLineArgs = ['-c', code, ...args];
|
|
179
|
+
const child = this._executePythonInterpreter(pythonPath?.getFilePath(), (p) => child_process.spawn(p, commandLineArgs, {
|
|
180
|
+
cwd: cwd.getFilePath(),
|
|
181
|
+
stdio: ['pipe', 'pipe', 'pipe'],
|
|
182
|
+
shell: this.shouldUseShellToRunInterpreter(p),
|
|
183
|
+
}));
|
|
184
|
+
const tokenWatch = (0, cancellationUtils_1.onCancellationRequested)(token, () => {
|
|
185
|
+
if (child) {
|
|
186
|
+
(0, processUtils_1.terminateChild)(child);
|
|
187
|
+
}
|
|
188
|
+
reject(new cancellationUtils_1.OperationCanceledException());
|
|
189
|
+
});
|
|
190
|
+
if (child) {
|
|
191
|
+
let stdout = '';
|
|
192
|
+
let stderr = '';
|
|
193
|
+
let output = '';
|
|
194
|
+
// Interleave stdout and stderr by capturing them with timestamps
|
|
195
|
+
const outputLines = [];
|
|
196
|
+
child.stdout?.on('data', (data) => {
|
|
197
|
+
const text = data.toString();
|
|
198
|
+
stdout += text;
|
|
199
|
+
outputLines.push({ timestamp: Date.now(), type: 'stdout', data: text });
|
|
200
|
+
});
|
|
201
|
+
child.stderr?.on('data', (data) => {
|
|
202
|
+
const text = data.toString();
|
|
203
|
+
stderr += text;
|
|
204
|
+
outputLines.push({ timestamp: Date.now(), type: 'stderr', data: text });
|
|
205
|
+
});
|
|
206
|
+
child.on('error', (error) => {
|
|
207
|
+
reject(new Error(`Failed to start Python process: ${error.message}`));
|
|
208
|
+
});
|
|
209
|
+
child.on('close', (code) => {
|
|
210
|
+
tokenWatch.dispose();
|
|
211
|
+
// Sort by timestamp to get proper interleaving
|
|
212
|
+
outputLines.sort((a, b) => a.timestamp - b.timestamp);
|
|
213
|
+
// Combine output in chronological order
|
|
214
|
+
output = outputLines.map((line) => line.data).join('');
|
|
215
|
+
resolve({ stdout, stderr, output, exitCode: code ?? undefined });
|
|
216
|
+
});
|
|
217
|
+
}
|
|
218
|
+
else {
|
|
219
|
+
tokenWatch.dispose();
|
|
220
|
+
reject(new Error(`Cannot start python interpreter with the given code snippet.`));
|
|
221
|
+
}
|
|
222
|
+
});
|
|
223
|
+
}
|
|
175
224
|
shouldUseShellToRunInterpreter(interpreterPath) {
|
|
176
225
|
// Windows bat/cmd files must me executed with the shell due to the following breaking change:
|
|
177
226
|
// https://nodejs.org/en/blog/vulnerability/april-2024-security-releases-2#command-injection-via-args-parameter-of-child_processspawn-without-shell-option-enabled-on-windows-cve-2024-27980---high
|
|
@@ -220,13 +269,13 @@ class FullAccessHost extends LimitedAccessHost {
|
|
|
220
269
|
});
|
|
221
270
|
return execOutput;
|
|
222
271
|
}
|
|
223
|
-
_getSearchPathResultFromInterpreter(interpreterPath,
|
|
272
|
+
_getSearchPathResultFromInterpreter(interpreterPath, importLogger) {
|
|
224
273
|
const result = {
|
|
225
274
|
paths: [],
|
|
226
275
|
prefix: undefined,
|
|
227
276
|
};
|
|
228
277
|
try {
|
|
229
|
-
|
|
278
|
+
importLogger?.log(`Executing interpreter: '${interpreterPath}'`);
|
|
230
279
|
const execOutput = this._executeCodeInInterpreter(interpreterPath, [], extractSys);
|
|
231
280
|
const caseDetector = this.serviceProvider.get(serviceKeys_1.ServiceKeys.caseSensitivityDetector);
|
|
232
281
|
// Parse the execOutput. It should be a JSON-encoded array of paths.
|
|
@@ -243,17 +292,17 @@ class FullAccessHost extends LimitedAccessHost {
|
|
|
243
292
|
result.paths.push(normalizedUri);
|
|
244
293
|
}
|
|
245
294
|
else {
|
|
246
|
-
|
|
295
|
+
importLogger?.log(`Skipping '${normalizedPath}' because it is not a valid directory`);
|
|
247
296
|
}
|
|
248
297
|
}
|
|
249
298
|
}
|
|
250
299
|
result.prefix = uri_1.Uri.file(execSplit.prefix, caseDetector);
|
|
251
300
|
if (result.paths.length === 0) {
|
|
252
|
-
|
|
301
|
+
importLogger?.log(`Found no valid directories`);
|
|
253
302
|
}
|
|
254
303
|
}
|
|
255
304
|
catch (err) {
|
|
256
|
-
|
|
305
|
+
importLogger?.log(`Could not parse output: '${execOutput}'`);
|
|
257
306
|
throw err;
|
|
258
307
|
}
|
|
259
308
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fullAccessHost.js","sourceRoot":"","sources":["../../../../../src/common/fullAccessHost.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;;;;;;;;;;;;;;;;;;;;;;;;;AAEH,6DAA+C;
|
|
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
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { CancellationToken } from 'vscode-languageserver';
|
|
2
|
+
import { ImportLogger } from '../analyzer/importLogger';
|
|
2
3
|
import { PythonPathResult } from '../analyzer/pythonPathUtils';
|
|
3
4
|
import { PythonPlatform } from './configOptions';
|
|
4
5
|
import { PythonVersion } from './pythonVersion';
|
|
@@ -11,19 +12,23 @@ export declare const enum HostKind {
|
|
|
11
12
|
export interface ScriptOutput {
|
|
12
13
|
stdout: string;
|
|
13
14
|
stderr: string;
|
|
15
|
+
output?: string;
|
|
16
|
+
exitCode?: number;
|
|
14
17
|
}
|
|
15
18
|
export interface Host {
|
|
16
19
|
readonly kind: HostKind;
|
|
17
|
-
getPythonSearchPaths(pythonPath?: Uri,
|
|
18
|
-
getPythonVersion(pythonPath?: Uri,
|
|
19
|
-
getPythonPlatform(
|
|
20
|
+
getPythonSearchPaths(pythonPath?: Uri, failureLogger?: ImportLogger): PythonPathResult;
|
|
21
|
+
getPythonVersion(pythonPath?: Uri, failureLogger?: ImportLogger): PythonVersion | undefined;
|
|
22
|
+
getPythonPlatform(failureLogger?: ImportLogger): PythonPlatform | undefined;
|
|
20
23
|
runScript(pythonPath: Uri | undefined, script: Uri, args: string[], cwd: Uri, token: CancellationToken): Promise<ScriptOutput>;
|
|
24
|
+
runSnippet(pythonPath: Uri | undefined, code: string, args: string[], cwd: Uri, token: CancellationToken): Promise<ScriptOutput>;
|
|
21
25
|
}
|
|
22
26
|
export declare class NoAccessHost implements Host {
|
|
23
27
|
get kind(): HostKind;
|
|
24
|
-
getPythonSearchPaths(pythonPath?: Uri,
|
|
25
|
-
getPythonVersion(pythonPath?: Uri,
|
|
26
|
-
getPythonPlatform(
|
|
28
|
+
getPythonSearchPaths(pythonPath?: Uri, failureLogger?: ImportLogger): PythonPathResult;
|
|
29
|
+
getPythonVersion(pythonPath?: Uri, failureLogger?: ImportLogger): PythonVersion | undefined;
|
|
30
|
+
getPythonPlatform(failureLogger?: ImportLogger): PythonPlatform | undefined;
|
|
27
31
|
runScript(pythonPath: Uri | undefined, scriptPath: Uri, args: string[], cwd: Uri, token: CancellationToken): Promise<ScriptOutput>;
|
|
32
|
+
runSnippet(pythonPath: Uri | undefined, code: string, args: string[], cwd: Uri, token: CancellationToken): Promise<ScriptOutput>;
|
|
28
33
|
}
|
|
29
34
|
export type HostFactory = () => Host;
|
package/dist/common/host.js
CHANGED
|
@@ -18,22 +18,25 @@ class NoAccessHost {
|
|
|
18
18
|
get kind() {
|
|
19
19
|
return 2 /* HostKind.NoAccess */;
|
|
20
20
|
}
|
|
21
|
-
getPythonSearchPaths(pythonPath,
|
|
22
|
-
|
|
21
|
+
getPythonSearchPaths(pythonPath, failureLogger) {
|
|
22
|
+
failureLogger?.log('No access to python executable.');
|
|
23
23
|
return {
|
|
24
24
|
paths: [],
|
|
25
25
|
prefix: undefined,
|
|
26
26
|
};
|
|
27
27
|
}
|
|
28
|
-
getPythonVersion(pythonPath,
|
|
28
|
+
getPythonVersion(pythonPath, failureLogger) {
|
|
29
29
|
return undefined;
|
|
30
30
|
}
|
|
31
|
-
getPythonPlatform(
|
|
31
|
+
getPythonPlatform(failureLogger) {
|
|
32
32
|
return undefined;
|
|
33
33
|
}
|
|
34
34
|
async runScript(pythonPath, scriptPath, args, cwd, token) {
|
|
35
35
|
return { stdout: '', stderr: '' };
|
|
36
36
|
}
|
|
37
|
+
async runSnippet(pythonPath, code, args, cwd, token) {
|
|
38
|
+
return { stdout: '', stderr: '' };
|
|
39
|
+
}
|
|
37
40
|
}
|
|
38
41
|
exports.NoAccessHost = NoAccessHost;
|
|
39
42
|
//# sourceMappingURL=host.js.map
|
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;;;
|
|
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;AAgCD,MAAa,YAAY;IACrB,IAAI,IAAI;QACJ,iCAAyB;IAC7B,CAAC;IAED,oBAAoB,CAAC,UAAgB,EAAE,aAA4B;QAC/D,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;CACJ;AAzCD,oCAyCC"}
|
|
@@ -10,8 +10,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
10
10
|
exports.cacheProperty = cacheProperty;
|
|
11
11
|
exports.cacheMethodWithNoArgs = cacheMethodWithNoArgs;
|
|
12
12
|
exports.cacheStaticFunc = cacheStaticFunc;
|
|
13
|
-
// Cache for static method results.
|
|
13
|
+
// Cache for static method results with LRU eviction.
|
|
14
14
|
const staticCache = new Map();
|
|
15
|
+
// Max number of static method values that are cached.
|
|
16
|
+
const maxStaticCacheEntries = 256;
|
|
15
17
|
// Caches the results of a getter property.
|
|
16
18
|
function cacheProperty() {
|
|
17
19
|
return function (target, functionName, descriptor) {
|
|
@@ -55,15 +57,24 @@ function cacheStaticFunc() {
|
|
|
55
57
|
const originalMethod = descriptor.value;
|
|
56
58
|
descriptor.value = function (...args) {
|
|
57
59
|
const key = `${functionName}+${args?.map((a) => a?.toString()).join(',')}`;
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
staticCache.
|
|
60
|
+
if (staticCache.has(key)) {
|
|
61
|
+
// Promote to most-recently used by re-inserting.
|
|
62
|
+
const value = staticCache.get(key);
|
|
63
|
+
staticCache.delete(key);
|
|
64
|
+
staticCache.set(key, value);
|
|
65
|
+
return value;
|
|
62
66
|
}
|
|
63
|
-
|
|
64
|
-
|
|
67
|
+
// Miss: compute and insert, evict LRU if over capacity.
|
|
68
|
+
const result = originalMethod.apply(this, args);
|
|
69
|
+
if (staticCache.size >= maxStaticCacheEntries) {
|
|
70
|
+
// Remove least-recently used (the first key in insertion order).
|
|
71
|
+
const lruKey = staticCache.keys().next().value;
|
|
72
|
+
if (lruKey !== undefined) {
|
|
73
|
+
staticCache.delete(lruKey);
|
|
74
|
+
}
|
|
65
75
|
}
|
|
66
|
-
|
|
76
|
+
staticCache.set(key, result);
|
|
77
|
+
return result;
|
|
67
78
|
};
|
|
68
79
|
return descriptor;
|
|
69
80
|
};
|
|
@@ -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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"}
|
|
@@ -28,7 +28,7 @@ export declare function isFile(fs: ReadOnlyFileSystem, uri: Uri, treatZipDirecto
|
|
|
28
28
|
export declare function tryStat(fs: ReadOnlyFileSystem, uri: Uri): Stats | undefined;
|
|
29
29
|
export declare function tryRealpath(fs: ReadOnlyFileSystem, uri: Uri): Uri | undefined;
|
|
30
30
|
export declare function getFileSystemEntries(fs: ReadOnlyFileSystem, uri: Uri): FileSystemEntries;
|
|
31
|
-
export declare function getFileSystemEntriesFromDirEntries(dirEntries: Dirent
|
|
31
|
+
export declare function getFileSystemEntriesFromDirEntries(dirEntries: Iterable<Dirent>, fs: ReadOnlyFileSystem, uri: Uri): FileSystemEntries;
|
|
32
32
|
export declare function getWildcardRegexPattern(root: Uri, fileSpec: string): string;
|
|
33
33
|
export declare function getWildcardRoot(root: Uri, fileSpec: string): Uri;
|
|
34
34
|
export declare function hasPythonExtension(uri: Uri): boolean;
|
|
@@ -141,7 +141,8 @@ function getFileSystemEntries(fs, uri) {
|
|
|
141
141
|
}
|
|
142
142
|
// Sorts the entires into files and directories, including any symbolic links.
|
|
143
143
|
function getFileSystemEntriesFromDirEntries(dirEntries, fs, uri) {
|
|
144
|
-
const entries = dirEntries.
|
|
144
|
+
const entries = Array.isArray(dirEntries) ? dirEntries.slice() : Array.from(dirEntries);
|
|
145
|
+
entries.sort((a, b) => {
|
|
145
146
|
if (a.name < b.name) {
|
|
146
147
|
return -1;
|
|
147
148
|
}
|
|
@@ -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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"}
|
|
@@ -19,10 +19,10 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
|
|
|
19
19
|
};
|
|
20
20
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
21
21
|
exports.WebUri = void 0;
|
|
22
|
+
const vscode_uri_1 = require("vscode-uri");
|
|
22
23
|
const pathUtils_1 = require("../pathUtils");
|
|
23
24
|
const baseUri_1 = require("./baseUri");
|
|
24
25
|
const memoization_1 = require("./memoization");
|
|
25
|
-
const vscode_uri_1 = require("vscode-uri");
|
|
26
26
|
class WebUri extends baseUri_1.BaseUri {
|
|
27
27
|
constructor(key, _scheme, _authority, _path, _query, _fragment, _originalString) {
|
|
28
28
|
super(key);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"webUri.js","sourceRoot":"","sources":["../../../../../../src/common/uri/webUri.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;GAWG;;;;;;;;;AAEH,4CAA0F;AAC1F,uCAAiD;AACjD,+CAAsF;
|
|
1
|
+
{"version":3,"file":"webUri.js","sourceRoot":"","sources":["../../../../../../src/common/uri/webUri.ts"],"names":[],"mappings":"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"}
|
|
@@ -1972,7 +1972,7 @@ class CompletionProvider {
|
|
|
1972
1972
|
return completionMap;
|
|
1973
1973
|
}
|
|
1974
1974
|
_addImplicitImportsToCompletion(importInfo, importFromNode, priorWord, completionMap) {
|
|
1975
|
-
importInfo.implicitImports
|
|
1975
|
+
importInfo.implicitImports?.forEach((implImport) => {
|
|
1976
1976
|
if (!importFromNode.d.imports.find((imp) => imp.d.name.d.value === implImport.name)) {
|
|
1977
1977
|
this.addNameToCompletions(implImport.name, vscode_languageserver_1.CompletionItemKind.Module, priorWord, completionMap, {
|
|
1978
1978
|
moduleUri: implImport.uri,
|