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

chplcheck: allow ignoring parent/child incorrect indentation using @chplcheck.ignore #25800

Merged
merged 5 commits into from
Aug 22, 2024
Merged

chplcheck: allow ignoring parent/child incorrect indentation using @chplcheck.ignore #25800

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2f0837c
Enable silencing incorrect indentation between parent and child state…
DanilaFe Aug 22, 2024
2060afe
Add test for silencing incorrect indentation warnings
DanilaFe Aug 22, 2024
4a32f83
Make chplcheck a known tool attribute namespace
DanilaFe Aug 22, 2024
cbd3769
Update a test which now prefers a different fixit
DanilaFe Aug 22, 2024
425813f
Add an auto-fixit good file
DanilaFe Aug 22, 2024
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
1 change: 1 addition & 0 deletions frontend/include/chpl/framework/all-global-strings.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,6 +156,7 @@ X(swap , "<=>")
X(chplBy , "chpl_by")
X(chplAlign , "chpl_align")
X(chpldocDot , "chpldoc.")
X(chplcheckDot , "chplcheck.")
X(llvmDot , "llvm.")
X(llvmMetadata , "llvm.metadata")
X(llvmAssertVectorized, "llvm.assertVectorized")
Expand Down
1 change: 1 addition & 0 deletions frontend/lib/uast/post-parse-checks.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1602,6 +1602,7 @@ void Visitor::checkAttributeNameRecognizedOrToolSpaced(const Attribute* node) {
node->name() == USTR("assertOnGpu") ||
node->name() == USTR("gpu.blockSize") ||
node->name().startsWith(USTR("chpldoc.")) ||
node->name().startsWith(USTR("chplcheck.")) ||
DanilaFe marked this conversation as resolved.
Show resolved Hide resolved
node->name().startsWith(USTR("llvm."))) {
// TODO: should we match chpldoc.nodoc or anything toolspaced with chpldoc.?
return;
Expand Down
2 changes: 1 addition & 1 deletion test/chplcheck/COMPOPTS
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
--using-attribute-toolname chplcheck --stop-after-pass=parseAndConvertUast
--stop-after-pass=parseAndConvertUast
34 changes: 34 additions & 0 deletions test/chplcheck/IncorrectIndentation.chpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -324,4 +324,38 @@ module IncorrectIndentation {
private use super.M2;
private use super.M2;
}


@chplcheck.ignore("IncorrectIndentation")
module DirectChildrenNotIndented {
proc f1()
{
writeln("hi");
writeln("??");
}

proc f2()
{
writeln("hi");
}

@chplcheck.ignore("IncorrectIndentation")
proc f3() {
writeln("hi");
}

proc f4() {
writeln("hi");
writeln("hi");
}

proc f5() {
writeln("hi"); writeln("hi");
}

proc f6() {
for 1..10 do
writeln("hi");
}
}
}
5 changes: 5 additions & 0 deletions test/chplcheck/IncorrectIndentation.good
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,3 +59,8 @@ IncorrectIndentation.chpl:305: node violates rule IncorrectIndentation
IncorrectIndentation.chpl:308: node violates rule EmptyStmts
IncorrectIndentation.chpl:314: node violates rule IncorrectIndentation
IncorrectIndentation.chpl:321: node violates rule IncorrectIndentation
IncorrectIndentation.chpl:339: node violates rule IncorrectIndentation
IncorrectIndentation.chpl:349: node violates rule IncorrectIndentation
IncorrectIndentation.chpl:353: node violates rule IncorrectIndentation
IncorrectIndentation.chpl:358: node violates rule IncorrectIndentation
[Success matching fixit for IncorrectIndentation]
Loading