From cfe630ab66920deea755576abc209e2bcbf14670 Mon Sep 17 00:00:00 2001 From: Andrey Lisin Date: Mon, 24 Dec 2018 11:54:38 +0300 Subject: [PATCH] PY-32863 Fix debugger errors when using 'this' as variable name --- .../debugger/PyDebuggerEditorsProvider.java | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/python/src/com/jetbrains/python/debugger/PyDebuggerEditorsProvider.java b/python/src/com/jetbrains/python/debugger/PyDebuggerEditorsProvider.java index af4b98460e61..242cd76c7e6e 100644 --- a/python/src/com/jetbrains/python/debugger/PyDebuggerEditorsProvider.java +++ b/python/src/com/jetbrains/python/debugger/PyDebuggerEditorsProvider.java @@ -21,8 +21,10 @@ import com.intellij.openapi.fileEditor.FileDocumentManager; import com.intellij.openapi.fileTypes.FileType; import com.intellij.openapi.project.Project; import com.intellij.psi.*; +import com.intellij.xdebugger.XNamedTreeNode; import com.intellij.xdebugger.XSourcePosition; import com.intellij.xdebugger.evaluation.EvaluationMode; +import com.intellij.xdebugger.evaluation.InlineDebuggerHelper; import com.intellij.xdebugger.evaluation.XDebuggerEditorsProvider; import com.jetbrains.python.PythonFileType; import com.jetbrains.python.psi.impl.PyExpressionCodeFragmentImpl; @@ -78,4 +80,19 @@ public class PyDebuggerEditorsProvider extends XDebuggerEditorsProvider { } return null; } + + private static class MyInlineDebuggerHelper extends InlineDebuggerHelper { + private static final MyInlineDebuggerHelper INSTANCE = new MyInlineDebuggerHelper(); + + @Override + public boolean shouldEvaluateChildrenByDefault(XNamedTreeNode node) { + return false; + } + } + + @NotNull + @Override + public InlineDebuggerHelper getInlineDebuggerHelper() { + return MyInlineDebuggerHelper.INSTANCE; + } }