Merge remote-tracking branch 'origin/master'

platform/lang-impl/src/com/intellij/ide/util/gotoByName/ChooseByNameBase.java

@@ -1521,8 +1521,9 @@ public abstract class ChooseByNameBase {
                   ApplicationAdapter listener = new ApplicationAdapter() {
                     @Override
                     public void beforeWriteActionStart(Object action) {
-                      cancel();
-                      scheduleRestart();
+                      if (cancel()) {
+                        scheduleRestart(); //don't restart if already canceled explicitly
+                      }
                       ApplicationManager.getApplication().removeApplicationListener(this);
                     }
                   };

platform/platform-impl/src/com/intellij/openapi/options/newEditor/Banner.java

@@ -21,10 +21,9 @@ import com.intellij.openapi.project.Project;
 import com.intellij.ui.JBColor;
 import com.intellij.ui.RelativeFont;
 import com.intellij.ui.components.labels.SwingActionLink;
+import com.intellij.ui.components.panels.HorizontalLayout;
 
 import javax.swing.Action;
-import javax.swing.BorderFactory;
-import javax.swing.BoxLayout;
 import javax.swing.JLabel;
 import javax.swing.JPanel;
 import java.awt.BorderLayout;
@@ -39,7 +38,7 @@ final class Banner extends JPanel {
 
   Banner(Action action) {
     super(new BorderLayout(10, 0));
-    myLeftPanel.setLayout(new BoxLayout(myLeftPanel, BoxLayout.X_AXIS));
+    myLeftPanel.setLayout(new HorizontalLayout(5));
     myProjectIcon.setIcon(AllIcons.General.ProjectConfigurableBanner);
     myProjectIcon.setForeground(JBColor.GRAY);
     myProjectIcon.setVisible(false);
@@ -67,11 +66,9 @@ final class Banner extends JPanel {
         }
         else {
           if (i > 0) {
-            JLabel label = new JLabel("\u203A");
-            label.setBorder(BorderFactory.createEmptyBorder(0, 5, 0, 5));
-            myLeftPanel.add(RelativeFont.HUGE.install(label));
+            myLeftPanel.add(HorizontalLayout.LEFT, RelativeFont.HUGE.install(new JLabel("\u203A")));
           }
-          myLeftPanel.add(RelativeFont.BOLD.install(new JLabel(name)));
+          myLeftPanel.add(HorizontalLayout.LEFT, RelativeFont.BOLD.install(new JLabel(name)));
         }
         i += 2;
       }

plugins/devkit/src/DevKitUseScopeEnlarger.java

@@ -18,7 +18,9 @@ package org.jetbrains.idea.devkit;
 import com.intellij.ide.highlighter.XmlFileType;
 import com.intellij.pom.PomTarget;
 import com.intellij.pom.PomTargetPsiElement;
+import com.intellij.psi.PsiClass;
 import com.intellij.psi.PsiElement;
+import com.intellij.psi.PsiModifier;
 import com.intellij.psi.search.GlobalSearchScope;
 import com.intellij.psi.search.SearchScope;
 import com.intellij.psi.search.UseScopeEnlarger;
@@ -26,11 +28,13 @@ import com.intellij.util.xml.DomElement;
 import com.intellij.util.xml.DomTarget;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.idea.devkit.dom.ExtensionPoint;
+import org.jetbrains.idea.devkit.util.PsiUtil;
 
 /**
  * @author peter
  */
 public class DevKitUseScopeEnlarger extends UseScopeEnlarger {
+
   @Override
   public SearchScope getAdditionalUseScope(@NotNull PsiElement element) {
     if (element instanceof PomTargetPsiElement) {
@@ -38,11 +42,21 @@ public class DevKitUseScopeEnlarger extends UseScopeEnlarger {
       if (target instanceof DomTarget) {
         DomElement domElement = ((DomTarget)target).getDomElement();
         if (domElement instanceof ExtensionPoint) {
-          return GlobalSearchScope.getScopeRestrictedByFileTypes(GlobalSearchScope.allScope(element.getProject()),
-                                                                 XmlFileType.INSTANCE);
+          return createProjectXmlFilesScope(element);
         }
       }
     }
+
+    if (element instanceof PsiClass &&
+        PsiUtil.isIdeaProject(element.getProject()) &&
+        ((PsiClass)element).hasModifierProperty(PsiModifier.PUBLIC)) {
+      return createProjectXmlFilesScope(element);
+    }
     return null;
   }
+
+  private static SearchScope createProjectXmlFilesScope(PsiElement element) {
+    return GlobalSearchScope.getScopeRestrictedByFileTypes(GlobalSearchScope.allScope(element.getProject()),
+                                                           XmlFileType.INSTANCE);
+  }
 }