KT-16640 Can't compile IJ project because of NPE

This commit is contained in:
Konstantin Bulenkov
2017-03-06 23:11:11 +03:00
parent 24ce6d93b5
commit 840a66a32c
@@ -1,3 +1,18 @@
/*
* Copyright 2000-2017 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.jetbrains.jps.javac.ast;
import com.sun.source.tree.LambdaExpressionTree;
@@ -8,6 +23,7 @@ import org.jetbrains.jps.javac.ast.api.JavacRef;
import javax.lang.model.element.Element;
import javax.lang.model.type.TypeMirror;
import javax.lang.model.util.Types;
/**
* Used via reflection in {@link JavacTreeRefScanner#createASTScanner()}
@@ -17,11 +33,14 @@ public class Javac8RefScanner extends JavacTreeRefScanner {
@Override
public Tree visitLambdaExpression(LambdaExpressionTree node, JavacReferenceCollectorListener.ReferenceCollector refCollector) {
final TypeMirror type = refCollector.getType(node);
final Element element = refCollector.getTypeUtility().asElement(type);
if (element != null) {
final JavacRef.JavacElementRefBase ref = refCollector.asJavacRef(element);
if (ref != null) {
refCollector.sinkDeclaration(new JavacDef.JavacFunExprDef(ref));
Types types = refCollector.getTypeUtility();
if (types != null) {
final Element element = types.asElement(type);
if (element != null) {
final JavacRef.JavacElementRefBase ref = refCollector.asJavacRef(element);
if (ref != null) {
refCollector.sinkDeclaration(new JavacDef.JavacFunExprDef(ref));
}
}
}
return super.visitLambdaExpression(node, refCollector);