Detect deprecated operations on dict() variables in Skylint

RELNOTES: None.
PiperOrigin-RevId: 184667932

1 files changed, 38 insertions, 2 deletions

diff --git a/src/tools/skylark/javatests/com/google/devtools/skylark/skylint/BadOperationCheckerTest.java b/src/tools/skylark/javatests/com/google/devtools/skylark/skylint/BadOperationCheckerTest.java
index 2e31121885..834b0e0e22 100644
--- a/src/tools/skylark/javatests/com/google/devtools/skylark/skylint/BadOperationCheckerTest.java
+++ b/src/tools/skylark/javatests/com/google/devtools/skylark/skylint/BadOperationCheckerTest.java
@@ -89,13 +89,49 @@ public class BadOperationCheckerTest {
         .contains(
             "2:1-2:9: '+' operator is deprecated");
 
+    Truth.assertThat(findIssues("foo = depset()", "bar = foo", "bar + baz").toString())
+        .contains(
+            "3:1-3:9: '+' operator is deprecated");
+
     Truth.assertThat(findIssues("foo = depset()", "foo += bar").toString())
         .contains(
-            "2:1-2:10: '+' operator is deprecated");
+            "2:1-2:10: '+=' operator is deprecated");
 
     Truth.assertThat(findIssues("foo += depset()").toString())
         .contains(
-            "1:1-1:15: '+' operator is deprecated");
+            "1:1-1:15: '+=' operator is deprecated");
+  }
+
+  @Test
+  public void dictPlusOperator() {
+    Truth.assertThat(findIssues("foo + dict()").toString())
+        .contains(
+            "1:1-1:12: '+' operator is deprecated and should not be used on dictionaries "
+            + "[deprecated-plus-dict]");
+
+    Truth.assertThat(findIssues("foo = dict()", "foo + bar").toString())
+        .contains(
+            "2:1-2:9: '+' operator is deprecated");
+
+    Truth.assertThat(findIssues("foo = dict()", "bar = foo", "bar + baz").toString())
+        .contains(
+            "3:1-3:9: '+' operator is deprecated");
+
+    Truth.assertThat(findIssues("foo = dict()", "foo += bar").toString())
+        .contains(
+            "2:1-2:10: '+=' operator is deprecated");
+
+    Truth.assertThat(findIssues("foo += dict()").toString())
+        .contains(
+            "1:1-1:13: '+=' operator is deprecated");
+
+    Truth.assertThat(findIssues("foo += { 5:3 }").toString())
+        .contains(
+            "1:1-1:14: '+=' operator is deprecated");
+
+    Truth.assertThat(findIssues("foo = { 5:3 }", "bar = foo", "bar + baz").toString())
+        .contains(
+            "3:1-3:9: '+' operator is deprecated");
   }
 
   @Test