@zzzen/pyright-internal 1.2.0-dev.20230507 → 1.2.0-dev.20230521
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/analyzerFileInfo.d.ts +1 -0
- package/dist/analyzer/analyzerFileInfo.js +4 -3
- package/dist/analyzer/analyzerFileInfo.js.map +1 -1
- package/dist/analyzer/backgroundAnalysisProgram.d.ts +17 -15
- package/dist/analyzer/backgroundAnalysisProgram.js +43 -53
- package/dist/analyzer/backgroundAnalysisProgram.js.map +1 -1
- package/dist/analyzer/binder.d.ts +0 -2
- package/dist/analyzer/binder.js +2 -20
- package/dist/analyzer/binder.js.map +1 -1
- package/dist/analyzer/checker.d.ts +1 -1
- package/dist/analyzer/checker.js +97 -29
- package/dist/analyzer/checker.js.map +1 -1
- package/dist/analyzer/constraintSolver.js +14 -15
- package/dist/analyzer/constraintSolver.js.map +1 -1
- package/dist/analyzer/constructorTransform.js +5 -1
- package/dist/analyzer/constructorTransform.js.map +1 -1
- package/dist/analyzer/constructors.js +248 -189
- package/dist/analyzer/constructors.js.map +1 -1
- package/dist/analyzer/dataClasses.js +5 -2
- package/dist/analyzer/dataClasses.js.map +1 -1
- package/dist/analyzer/declarationUtils.js +1 -0
- package/dist/analyzer/declarationUtils.js.map +1 -1
- package/dist/analyzer/docStringConversion.js +1 -1
- package/dist/analyzer/docStringConversion.js.map +1 -1
- package/dist/analyzer/enums.js +8 -0
- package/dist/analyzer/enums.js.map +1 -1
- package/dist/analyzer/importResolver.d.ts +4 -4
- package/dist/analyzer/importResolver.js +93 -69
- package/dist/analyzer/importResolver.js.map +1 -1
- package/dist/analyzer/importResult.d.ts +2 -2
- package/dist/analyzer/importStatementUtils.js +2 -2
- package/dist/analyzer/importStatementUtils.js.map +1 -1
- package/dist/analyzer/namedTuples.js +2 -5
- package/dist/analyzer/namedTuples.js.map +1 -1
- package/dist/analyzer/packageTypeVerifier.js +1 -1
- package/dist/analyzer/packageTypeVerifier.js.map +1 -1
- package/dist/analyzer/parseTreeUtils.js +2 -34
- package/dist/analyzer/parseTreeUtils.js.map +1 -1
- package/dist/analyzer/parseTreeWalker.js +2 -2
- package/dist/analyzer/parseTreeWalker.js.map +1 -1
- package/dist/analyzer/patternMatching.js +1 -0
- package/dist/analyzer/patternMatching.js.map +1 -1
- package/dist/analyzer/program.d.ts +18 -34
- package/dist/analyzer/program.js +57 -259
- package/dist/analyzer/program.js.map +1 -1
- package/dist/analyzer/protocols.js +4 -2
- package/dist/analyzer/protocols.js.map +1 -1
- package/dist/analyzer/service.d.ts +8 -16
- package/dist/analyzer/service.js +33 -47
- package/dist/analyzer/service.js.map +1 -1
- package/dist/analyzer/sourceFile.d.ts +1 -15
- package/dist/analyzer/sourceFile.js +14 -96
- package/dist/analyzer/sourceFile.js.map +1 -1
- package/dist/analyzer/sourceMapper.js +1 -1
- package/dist/analyzer/sourceMapper.js.map +1 -1
- package/dist/analyzer/symbol.d.ts +3 -1
- package/dist/analyzer/symbol.js +5 -0
- package/dist/analyzer/symbol.js.map +1 -1
- package/dist/analyzer/typeDocStringUtils.js +1 -1
- package/dist/analyzer/typeDocStringUtils.js.map +1 -1
- package/dist/analyzer/typeEvaluator.d.ts +2 -2
- package/dist/analyzer/typeEvaluator.js +495 -196
- package/dist/analyzer/typeEvaluator.js.map +1 -1
- package/dist/analyzer/typeEvaluatorTypes.d.ts +7 -2
- package/dist/analyzer/typeEvaluatorTypes.js.map +1 -1
- package/dist/analyzer/typeGuards.js +1 -0
- package/dist/analyzer/typeGuards.js.map +1 -1
- package/dist/analyzer/typePrinter.d.ts +3 -3
- package/dist/analyzer/typePrinter.js +255 -101
- package/dist/analyzer/typePrinter.js.map +1 -1
- package/dist/analyzer/typeUtils.d.ts +12 -7
- package/dist/analyzer/typeUtils.js +174 -49
- package/dist/analyzer/typeUtils.js.map +1 -1
- package/dist/analyzer/typeVarContext.d.ts +1 -2
- package/dist/analyzer/typeVarContext.js +16 -34
- package/dist/analyzer/typeVarContext.js.map +1 -1
- package/dist/analyzer/typedDicts.js +138 -41
- package/dist/analyzer/typedDicts.js.map +1 -1
- package/dist/analyzer/types.d.ts +10 -3
- package/dist/analyzer/types.js +32 -16
- package/dist/analyzer/types.js.map +1 -1
- package/dist/backgroundAnalysisBase.d.ts +25 -19
- package/dist/backgroundAnalysisBase.js +161 -115
- package/dist/backgroundAnalysisBase.js.map +1 -1
- package/dist/backgroundThreadBase.d.ts +1 -1
- package/dist/backgroundThreadBase.js +1 -1
- package/dist/backgroundThreadBase.js.map +1 -1
- package/dist/commands/dumpFileDebugInfoCommand.js +3 -4
- package/dist/commands/dumpFileDebugInfoCommand.js.map +1 -1
- package/dist/common/configOptions.js +1 -1
- package/dist/common/configOptions.js.map +1 -1
- package/dist/common/extensibility.d.ts +26 -5
- package/dist/common/extensibility.js.map +1 -1
- package/dist/common/logTracker.d.ts +2 -0
- package/dist/common/logTracker.js +8 -1
- package/dist/common/logTracker.js.map +1 -1
- package/dist/common/lspUtils.d.ts +4 -1
- package/dist/common/lspUtils.js +38 -1
- package/dist/common/lspUtils.js.map +1 -1
- package/dist/common/pythonVersion.d.ts +2 -1
- package/dist/common/pythonVersion.js +1 -0
- package/dist/common/pythonVersion.js.map +1 -1
- package/dist/common/textRange.js +1 -1
- package/dist/common/textRange.js.map +1 -1
- package/dist/common/workspaceEditUtils.d.ts +3 -3
- package/dist/common/workspaceEditUtils.js +15 -17
- package/dist/common/workspaceEditUtils.js.map +1 -1
- package/dist/languageServerBase.d.ts +2 -5
- package/dist/languageServerBase.js +35 -62
- package/dist/languageServerBase.js.map +1 -1
- package/dist/languageService/autoImporter.d.ts +51 -52
- package/dist/languageService/autoImporter.js +126 -211
- package/dist/languageService/autoImporter.js.map +1 -1
- package/dist/languageService/callHierarchyProvider.js +8 -33
- package/dist/languageService/callHierarchyProvider.js.map +1 -1
- package/dist/languageService/completionProvider.d.ts +42 -81
- package/dist/languageService/completionProvider.js +608 -841
- package/dist/languageService/completionProvider.js.map +1 -1
- package/dist/languageService/documentSymbolCollector.d.ts +2 -2
- package/dist/languageService/documentSymbolCollector.js +40 -30
- package/dist/languageService/documentSymbolCollector.js.map +1 -1
- package/dist/languageService/documentSymbolProvider.d.ts +13 -35
- package/dist/languageService/documentSymbolProvider.js +52 -264
- package/dist/languageService/documentSymbolProvider.js.map +1 -1
- package/dist/languageService/hoverProvider.d.ts +1 -3
- package/dist/languageService/hoverProvider.js +11 -97
- package/dist/languageService/hoverProvider.js.map +1 -1
- package/dist/languageService/referencesProvider.d.ts +3 -3
- package/dist/languageService/referencesProvider.js +6 -8
- package/dist/languageService/referencesProvider.js.map +1 -1
- package/dist/languageService/renameProvider.d.ts +0 -1
- package/dist/languageService/renameProvider.js +2 -6
- package/dist/languageService/renameProvider.js.map +1 -1
- package/dist/languageService/signatureHelpProvider.js +1 -1
- package/dist/languageService/signatureHelpProvider.js.map +1 -1
- package/dist/languageService/symbolIndexer.d.ts +23 -0
- package/dist/languageService/symbolIndexer.js +105 -0
- package/dist/languageService/symbolIndexer.js.map +1 -0
- package/dist/languageService/tooltipUtils.d.ts +8 -1
- package/dist/languageService/tooltipUtils.js +102 -1
- package/dist/languageService/tooltipUtils.js.map +1 -1
- package/dist/languageService/workspaceSymbolProvider.d.ts +17 -0
- package/dist/languageService/workspaceSymbolProvider.js +133 -0
- package/dist/languageService/workspaceSymbolProvider.js.map +1 -0
- package/dist/localization/localize.d.ts +38 -4
- package/dist/localization/localize.js +21 -4
- package/dist/localization/localize.js.map +1 -1
- package/dist/localization/package.nls.en-us.json +23 -6
- package/dist/parser/parseNodes.d.ts +8 -8
- package/dist/parser/parseNodes.js +20 -10
- package/dist/parser/parseNodes.js.map +1 -1
- package/dist/parser/parser.d.ts +3 -3
- package/dist/parser/parser.js +136 -159
- package/dist/parser/parser.js.map +1 -1
- package/dist/parser/stringTokenUtils.d.ts +3 -13
- package/dist/parser/stringTokenUtils.js +8 -181
- package/dist/parser/stringTokenUtils.js.map +1 -1
- package/dist/parser/tokenizer.d.ts +3 -0
- package/dist/parser/tokenizer.js +211 -24
- package/dist/parser/tokenizer.js.map +1 -1
- package/dist/parser/tokenizerTypes.d.ts +31 -1
- package/dist/parser/tokenizerTypes.js +51 -1
- package/dist/parser/tokenizerTypes.js.map +1 -1
- package/dist/pyright.js +26 -4
- package/dist/pyright.js.map +1 -1
- package/dist/readonlyAugmentedFileSystem.js +1 -1
- package/dist/readonlyAugmentedFileSystem.js.map +1 -1
- package/dist/tests/chainedSourceFiles.test.js +15 -20
- package/dist/tests/chainedSourceFiles.test.js.map +1 -1
- package/dist/tests/checker.test.js +14 -0
- package/dist/tests/checker.test.js.map +1 -1
- package/dist/tests/completions.test.js +11 -236
- package/dist/tests/completions.test.js.map +1 -1
- package/dist/tests/docStringConversion.test.js +36 -2
- package/dist/tests/docStringConversion.test.js.map +1 -1
- package/dist/tests/fourslash/completions.override2.fourslash.js +1 -16
- package/dist/tests/fourslash/completions.override2.fourslash.js.map +1 -1
- package/dist/tests/harness/fourslash/testLanguageService.js +1 -1
- package/dist/tests/harness/fourslash/testLanguageService.js.map +1 -1
- package/dist/tests/harness/fourslash/testState.d.ts +14 -8
- package/dist/tests/harness/fourslash/testState.js +27 -37
- package/dist/tests/harness/fourslash/testState.js.map +1 -1
- package/dist/tests/importResolver.test.js +84 -4
- package/dist/tests/importResolver.test.js.map +1 -1
- package/dist/tests/textRange.test.js +45 -0
- package/dist/tests/textRange.test.js.map +1 -0
- package/dist/tests/tokenizer.test.js +272 -58
- package/dist/tests/tokenizer.test.js.map +1 -1
- package/dist/tests/typeEvaluator2.test.js +16 -0
- package/dist/tests/typeEvaluator2.test.js.map +1 -1
- package/dist/tests/typeEvaluator3.test.js +14 -0
- package/dist/tests/typeEvaluator3.test.js.map +1 -1
- package/dist/tests/typeEvaluator4.test.js +7 -2
- package/dist/tests/typeEvaluator4.test.js.map +1 -1
- package/dist/tests/typeEvaluator5.test.js +29 -9
- package/dist/tests/typeEvaluator5.test.js.map +1 -1
- package/dist/tests/workspaceEditUtils.test.js +15 -10
- package/dist/tests/workspaceEditUtils.test.js.map +1 -1
- package/dist/workspaceFactory.js +3 -5
- package/dist/workspaceFactory.js.map +1 -1
- package/package.json +1 -1
- package/dist/languageService/importAdder.d.ts +0 -40
- package/dist/languageService/importAdder.js +0 -388
- package/dist/languageService/importAdder.js.map +0 -1
- package/dist/tests/fourslash/completions.commitChars.fourslash.d.ts +0 -1
- package/dist/tests/fourslash/completions.commitChars.fourslash.js +0 -81
- package/dist/tests/fourslash/completions.commitChars.fourslash.js.map +0 -1
- package/dist/tests/importAdder.test.js +0 -1325
- package/dist/tests/importAdder.test.js.map +0 -1
- /package/dist/tests/{importAdder.test.d.ts → textRange.test.d.ts} +0 -0
@@ -11,6 +11,7 @@ export interface AbsoluteModuleDescriptor {
|
|
11
11
|
}
|
12
12
|
export interface LookupImportOptions {
|
13
13
|
skipFileNeededCheck: boolean;
|
14
|
+
skipParsing?: boolean;
|
14
15
|
}
|
15
16
|
export declare type ImportLookup = (filePathOrModule: string | AbsoluteModuleDescriptor, options?: LookupImportOptions) => ImportLookupResult | undefined;
|
16
17
|
export interface ImportLookupResult {
|
@@ -18,10 +18,11 @@ function isAnnotationEvaluationPostponed(fileInfo) {
|
|
18
18
|
if (fileInfo.futureImports.has('annotations')) {
|
19
19
|
return true;
|
20
20
|
}
|
21
|
-
// As of
|
22
|
-
//
|
21
|
+
// As of May 2023, the Python steering council has approved PEP 649 for Python 3.13.
|
22
|
+
// It was tentatively approved for 3.12, but they decided to defer until the next
|
23
|
+
// release to reduce the risk.
|
23
24
|
// https://discuss.python.org/t/pep-649-deferred-evaluation-of-annotations-tentatively-accepted/21331
|
24
|
-
if (fileInfo.executionEnvironment.pythonVersion >= pythonVersion_1.PythonVersion.
|
25
|
+
if (fileInfo.executionEnvironment.pythonVersion >= pythonVersion_1.PythonVersion.V3_13) {
|
25
26
|
return true;
|
26
27
|
}
|
27
28
|
return false;
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"analyzerFileInfo.js","sourceRoot":"","sources":["../../../src/analyzer/analyzerFileInfo.ts"],"names":[],"mappings":";AAAA;;;;;;;;GAQG;;;AAIH,2DAAwD;
|
1
|
+
{"version":3,"file":"analyzerFileInfo.js","sourceRoot":"","sources":["../../../src/analyzer/analyzerFileInfo.ts"],"names":[],"mappings":";AAAA;;;;;;;;GAQG;;;AAIH,2DAAwD;AAqDxD,SAAgB,+BAA+B,CAAC,QAA0B;IACtE,IAAI,QAAQ,CAAC,UAAU,EAAE;QACrB,OAAO,IAAI,CAAC;KACf;IAED,IAAI,QAAQ,CAAC,aAAa,CAAC,GAAG,CAAC,aAAa,CAAC,EAAE;QAC3C,OAAO,IAAI,CAAC;KACf;IAED,oFAAoF;IACpF,iFAAiF;IACjF,8BAA8B;IAC9B,qGAAqG;IACrG,IAAI,QAAQ,CAAC,oBAAoB,CAAC,aAAa,IAAI,6BAAa,CAAC,KAAK,EAAE;QACpE,OAAO,IAAI,CAAC;KACf;IAED,OAAO,KAAK,CAAC;AACjB,CAAC;AAlBD,0EAkBC"}
|
@@ -1,5 +1,5 @@
|
|
1
1
|
import { CancellationToken } from 'vscode-languageserver';
|
2
|
-
import { BackgroundAnalysisBase
|
2
|
+
import { BackgroundAnalysisBase } from '../backgroundAnalysisBase';
|
3
3
|
import { ConfigOptions } from '../common/configOptions';
|
4
4
|
import { ConsoleInterface } from '../common/console';
|
5
5
|
import { Diagnostic } from '../common/diagnostic';
|
@@ -7,25 +7,31 @@ import { Range } from '../common/textRange';
|
|
7
7
|
import { AnalysisCompleteCallback } from './analysis';
|
8
8
|
import { CacheManager } from './cacheManager';
|
9
9
|
import { ImportResolver } from './importResolver';
|
10
|
-
import {
|
10
|
+
import { MaxAnalysisTime, OpenFileOptions, Program } from './program';
|
11
|
+
export declare enum InvalidatedReason {
|
12
|
+
Reanalyzed = 0,
|
13
|
+
SourceWatcherChanged = 1,
|
14
|
+
LibraryWatcherChanged = 2,
|
15
|
+
LibraryWatcherContentOnlyChanged = 3
|
16
|
+
}
|
11
17
|
export declare class BackgroundAnalysisProgram {
|
12
|
-
|
18
|
+
protected readonly serviceId: string;
|
19
|
+
private readonly _console;
|
13
20
|
private _configOptions;
|
14
21
|
private _importResolver;
|
15
22
|
private _backgroundAnalysis?;
|
16
|
-
private _maxAnalysisTime?;
|
17
|
-
private _disableChecker?;
|
23
|
+
private readonly _maxAnalysisTime?;
|
24
|
+
private readonly _disableChecker?;
|
18
25
|
private _program;
|
19
26
|
private _disposed;
|
20
27
|
private _onAnalysisCompletion;
|
21
28
|
private _preEditAnalysis;
|
22
|
-
constructor(_console: ConsoleInterface, _configOptions: ConfigOptions, _importResolver: ImportResolver, _backgroundAnalysis?: BackgroundAnalysisBase | undefined, _maxAnalysisTime?: MaxAnalysisTime | undefined, _disableChecker?: boolean | undefined, cacheManager?: CacheManager);
|
29
|
+
constructor(serviceId: string, _console: ConsoleInterface, _configOptions: ConfigOptions, _importResolver: ImportResolver, _backgroundAnalysis?: BackgroundAnalysisBase | undefined, _maxAnalysisTime?: MaxAnalysisTime | undefined, _disableChecker?: boolean | undefined, cacheManager?: CacheManager);
|
23
30
|
get configOptions(): ConfigOptions;
|
24
31
|
get importResolver(): ImportResolver;
|
25
32
|
get program(): Program;
|
26
33
|
get host(): import("../common/host").Host;
|
27
34
|
get backgroundAnalysis(): BackgroundAnalysisBase | undefined;
|
28
|
-
set backgroundAnalysis(value: BackgroundAnalysisBase | undefined);
|
29
35
|
hasSourceFile(filePath: string): boolean;
|
30
36
|
setConfigOptions(configOptions: ConfigOptions): void;
|
31
37
|
setImportResolver(importResolver: ImportResolver): void;
|
@@ -37,23 +43,19 @@ export declare class BackgroundAnalysisProgram {
|
|
37
43
|
updateOpenFileContents(path: string, version: number | null, contents: string, options: OpenFileOptions): void;
|
38
44
|
setFileClosed(filePath: string, isTracked?: boolean): void;
|
39
45
|
addInterimFile(filePath: string): void;
|
40
|
-
markAllFilesDirty(evenIfContentsAreSame: boolean
|
41
|
-
markFilesDirty(filePaths: string[], evenIfContentsAreSame: boolean
|
46
|
+
markAllFilesDirty(evenIfContentsAreSame: boolean): void;
|
47
|
+
markFilesDirty(filePaths: string[], evenIfContentsAreSame: boolean): void;
|
42
48
|
setCompletionCallback(callback?: AnalysisCompleteCallback): void;
|
43
49
|
startAnalysis(token: CancellationToken): boolean;
|
44
50
|
analyzeFile(filePath: string, token: CancellationToken): boolean;
|
45
|
-
|
46
|
-
refreshIndexing(refreshOptions?: RefreshOptions): void;
|
47
|
-
cancelIndexing(): void;
|
48
|
-
getIndexing(filePath: string): Map<string, import("../languageService/documentSymbolProvider").IndexResults> | undefined;
|
51
|
+
libraryUpdated(): void;
|
49
52
|
getDiagnosticsForRange(filePath: string, range: Range, token: CancellationToken): Promise<Diagnostic[]>;
|
50
53
|
writeTypeStub(targetImportPath: string, targetIsSingleFile: boolean, stubPath: string, token: CancellationToken): Promise<any>;
|
51
|
-
invalidateAndForceReanalysis(
|
54
|
+
invalidateAndForceReanalysis(reason: InvalidatedReason): void;
|
52
55
|
restart(): void;
|
53
56
|
dispose(): void;
|
54
57
|
enterEditMode(): void;
|
55
58
|
exitEditMode(): import("../common/editAction").FileEditAction[];
|
56
|
-
protected getIndices(): Indices | undefined;
|
57
59
|
private _ensurePartialStubPackages;
|
58
60
|
private _reportDiagnosticsForRemovedFiles;
|
59
61
|
}
|
@@ -8,11 +8,19 @@
|
|
8
8
|
* analysis running in a worker process.
|
9
9
|
*/
|
10
10
|
Object.defineProperty(exports, "__esModule", { value: true });
|
11
|
-
exports.BackgroundAnalysisProgram = void 0;
|
11
|
+
exports.BackgroundAnalysisProgram = exports.InvalidatedReason = void 0;
|
12
12
|
const analysis_1 = require("./analysis");
|
13
13
|
const program_1 = require("./program");
|
14
|
+
var InvalidatedReason;
|
15
|
+
(function (InvalidatedReason) {
|
16
|
+
InvalidatedReason[InvalidatedReason["Reanalyzed"] = 0] = "Reanalyzed";
|
17
|
+
InvalidatedReason[InvalidatedReason["SourceWatcherChanged"] = 1] = "SourceWatcherChanged";
|
18
|
+
InvalidatedReason[InvalidatedReason["LibraryWatcherChanged"] = 2] = "LibraryWatcherChanged";
|
19
|
+
InvalidatedReason[InvalidatedReason["LibraryWatcherContentOnlyChanged"] = 3] = "LibraryWatcherContentOnlyChanged";
|
20
|
+
})(InvalidatedReason = exports.InvalidatedReason || (exports.InvalidatedReason = {}));
|
14
21
|
class BackgroundAnalysisProgram {
|
15
|
-
constructor(_console, _configOptions, _importResolver, _backgroundAnalysis, _maxAnalysisTime, _disableChecker, cacheManager) {
|
22
|
+
constructor(serviceId, _console, _configOptions, _importResolver, _backgroundAnalysis, _maxAnalysisTime, _disableChecker, cacheManager) {
|
23
|
+
this.serviceId = serviceId;
|
16
24
|
this._console = _console;
|
17
25
|
this._configOptions = _configOptions;
|
18
26
|
this._importResolver = _importResolver;
|
@@ -20,7 +28,7 @@ class BackgroundAnalysisProgram {
|
|
20
28
|
this._maxAnalysisTime = _maxAnalysisTime;
|
21
29
|
this._disableChecker = _disableChecker;
|
22
30
|
this._disposed = false;
|
23
|
-
this._program = new program_1.Program(this.
|
31
|
+
this._program = new program_1.Program(this.importResolver, this.configOptions, this._console, undefined, this._disableChecker, cacheManager, serviceId);
|
24
32
|
}
|
25
33
|
get configOptions() {
|
26
34
|
return this._configOptions;
|
@@ -37,9 +45,6 @@ class BackgroundAnalysisProgram {
|
|
37
45
|
get backgroundAnalysis() {
|
38
46
|
return this._backgroundAnalysis;
|
39
47
|
}
|
40
|
-
set backgroundAnalysis(value) {
|
41
|
-
this._backgroundAnalysis = value;
|
42
|
-
}
|
43
48
|
hasSourceFile(filePath) {
|
44
49
|
return !!this._program.getSourceFile(filePath);
|
45
50
|
}
|
@@ -54,7 +59,7 @@ class BackgroundAnalysisProgram {
|
|
54
59
|
this._importResolver = importResolver;
|
55
60
|
(_a = this._backgroundAnalysis) === null || _a === void 0 ? void 0 : _a.setImportResolver(importResolver);
|
56
61
|
this._program.setImportResolver(importResolver);
|
57
|
-
this.
|
62
|
+
this.configOptions.getExecutionEnvironments().forEach((e) => this._ensurePartialStubPackages(e));
|
58
63
|
}
|
59
64
|
setTrackedFiles(filePaths) {
|
60
65
|
var _a;
|
@@ -97,15 +102,15 @@ class BackgroundAnalysisProgram {
|
|
97
102
|
(_a = this._backgroundAnalysis) === null || _a === void 0 ? void 0 : _a.addInterimFile(filePath);
|
98
103
|
this._program.addInterimFile(filePath);
|
99
104
|
}
|
100
|
-
markAllFilesDirty(evenIfContentsAreSame
|
105
|
+
markAllFilesDirty(evenIfContentsAreSame) {
|
101
106
|
var _a;
|
102
|
-
(_a = this._backgroundAnalysis) === null || _a === void 0 ? void 0 : _a.markAllFilesDirty(evenIfContentsAreSame
|
103
|
-
this._program.markAllFilesDirty(evenIfContentsAreSame
|
107
|
+
(_a = this._backgroundAnalysis) === null || _a === void 0 ? void 0 : _a.markAllFilesDirty(evenIfContentsAreSame);
|
108
|
+
this._program.markAllFilesDirty(evenIfContentsAreSame);
|
104
109
|
}
|
105
|
-
markFilesDirty(filePaths, evenIfContentsAreSame
|
110
|
+
markFilesDirty(filePaths, evenIfContentsAreSame) {
|
106
111
|
var _a;
|
107
|
-
(_a = this._backgroundAnalysis) === null || _a === void 0 ? void 0 : _a.markFilesDirty(filePaths, evenIfContentsAreSame
|
108
|
-
this._program.markFilesDirty(filePaths, evenIfContentsAreSame
|
112
|
+
(_a = this._backgroundAnalysis) === null || _a === void 0 ? void 0 : _a.markFilesDirty(filePaths, evenIfContentsAreSame);
|
113
|
+
this._program.markFilesDirty(filePaths, evenIfContentsAreSame);
|
109
114
|
}
|
110
115
|
setCompletionCallback(callback) {
|
111
116
|
var _a;
|
@@ -114,7 +119,7 @@ class BackgroundAnalysisProgram {
|
|
114
119
|
}
|
115
120
|
startAnalysis(token) {
|
116
121
|
if (this._backgroundAnalysis) {
|
117
|
-
this._backgroundAnalysis.startAnalysis(this.
|
122
|
+
this._backgroundAnalysis.startAnalysis(this.program, token);
|
118
123
|
return false;
|
119
124
|
}
|
120
125
|
return (0, analysis_1.analyzeProgram)(this._program, this._maxAnalysisTime, this._configOptions, this._onAnalysisCompletion, this._console, token);
|
@@ -122,21 +127,8 @@ class BackgroundAnalysisProgram {
|
|
122
127
|
analyzeFile(filePath, token) {
|
123
128
|
return this._program.analyzeFile(filePath, token);
|
124
129
|
}
|
125
|
-
|
126
|
-
|
127
|
-
(_a = this._backgroundAnalysis) === null || _a === void 0 ? void 0 : _a.startIndexing(indexOptions, this._configOptions, this.importResolver, this.host.kind);
|
128
|
-
}
|
129
|
-
refreshIndexing(refreshOptions) {
|
130
|
-
var _a;
|
131
|
-
(_a = this._backgroundAnalysis) === null || _a === void 0 ? void 0 : _a.refreshIndexing(this._configOptions, this.importResolver, this.host.kind, refreshOptions);
|
132
|
-
}
|
133
|
-
cancelIndexing() {
|
134
|
-
var _a;
|
135
|
-
(_a = this._backgroundAnalysis) === null || _a === void 0 ? void 0 : _a.cancelIndexing();
|
136
|
-
}
|
137
|
-
getIndexing(filePath) {
|
138
|
-
var _a;
|
139
|
-
return (_a = this.getIndices()) === null || _a === void 0 ? void 0 : _a.getIndex(this._configOptions.findExecEnvironment(filePath).root);
|
130
|
+
libraryUpdated() {
|
131
|
+
// empty
|
140
132
|
}
|
141
133
|
async getDiagnosticsForRange(filePath, range, token) {
|
142
134
|
if (this._backgroundAnalysis) {
|
@@ -152,17 +144,14 @@ class BackgroundAnalysisProgram {
|
|
152
144
|
/* maxTime */ undefined, this._configOptions, this._onAnalysisCompletion, this._console, token);
|
153
145
|
return this._program.writeTypeStub(targetImportPath, targetIsSingleFile, stubPath, token);
|
154
146
|
}
|
155
|
-
invalidateAndForceReanalysis(
|
147
|
+
invalidateAndForceReanalysis(reason) {
|
156
148
|
var _a;
|
157
|
-
|
158
|
-
this.refreshIndexing(refreshOptions);
|
159
|
-
}
|
160
|
-
(_a = this._backgroundAnalysis) === null || _a === void 0 ? void 0 : _a.invalidateAndForceReanalysis(rebuildUserFileIndexing);
|
149
|
+
(_a = this._backgroundAnalysis) === null || _a === void 0 ? void 0 : _a.invalidateAndForceReanalysis(reason);
|
161
150
|
// Make sure the import resolver doesn't have invalid
|
162
151
|
// cached entries.
|
163
152
|
this._importResolver.invalidateCache();
|
164
153
|
// Mark all files with one or more errors dirty.
|
165
|
-
this._program.markAllFilesDirty(true
|
154
|
+
this._program.markAllFilesDirty(/* evenIfContentsAreSame */ true);
|
166
155
|
}
|
167
156
|
restart() {
|
168
157
|
var _a;
|
@@ -170,6 +159,9 @@ class BackgroundAnalysisProgram {
|
|
170
159
|
}
|
171
160
|
dispose() {
|
172
161
|
var _a;
|
162
|
+
if (this._disposed) {
|
163
|
+
return;
|
164
|
+
}
|
173
165
|
this._disposed = true;
|
174
166
|
this._program.dispose();
|
175
167
|
(_a = this._backgroundAnalysis) === null || _a === void 0 ? void 0 : _a.shutdown();
|
@@ -186,30 +178,28 @@ class BackgroundAnalysisProgram {
|
|
186
178
|
this._preEditAnalysis = undefined;
|
187
179
|
return this._program.exitEditMode();
|
188
180
|
}
|
189
|
-
getIndices() {
|
190
|
-
return undefined;
|
191
|
-
}
|
192
181
|
_ensurePartialStubPackages(execEnv) {
|
193
182
|
var _a;
|
194
183
|
(_a = this._backgroundAnalysis) === null || _a === void 0 ? void 0 : _a.ensurePartialStubPackages(execEnv.root);
|
195
184
|
return this._importResolver.ensurePartialStubPackages(execEnv);
|
196
185
|
}
|
197
186
|
_reportDiagnosticsForRemovedFiles(fileDiags) {
|
198
|
-
if (fileDiags.length
|
199
|
-
|
200
|
-
|
201
|
-
|
202
|
-
|
203
|
-
|
204
|
-
|
205
|
-
|
206
|
-
|
207
|
-
|
208
|
-
|
209
|
-
|
210
|
-
|
211
|
-
|
212
|
-
|
187
|
+
if (fileDiags.length === 0) {
|
188
|
+
return;
|
189
|
+
}
|
190
|
+
// If analysis is running in the foreground process, report any
|
191
|
+
// diagnostics that resulted from the close operation (used to
|
192
|
+
// clear diagnostics that are no longer of interest).
|
193
|
+
if (!this._backgroundAnalysis && this._onAnalysisCompletion) {
|
194
|
+
this._onAnalysisCompletion({
|
195
|
+
diagnostics: fileDiags,
|
196
|
+
filesInProgram: this._program.getFileCount(),
|
197
|
+
filesRequiringAnalysis: this._program.getFilesToAnalyzeCount(),
|
198
|
+
checkingOnlyOpenFiles: this._program.isCheckingOnlyOpenFiles(),
|
199
|
+
fatalErrorOccurred: false,
|
200
|
+
configParseErrorOccurred: false,
|
201
|
+
elapsedTime: 0,
|
202
|
+
});
|
213
203
|
}
|
214
204
|
}
|
215
205
|
}
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"backgroundAnalysisProgram.js","sourceRoot":"","sources":["../../../src/analyzer/backgroundAnalysisProgram.ts"],"names":[],"mappings":";AAAA;;;;;;;GAOG;;;AAUH,yCAAsE;AAGtE,
|
1
|
+
{"version":3,"file":"backgroundAnalysisProgram.js","sourceRoot":"","sources":["../../../src/analyzer/backgroundAnalysisProgram.ts"],"names":[],"mappings":"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"}
|
@@ -127,8 +127,6 @@ export declare class Binder extends ParseTreeWalker {
|
|
127
127
|
private _getVariableDocString;
|
128
128
|
private _isAnnotationFinal;
|
129
129
|
private _isAnnotationClassVar;
|
130
|
-
private _isRequiredAnnotation;
|
131
|
-
private _isNotRequiredAnnotation;
|
132
130
|
private _getMemberAccessInfo;
|
133
131
|
private _addImplicitImportsToLoaderActions;
|
134
132
|
private _handleTypingStubAssignmentOrAnnotation;
|
package/dist/analyzer/binder.js
CHANGED
@@ -1342,7 +1342,7 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
|
|
1342
1342
|
// The symbol wasn't in the target module's symbol table. It's probably
|
1343
1343
|
// an implicitly-imported submodule referenced by __all__.
|
1344
1344
|
if (importInfo && importInfo.filteredImplicitImports) {
|
1345
|
-
const implicitImport = importInfo.filteredImplicitImports.
|
1345
|
+
const implicitImport = importInfo.filteredImplicitImports.get(name);
|
1346
1346
|
if (implicitImport) {
|
1347
1347
|
const submoduleFallback = {
|
1348
1348
|
type: 8 /* Alias */,
|
@@ -1416,7 +1416,7 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
|
|
1416
1416
|
// Is the import referring to an implicitly-imported module?
|
1417
1417
|
let implicitImport;
|
1418
1418
|
if (importInfo && importInfo.filteredImplicitImports) {
|
1419
|
-
implicitImport = importInfo.filteredImplicitImports.
|
1419
|
+
implicitImport = importInfo.filteredImplicitImports.get(importedName);
|
1420
1420
|
}
|
1421
1421
|
let submoduleFallback;
|
1422
1422
|
let loadSymbolsFromPath = true;
|
@@ -3016,24 +3016,6 @@ class Binder extends parseTreeWalker_1.ParseTreeWalker {
|
|
3016
3016
|
}
|
3017
3017
|
return { isClassVar, classVarTypeNode };
|
3018
3018
|
}
|
3019
|
-
// Determines if the specified type annotation is wrapped in a "Required".
|
3020
|
-
_isRequiredAnnotation(typeAnnotation) {
|
3021
|
-
if (typeAnnotation && typeAnnotation.nodeType === 24 /* Index */ && typeAnnotation.items.length === 1) {
|
3022
|
-
if (this._isTypingAnnotation(typeAnnotation.baseExpression, 'Required')) {
|
3023
|
-
return true;
|
3024
|
-
}
|
3025
|
-
}
|
3026
|
-
return false;
|
3027
|
-
}
|
3028
|
-
// Determines if the specified type annotation is wrapped in a "NotRequired".
|
3029
|
-
_isNotRequiredAnnotation(typeAnnotation) {
|
3030
|
-
if (typeAnnotation && typeAnnotation.nodeType === 24 /* Index */ && typeAnnotation.items.length === 1) {
|
3031
|
-
if (this._isTypingAnnotation(typeAnnotation.baseExpression, 'NotRequired')) {
|
3032
|
-
return true;
|
3033
|
-
}
|
3034
|
-
}
|
3035
|
-
return false;
|
3036
|
-
}
|
3037
3019
|
// Determines whether a member access expression is referring to a
|
3038
3020
|
// member of a class (either a class or instance member). This will
|
3039
3021
|
// typically take the form "self.x" or "cls.x".
|