diff --git a/python/BUILD.bazel b/python/BUILD.bazel index b54945a35c07..4350bd5611bf 100644 --- a/python/BUILD.bazel +++ b/python/BUILD.bazel @@ -547,6 +547,7 @@ jvm_library( "//python/python-syntax-core:syntax-core", "//platform/core-ui", "//platform/ide-core-impl", + "//platform/core-impl", ], runtime_deps = [":python-pydev_resources"] ) diff --git a/python/intellij.python.pydev.iml b/python/intellij.python.pydev.iml index 069fbfa018bc..7af9b27b302e 100644 --- a/python/intellij.python.pydev.iml +++ b/python/intellij.python.pydev.iml @@ -24,5 +24,6 @@ + \ No newline at end of file diff --git a/python/pydevSrc/src/com/jetbrains/python/debugger/PyDebugValue.java b/python/pydevSrc/src/com/jetbrains/python/debugger/PyDebugValue.java index f212aa648ef6..fa3415937001 100644 --- a/python/pydevSrc/src/com/jetbrains/python/debugger/PyDebugValue.java +++ b/python/pydevSrc/src/com/jetbrains/python/debugger/PyDebugValue.java @@ -6,16 +6,16 @@ import com.google.common.collect.ImmutableMap; import com.google.common.collect.Maps; import com.intellij.icons.AllIcons; import com.intellij.ide.DataManager; +import com.intellij.ide.plugins.PluginManagerCore; import com.intellij.openapi.actionSystem.ActionManager; import com.intellij.openapi.actionSystem.AnAction; import com.intellij.openapi.actionSystem.AnActionEvent; import com.intellij.openapi.actionSystem.DataContext; -import com.intellij.openapi.util.registry.Registry; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.application.ReadAction; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.util.NlsSafe; -import com.intellij.util.PlatformUtils; +import com.intellij.openapi.util.registry.Registry; import com.intellij.xdebugger.frame.*; import com.intellij.xdebugger.frame.presentation.XRegularValuePresentation; import com.intellij.xdebugger.impl.ui.tree.nodes.XValueNodeImpl; @@ -28,8 +28,8 @@ import org.jetbrains.annotations.Nullable; import javax.swing.*; import java.awt.*; -import java.util.*; import java.awt.event.MouseEvent; +import java.util.*; import java.util.List; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -567,7 +567,7 @@ public class PyDebugValue extends XNamedValue { private static boolean checkAndShowViewAsImageOnScreen(PyDebugValue debugValue) { try { return Registry.get("actions.show.as.image.visibility").asBoolean() - && !PlatformUtils.isPyCharmCommunity() + && !PluginManagerCore.isDisabled(PluginManagerCore.ULTIMATE_PLUGIN_ID) && checkAndEnableViewAsImageVisibility(debugValue); } catch (MissingResourceException e) { return false;