Try to fix compile error on buildserver

This commit is contained in:
Nikolay Krasko
2012-03-05 11:36:31 +04:00
parent eb3aac9acb
commit 863e3ff382
2 changed files with 13 additions and 4 deletions
@@ -26,6 +26,7 @@ import com.intellij.psi.PsiMethod;
import com.intellij.psi.search.GlobalSearchScope;
import com.intellij.psi.search.PsiShortNamesCache;
import com.intellij.util.ArrayUtil;
import com.intellij.util.Processor;
import com.intellij.util.containers.HashSet;
import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.NotNull;
@@ -207,6 +208,11 @@ public class JetShortNamesCache extends PsiShortNamesCache {
return new PsiMethod[0];
}
@Override
public boolean processMethodsWithName(@NonNls @NotNull String name, @NotNull GlobalSearchScope scope, @NotNull Processor<PsiMethod> processor) {
return false;
}
@NotNull
@Override
public String[] getAllMethodNames() {
@@ -153,10 +153,13 @@ public class ImportClassAndFunFix extends JetHintAction<JetSimpleNameExpression>
if (project == null) {
return false;
}
String hintText = ShowAutoImportPass.getMessage(suggestions.size() > 1, suggestions.get(0));
if (!ApplicationManager.getApplication().isUnitTestMode() &&
!HintManager.getInstance().hasShownHintsThatWillHideByOtherHint()) {
if (HintManager.getInstance().hasShownHintsThatWillHideByOtherHint(true)) {
return false;
}
if (!ApplicationManager.getApplication().isUnitTestMode()) {
String hintText = ShowAutoImportPass.getMessage(suggestions.size() > 1, suggestions.get(0));
HintManager.getInstance().showQuestionHint(
editor, hintText,