azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Enabled Kotlin internal mode in JetPsiChecker tests.

Browse Source
This commit is contained in:
Evgeny Gerashchenko
2014-08-04 18:35:14 +04:00
parent a4bbe2486c
commit 393afd1bc1
4 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/jet/plugin/actions/internal/KotlinInternalModeToggleAction.kt
+7 -3
View File
@@ -25,17 +25,21 @@ public class KotlinInternalModeToggleAction: ToggleAction("Kotlin Internal Mode"
public class object { public class object {
val INTERNAL_MODE_PROPERTY = "kotlin.internal.mode.enabled" val INTERNAL_MODE_PROPERTY = "kotlin.internal.mode.enabled"
public fun isEnabled(): Boolean { public var enabled: Boolean
get() {
return PropertiesComponent.getInstance()!!.getBoolean(INTERNAL_MODE_PROPERTY, false) return PropertiesComponent.getInstance()!!.getBoolean(INTERNAL_MODE_PROPERTY, false)
} }
set(value) {
PropertiesComponent.getInstance()!!.setValue(INTERNAL_MODE_PROPERTY, value.toString())
}
} }
override fun isSelected(e: AnActionEvent?): Boolean { override fun isSelected(e: AnActionEvent?): Boolean {
return isEnabled() return enabled
} }
override fun setSelected(e: AnActionEvent?, state: Boolean) { override fun setSelected(e: AnActionEvent?, state: Boolean) {
PropertiesComponent.getInstance()!!.setValue(INTERNAL_MODE_PROPERTY, "$state") enabled = state
DaemonCodeAnalyzer.getInstance(e!!.getProject())!!.settingsChanged() DaemonCodeAnalyzer.getInstance(e!!.getProject())!!.settingsChanged()
} }
idea/src/org/jetbrains/jet/plugin/highlighter/DebugInfoAnnotator.java
+1 -1
View File
@@ -37,7 +37,7 @@ import org.jetbrains.jet.plugin.caches.resolve.ResolvePackage;
public class DebugInfoAnnotator implements Annotator { public class DebugInfoAnnotator implements Annotator {
public static boolean isDebugInfoEnabled() { public static boolean isDebugInfoEnabled() {
return KotlinInternalModeToggleAction.OBJECT$.isEnabled(); return KotlinInternalModeToggleAction.OBJECT$.getEnabled();
} }
@Override @Override
idea/src/org/jetbrains/jet/plugin/highlighter/JetPsiChecker.java
+2 -2
View File
@@ -264,7 +264,7 @@ public class JetPsiChecker implements Annotator, HighlightRangeExtension {
@NotNull @NotNull
private static String getMessage(@NotNull Diagnostic diagnostic) { private static String getMessage(@NotNull Diagnostic diagnostic) {
String message = IdeErrorMessages.RENDERER.render(diagnostic); String message = IdeErrorMessages.RENDERER.render(diagnostic);
if (KotlinInternalModeToggleAction.OBJECT$.isEnabled() || ApplicationManager.getApplication().isUnitTestMode()) { if (KotlinInternalModeToggleAction.OBJECT$.getEnabled() || ApplicationManager.getApplication().isUnitTestMode()) {
String factoryName = diagnostic.getFactory().getName(); String factoryName = diagnostic.getFactory().getName();
if (message.startsWith("<html>")) { if (message.startsWith("<html>")) {
message = String.format("<html>[%s] %s", factoryName, message.substring("<html>".length())); message = String.format("<html>[%s] %s", factoryName, message.substring("<html>".length()));
@@ -281,7 +281,7 @@ public class JetPsiChecker implements Annotator, HighlightRangeExtension {
@NotNull @NotNull
private static String getDefaultMessage(@NotNull Diagnostic diagnostic) { private static String getDefaultMessage(@NotNull Diagnostic diagnostic) {
String message = DefaultErrorMessages.RENDERER.render(diagnostic); String message = DefaultErrorMessages.RENDERER.render(diagnostic);
if (KotlinInternalModeToggleAction.OBJECT$.isEnabled() || ApplicationManager.getApplication().isUnitTestMode()) { if (KotlinInternalModeToggleAction.OBJECT$.getEnabled() || ApplicationManager.getApplication().isUnitTestMode()) {
return String.format("[%s] %s", diagnostic.getFactory().getName(), message); return String.format("[%s] %s", diagnostic.getFactory().getName(), message);
} }
return message; return message;
idea/tests/org/jetbrains/jet/plugin/JetLightCodeInsightFixtureTestCase.java
+2
View File
@@ -33,6 +33,7 @@ import org.jetbrains.annotations.NotNull;
import org.jetbrains.jet.InTextDirectivesUtils; import org.jetbrains.jet.InTextDirectivesUtils;
import org.jetbrains.jet.JetTestCaseBuilder; import org.jetbrains.jet.JetTestCaseBuilder;
import org.jetbrains.jet.lang.psi.JetFile; import org.jetbrains.jet.lang.psi.JetFile;
import org.jetbrains.jet.plugin.actions.internal.KotlinInternalModeToggleAction;
import org.jetbrains.jet.plugin.references.BuiltInsReferenceResolver; import org.jetbrains.jet.plugin.references.BuiltInsReferenceResolver;
import org.jetbrains.jet.utils.UtilsPackage; import org.jetbrains.jet.utils.UtilsPackage;
@@ -47,6 +48,7 @@ public abstract class JetLightCodeInsightFixtureTestCase extends LightCodeInsigh
super.setUp(); super.setUp();
((StartupManagerImpl) StartupManager.getInstance(getProject())).runPostStartupActivities(); ((StartupManagerImpl) StartupManager.getInstance(getProject())).runPostStartupActivities();
VfsRootAccess.allowRootAccess(JetTestCaseBuilder.getHomeDirectory()); VfsRootAccess.allowRootAccess(JetTestCaseBuilder.getHomeDirectory());
KotlinInternalModeToggleAction.OBJECT$.setEnabled(true);
} }
@Override @Override