aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/tools/skylark
diff options
context:
space:
mode:
authorGravatar fzaiser <fzaiser@google.com>2017-11-02 06:32:57 -0400
committerGravatar John Cater <jcater@google.com>2017-11-02 10:04:21 -0400
commit9b2e0e08b8283032580d29ba7638bace94642e7e (patch)
tree7c4064c5a24f56dba5b0294aae8274eb8bfc1f75 /src/tools/skylark
parent32fbb0727646f3b9a56decadc344a93a8dbe0a70 (diff)
Skylint: also allow "UNUSED_" prefix in capital letters
RELNOTES: none PiperOrigin-RevId: 174305935
Diffstat (limited to 'src/tools/skylark')
-rw-r--r--src/tools/skylark/java/com/google/devtools/skylark/skylint/UsageChecker.java2
-rw-r--r--src/tools/skylark/javatests/com/google/devtools/skylark/skylint/UsageCheckerTest.java2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/tools/skylark/java/com/google/devtools/skylark/skylint/UsageChecker.java b/src/tools/skylark/java/com/google/devtools/skylark/skylint/UsageChecker.java
index d8fbfede69..0c62e73bcd 100644
--- a/src/tools/skylark/java/com/google/devtools/skylark/skylint/UsageChecker.java
+++ b/src/tools/skylark/java/com/google/devtools/skylark/skylint/UsageChecker.java
@@ -190,7 +190,7 @@ public class UsageChecker extends AstVisitorWithNameResolution {
return;
}
if ((nameInfo.kind == Kind.LOCAL || nameInfo.kind == Kind.PARAMETER)
- && (name.startsWith("_") || name.startsWith("unused_"))) {
+ && (name.startsWith("_") || name.startsWith("unused_") || name.startsWith("UNUSED_"))) {
// local variables starting with an underscore need not be used
return;
}
diff --git a/src/tools/skylark/javatests/com/google/devtools/skylark/skylint/UsageCheckerTest.java b/src/tools/skylark/javatests/com/google/devtools/skylark/skylint/UsageCheckerTest.java
index 0a74befd40..3acf1d93d7 100644
--- a/src/tools/skylark/javatests/com/google/devtools/skylark/skylint/UsageCheckerTest.java
+++ b/src/tools/skylark/javatests/com/google/devtools/skylark/skylint/UsageCheckerTest.java
@@ -306,6 +306,8 @@ public class UsageCheckerTest {
Truth.assertThat(findIssues("def f(_param):", " _local = [[] for _x in []]")).isEmpty();
Truth.assertThat(findIssues("def f(unused_param):", " unused_local = [[] for unused_x in []]"))
.isEmpty();
+ Truth.assertThat(findIssues("def f():", " UNUSED_CONSTANT = 'unused'"))
+ .isEmpty();
}
@Test