MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

fixed completion in expressions for primitive type

Browse Source
This commit is contained in:
Egor.Ushakov
2016-08-10 12:29:24 +03:00
parent 6aba99a6e8
commit c552faa6e6
2 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/debugger/impl/src/com/intellij/debugger/impl/DebuggerUtilsImpl.java
+2
View File
@@ -48,6 +48,7 @@ import com.intellij.xdebugger.impl.breakpoints.XExpressionState;
import com.sun.jdi.Value;
import com.sun.jdi.connect.spi.TransportService;
import org.jdom.Element;
import org.jetbrains.annotations.NotNull;
import java.io.IOException;
@@ -139,6 +140,7 @@ public class DebuggerUtilsImpl extends DebuggerUtilsEx{
return PositionUtil.getContextElement(context);
}
@NotNull
public static Pair<PsiClass, PsiType> getPsiClassAndType(String className, Project project) {
PsiClass contextClass;
PsiType contextType;
java/debugger/impl/src/com/intellij/debugger/settings/CompoundRendererConfigurable.java
+14 -10
View File
@@ -22,15 +22,18 @@ import com.intellij.debugger.engine.evaluation.CodeFragmentKind;
import com.intellij.debugger.engine.evaluation.TextWithImports;
import com.intellij.debugger.engine.evaluation.TextWithImportsImpl;
import com.intellij.debugger.impl.DebuggerUtilsEx;
import com.intellij.debugger.impl.DebuggerUtilsImpl;
import com.intellij.debugger.ui.JavaDebuggerSupport;
import com.intellij.debugger.ui.tree.render.*;
import com.intellij.openapi.Disposable;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.Pair;
import com.intellij.psi.*;
import com.intellij.psi.JavaCodeFragment;
import com.intellij.psi.PsiClass;
import com.intellij.psi.PsiDocumentManager;
import com.intellij.psi.PsiType;
import com.intellij.psi.impl.source.PsiTypeCodeFragmentImpl;
import com.intellij.psi.search.GlobalSearchScope;
import com.intellij.ui.*;
import com.intellij.ui.components.JBCheckBox;
import com.intellij.ui.table.JBTable;
@@ -205,15 +208,16 @@ class CompoundRendererConfigurable extends JPanel {
private void updateContext(final String qName) {
ApplicationManager.getApplication().runReadAction(() -> {
Project project = myProject;
PsiClass psiClass = project != null ? DebuggerUtils.findClass(qName, project, GlobalSearchScope.allScope(project)) : null;
if (psiClass != null) {
psiClass = (PsiClass)psiClass.getNavigationElement();
if (project != null) {
Pair<PsiClass, PsiType> pair = DebuggerUtilsImpl.getPsiClassAndType(qName, project);
if (pair.first != null) {
XSourcePositionImpl position = XSourcePositionImpl.createByElement(pair.first);
myLabelEditor.setSourcePosition(position);
myChildrenEditor.setSourcePosition(position);
myChildrenExpandedEditor.setSourcePosition(position);
myListChildrenEditor.setSourcePosition(position);
}
}
XSourcePositionImpl position = XSourcePositionImpl.createByElement(psiClass);
myLabelEditor.setSourcePosition(position);
myChildrenEditor.setSourcePosition(position);
myChildrenExpandedEditor.setSourcePosition(position);
myListChildrenEditor.setSourcePosition(position);
});
}