diff --git a/python/src/com/jetbrains/python/console/PyConsoleOptions.java b/python/src/com/jetbrains/python/console/PyConsoleOptions.java
index 8dd494c9c99a..c43988fde2a9 100644
--- a/python/src/com/jetbrains/python/console/PyConsoleOptions.java
+++ b/python/src/com/jetbrains/python/console/PyConsoleOptions.java
@@ -55,6 +55,14 @@ public class PyConsoleOptions implements PersistentStateComponent
-
+
@@ -34,7 +34,7 @@
-
+
@@ -45,6 +45,14 @@
+
+
+
+
+
+
+
+
diff --git a/python/src/com/jetbrains/python/console/PyConsoleOptionsConfigurable.java b/python/src/com/jetbrains/python/console/PyConsoleOptionsConfigurable.java
index b49799681cf0..99bee559b3ef 100644
--- a/python/src/com/jetbrains/python/console/PyConsoleOptionsConfigurable.java
+++ b/python/src/com/jetbrains/python/console/PyConsoleOptionsConfigurable.java
@@ -162,6 +162,7 @@ public class PyConsoleOptionsConfigurable extends SearchableConfigurable.Parent.
private JPanel myWholePanel;
private JBCheckBox myShowDebugConsoleByDefault;
private JBCheckBox myIpythonEnabledCheckbox;
+ private JBCheckBox myShowsVariablesByDefault;
private PyConsoleOptions myOptionsProvider;
public JPanel createPanel(PyConsoleOptions optionsProvider) {
@@ -172,17 +173,20 @@ public class PyConsoleOptionsConfigurable extends SearchableConfigurable.Parent.
public void apply() {
myOptionsProvider.setShowDebugConsoleByDefault(myShowDebugConsoleByDefault.isSelected());
+ myOptionsProvider.setShowVariablesByDefault(myShowsVariablesByDefault.isSelected());
myOptionsProvider.setIpythonEnabled(myIpythonEnabledCheckbox.isSelected());
}
public void reset() {
myShowDebugConsoleByDefault.setSelected(myOptionsProvider.isShowDebugConsoleByDefault());
+ myShowsVariablesByDefault.setSelected(myOptionsProvider.isShowVariableByDefault());
myIpythonEnabledCheckbox.setSelected(myOptionsProvider.isIpythonEnabled());
}
public boolean isModified() {
return myShowDebugConsoleByDefault.isSelected() != myOptionsProvider.isShowDebugConsoleByDefault() ||
- myIpythonEnabledCheckbox.isSelected() != myOptionsProvider.isIpythonEnabled();
+ myIpythonEnabledCheckbox.isSelected() != myOptionsProvider.isIpythonEnabled() ||
+ myShowsVariablesByDefault.isSelected() != myOptionsProvider.isShowVariableByDefault();
}
}
diff --git a/python/src/com/jetbrains/python/console/PythonConsoleView.java b/python/src/com/jetbrains/python/console/PythonConsoleView.java
index c2790598e495..d898857e0679 100644
--- a/python/src/com/jetbrains/python/console/PythonConsoleView.java
+++ b/python/src/com/jetbrains/python/console/PythonConsoleView.java
@@ -97,7 +97,7 @@ public class PythonConsoleView extends LanguageConsoleImpl implements Observable
private XStandaloneVariablesView mySplitView;
private ActionCallback myInitialized = new ActionCallback();
- private boolean isShowVars = true;
+ private boolean isShowVars;
/**
* @param testMode this console will be used to display test output and should support TC messages
@@ -105,7 +105,7 @@ public class PythonConsoleView extends LanguageConsoleImpl implements Observable
public PythonConsoleView(final Project project, final String title, final Sdk sdk, final boolean testMode) {
super(project, title, PythonLanguage.getInstance());
myTestMode = testMode;
-
+ isShowVars = PyConsoleOptions.getInstance(project).isShowVariableByDefault();
getVirtualFile().putUserData(LanguageLevel.KEY, PythonSdkType.getLanguageLevelForSdk(sdk));
// Mark editor as console one, to prevent autopopup completion
getConsoleEditor().putUserData(PythonConsoleAutopopupBlockingHandler.REPL_KEY, new Object());