fix: fix NPE in isTypeInCollision (#1326)

INRIA · May 29, 2017 · b3f568d · b3f568d
1 parent 54e1909
commit b3f568d
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/src/main/java/spoon/reflect/visitor/ImportScannerImpl.java b/src/main/java/spoon/reflect/visitor/ImportScannerImpl.java
@@ -563,7 +563,7 @@ protected Set<String> lookForLocalVariables(CtElement parent) {
 	 * @return true if the ref should be imported.
 	 */
 	protected boolean isTypeInCollision(CtReference ref, boolean fqnMode) {
-		if (targetType.getSimpleName().equals(ref.getSimpleName()) && !targetType.equals(ref)) {
+		if (targetType != null && targetType.getSimpleName().equals(ref.getSimpleName()) && !targetType.equals(ref)) {
 			return true;
 		}
 

diff --git a/src/test/java/spoon/test/imports/ImportScannerTest.java b/src/test/java/spoon/test/imports/ImportScannerTest.java
@@ -7,6 +7,7 @@
 import spoon.reflect.declaration.CtClass;
 import spoon.reflect.declaration.CtType;
 import spoon.reflect.factory.Factory;
+import spoon.reflect.reference.CtFieldReference;
 import spoon.reflect.reference.CtTypeReference;
 import spoon.reflect.visitor.ImportScanner;
 import spoon.reflect.visitor.ImportScannerImpl;
@@ -94,4 +95,15 @@ public void testMultiCatchImport() throws Exception {
 		//assertTrue( importScanner.isImported( factory.Type().createReference( ArithmeticException.class ) ));
 		assertTrue( importScanner.isImported( factory.Type().createReference( AccessControlException.class ) ));
 	}
+
+	@Test
+	public void testTargetTypeNull() throws Exception {
+		Launcher spoon = new Launcher();
+		Factory factory = spoon.createFactory();
+		CtFieldReference fieldRef = factory.createFieldReference();
+		fieldRef.setStatic(true);
+
+		ImportScanner importScanner = new MinimalImportScanner();
+		importScanner.computeImports(fieldRef);
+	}
 }