#284 fixed

cflint · Jun 16, 2017 · f72821c · f72821c
1 parent a7015db
commit f72821c
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 3 deletions.
diff --git a/src/main/java/com/cflint/CFLint.java b/src/main/java/com/cflint/CFLint.java
@@ -880,12 +880,20 @@ private void process(final CFExpression expression, final Element elem, Context
                 if(context.isInAssignmentExpression() && new CFScopes().isScoped(fullVarExpression,"local") && fullVarExpression.getExpressions().size()>1){
                     handler.addVariable(fullVarExpression.getExpressions().get(1).Decompile(0));
                 }
+                Context subContext = context.subContext(context.getElement());
+                subContext.setInAssignmentExpression(false);
                 for (final CFExpression expr : fullVarExpression.getExpressions()) {
                     if (expr instanceof CFFunctionExpression) {
-                        process(expr, elem, context);
+                        process(expr, elem, subContext);
                     }
                     if (expr instanceof CFMember){
-                        process(((CFMember) expr).getExpression(), elem, context);
+                        process(((CFMember) expr).getExpression(), elem, subContext);
+                    }
+                    if (expr instanceof CFArrayExpression){
+                    	CFArrayExpression aryExpr = (CFArrayExpression)expr;
+                    	if(aryExpr.getElements().size()>0){
+                    		process(aryExpr.getElements().get(0), elem, subContext);
+                    	}
                     }
                 }
             } else {

diff --git a/src/test/resources/com/cflint/tests/VarScoper/cfquery_scoper.cfc b/src/test/resources/com/cflint/tests/VarScoper/cfquery_scoper.cfc
@@ -9,7 +9,7 @@
 
 		<cfloop query="local.something">
 		    <cfscript>
-		        variables.siteDetailList[siteID] = 123;
+		        siteID = 123;
 		    </cfscript>
 		</cfloop>
 		<cfset siteID=1/>

diff --git a/src/test/resources/com/cflint/tests/VarScoper/structassignment.cfc b/src/test/resources/com/cflint/tests/VarScoper/structassignment.cfc
@@ -0,0 +1,10 @@
+<cfcomponent>
+	<cffunction name="foo">
+		<cfscript>
+		        var siteDetail={};
+		        foobar.foo.xyz.[siteID] = 123;
+		        siteDetail.foo.xyz.[siteID] = 123;
+		    </cfscript>
+		</cfloop>
+	</cffunction>
+</cfcomponent>
diff --git a/src/test/resources/com/cflint/tests/VarScoper/structassignment.expected.txt b/src/test/resources/com/cflint/tests/VarScoper/structassignment.expected.txt
@@ -0,0 +1 @@
+[ ]