Avoid scanning empty expressions. Closes #222

cflint · Dec 7, 2016 · a303ef4 · a303ef4
1 parent 38e35d5
commit a303ef4
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 0 deletions.
diff --git a/src/main/java/com/cflint/CFLint.java b/src/main/java/com/cflint/CFLint.java
@@ -520,6 +520,8 @@ protected void doStructureStart(final Element elem, final Context context,
 	}
 
 	protected void scanExpression(final CFScriptStatement expression, Context context, final Element elem) {
+		if(expression == null)
+			return;
 		for (final CFLintScanner plugin : extensions) {
 			try {
 				plugin.expression(expression, context, bugs);

diff --git a/src/main/java/com/cflint/config/ConfigUtils.java b/src/main/java/com/cflint/config/ConfigUtils.java
@@ -24,6 +24,7 @@
 import com.fasterxml.jackson.core.JsonParseException;
 import com.fasterxml.jackson.databind.JsonMappingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
 import com.fasterxml.jackson.module.jaxb.JaxbAnnotationModule;
 
 public class ConfigUtils {
@@ -79,6 +80,7 @@ public static String marshalJson(final Object obj)
 		final ObjectMapper objectMapper = new ObjectMapper();
 		final JaxbAnnotationModule module = new JaxbAnnotationModule();
 		objectMapper.registerModule(module);
+		objectMapper.enable(SerializationFeature.INDENT_OUTPUT);
 		objectMapper.writeValue(sw, obj);
 		return sw.toString();
 	}

diff --git a/src/test/java/com/cflint/TestCFBugs_SimpleComplexity.java b/src/test/java/com/cflint/TestCFBugs_SimpleComplexity.java
@@ -102,6 +102,20 @@ public void testNonComplexNameScriptBased() throws ParseException, IOException {
 		assertEquals(0, result.size());
 	}
 
+	@Test
+	public void testIfStatementNoElse() throws ParseException, IOException {
+		final String cfcSrc = "component {\r\n"+
+				"    public void function foo() {\r\n"+
+				"        if (something) {\r\n"+
+				"            doSomething();\r\n"+
+				"        }\r\n"+
+				"    }\r\n"+
+				"}";
+		cfBugs.process(cfcSrc, "test");
+		Collection<List<BugInfo>> result = cfBugs.getBugs().getBugList().values();
+		assertEquals(0, result.size());
+	}
+
 	@Test
 	public void testComplexScriptBased() throws ParseException, IOException {
 		final String cfcSrc = "component {\r\n"