error if static on-demand import references non-class (IDEA-160943)

This commit is contained in:
Anna.Kozlova
2016-12-28 17:08:19 +01:00
parent 9d36c59c72
commit 9a669f36ad
4 changed files with 48 additions and 0 deletions
@@ -596,6 +596,7 @@ public class HighlightVisitorImpl extends JavaElementVisitor implements Highligh
@Override
public void visitImportStaticStatement(PsiImportStaticStatement statement) {
myHolder.add(checkFeature(statement, Feature.STATIC_IMPORTS));
if (!myHolder.hasErrorResults()) myHolder.add(ImportsHighlightUtil.checkStaticOnDemandImportResolvesToClass(statement));
}
@Override
@@ -0,0 +1,40 @@
/*
* Copyright 2000-2016 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 com.intellij.codeInsight.daemon.impl.analysis;
import com.intellij.codeInsight.daemon.impl.HighlightInfo;
import com.intellij.codeInsight.daemon.impl.HighlightInfoType;
import com.intellij.psi.PsiElement;
import com.intellij.psi.PsiImportStaticStatement;
import com.intellij.psi.PsiJavaCodeReferenceElement;
import com.intellij.util.ObjectUtils;
public class ImportsHighlightUtil {
static HighlightInfo checkStaticOnDemandImportResolvesToClass(PsiImportStaticStatement statement) {
if (statement.isOnDemand() && statement.resolveTargetClass() == null) {
PsiJavaCodeReferenceElement ref = statement.getImportReference();
if (ref != null) {
PsiElement resolve = ref.resolve();
if (resolve != null) {
return HighlightInfo.newHighlightInfo(HighlightInfoType.ERROR)
.range(ObjectUtils.notNull(ref.getReferenceNameElement(), ref))
.descriptionAndTooltip("Class " + ref.getCanonicalText() + " not found").create();
}
}
}
return null;
}
}
@@ -0,0 +1,3 @@
import static java.<error descr="Class java.io not found">io</error>.*;
class Main { }
@@ -90,4 +90,8 @@ public class LightAdvHighlightingJdk6Test extends LightDaemonAnalyzerTestCase {
public void testSpeculateOnUnhandledExceptionsOverResolvedConstructorOnly() throws Exception {
doTest(false, false);
}
public void testStaticOnDemandImportResolvesToClass() throws Exception {
doTest(false, false);
}
}