Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

libnixf/Sema: place with warning only on its keyword #476

Merged
merged 1 commit into from
Apr 28, 2024
Merged

libnixf/Sema: place with warning only on its keyword #476

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
libnixf/Sema: place with warning only on its keyword 
Fixes: #475
  • Loading branch information
@inclyc
inclyc committed Apr 28, 2024
commit 6c8597ea5be3160ea0da2372d4f0d89554469d6b
4 changes: 3 additions & 1 deletion libnixf/src/Sema/VariableLookup.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,9 @@ void VariableLookupAnalysis::lookupVar(const ExprVar &Var,
if (Def->syntax()) {
D.note(Note::NK_VarBindToThis, Def->syntax()->range());
}
D.note(Note::NK_EscapingWith, WithEnv->syntax()->range());
const auto &KwWith =
static_cast<const nixf::ExprWith *>(WithEnv->syntax())->kwWith();
D.note(Note::NK_EscapingWith, KwWith.range());
}
return;
}
Expand Down
8 changes: 8 additions & 0 deletions libnixf/test/Sema/VariableLookup.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,6 +260,14 @@ TEST_F(VLATest, EscapingWith) {
const Diagnostic &D = Diags[0];

ASSERT_EQ(D.notes().size(), 2);

ASSERT_EQ(D.notes()[0].kind(), Note::NK_VarBindToThis);
ASSERT_EQ(D.notes()[0].range().lCur().offset(), 0);
ASSERT_EQ(D.notes()[0].range().rCur().offset(), 1);

ASSERT_EQ(D.notes()[1].kind(), Note::NK_EscapingWith);
ASSERT_EQ(D.notes()[1].range().lCur().offset(), 3);
ASSERT_EQ(D.notes()[1].range().rCur().offset(), 7);
}

TEST_F(VLATest, InheritRec) {
Expand Down
Loading