From 7ca61526271c9257f755abbc39cd97e8c4cd3f03 Mon Sep 17 00:00:00 2001 From: Alexey Kudravtsev Date: Wed, 18 Nov 2015 15:55:42 +0300 Subject: [PATCH] more diagnostics --- .../daemon/impl/DaemonRespondToChangesTest.java | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/impl/DaemonRespondToChangesTest.java b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/impl/DaemonRespondToChangesTest.java index dcda5ff34a48..560f79aa1ef7 100644 --- a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/impl/DaemonRespondToChangesTest.java +++ b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/impl/DaemonRespondToChangesTest.java @@ -689,7 +689,6 @@ public class DaemonRespondToChangesTest extends DaemonAnalyzerTestCase { assertEquals(0, count[0]); } - public void testLineMarkersReuse() throws Throwable { configureByFile(BASE_PATH + "LineMarkerChange.java"); @@ -701,28 +700,28 @@ public class DaemonRespondToChangesTest extends DaemonAnalyzerTestCase { type('X'); - final Collection changed = new HashSet<>(); + final Collection changed = new ArrayList<>(); MarkupModelEx modelEx = (MarkupModelEx)DocumentMarkupModel.forDocument(getDocument(getFile()), getProject(), true); modelEx.addMarkupModelListener(getTestRootDisposable(), new MarkupModelListener() { @Override public void afterAdded(@NotNull RangeHighlighterEx highlighter) { - changed(highlighter); + changed(highlighter, "after added"); } @Override public void beforeRemoved(@NotNull RangeHighlighterEx highlighter) { - changed(highlighter); + changed(highlighter, "before removed"); } @Override public void attributesChanged(@NotNull RangeHighlighterEx highlighter, boolean renderersChanged) { - changed(highlighter); + changed(highlighter, "changed"); } - private void changed(@NotNull RangeHighlighterEx highlighter) { + private void changed(@NotNull RangeHighlighterEx highlighter, String reason) { String text = highlighter.getDocument().getText().substring(highlighter.getStartOffset(), highlighter.getEndOffset()); if (text.equals("X")) return; //non relevant - changed.add(highlighter); + changed.add(reason+": "+highlighter); } }); @@ -730,8 +729,8 @@ public class DaemonRespondToChangesTest extends DaemonAnalyzerTestCase { CodeInsightTestFixtureImpl.instantiateAndRun(myFile, myEditor, new int[]{Pass.UPDATE_ALL, Pass.LOCAL_INSPECTIONS}, false); assertEmpty(changed); - lineMarkers = DaemonCodeAnalyzerImpl.getLineMarkers(myEditor.getDocument(), getProject()); - assertEquals(5, lineMarkers.size()); + List lineMarkersAfter = DaemonCodeAnalyzerImpl.getLineMarkers(myEditor.getDocument(), getProject()); + assertEquals(lineMarkersAfter.size(), lineMarkers.size()); } public void testLineMarkersClearWhenTypingAtTheEndOfPsiComment() throws Throwable {