Simplify isVariableDeclaredSafely()

ballerina-platform · Feb 27, 2025 · 2ec1e36 · 2ec1e36
1 parent c79470a
commit 2ec1e36
Showing 1 changed file with 17 additions and 32 deletions.
diff --git a/...main/java/io/ballerina/stdlib/io/compiler/staticcodeanalyzer/IOPathInjectionAnalyzer.java b/...main/java/io/ballerina/stdlib/io/compiler/staticcodeanalyzer/IOPathInjectionAnalyzer.java
@@ -95,10 +95,9 @@ private boolean isSafePath(FunctionCallExpressionNode functionCall) {
             return true;
         }
 
-        if (argument instanceof BinaryExpressionNode binaryExpression) {
-            if (binaryExpression.operator().kind() == SyntaxKind.PLUS_TOKEN) {
-                return false;
-            }
+        if (argument instanceof BinaryExpressionNode binaryExpression &&
+                binaryExpression.operator().kind() == SyntaxKind.PLUS_TOKEN) {
+            return false;
         }
 
         if (argument instanceof SimpleNameReferenceNode variableRef) {
@@ -123,28 +122,16 @@ private boolean isVariableSafe(SimpleNameReferenceNode variableRef) {
     private boolean isVariableDeclaredSafely(FunctionBodyBlockNode functionBody, String variableName,
                                              SimpleNameReferenceNode variableRef) {
         for (StatementNode statement : functionBody.statements()) {
-            if (!(statement instanceof VariableDeclarationNode varDecl)) {
-                continue;
-            }
-
-            if (!isMatchingVariable(varDecl, variableName)) {
-                continue;
-            }
-
-            ExpressionNode initializer = varDecl.initializer().orElse(null);
-            if (initializer == null) {
+            if (statement instanceof VariableDeclarationNode varDecl && isMatchingVariable(varDecl, variableName)) {
+                ExpressionNode initializer = varDecl.initializer().orElse(null);
+                if (initializer == null || isConcatenationAssignment(initializer)) {
+                    return isFunctionParameter(variableRef);
+                }
+                if (initializer instanceof SimpleNameReferenceNode refNode) {
+                    return isFunctionParameter(refNode);
+                }
                 return true;
             }
-
-            if (isConcatenationAssignment(initializer)) {
-                return isFunctionParameter(variableRef);
-            }
-
-            if (initializer instanceof SimpleNameReferenceNode refNode) {
-                return isFunctionParameter(refNode);
-            }
-
-            return true;
         }
         return true;
     }
@@ -219,15 +206,13 @@ private boolean isInitializerAssignedToFunctionParameter(ExpressionNode initiali
 
     private boolean isIndirectFunctionParameterFromBinary(BinaryExpressionNode binaryExpr,
                                                           RequiredParameterNode reqParam) {
-        if (binaryExpr.lhsExpr() instanceof SimpleNameReferenceNode leftRef) {
-            if (leftRef.name().text().equals(reqParam.paramName().get().text())) {
-                return true;
-            }
+        if (binaryExpr.lhsExpr() instanceof SimpleNameReferenceNode leftRef &&
+                leftRef.name().text().equals(reqParam.paramName().get().text())) {
+            return true;
         }
-        if (binaryExpr.rhsExpr() instanceof SimpleNameReferenceNode rightRef) {
-            if (rightRef.name().text().equals(reqParam.paramName().get().text())) {
-                return true;
-            }
+        if (binaryExpr.rhsExpr() instanceof SimpleNameReferenceNode rightRef &&
+                rightRef.name().text().equals(reqParam.paramName().get().text())) {
+            return true;
         }
         return false;
     }