small correction on GCI103 after merge

Author: dedece35

CHANGELOG.md

@@ -9,7 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Added
 
-- [#76](https://github.com/green-code-initiative/creedengo-python/pull/76) Add rule GCI 103 Dictionary Items Unused. A rule specifying that dictionary iteration should consider the pertinence of the element used.
+- [#76](https://github.com/green-code-initiative/creedengo-python/pull/76) Add rule GCI103 Dictionary Items Unused. A rule specifying that dictionary iteration should consider the pertinence of the element used.
 - [#79](https://github.com/green-code-initiative/creedengo-python/pull/79) Add rule GCI106 Avoid SQRT in a loop
 - [#71](https://github.com/green-code-initiative/creedengo-python/pull/71) Add rule GCI96 Require Usecols Argument in Pandas Read Functions
 - [#72](https://github.com/green-code-initiative/creedengo-python/pull/72) Add rule GCI97 Optimize square computation (scalar vs vectorized method)

src/it/java/org/greencodeinitiative/creedengo/python/integration/tests/GCIRulesIT.java

@@ -310,10 +310,10 @@ void testGCI103(){
         String ruleId = "creedengo-python:GCI103";
         String ruleMsg = "Use dict.keys() or dict.values() instead of dict.items() when only one part of the key-value pair is used";
         int[] startLines = new int[]{
-            5, 8, 12, 32, 35, 44
+            5, 8, 24, 27, 36
         };
         int[] endLines = new int[]{
-            5, 8, 12, 32, 35, 44
+            5, 8, 24, 27, 36
         };
 
         checkIssuesForFile(filePath, ruleId, ruleMsg, startLines, endLines, SEVERITY, TYPE, EFFORT_1MIN);  

src/it/test-projects/creedengo-python-plugin-test-project/src/dictionaryItemsUnused.py

@@ -5,26 +5,18 @@
 for key, value in my_dict.items():  # Noncompliant {{Use dict.keys() or dict.values() instead of dict.items() when only one part of the key-value pair is used}}
     result.append(key)
 
-for key, value in my_dict.items():  # Noncompliant {{Use dict.keys() or dict.values() instead of dict.items() when only one part of the key-value pair is used}}
-    result.append(key)
-
-
 for key, value in my_dict.items():  # Noncompliant {{Use dict.keys() or dict.values() instead of dict.items() when only one part of the key-value pair is used}}
     result.append(value)
 
-
 for key in my_dict.keys():
     result.append(key)
 
-
 for value in my_dict.values():
     result.append(value)
 
-
 for item in my_dict.items():
     result.append(item)  
 
-
 entries = []
 for k, v in my_dict.items():
     entries.append((k, v))  
@@ -51,9 +43,7 @@
 
 copied_dict = dict(my_dict.items())
 
-
 for i, (k, v) in enumerate(my_dict.items()):
     print(i, k, v)
 
-
 {(k, v) for k, v in my_dict.items()}

src/main/java/org/greencodeinitiative/creedengo/python/checks/DictionaryItemsUnused.java

@@ -72,17 +72,15 @@ private boolean isItemsCall(Expression expr) {
             CallExpression callExpr = (CallExpression) expr;
             if (callExpr.callee().is(Tree.Kind.QUALIFIED_EXPR)) {
                 QualifiedExpression qualExpr = (QualifiedExpression) callExpr.callee();
-                boolean isItems = "items".equals(qualExpr.name().name());
-                return isItems;
+                return "items".equals(qualExpr.name().name());
             }
         }
         return false;
     }
 
     private void trackNameUsages(Tree node, ItemsLoopInfo info) {
-        if (node instanceof Name) {
-            String name = ((Name) node).name();
-            info.markUsage(name);
+        if (node instanceof Name nodeName) {
+            info.markUsage(nodeName.name());
         }
 
         for (Tree child : node.children()) {
@@ -115,11 +113,11 @@ private static class ItemsLoopInfo {
             this.valueVar = valueVar;
         }
 
-        void markUsage(String var) {
-            if (var.equals(keyVar)) {
+        void markUsage(String val) {
+            if (val.equals(keyVar)) {
                 keyUsed = true;
             }
-            if (var.equals(valueVar)) {
+            if (val.equals(valueVar)) {
                 valueUsed = true;
             }
         }

src/test/resources/checks/DictionaryItemsUnused.py renamed to src/test/resources/checks/dictionaryItemsUnused.py

@@ -5,26 +5,18 @@
 for key, value in my_dict.items():  # Noncompliant {{Use dict.keys() or dict.values() instead of dict.items() when only one part of the key-value pair is used}}
     result.append(key)
 
-for key, value in my_dict.items():  # Noncompliant {{Use dict.keys() or dict.values() instead of dict.items() when only one part of the key-value pair is used}}
-    result.append(key)
-
-
 for key, value in my_dict.items():  # Noncompliant {{Use dict.keys() or dict.values() instead of dict.items() when only one part of the key-value pair is used}}
     result.append(value)
 
-
 for key in my_dict.keys():
     result.append(key)
 
-
 for value in my_dict.values():
     result.append(value)
 
-
 for item in my_dict.items():
     result.append(item)  
 
-
 entries = []
 for k, v in my_dict.items():
     entries.append((k, v))  
@@ -51,9 +43,7 @@
 
 copied_dict = dict(my_dict.items())
 
-
 for i, (k, v) in enumerate(my_dict.items()):
     print(i, k, v)
 
-
 {(k, v) for k, v in my_dict.items()}