From 83963d9fa69ea2719da573e975b86d85cd1807cb Mon Sep 17 00:00:00 2001
From: Alexey Kudravtsev <cdr@jetbrains.com>
Date: Thu, 10 Feb 2005 14:03:46 +0300
Subject: [PATCH] (no message)

---
 .../codeInsight/daemon/impl/DaemonCodeAnalyzerImpl.java   | 2 +-
 .../ide/structureView/impl/java/PsiFieldTreeElement.java  | 8 +++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/source/com/intellij/codeInsight/daemon/impl/DaemonCodeAnalyzerImpl.java b/source/com/intellij/codeInsight/daemon/impl/DaemonCodeAnalyzerImpl.java
index 45f165670b75..39839df8d792 100644
--- a/source/com/intellij/codeInsight/daemon/impl/DaemonCodeAnalyzerImpl.java
+++ b/source/com/intellij/codeInsight/daemon/impl/DaemonCodeAnalyzerImpl.java
@@ -535,6 +535,7 @@ public class DaemonCodeAnalyzerImpl extends DaemonCodeAnalyzer implements JDOMEx
         final boolean wasCanceled = myUpdateProgress.isCanceled();
         final boolean wasRunning = myUpdateProgress.isRunning();
 
+        myUpdateThreadSemaphore.up();
         ApplicationManager.getApplication().invokeLater(new Runnable() {
           public void run() {
             if (myDisposed) return;
@@ -548,7 +549,6 @@ public class DaemonCodeAnalyzerImpl extends DaemonCodeAnalyzer implements JDOMEx
             }
           }
         }, ModalityState.stateForComponent(editor.getComponent()));
-        myUpdateThreadSemaphore.up();
       }
     };
 
diff --git a/source/com/intellij/ide/structureView/impl/java/PsiFieldTreeElement.java b/source/com/intellij/ide/structureView/impl/java/PsiFieldTreeElement.java
index e86f2263fe0c..50a01fc08478 100644
--- a/source/com/intellij/ide/structureView/impl/java/PsiFieldTreeElement.java
+++ b/source/com/intellij/ide/structureView/impl/java/PsiFieldTreeElement.java
@@ -3,6 +3,8 @@ package com.intellij.ide.structureView.impl.java;
 import com.intellij.ide.structureView.StructureViewTreeElement;
 import com.intellij.navigation.ItemPresentation;
 import com.intellij.psi.PsiField;
+import com.intellij.psi.PsiSubstitutor;
+import com.intellij.psi.util.PsiFormatUtil;
 
 public class PsiFieldTreeElement extends JavaClassTreeElementBase<PsiField>{
   public PsiFieldTreeElement(PsiField field, boolean isInherited) {
@@ -18,7 +20,11 @@ public class PsiFieldTreeElement extends JavaClassTreeElementBase<PsiField>{
   }
 
   public String getPresentableText() {
-    return getElement().getName();
+    return PsiFormatUtil.formatVariable(
+      getElement(),
+      PsiFormatUtil.SHOW_NAME | PsiFormatUtil.SHOW_TYPE | PsiFormatUtil.TYPE_AFTER,
+      PsiSubstitutor.EMPTY
+    );
   }
 
   public PsiField getField() {