microsoft/pyright
1
1
Fork 0
mirror of https://github.com/microsoft/pyright.git synced 2024-09-11 16:06:39 +03:00
Code Issues Projects Releases Wiki Activity

Removed console from AnalyzerFileInfo.

Browse Source 
Fixed bug in type analyzer that caused some type checks relating to parameters to be missed.
Added to heuristic to determine when to strip literal type for private class member types.
This commit is contained in:
Eric Traut 2019-09-21 22:52:22 -07:00
parent 57ca2da3e6
commit 04c387e5f2
4 changed files with 22 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/src/analyzer/analyzerFileInfo.ts
View File

@ -8,7 +8,6 @@
*/
import { DiagnosticSettings, ExecutionEnvironment } from '../common/configOptions';
import { ConsoleInterface } from '../common/console';
import { TextRangeDiagnosticSink } from '../common/diagnosticSink';
import StringMap from '../common/stringMap';
import { TextRange } from '../common/textRange';
@ -32,5 +31,4 @@ export interface AnalyzerFileInfo {
isStubFile: boolean;
isTypingStubFile: boolean;
isBuiltInStubFile: boolean;
console: ConsoleInterface;
}

7
server/src/analyzer/sourceFile.ts
View File

@ -673,6 +673,10 @@ export class SourceFile {
const typeAnalyzer = new TypeAnalyzer(this._analysisJob.parseResults!.parseTree,
fileInfo, this._analysisJob.typeAnalysisPassNumber);
this._analysisJob.typeAnalysisPassNumber++;
if (typeAnalyzer.isAtMaxAnalysisPassCount()) {
this._console.log(
`Hit max analysis pass count for ${ this._filePath }`);
}
// Repeatedly call the analyzer until everything converges.
this._analysisJob.isTypeAnalysisPassNeeded = typeAnalyzer.analyze();
@ -729,8 +733,7 @@ export class SourceFile {
filePath: this._filePath,
isStubFile: this._isStubFile,
isTypingStubFile: this._isTypingStubFile,
isBuiltInStubFile: this._isBuiltInStubFile,
console: this._console
isBuiltInStubFile: this._isBuiltInStubFile
};
return fileInfo;
}

26
server/src/analyzer/typeAnalyzer.ts
View File

@ -13,7 +13,8 @@ import * as assert from 'assert';
import { DiagnosticLevel } from '../common/configOptions';
import { AddMissingOptionalToParamAction, Diagnostic,
DiagnosticAddendum } from '../common/diagnostic';
DiagnosticAddendum,
getEmptyRange } from '../common/diagnostic';
import { DiagnosticRule } from '../common/diagnosticRules';
import { convertOffsetsToRange } from '../common/positionUtils';
import { PythonVersion } from '../common/pythonVersion';
@ -118,15 +119,17 @@ export class TypeAnalyzer extends ParseTreeWalker {
// If we've already analyzed the file the max number of times,
// just give up and admit defeat. This should happen only in
// the case of analyzer bugs.
if (this._analysisVersion >= _maxAnalysisPassCount) {
this._fileInfo.console.log(
`Hit max analysis pass count for ${ this._fileInfo.filePath }`);
if (this.isAtMaxAnalysisPassCount()) {
return false;
}
return this._didAnalysisChange;
}
isAtMaxAnalysisPassCount() {
return this._analysisVersion >= _maxAnalysisPassCount;
}
getLastReanalysisReason() {
return this._lastAnalysisChangeReason;
}
@ -519,7 +522,7 @@ export class TypeAnalyzer extends ParseTreeWalker {
path: this._fileInfo.filePath,
range: convertOffsetsToRange(paramNode.start, TextRange.getEnd(paramNode),
this._fileInfo.lines),
declaredType: specializedParamType
declaredType: paramNode.typeAnnotation ? specializedParamType : undefined
};
assert(paramNode !== undefined && paramNode.name !== undefined);
@ -1337,7 +1340,7 @@ export class TypeAnalyzer extends ParseTreeWalker {
const declaration: Declaration = {
category: DeclarationCategory.Module,
path: implicitImport.path,
range: { start: { line: 0, column: 0 }, end: { line: 0, column: 0 }}
range: getEmptyRange()
};
const newSymbol = Symbol.createWithType(
@ -1355,7 +1358,7 @@ export class TypeAnalyzer extends ParseTreeWalker {
moduleDeclaration = {
category: DeclarationCategory.Module,
path: resolvedPath,
range: { start: { line: 0, column: 0 }, end: { line: 0, column: 0 } }
range: getEmptyRange()
};
}
@ -1441,7 +1444,7 @@ export class TypeAnalyzer extends ParseTreeWalker {
declaration = {
category: DeclarationCategory.Module,
path: implicitImport.path,
range: { start: { line: 0, column: 0 }, end: { line: 0, column: 0 } }
range: getEmptyRange()
};
}
} else {
@ -2798,12 +2801,13 @@ export class TypeAnalyzer extends ParseTreeWalker {
const memberName = node.memberName.nameToken.value;
const isConstant = SymbolNameUtils.isConstantName(memberName);
const isPrivate = SymbolNameUtils.isPrivateOrProtectedName(memberName);
const honorPrivateNaming = this._fileInfo.diagnosticSettings.reportPrivateUsage !== 'none';
// If the member name appears to be a constant, use the strict
// source type. If it's a member variable that can be overridden
// by a child class, use the more general version by stripping
// off the literal.
if (!isConstant && !isPrivate) {
if (!isConstant && (!isPrivate || !honorPrivateNaming)) {
srcType = TypeUtils.stripLiteralValue(srcType);
}
@ -3420,7 +3424,9 @@ export class TypeAnalyzer extends ParseTreeWalker {
if (ScopeUtils.getPermanentScope(this._currentScope).getType() === ScopeType.Class) {
const isConstant = SymbolNameUtils.isConstantName(nameValue);
const isPrivate = SymbolNameUtils.isPrivateOrProtectedName(nameValue);
if (!isConstant && !isPrivate) {
const honorPrivateNaming = this._fileInfo.diagnosticSettings.reportPrivateUsage !== 'none';
if (!isConstant && (!isPrivate || !honorPrivateNaming)) {
srcType = TypeUtils.stripLiteralValue(srcType);
}
}

3
server/src/tests/testUtils.ts
View File

@ -87,8 +87,7 @@ export function buildAnalyzerFileInfo(filePath: string, parseResults: ParseResul
filePath,
isStubFile: filePath.endsWith('.pyi'),
isTypingStubFile: false,
isBuiltInStubFile: false,
console: new StandardConsole()
isBuiltInStubFile: false
};
return fileInfo;