This commit is contained in:
Alexey Kudravtsev
2016-08-15 16:55:00 +03:00
parent 73a9685aca
commit e3d8ef59a8
3 changed files with 9 additions and 8 deletions
@@ -1438,7 +1438,6 @@ public class DaemonRespondToChangesTest extends DaemonAnalyzerTestCase {
visitedElements.add(element);
}
}
final MyVisitor visitor = new MyVisitor();
final LocalInspectionTool tool = new LocalInspectionTool() {
@Nls
@NotNull
@@ -1463,7 +1462,7 @@ public class DaemonRespondToChangesTest extends DaemonAnalyzerTestCase {
@NotNull
@Override
public PsiElementVisitor buildVisitor(@NotNull ProblemsHolder holder, boolean isOnTheFly) {
return visitor;
return new MyVisitor();
}
};
disposeOnTearDown(() -> disableInspectionTool(tool.getShortName()));
@@ -51,12 +51,14 @@ import com.intellij.psi.util.PsiUtilBase;
import com.intellij.psi.util.PsiUtilCore;
import com.intellij.usages.UsageTarget;
import com.intellij.usages.UsageTargetUtil;
import com.intellij.util.Function;
import com.intellij.util.containers.ContainerUtil;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.util.*;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
public class HighlightUsagesHandler extends HighlightHandlerBase {
private static final Logger LOG = Logger.getInstance("#com.intellij.codeInsight.highlighting.HighlightUsagesHandler");
@@ -341,7 +343,7 @@ public class HighlightUsagesHandler extends HighlightHandlerBase {
}
}
public static boolean isClearHighlights(Editor editor) {
public static boolean isClearHighlights(@NotNull Editor editor) {
if (editor instanceof EditorWindow) editor = ((EditorWindow)editor).getDelegate();
RangeHighlighter[] highlighters = ((HighlightManagerImpl)HighlightManager.getInstance(editor.getProject())).getHighlighters(editor);
@@ -38,15 +38,15 @@ import java.util.List;
* @author yole
*/
public abstract class HighlightUsagesHandlerBase<T extends PsiElement> {
protected final Editor myEditor;
protected final PsiFile myFile;
@NotNull protected final Editor myEditor;
@NotNull protected final PsiFile myFile;
protected List<TextRange> myReadUsages = new ArrayList<>();
protected List<TextRange> myWriteUsages = new ArrayList<>();
protected String myStatusText;
protected String myHintText;
protected HighlightUsagesHandlerBase(final Editor editor, final PsiFile file) {
protected HighlightUsagesHandlerBase(@NotNull Editor editor, @NotNull PsiFile file) {
myEditor = editor;
myFile = file;
}