Merge branch 'master' into nodeDescriptor_names_ext
authorEgor.Ushakov <egor.ushakov@jetbrains.com>
Mon, 24 Aug 2015 08:03:42 +0000 (11:03 +0300)
committerEgor.Ushakov <egor.ushakov@jetbrains.com>
Mon, 24 Aug 2015 08:03:42 +0000 (11:03 +0300)
1  2 
java/debugger/impl/src/com/intellij/debugger/ui/impl/watch/FieldDescriptorImpl.java
java/debugger/impl/src/com/intellij/debugger/ui/impl/watch/LocalVariableDescriptorImpl.java
resources/src/META-INF/IdeaPlugin.xml

index 58341e425b2f2efe448cf28bbabaae013d2586d2,6e10830ea1ec004024ad31fb3b8497ae6749408d..dc2602ca6e4f6332a443284b49e91a574533196c
@@@ -23,10 -23,8 +23,9 @@@ import com.intellij.debugger.engine.eva
  import com.intellij.debugger.impl.PositionUtil;
  import com.intellij.debugger.jdi.LocalVariableProxyImpl;
  import com.intellij.debugger.jdi.StackFrameProxyImpl;
- import com.intellij.debugger.settings.NodeRendererSettings;
  import com.intellij.debugger.ui.tree.LocalVariableDescriptor;
  import com.intellij.debugger.ui.tree.NodeDescriptor;
 +import com.intellij.debugger.ui.tree.NodeDescriptorNameAdjuster;
  import com.intellij.openapi.project.Project;
  import com.intellij.psi.JavaPsiFacade;
  import com.intellij.psi.PsiElementFactory;
@@@ -93,20 -92,13 +93,18 @@@ public class LocalVariableDescriptorImp
  
    @Override
    public String getName() {
 -    return myLocalVariable.name();
 +    String varName = myLocalVariable.name();
 +    NodeDescriptorNameAdjuster nameAdjuster = NodeDescriptorNameAdjuster.findFor(this);
 +    if (nameAdjuster != null) {
 +      return nameAdjuster.fixName(varName, this);
 +    }
 +    return varName;
    }
  
+   @Nullable
    @Override
-   public String calcValueName() {
-     if (NodeRendererSettings.getInstance().getClassRenderer().SHOW_DECLARED_TYPE) {
-       return addDeclaredType(myTypeName);
-     }
-     return super.calcValueName();
+   public String getDeclaredType() {
+     return myLocalVariable.typeName();
    }
  
    @Override
Simple merge