MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

light highlighting tests fixed

Browse Source
This commit is contained in:
Alexey Kudravtsev
2009-10-16 13:48:16 +04:00
parent 511bfd013a
commit 82c8cbd59d
4 changed files with 45 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/testFramework/src/com/intellij/codeInsight/daemon/DaemonAnalyzerTestCase.java
+9 -20
View File
@@ -19,7 +19,10 @@ import com.intellij.codeHighlighting.HighlightDisplayLevel;
import com.intellij.codeHighlighting.Pass;
import com.intellij.codeHighlighting.TextEditorHighlightingPass;
import com.intellij.codeInsight.CodeInsightTestCase;
import com.intellij.codeInsight.daemon.impl.*;
import com.intellij.codeInsight.daemon.impl.DaemonCodeAnalyzerImpl;
import com.intellij.codeInsight.daemon.impl.ExternalToolPass;
import com.intellij.codeInsight.daemon.impl.HighlightInfo;
import com.intellij.codeInsight.daemon.impl.TextEditorHighlightingPassRegistrarEx;
import com.intellij.codeInsight.daemon.quickFix.LightQuickFixTestCase;
import com.intellij.codeInsight.intention.IntentionAction;
import com.intellij.codeInspection.InspectionProfileEntry;
@@ -37,8 +40,6 @@ import com.intellij.openapi.Disposable;
import com.intellij.openapi.editor.Document;
import com.intellij.openapi.editor.Editor;
import com.intellij.openapi.module.Module;
import com.intellij.openapi.progress.ProgressIndicator;
import com.intellij.openapi.progress.ProgressManager;
import com.intellij.openapi.roots.ModuleRootManager;
import com.intellij.openapi.startup.StartupManager;
import com.intellij.openapi.util.Disposer;
@@ -60,6 +61,7 @@ import com.intellij.psi.search.GlobalSearchScope;
import com.intellij.psi.search.UsageSearchContext;
import com.intellij.testFramework.ExpectedHighlightingData;
import com.intellij.testFramework.FileTreeAccessFilter;
import com.intellij.testFramework.fixtures.impl.CodeInsightTestFixtureImpl;
import com.intellij.util.IncorrectOperationException;
import gnu.trove.THashMap;
import gnu.trove.TIntArrayList;
@@ -269,29 +271,16 @@ public abstract class DaemonAnalyzerTestCase extends CodeInsightTestCase {
toIgnore.add(Pass.VISIBLE_LINE_MARKERS);
toIgnore.add(Pass.LINE_MARKERS);
}
final ProgressIndicator progress = new DaemonProgressIndicator();
final List<TextEditorHighlightingPass> passes = TextEditorHighlightingPassRegistrarEx.getInstanceEx(getProject()).instantiatePasses(getFile(), getEditor(), toIgnore.toNativeArray());
for(Iterator<TextEditorHighlightingPass> i = passes.iterator();i.hasNext();) {
final TextEditorHighlightingPass pass = i.next();
for (final TextEditorHighlightingPass pass : passes) {
if ((!(pass instanceof ExternalToolPass) && forceExternalValidation()) ||
(pass instanceof ExternalToolPass && !forceExternalValidation() && !doExternalValidation())
) {
i.remove();
(pass instanceof ExternalToolPass && !forceExternalValidation() && !doExternalValidation())) {
toIgnore.add(pass.getId());
}
}
ProgressManager.getInstance().runProcess(new Runnable() {
public void run() {
for (TextEditorHighlightingPass pass : passes) {
pass.collectInformation(progress);
}
for (TextEditorHighlightingPass pass : passes) {
pass.applyInformationToEditor();
}
}
}, progress);
CodeInsightTestFixtureImpl.instantiateAndRun(getFile(), getEditor(), toIgnore.toNativeArray());
if (doTestLineMarkers()) {
Document document = getDocument(getFile());
java/testFramework/src/com/intellij/codeInsight/daemon/LightDaemonAnalyzerTestCase.java
+7 -26
View File
@@ -16,28 +16,20 @@
package com.intellij.codeInsight.daemon;
import com.intellij.codeHighlighting.Pass;
import com.intellij.codeHighlighting.TextEditorHighlightingPass;
import com.intellij.codeInsight.daemon.impl.DaemonCodeAnalyzerImpl;
import com.intellij.codeInsight.daemon.impl.DaemonProgressIndicator;
import com.intellij.codeInsight.daemon.impl.HighlightInfo;
import com.intellij.codeInsight.daemon.impl.TextEditorHighlightingPassRegistrarEx;
import com.intellij.injected.editor.EditorWindow;
import com.intellij.openapi.editor.Editor;
import com.intellij.openapi.progress.ProgressIndicator;
import com.intellij.openapi.vfs.VirtualFileFilter;
import com.intellij.psi.PsiDocumentManager;
import com.intellij.psi.PsiFile;
import com.intellij.psi.impl.source.tree.injected.InjectedLanguageUtil;
import com.intellij.testFramework.ExpectedHighlightingData;
import com.intellij.testFramework.FileTreeAccessFilter;
import com.intellij.testFramework.LightCodeInsightTestCase;
import com.intellij.testFramework.fixtures.impl.CodeInsightTestFixtureImpl;
import com.intellij.util.ArrayUtil;
import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.NotNull;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
public abstract class LightDaemonAnalyzerTestCase extends LightCodeInsightTestCase {
@@ -82,27 +74,16 @@ public abstract class LightDaemonAnalyzerTestCase extends LightCodeInsightTestCa
protected List<HighlightInfo> doHighlighting() {
PsiDocumentManager.getInstance(getProject()).commitAllDocuments();
ProgressIndicator progress = new DaemonProgressIndicator();
int[] toIgnore = doFolding() ? ArrayUtil.EMPTY_INT_ARRAY : new int[]{Pass.UPDATE_FOLDING};
Editor editor = getEditor();
PsiFile file = getFile();
if (editor instanceof EditorWindow) {
editor = ((EditorWindow)editor).getDelegate();
file = InjectedLanguageUtil.getTopLevelFile(file);
}
TextEditorHighlightingPassRegistrarEx registrar = TextEditorHighlightingPassRegistrarEx.getInstanceEx(getProject());
List<TextEditorHighlightingPass> passes = registrar.instantiatePasses(file, editor, toIgnore);
for (TextEditorHighlightingPass pass : passes) {
pass.collectInformation(progress);
}
for (TextEditorHighlightingPass pass : passes) {
pass.applyInformationToEditor();
}
List<HighlightInfo> infos = DaemonCodeAnalyzerImpl.getHighlights(editor.getDocument(), getProject());
return infos == null ? Collections.<HighlightInfo>emptyList() : new ArrayList<HighlightInfo>(infos);
//if (editor instanceof EditorWindow) {
// editor = ((EditorWindow)editor).getDelegate();
// file = InjectedLanguageUtil.getTopLevelFile(file);
//}
return CodeInsightTestFixtureImpl.instantiateAndRun(file, editor, toIgnore);
}
protected boolean doFolding() {