From 9ba4d4bb8a823c765c30278b02f88f9cd9b0fc5c Mon Sep 17 00:00:00 2001 From: Alexey Kudravtsev Date: Wed, 9 Mar 2011 12:53:04 +0300 Subject: [PATCH] cleanup --- .../execution/console/LanguageConsoleImpl.java | 1 + .../intellij/internal/psiView/PsiViewerDialog.java | 3 ++- .../fixtures/impl/CodeInsightTestFixtureImpl.java | 1 + .../util/testSrc/com/intellij/util/Assertion.java | 14 +++++++------- .../jetbrains/idea/maven/dom/MavenDomTestCase.java | 1 + 5 files changed, 12 insertions(+), 8 deletions(-) diff --git a/platform/lang-impl/src/com/intellij/execution/console/LanguageConsoleImpl.java b/platform/lang-impl/src/com/intellij/execution/console/LanguageConsoleImpl.java index 6e5151894664..4a58c854a986 100644 --- a/platform/lang-impl/src/com/intellij/execution/console/LanguageConsoleImpl.java +++ b/platform/lang-impl/src/com/intellij/execution/console/LanguageConsoleImpl.java @@ -417,6 +417,7 @@ public class LanguageConsoleImpl implements Disposable, TypeSafeDataProvider { private static void duplicateHighlighters(MarkupModel to, MarkupModel from, int offset, TextRange textRange) { for (RangeHighlighter rangeHighlighter : from.getAllHighlighters()) { + if (!rangeHighlighter.isValid()) continue; final int localOffset = textRange.getStartOffset(); final int start = Math.max(rangeHighlighter.getStartOffset(), localOffset) - localOffset; final int end = Math.min(rangeHighlighter.getEndOffset(), textRange.getEndOffset()) - localOffset; diff --git a/platform/lang-impl/src/com/intellij/internal/psiView/PsiViewerDialog.java b/platform/lang-impl/src/com/intellij/internal/psiView/PsiViewerDialog.java index d4a9586fe297..1dd56eedd869 100644 --- a/platform/lang-impl/src/com/intellij/internal/psiView/PsiViewerDialog.java +++ b/platform/lang-impl/src/com/intellij/internal/psiView/PsiViewerDialog.java @@ -59,6 +59,7 @@ import com.intellij.ui.TitledBorderWithMnemonic; import com.intellij.ui.TreeSpeedSearch; import com.intellij.ui.components.JBList; import com.intellij.ui.treeStructure.Tree; +import com.intellij.util.ArrayUtil; import com.intellij.util.IncorrectOperationException; import com.intellij.util.ui.UIUtil; import com.intellij.util.ui.tree.TreeUtil; @@ -869,7 +870,7 @@ public class PsiViewerDialog extends DialogWrapper implements DataProvider { } public void clearSelection() { - if (myHighlighter != null && Arrays.asList(myEditor.getMarkupModel().getAllHighlighters()).contains(myHighlighter)) { + if (myHighlighter != null && ArrayUtil.contains(myHighlighter, myEditor.getMarkupModel().getAllHighlighters())) { myHighlighter.dispose(); myHighlighter = null; } diff --git a/platform/testFramework/src/com/intellij/testFramework/fixtures/impl/CodeInsightTestFixtureImpl.java b/platform/testFramework/src/com/intellij/testFramework/fixtures/impl/CodeInsightTestFixtureImpl.java index 003e446c9749..7ac2cc1acdc6 100644 --- a/platform/testFramework/src/com/intellij/testFramework/fixtures/impl/CodeInsightTestFixtureImpl.java +++ b/platform/testFramework/src/com/intellij/testFramework/fixtures/impl/CodeInsightTestFixtureImpl.java @@ -788,6 +788,7 @@ public class CodeInsightTestFixtureImpl extends BaseFixture implements CodeInsig } for (final RangeHighlighter highlighter : myEditor.getDocument().getMarkupModel(project).getAllHighlighters()) { + if (!highlighter.isValid()) continue; addGutterIconRenderer(highlighter.getGutterIconRenderer(), highlighter.getStartOffset(), result); } return ContainerUtil.concat(result.values()); diff --git a/platform/util/testSrc/com/intellij/util/Assertion.java b/platform/util/testSrc/com/intellij/util/Assertion.java index d8be62de91ea..72e727ad5b2b 100644 --- a/platform/util/testSrc/com/intellij/util/Assertion.java +++ b/platform/util/testSrc/com/intellij/util/Assertion.java @@ -126,7 +126,7 @@ public class Assertion extends Assert { compareAll(expected.toArray(), actual); } - public void compareUnordered(Object[] expected, Collection actual) { + public static void compareUnordered(Object[] expected, Collection actual) { assertEquals(expected.length, actual.size()); for (Object exp : expected) { assertTrue(actual.contains(exp)); @@ -142,11 +142,11 @@ public class Assertion extends Assert { //compareAll(expectedList, actualList); } - public void compareUnordered(Collection expected, Collection actual) { + public static void compareUnordered(Collection expected, Collection actual) { compareUnordered(expected.toArray(), actual); } - public void compareUnordered(Collection expected, Object[] actual) { + public static void compareUnordered(Collection expected, Object[] actual) { compareUnordered(expected, new ArrayList(Arrays.asList(actual))); } @@ -210,7 +210,7 @@ public class Assertion extends Assert { count(number, Arrays.asList(objects)); } - public void compareUnordered(Object[] expected, Object[] actual) { + public static void compareUnordered(Object[] expected, Object[] actual) { compareUnordered(expected, new HashSet(Arrays.asList(actual))); } @@ -235,7 +235,7 @@ public class Assertion extends Assert { compareAll(new int[]{element}, actual); } - public void size(int size, Collection collection) { + public static void size(int size, Collection collection) { if (collection.size() != size) { System.err.println("Expected: " + size + " actual: " + collection.size()); } @@ -268,7 +268,7 @@ public class Assertion extends Assert { } } - public int countOccurences(Collection collection, T item) { + public static int countOccurences(Collection collection, T item) { int counter = 0; for (T obj : collection) { if (Comparing.equal(item, obj)) counter++; @@ -280,7 +280,7 @@ public class Assertion extends Assert { containsAll(collection, Arrays.asList(subArray)); } - public void size(int size, Object[] objects) { + public static void size(int size, Object[] objects) { size(size, Arrays.asList(objects)); } diff --git a/plugins/maven/src/test/java/org/jetbrains/idea/maven/dom/MavenDomTestCase.java b/plugins/maven/src/test/java/org/jetbrains/idea/maven/dom/MavenDomTestCase.java index 9ddc18a77c6d..f0cb83c74e1e 100644 --- a/plugins/maven/src/test/java/org/jetbrains/idea/maven/dom/MavenDomTestCase.java +++ b/plugins/maven/src/test/java/org/jetbrains/idea/maven/dom/MavenDomTestCase.java @@ -358,6 +358,7 @@ public abstract class MavenDomTestCase extends MavenImportingTestCase { RangeHighlighter[] highlighters = editor.getMarkupModel().getAllHighlighters(); List actual = new ArrayList(); for (RangeHighlighter each : highlighters) { + if (!each.isValid()) continue; int offset = each.getStartOffset(); PsiElement element = getTestPsiFile(file).findElementAt(offset); element = PsiTreeUtil.getParentOfType(element, XmlTag.class);