Skip to content
This repository was archived by the owner on Apr 14, 2022. It is now read-only.

Ignoring assignment statements that occur before class and function declaration #1422

Merged
merged 4 commits into from
Aug 13, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 15 additions & 1 deletion src/Analysis/Ast/Impl/Analyzer/Handlers/AssignmentHandler.cs
Original file line number Diff line number Diff line change
Expand Up @@ -71,12 +71,26 @@ public void HandleAssignment(AssignmentStatement node) {
}

var source = value.IsGeneric() ? VariableSource.Generic : VariableSource.Declaration;
Eval.DeclareVariable(ne.Name, value ?? Module.Interpreter.UnknownType, source, Eval.GetLocationOfName(ne));
var location = Eval.GetLocationOfName(ne);
if (IsValidAssignment(ne.Name, location)) {
Eval.DeclareVariable(ne.Name, value ?? Module.Interpreter.UnknownType, source, location);
}
}

TryHandleClassVariable(node, value);
}

private bool IsValidAssignment(string name, Location loc) {
if (Eval.GetInScope(name) is ILocatedMember m) {
// Class and function definition are processed first, so only override
// if assignment happens after declaration
if (loc.IndexSpan.Start < m.Location.IndexSpan.Start) {
return false;
}
}
return true;
}

public void HandleAnnotatedExpression(ExpressionWithAnnotation expr, IMember value) {
if (expr?.Annotation == null) {
return;
Expand Down
42 changes: 42 additions & 0 deletions src/Analysis/Ast/Test/AssignmentTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -308,6 +308,48 @@ def func(self):
.Which.Should().HaveMembers(listMemberNames);
}

[TestMethod, Priority(0)]
public async Task AssignBeforeClassDef() {
const string code = @"
D = 5
class D: ...
";
var analysis = await GetAnalysisAsync(code);
analysis.Should().HaveClass("D");
}

[TestMethod, Priority(0)]
public async Task AssignAfterClassDef() {
const string code = @"
class D: ...
D = 5
";
var analysis = await GetAnalysisAsync(code);
analysis.Should().HaveVariable("D").OfType(BuiltinTypeId.Int);
}

[TestMethod, Priority(0)]
public async Task AssignBeforeFunctionDef() {
const string code = @"
D = 5
def D():
pass
";
var analysis = await GetAnalysisAsync(code);
analysis.Should().HaveFunction("D");
}

[TestMethod, Priority(0)]
public async Task AssignAfterFunctionDef() {
const string code = @"
def D():
pass
D = 5
";
var analysis = await GetAnalysisAsync(code);
analysis.Should().HaveVariable("D").OfType(BuiltinTypeId.Int);
}

[TestMethod, Priority(0)]
public async Task StrIndex() {
const string code = @"
Expand Down
11 changes: 11 additions & 0 deletions src/Analysis/Ast/Test/LintInheritNonClassTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -474,6 +474,17 @@ class Test3(SupportsInt):

class Test3(FrozenSet):
mystr = 'test'
";
var analysis = await GetAnalysisAsync(code);
analysis.Diagnostics.Should().BeEmpty();
}

[TestMethod, Priority(0)]
public async Task InheritFromEnum() {
const string code = @"
from enum import Enum, EnumMeta

class C(Enum): ...
";
var analysis = await GetAnalysisAsync(code);
analysis.Diagnostics.Should().BeEmpty();
Expand Down