javac indices: enable by default & disable in tests, again

This commit is contained in:
Dmitry Batkovich
2016-12-14 22:27:15 +03:00
parent d0821c6651
commit 23e75561bc
3 changed files with 6 additions and 2 deletions
@@ -15,6 +15,7 @@
*/
package com.intellij.compiler;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.components.AbstractProjectComponent;
import com.intellij.openapi.fileTypes.FileType;
import com.intellij.openapi.project.Project;
@@ -28,6 +29,7 @@ import org.jetbrains.annotations.Nullable;
public abstract class CompilerReferenceService extends AbstractProjectComponent {
public static final RegistryValue IS_ENABLED_KEY = Registry.get("compiler.ref.index");
public static volatile boolean enabledInTests = false;
protected CompilerReferenceService(Project project) {
super(project);
@@ -53,6 +55,6 @@ public abstract class CompilerReferenceService extends AbstractProjectComponent
@NotNull FileType searchFileType);
public static boolean isEnabled() {
return IS_ENABLED_KEY.asBoolean();
return (!ApplicationManager.getApplication().isHeadlessEnvironment() || enabledInTests) && IS_ENABLED_KEY.asBoolean();
}
}
@@ -24,12 +24,14 @@ public abstract class CompilerReferencesTestBase extends AbstractCompilerAwareTe
public void setUp() throws Exception {
myDefaultEnableState = CompilerReferenceService.IS_ENABLED_KEY.asBoolean();
CompilerReferenceService.IS_ENABLED_KEY.setValue(true);
CompilerReferenceService.enabledInTests = true;
super.setUp();
}
@Override
public void tearDown() throws Exception {
CompilerReferenceService.IS_ENABLED_KEY.setValue(myDefaultEnableState);
CompilerReferenceService.enabledInTests = false;
super.tearDown();
}
}