From 4da23bc3bf538c78f0a8d18942cbee196816d099 Mon Sep 17 00:00:00 2001
From: Alexey Kudravtsev <cdr@intellij.com>
Date: Thu, 24 Sep 2015 15:26:01 +0300
Subject: [PATCH 01/23] IDEA-CR-4999 followup

---
 platform/platform-api/src/com/intellij/ui/tabs/TabInfo.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/platform/platform-api/src/com/intellij/ui/tabs/TabInfo.java b/platform/platform-api/src/com/intellij/ui/tabs/TabInfo.java
index 91536d53deaa..527eaf22abb2 100644
--- a/platform/platform-api/src/com/intellij/ui/tabs/TabInfo.java
+++ b/platform/platform-api/src/com/intellij/ui/tabs/TabInfo.java
@@ -108,7 +108,7 @@ public final class TabInfo implements Queryable, PlaceProvider<String> {
 
   public TabInfo setText(String text) {
     List<SimpleTextAttributes> attributes = myText.getAttributes();
-    TextAttributes textAttributes = attributes.isEmpty() ? null : attributes.get(0).toTextAttributes();
+    TextAttributes textAttributes = attributes.size() == 1 ? attributes.get(0).toTextAttributes() : null;
     TextAttributes defaultAttributes = getDefaultAttributes().toTextAttributes();
     if (!myText.toString().equals(text) || !Comparing.equal(textAttributes, defaultAttributes)) {
       clearText(false);

From c0284062e56f5ea14fd3c577978323bf96b5cf60 Mon Sep 17 00:00:00 2001
From: Alexey Kudravtsev <cdr@intellij.com>
Date: Thu, 24 Sep 2015 15:34:11 +0300
Subject: [PATCH 02/23] make test more portable

---
 .../intellij/application/ApplicationImplTest.java   | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/platform/platform-tests/testSrc/com/intellij/application/ApplicationImplTest.java b/platform/platform-tests/testSrc/com/intellij/application/ApplicationImplTest.java
index 308a6545a5a2..0afee92585c4 100644
--- a/platform/platform-tests/testSrc/com/intellij/application/ApplicationImplTest.java
+++ b/platform/platform-tests/testSrc/com/intellij/application/ApplicationImplTest.java
@@ -15,6 +15,7 @@
  */
 package com.intellij.application;
 
+import com.intellij.concurrency.JobSchedulerImpl;
 import com.intellij.openapi.Disposable;
 import com.intellij.openapi.application.AccessToken;
 import com.intellij.openapi.application.Application;
@@ -105,8 +106,8 @@ public class ApplicationImplTest extends PlatformTestCase {
   }
 
 
-  public void testReadWriteLockPerformance() throws InterruptedException {
-    int iterations = Timings.adjustAccordingToMySpeed(300000, true);
+  public void testRead50Write50LockPerformance() throws InterruptedException {
+    int iterations = Timings.adjustAccordingToMySpeed(400000, true);
     System.out.println("iterations = " + iterations);
     final int readIterations = iterations;
     final int writeIterations = iterations;
@@ -114,8 +115,8 @@ public class ApplicationImplTest extends PlatformTestCase {
     runReadWrites(readIterations, writeIterations, 2000);
   }
 
-  public void testReadLockPerformance() throws InterruptedException {
-    int iterations = Timings.adjustAccordingToMySpeed(300000, true);
+  public void testRead100Write0LockPerformance() throws InterruptedException {
+    int iterations = Timings.adjustAccordingToMySpeed(400000, true);
     System.out.println("iterations = " + iterations);
     final int readIterations = iterations;
     final int writeIterations = 0;
@@ -129,7 +130,7 @@ public class ApplicationImplTest extends PlatformTestCase {
     application.disableEventsUntil(disposable);
 
     try {
-      final int numOfThreads = 10;
+      final int numOfThreads = JobSchedulerImpl.CORES_COUNT;
       PlatformTestUtil.startPerformanceTest("lock performance", expectedMs, () -> {
         final CountDownLatch reads = new CountDownLatch(numOfThreads);
         for (int i = 0; i < numOfThreads; i++) {
@@ -155,7 +156,7 @@ public class ApplicationImplTest extends PlatformTestCase {
           System.out.println("write end");
         }
         reads.await();
-      }).assertTiming();
+      }).cpuBound().assertTiming();
     }
     finally {
       Disposer.dispose(disposable);

From 305dae3a13b9a85f2fbc3dabf8f8e370d714aa1c Mon Sep 17 00:00:00 2001
From: Alexey Kudravtsev <cdr@intellij.com>
Date: Thu, 24 Sep 2015 17:38:24 +0300
Subject: [PATCH 03/23] cleanup

---
 .../src/com/intellij/util/containers/TransferToEDTQueue.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/platform/util/src/com/intellij/util/containers/TransferToEDTQueue.java b/platform/util/src/com/intellij/util/containers/TransferToEDTQueue.java
index ba9ebb5a8f7d..654e290c110d 100644
--- a/platform/util/src/com/intellij/util/containers/TransferToEDTQueue.java
+++ b/platform/util/src/com/intellij/util/containers/TransferToEDTQueue.java
@@ -22,6 +22,7 @@ import com.intellij.util.concurrency.Semaphore;
 import gnu.trove.Equality;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.TestOnly;
 
 import javax.swing.*;
 import java.util.Collection;
@@ -160,6 +161,8 @@ public class TransferToEDTQueue<T> {
     }
   }
 
+  @TestOnly
+  @NotNull
   public Collection<T> dump() {
     synchronized (myQueue) {
       return myQueue.toList();
@@ -169,11 +172,9 @@ public class TransferToEDTQueue<T> {
   // process all queue in current thread
   public void drain() {
     int processed = 0;
-    long start = System.currentTimeMillis();
     while (processNext()) {
       processed++;
     }
-    long finish = System.currentTimeMillis();
   }
 
   // blocks until all elements in the queue are processed

From c351671a1853c49c4e0644af92d8f5c7b542fe76 Mon Sep 17 00:00:00 2001
From: Alexey Kudravtsev <cdr@intellij.com>
Date: Thu, 24 Sep 2015 18:43:04 +0300
Subject: [PATCH 04/23] introduce timeouts

---
 .../application/ApplicationImplTest.java      | 84 ++++++++++---------
 1 file changed, 46 insertions(+), 38 deletions(-)

diff --git a/platform/platform-tests/testSrc/com/intellij/application/ApplicationImplTest.java b/platform/platform-tests/testSrc/com/intellij/application/ApplicationImplTest.java
index 0afee92585c4..f2eee2542ebb 100644
--- a/platform/platform-tests/testSrc/com/intellij/application/ApplicationImplTest.java
+++ b/platform/platform-tests/testSrc/com/intellij/application/ApplicationImplTest.java
@@ -53,6 +53,7 @@ public class ApplicationImplTest extends PlatformTestCase {
   protected void setUp() throws Exception {
     super.setUp();
     exception = null;
+    timeOut = System.currentTimeMillis() + 2*60*1000;
   }
 
   private volatile Throwable exception;
@@ -187,7 +188,7 @@ public class ApplicationImplTest extends PlatformTestCase {
         try {
           System.out.println("read lock1 acquired");
           read1Acquired.set(true);
-          while (holdRead1.get());
+          while (holdRead1.get() && ok());
         }
         finally {
           lock.unlockRead(stamp);
@@ -195,20 +196,20 @@ public class ApplicationImplTest extends PlatformTestCase {
           System.out.println("read lock1 released");
         }
       }
-      catch (Exception e) {
+      catch (Throwable e) {
         exception = e;
-        throw e;
+        throw new RuntimeException(e);
       }
     }, "read lock1");
     readAction1.start();
 
-    while (!read1Acquired.get());
+    while (!read1Acquired.get() && ok());
     AtomicBoolean aboutToAcquireWrite = new AtomicBoolean();
     // readActions2 should try to acquire read action when write action is pending
     Thread readActions2 = new Thread(() -> {
       try {
         assertFalse(ApplicationManager.getApplication().isDispatchThread());
-        while (!aboutToAcquireWrite.get());
+        while (!aboutToAcquireWrite.get() && ok());
         TimeoutUtil.sleep(2000); // make sure it called writelock
         long stamp = lock.readLock();
         try {
@@ -221,9 +222,9 @@ public class ApplicationImplTest extends PlatformTestCase {
           System.out.println("read lock2 released");
         }
       }
-      catch (Exception e) {
+      catch (Throwable e) {
         exception = e;
-        throw e;
+        throw new RuntimeException(e);
       }
     }, "read lock2");
     readActions2.start();
@@ -231,12 +232,12 @@ public class ApplicationImplTest extends PlatformTestCase {
     Thread checkThread = new Thread(()->{
       try {
         assertFalse(ApplicationManager.getApplication().isDispatchThread());
-        while (!aboutToAcquireWrite.get());
-        while (!read1Acquired.get());
+        while (!aboutToAcquireWrite.get() && ok());
+        while (!read1Acquired.get() && ok());
         TimeoutUtil.sleep(2000); // make sure it called writelock
 
         long timeout = System.currentTimeMillis() + 10000;
-        while (System.currentTimeMillis() < timeout) {
+        while (System.currentTimeMillis() < timeout && ok()) {
           assertTrue(aboutToAcquireWrite.get());
           assertTrue(read1Acquired.get());
           assertFalse(read1Released.get());
@@ -250,10 +251,10 @@ public class ApplicationImplTest extends PlatformTestCase {
         }
 
         holdRead1.set(false);
-        while (!writeAcquired.get());
+        while (!writeAcquired.get() && ok());
 
         timeout = System.currentTimeMillis() + 10000;
-        while (System.currentTimeMillis() < timeout) {
+        while (System.currentTimeMillis() < timeout && ok()) {
           assertTrue(aboutToAcquireWrite.get());
           assertTrue(read1Acquired.get());
           assertTrue(read1Released.get());
@@ -267,11 +268,11 @@ public class ApplicationImplTest extends PlatformTestCase {
 
         holdWrite.set(false);
 
-        while (!read2Acquired.get());
+        while (!read2Acquired.get() && ok());
         TimeoutUtil.sleep(1000); // wait for immediate release of read lock2
 
         timeout = System.currentTimeMillis() + 10000;
-        while (System.currentTimeMillis() < timeout) {
+        while (System.currentTimeMillis() < timeout && ok()) {
           assertTrue(aboutToAcquireWrite.get());
           assertTrue(read1Acquired.get());
           assertTrue(read1Released.get());
@@ -281,9 +282,9 @@ public class ApplicationImplTest extends PlatformTestCase {
           assertTrue(writeReleased.get());
         }
       }
-      catch (Exception e) {
+      catch (Throwable e) {
         exception = e;
-        throw e;
+        throw new RuntimeException(e);
       }
     }, "check");
     checkThread.start();
@@ -293,7 +294,7 @@ public class ApplicationImplTest extends PlatformTestCase {
     try {
       System.out.println("write lock acquired");
       writeAcquired.set(true);
-      while (holdWrite.get() && exception == null);
+      while (holdWrite.get() && ok());
     }
     finally {
       lock.unlockWrite(stamp);
@@ -307,6 +308,12 @@ public class ApplicationImplTest extends PlatformTestCase {
     if (exception != null) throw exception;
   }
 
+  private static long timeOut;
+  private boolean ok() throws Throwable {
+    if (exception != null) throw exception;
+    return System.currentTimeMillis() < timeOut;
+  }
+
   public void testAppLockReadWritePreference() throws Throwable {
     // take read lock1.
     // try to take write lock - must wait (because of taken read lock)
@@ -330,7 +337,7 @@ public class ApplicationImplTest extends PlatformTestCase {
         try {
           System.out.println("read lock1 acquired");
           read1Acquired.set(true);
-          while (holdRead1.get());
+          while (holdRead1.get() && ok());
         }
         finally {
           stamp.finish();
@@ -338,20 +345,20 @@ public class ApplicationImplTest extends PlatformTestCase {
           System.out.println("read lock1 released");
         }
       }
-      catch (Exception e) {
+      catch (Throwable e) {
         exception = e;
-        throw e;
+        throw new RuntimeException(e);
       }
     }, "read lock1");
     readAction1.start();
 
-    while (!read1Acquired.get());
+    while (!read1Acquired.get() && ok());
     AtomicBoolean aboutToAcquireWrite = new AtomicBoolean();
     // readActions2 should try to acquire read action when write action is pending
     Thread readActions2 = new Thread(() -> {
       try {
         assertFalse(ApplicationManager.getApplication().isDispatchThread());
-        while (!aboutToAcquireWrite.get());
+        while (!aboutToAcquireWrite.get() && ok());
         TimeoutUtil.sleep(2000); // make sure it called writelock
         AccessToken stamp = application.acquireReadActionLock();
         try {
@@ -364,9 +371,9 @@ public class ApplicationImplTest extends PlatformTestCase {
           System.out.println("read lock2 released");
         }
       }
-      catch (Exception e) {
+      catch (Throwable e) {
         exception = e;
-        throw e;
+        throw new RuntimeException(e);
       }
     }, "read lock2");
     readActions2.start();
@@ -374,12 +381,12 @@ public class ApplicationImplTest extends PlatformTestCase {
     Thread checkThread = new Thread(()->{
       try {
         assertFalse(ApplicationManager.getApplication().isDispatchThread());
-        while (!aboutToAcquireWrite.get());
-        while (!read1Acquired.get());
+        while (!aboutToAcquireWrite.get() && ok());
+        while (!read1Acquired.get() && ok());
         TimeoutUtil.sleep(2000); // make sure it called writelock
 
         long timeout = System.currentTimeMillis() + 10000;
-        while (System.currentTimeMillis() < timeout) {
+        while (System.currentTimeMillis() < timeout && ok()) {
           assertTrue(aboutToAcquireWrite.get());
           assertTrue(read1Acquired.get());
           assertFalse(read1Released.get());
@@ -392,10 +399,10 @@ public class ApplicationImplTest extends PlatformTestCase {
         }
 
         holdRead1.set(false);
-        while (!writeAcquired.get());
+        while (!writeAcquired.get() && ok());
 
         timeout = System.currentTimeMillis() + 10000;
-        while (System.currentTimeMillis() < timeout) {
+        while (System.currentTimeMillis() < timeout && ok()) {
           assertTrue(aboutToAcquireWrite.get());
           assertTrue(read1Acquired.get());
           assertTrue(read1Released.get());
@@ -409,11 +416,11 @@ public class ApplicationImplTest extends PlatformTestCase {
 
         holdWrite.set(false);
 
-        while (!read2Acquired.get());
+        while (!read2Acquired.get() && ok());
         TimeoutUtil.sleep(1000); // wait for immediate release of read lock2
 
         timeout = System.currentTimeMillis() + 10000;
-        while (System.currentTimeMillis() < timeout) {
+        while (System.currentTimeMillis() < timeout && ok()) {
           assertTrue(aboutToAcquireWrite.get());
           assertTrue(read1Acquired.get());
           assertTrue(read1Released.get());
@@ -423,9 +430,9 @@ public class ApplicationImplTest extends PlatformTestCase {
           assertTrue(writeReleased.get());
         }
       }
-      catch (Exception e) {
+      catch (Throwable e) {
         exception = e;
-        throw e;
+        throw new RuntimeException(e);
       }
     }, "check");
     checkThread.start();
@@ -435,7 +442,7 @@ public class ApplicationImplTest extends PlatformTestCase {
     try {
       System.out.println("write lock acquired");
       writeAcquired.set(true);
-      while (holdWrite.get() && exception == null);
+      while (holdWrite.get()  && ok());
     }
     finally {
       stamp.finish();
@@ -462,10 +469,10 @@ public class ApplicationImplTest extends PlatformTestCase {
     final StringBuffer LOG = new StringBuffer();
     new Thread(() -> {
       try {
-        ApplicationManager.getApplication().runReadAction(() -> {
+        ApplicationManager.getApplication().runReadAction((ThrowableComputable<Object, Throwable>)() -> {
           LOG.append("inside read action\n");
           readStarted = true;
-          while (!tryingToStartWriteAction);
+          while (!tryingToStartWriteAction && ok());
           TimeoutUtil.sleep(100);
 
           for (int i = 0; i < anotherReadActionStarted.length; i++) {
@@ -490,7 +497,7 @@ public class ApplicationImplTest extends PlatformTestCase {
           }
 
           for (AtomicBoolean threadStarted : anotherThreadStarted) {
-            while (!threadStarted.get()) ;
+            while (!threadStarted.get() && ok()) ;
           }
           // now the other threads try to get read lock. we should not let them
           for (int i=0; i<10; i++) {
@@ -500,6 +507,7 @@ public class ApplicationImplTest extends PlatformTestCase {
             TimeoutUtil.sleep(20);
           }
           LOG.append("\nfinished read action");
+          return null;
         });
       }
       catch (Throwable e) {
@@ -508,7 +516,7 @@ public class ApplicationImplTest extends PlatformTestCase {
     }, "read").start();
 
 
-    while (!readStarted);
+    while (!readStarted && ok());
     tryingToStartWriteAction = true;
     LOG.append("\nwrite about to start");
     ApplicationManager.getApplication().runWriteAction(() -> {

From 1230a1efe6010ad2c264b184f518d6d7c31b0d43 Mon Sep 17 00:00:00 2001
From: Kirill Likhodedov <Kirill.Likhodedov@jetbrains.com>
Date: Thu, 24 Sep 2015 18:42:56 +0300
Subject: [PATCH 05/23] [git] simplify and fix NPE: use utility method
 returning boolean instead of overriding onCancel

---
 .../src/git4idea/commands/GitHandlerUtil.java  |  8 ++++----
 .../src/git4idea/ui/GitUnstashDialog.java      | 18 +++++++-----------
 2 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/plugins/git4idea/src/git4idea/commands/GitHandlerUtil.java b/plugins/git4idea/src/git4idea/commands/GitHandlerUtil.java
index a840249f1f89..a15bab7ca2f0 100644
--- a/plugins/git4idea/src/git4idea/commands/GitHandlerUtil.java
+++ b/plugins/git4idea/src/git4idea/commands/GitHandlerUtil.java
@@ -251,19 +251,19 @@ public class GitHandlerUtil {
     /**
      * a progress manager to use
      */
-    private final ProgressIndicator myProgressIndicator;
+    @Nullable private final ProgressIndicator myProgressIndicator;
 
     /**
      * A constructor
      *
-     * @param manager       the project manager
+     * @param indicator       the project manager
      * @param handler       a handler instance
      * @param operationName an operation name
      * @param showErrors    if true, the errors are shown when process is terminated
      */
-    public GitLineHandlerListenerProgress(final ProgressIndicator manager, GitHandler handler, String operationName, boolean showErrors) {
+    public GitLineHandlerListenerProgress(@Nullable ProgressIndicator indicator, GitHandler handler, String operationName, boolean showErrors) {
       super(handler, operationName, showErrors);    //To change body of overridden methods use File | Settings | File Templates.
-      myProgressIndicator = manager;
+      myProgressIndicator = indicator;
     }
 
     /**
diff --git a/plugins/git4idea/src/git4idea/ui/GitUnstashDialog.java b/plugins/git4idea/src/git4idea/ui/GitUnstashDialog.java
index dfc2d6bc9b38..ec5c56b37347 100644
--- a/plugins/git4idea/src/git4idea/ui/GitUnstashDialog.java
+++ b/plugins/git4idea/src/git4idea/ui/GitUnstashDialog.java
@@ -361,21 +361,17 @@ public class GitUnstashDialog extends DialogWrapper {
     AccessToken token = DvcsUtil.workingTreeChangeStarted(myProject);
     try {
       final Ref<GitCommandResult> result = Ref.create();
-      final Ref<Boolean> cancelled = Ref.create();
-      ProgressManager.getInstance().run(new Task.Modal(h.project(), GitBundle.getString("unstash.unstashing"), true) {
+      final ProgressManager progressManager = ProgressManager.getInstance();
+      boolean completed = progressManager.runProcessWithProgressSynchronously(new Runnable() {
         @Override
-        public void run(@NotNull final ProgressIndicator indicator) {
-          indicator.setIndeterminate(true);
-          h.addLineListener(new GitHandlerUtil.GitLineHandlerListenerProgress(indicator, h, "stash", false));
+        public void run() {
+          h.addLineListener(new GitHandlerUtil.GitLineHandlerListenerProgress(progressManager.getProgressIndicator(), h, "stash", false));
           Git git = ServiceManager.getService(Git.class);
           result.set(git.runCommand(new Computable.PredefinedValueComputable<GitLineHandler>(h)));
         }
-        @Override
-        public void onCancel() {
-          cancelled.set(true);
-        }
-      });
-      if (cancelled.get()) return;
+      }, GitBundle.getString("unstash.unstashing"), true, myProject);
+
+      if (!completed) return;
 
       ServiceManager.getService(myProject, GitPlatformFacade.class).hardRefresh(root);
       GitCommandResult res = result.get();

From 69af05f4e168edd1111cb3ae27f7848a4d07b96f Mon Sep 17 00:00:00 2001
From: Dmitry Avdeev <Dmitry.Avdeev@jetbrains.com>
Date: Thu, 24 Sep 2015 18:50:45 +0300
Subject: [PATCH 06/23] IDEA-145420 Shortcut has strange FG color in popup menu

---
 .../src/com/intellij/ide/ui/laf/darcula/darcula_mac.properties | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/darcula_mac.properties b/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/darcula_mac.properties
index 32f21a8df73c..463569a981c4 100644
--- a/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/darcula_mac.properties
+++ b/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/darcula_mac.properties
@@ -1,3 +1,4 @@
 # suppress inspection "UnusedProperty" for whole file
 darcula.selectionBackground=2F65CA
-Menu.arrowIcon=AllIcons.Mac.Tree_white_right_arrow
\ No newline at end of file
+Menu.arrowIcon=AllIcons.Mac.Tree_white_right_arrow
+MenuItem.acceleratorSelectionForeground=ffffff
\ No newline at end of file

From 6e6afdaa652d9cc2d376f5633872106f19e2750d Mon Sep 17 00:00:00 2001
From: Dmitry Batkovich <dmitry.batkovich@jetbrains.com>
Date: Thu, 24 Sep 2015 19:02:16 +0300
Subject: [PATCH 07/23] IDEA-51447 Help button in the structure tool window
 opens wrong page, when a *.properties file structure is shown.

---
 .../editor/PropertiesGroupingStructureViewComponent.java | 6 ------
 .../editor/ResourceBundleStructureViewComponent.java     | 9 ++++++---
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/plugins/properties/src/com/intellij/lang/properties/editor/PropertiesGroupingStructureViewComponent.java b/plugins/properties/src/com/intellij/lang/properties/editor/PropertiesGroupingStructureViewComponent.java
index 8993be097090..894c03e7ddde 100644
--- a/plugins/properties/src/com/intellij/lang/properties/editor/PropertiesGroupingStructureViewComponent.java
+++ b/plugins/properties/src/com/intellij/lang/properties/editor/PropertiesGroupingStructureViewComponent.java
@@ -24,7 +24,6 @@ import com.intellij.openapi.fileEditor.FileEditor;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.ui.Messages;
 import com.intellij.util.ArrayUtil;
-import org.jetbrains.annotations.NonNls;
 
 import java.util.LinkedHashSet;
 import java.util.Set;
@@ -138,10 +137,5 @@ public class PropertiesGroupingStructureViewComponent extends StructureViewCompo
       }
     }
   }
-
-  @NonNls
-  public String getHelpID() {
-    return "editing.propertyFile.bundleEditor";
-  }
 }
 
diff --git a/plugins/properties/src/com/intellij/lang/properties/editor/ResourceBundleStructureViewComponent.java b/plugins/properties/src/com/intellij/lang/properties/editor/ResourceBundleStructureViewComponent.java
index 435f0c3a8c86..9c36ee1fa648 100644
--- a/plugins/properties/src/com/intellij/lang/properties/editor/ResourceBundleStructureViewComponent.java
+++ b/plugins/properties/src/com/intellij/lang/properties/editor/ResourceBundleStructureViewComponent.java
@@ -29,12 +29,9 @@ import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.ide.CopyPasteManager;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.text.StringUtil;
-import com.intellij.pom.PomTargetPsiElement;
-import com.intellij.pom.references.PomService;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiFile;
 import com.intellij.psi.PsiNamedElement;
-import com.intellij.psi.PsiTarget;
 import com.intellij.psi.util.PsiUtilCore;
 import com.intellij.refactoring.safeDelete.SafeDeleteHandler;
 import com.intellij.ui.PopupHandler;
@@ -43,6 +40,7 @@ import com.intellij.usages.UsageView;
 import com.intellij.util.ArrayFactory;
 import com.intellij.util.NullableFunction;
 import com.intellij.util.containers.ContainerUtil;
+import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -235,5 +233,10 @@ public class ResourceBundleStructureViewComponent extends PropertiesGroupingStru
       return true;
     }
   }
+
+  @NonNls
+  public String getHelpID() {
+    return "editing.propertyFile.bundleEditor";
+  }
 }
 

From 9f59a40bee4a6fe516a077e8d038eb911c5ec70d Mon Sep 17 00:00:00 2001
From: Kirill Likhodedov <Kirill.Likhodedov@jetbrains.com>
Date: Thu, 24 Sep 2015 19:06:47 +0300
Subject: [PATCH 08/23] [git] don't close the 'add remote' dialog if validation
 is cancelled or fails

---
 .../git4idea/push/GitDefineRemoteDialog.java  | 60 ++++++++++++++++++-
 .../src/git4idea/push/GitPushTargetPanel.java | 39 +-----------
 2 files changed, 59 insertions(+), 40 deletions(-)

diff --git a/plugins/git4idea/src/git4idea/push/GitDefineRemoteDialog.java b/plugins/git4idea/src/git4idea/push/GitDefineRemoteDialog.java
index 989e73edb9fc..945a7b8db8e8 100644
--- a/plugins/git4idea/src/git4idea/push/GitDefineRemoteDialog.java
+++ b/plugins/git4idea/src/git4idea/push/GitDefineRemoteDialog.java
@@ -15,13 +15,22 @@
  */
 package git4idea.push;
 
-import com.intellij.openapi.project.Project;
+import com.intellij.openapi.diagnostic.Logger;
+import com.intellij.openapi.progress.ProcessCanceledException;
+import com.intellij.openapi.progress.ProgressManager;
 import com.intellij.openapi.ui.DialogWrapper;
+import com.intellij.openapi.ui.Messages;
+import com.intellij.openapi.util.ThrowableComputable;
 import com.intellij.openapi.util.text.StringUtil;
+import com.intellij.openapi.vfs.VfsUtilCore;
 import com.intellij.ui.components.JBLabel;
 import com.intellij.util.ui.GridBag;
 import com.intellij.util.ui.UIUtil;
+import git4idea.commands.Git;
+import git4idea.commands.GitCommandResult;
 import git4idea.repo.GitRemote;
+import git4idea.repo.GitRepository;
+import git4idea.validators.GitRefNameValidator;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -30,11 +39,18 @@ import java.awt.*;
 
 class GitDefineRemoteDialog extends DialogWrapper {
 
+  private static final Logger LOG = Logger.getInstance(GitDefineRemoteDialog.class);
+
+  @NotNull private final GitRepository myRepository;
+  @NotNull private final Git myGit;
+
   @NotNull private final JTextField myRemoteName;
   @NotNull private final JTextField myRemoteUrl;
 
-  GitDefineRemoteDialog(@NotNull Project project) {
-    super(project);
+  GitDefineRemoteDialog(@NotNull GitRepository repository, @NotNull Git git) {
+    super(repository.getProject());
+    myRepository = repository;
+    myGit = git;
     myRemoteName = new JTextField(GitRemote.ORIGIN_NAME, 20);
     myRemoteUrl = new JTextField(20);
     setTitle("Define Remote");
@@ -71,4 +87,42 @@ class GitDefineRemoteDialog extends DialogWrapper {
   public JComponent getPreferredFocusedComponent() {
     return myRemoteUrl;
   }
+
+  @Override
+  protected void doOKAction() {
+    try {
+      String name = getRemoteName();
+      String url = getRemoteUrl();
+      String error = validateRemoteUnderModal(name, url);
+      if (error != null) {
+        LOG.warn(String.format("Invalid remote. Name: [%s], URL: [%s], error: %s", name, url, error));
+        Messages.showErrorDialog(myRepository.getProject(), error, "Invalid Remote URL");
+      }
+      else {
+        super.doOKAction();
+      }
+    }
+    catch (ProcessCanceledException pce) {
+      // let the dialog stay open
+    }
+  }
+
+  @Nullable
+  private String validateRemoteUnderModal(final String name, final String url) {
+    if (url.isEmpty()) {
+      return "URL can't be empty";
+    }
+    if (!GitRefNameValidator.getInstance().checkInput(name)) {
+      return "Remote name is invalid";
+    }
+
+    return ProgressManager.getInstance().runProcessWithProgressSynchronously(new ThrowableComputable<String, ProcessCanceledException>() {
+      @Override
+      public String compute() throws ProcessCanceledException {
+        final GitCommandResult result = myGit.lsRemote(myRepository.getProject(), VfsUtilCore.virtualToIoFile(myRepository.getRoot()), url);
+        return !result.success() ? "Remote URL is invalid: " + result.getErrorOutputAsHtmlString() : null;
+      }
+    }, "Checking URL...", true, myRepository.getProject());
+  }
+
 }
diff --git a/plugins/git4idea/src/git4idea/push/GitPushTargetPanel.java b/plugins/git4idea/src/git4idea/push/GitPushTargetPanel.java
index ef36f95e59f6..fa0a7882b780 100644
--- a/plugins/git4idea/src/git4idea/push/GitPushTargetPanel.java
+++ b/plugins/git4idea/src/git4idea/push/GitPushTargetPanel.java
@@ -31,8 +31,6 @@ import com.intellij.openapi.ui.ValidationInfo;
 import com.intellij.openapi.ui.popup.ListPopup;
 import com.intellij.openapi.ui.popup.PopupStep;
 import com.intellij.openapi.ui.popup.util.BaseListPopupStep;
-import com.intellij.openapi.util.Ref;
-import com.intellij.openapi.vfs.VfsUtilCore;
 import com.intellij.openapi.wm.IdeFocusManager;
 import com.intellij.ui.ColoredTreeCellRenderer;
 import com.intellij.ui.SimpleTextAttributes;
@@ -47,7 +45,6 @@ import git4idea.commands.Git;
 import git4idea.commands.GitCommandResult;
 import git4idea.repo.GitRemote;
 import git4idea.repo.GitRepository;
-import git4idea.validators.GitRefNameValidator;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -162,44 +159,12 @@ public class GitPushTargetPanel extends PushTargetPanel<GitPushTarget> {
   }
 
   private void showDefineRemoteDialog() {
-    GitDefineRemoteDialog dialog = new GitDefineRemoteDialog(myRepository.getProject());
+    GitDefineRemoteDialog dialog = new GitDefineRemoteDialog(myRepository, myGit);
     if (dialog.showAndGet()) {
-      String name = dialog.getRemoteName();
-      String url = dialog.getRemoteUrl();
-      String error = validateRemoteUnderModal(name, url);
-      if (error != null) {
-        LOG.warn(String.format("Invalid remote. Name: [%s], URL: [%s], error: %s", name, url, error));
-        Messages.showErrorDialog(myRepository.getProject(), error, "Invalid Remote URL");
-      }
-      else {
-        addRemoteUnderModal(name, url);
-      }
+      addRemoteUnderModal(dialog.getRemoteName(), dialog.getRemoteUrl());
     }
   }
 
-  @Nullable
-  private String validateRemoteUnderModal(final String name, final String url) {
-    if (url.isEmpty()) {
-      return "URL can't be empty";
-    }
-    if (!GitRefNameValidator.getInstance().checkInput(name)) {
-      return "Remote name is invalid";
-    }
-
-    final Ref<String> error = Ref.create();
-    ProgressManager.getInstance().run(new Task.Modal(myRepository.getProject(), "Checking URL...", true) {
-      @Override
-      public void run(@NotNull ProgressIndicator indicator) {
-        indicator.setIndeterminate(true);
-        final GitCommandResult result = myGit.lsRemote(myRepository.getProject(), VfsUtilCore.virtualToIoFile(myRepository.getRoot()), url);
-        if (!result.success()) {
-          error.set("Remote URL is invalid: " + result.getErrorOutputAsHtmlString());
-        }
-      }
-    });
-    return error.get();
-  }
-
   private void addRemoteUnderModal(@NotNull final String remoteName, @NotNull final String remoteUrl) {
     ProgressManager.getInstance().run(new Task.Modal(myRepository.getProject(), "Adding remote...", true) {
       private GitCommandResult myResult;

From d94d0f404f2791f64b005a0b6a257333cfc64ba2 Mon Sep 17 00:00:00 2001
From: peter <peter@jetbrains.com>
Date: Thu, 24 Sep 2015 17:43:34 +0200
Subject: [PATCH 09/23] PsiFileImpl: fix race condition between AST and stub
 loading, which resulted in stub elements being not bound to AST

---
 .../intellij/psi/impl/source/PsiFileImpl.java | 21 +++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/platform/core-impl/src/com/intellij/psi/impl/source/PsiFileImpl.java b/platform/core-impl/src/com/intellij/psi/impl/source/PsiFileImpl.java
index d36d802a8008..93faaab938dd 100644
--- a/platform/core-impl/src/com/intellij/psi/impl/source/PsiFileImpl.java
+++ b/platform/core-impl/src/com/intellij/psi/impl/source/PsiFileImpl.java
@@ -186,15 +186,32 @@ public abstract class PsiFileImpl extends ElementBase implements PsiFileEx, PsiF
     FileElement treeElement = createFileElement(viewProvider.getContents());
     treeElement.setPsi(this);
 
-    final StubTree stub = derefStub();
-    List<Pair<StubBasedPsiElementBase, CompositeElement>> bindings = calcStubAstBindings(treeElement, cachedDocument, stub);
+    while (true) {
+      StubTree stub = derefStub();
+      List<Pair<StubBasedPsiElementBase, CompositeElement>> bindings = calcStubAstBindings(treeElement, cachedDocument, stub);
 
+      FileElement savedTree = ensureTreeElement(viewProvider, treeElement, stub, bindings);
+      if (savedTree != null) {
+        return savedTree;
+      }
+    }
+  }
+
+  @Nullable
+  private FileElement ensureTreeElement(@NotNull FileViewProvider viewProvider,
+                                        @NotNull FileElement treeElement,
+                                        @Nullable StubTree stub,
+                                        @NotNull List<Pair<StubBasedPsiElementBase, CompositeElement>> bindings) {
     synchronized (PsiLock.LOCK) {
       FileElement existing = derefTreeElement();
       if (existing != null) {
         return existing;
       }
 
+      if (stub != derefStub()) {
+        return null; // stub has been just loaded by another thread, it needs to be bound to AST
+      }
+
       if (stub != null) {
         treeElement.putUserData(STUB_TREE_IN_PARSED_TREE, new SoftReference<StubTree>(stub));
         putUserData(ObjectStubTree.LAST_STUB_TREE_HASH, stub.hashCode());

From ec78edbf02859c9d85ba6a4b77c40f987e76c7a5 Mon Sep 17 00:00:00 2001
From: Dmitry Avdeev <Dmitry.Avdeev@jetbrains.com>
Date: Thu, 24 Sep 2015 19:48:51 +0300
Subject: [PATCH 10/23] making myEntriesList access thread-safe

---
 .../fileEditor/impl/EditorHistoryManager.java | 40 +++++++++++--------
 1 file changed, 24 insertions(+), 16 deletions(-)

diff --git a/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/EditorHistoryManager.java b/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/EditorHistoryManager.java
index ed3ffcda0caa..117a3ed7fb5d 100644
--- a/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/EditorHistoryManager.java
+++ b/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/EditorHistoryManager.java
@@ -53,7 +53,7 @@ public final class EditorHistoryManager extends AbstractProjectComponent impleme
   /**
    * State corresponding to the most recent file is the last
    */
-  private final List<HistoryEntry> myEntriesList = Collections.synchronizedList(new ArrayList<HistoryEntry>());
+  private final List<HistoryEntry> myEntriesList = new ArrayList<HistoryEntry>();
 
   /**
    * Invoked by reflection
@@ -81,7 +81,7 @@ public final class EditorHistoryManager extends AbstractProjectComponent impleme
             //noinspection unchecked
             for (final Element e : (Iterable<Element>)children) {
               try {
-                myEntriesList.add(new HistoryEntry(myProject, e));
+                addEntry(new HistoryEntry(EditorHistoryManager.this.myProject, e));
               }
               catch (InvalidDataException e1) {
                 // OK here
@@ -100,6 +100,14 @@ public final class EditorHistoryManager extends AbstractProjectComponent impleme
     );
   }
 
+  private synchronized void addEntry(HistoryEntry entry) {
+    myEntriesList.add(entry);
+  }
+
+  private synchronized void removeEntry(HistoryEntry entry) {
+    myEntriesList.remove(entry);
+  }
+
   @Override
   @NotNull
   public String getComponentName(){
@@ -145,8 +153,8 @@ public final class EditorHistoryManager extends AbstractProjectComponent impleme
 
     final HistoryEntry entry = getEntry(file);
     if(entry != null){
-      myEntriesList.remove(entry);
-      myEntriesList.add(entry);
+      removeEntry(entry);
+      addEntry(entry);
     }
     else {
       final FileEditorState[] states=new FileEditorState[editors.length];
@@ -157,7 +165,7 @@ public final class EditorHistoryManager extends AbstractProjectComponent impleme
         providers[i] = provider;
         states[i] = editors[i].getState(FileEditorStateLevel.FULL);
       }
-      myEntriesList.add(new HistoryEntry(file, providers, states, providers[selectedProviderIndex]));
+      addEntry(new HistoryEntry(file, providers, states, providers[selectedProviderIndex]));
       trimToSize();
     }
   }
@@ -222,8 +230,8 @@ public final class EditorHistoryManager extends AbstractProjectComponent impleme
       LOG.assertTrue(entry.mySelectedProvider != null);
 
       if(changeEntryOrderOnly){
-        myEntriesList.remove(entry);
-        myEntriesList.add(entry);
+        removeEntry(entry);
+        addEntry(entry);
       }
     }
   }
@@ -231,7 +239,7 @@ public final class EditorHistoryManager extends AbstractProjectComponent impleme
   /**
    * Removes all entries that correspond to invalid files
    */
-  private void validateEntries(){
+  private synchronized void validateEntries(){
     for(int i=myEntriesList.size()-1; i>=0; i--){
       final HistoryEntry entry = myEntriesList.get(i);
       if(!entry.myFile.isValid()){
@@ -243,7 +251,7 @@ public final class EditorHistoryManager extends AbstractProjectComponent impleme
   /**
    * @return array of valid files that are in the history, oldest first. May contain duplicates.
    */
-  public VirtualFile[] getFiles(){
+  public synchronized VirtualFile[] getFiles(){
     validateEntries();
     final VirtualFile[] result = new VirtualFile[myEntriesList.size()];
     for(int i=myEntriesList.size()-1; i>=0 ;i--){
@@ -265,7 +273,7 @@ public final class EditorHistoryManager extends AbstractProjectComponent impleme
     return result;
   }
 
-  public boolean hasBeenOpen(@NotNull VirtualFile f) {
+  public synchronized boolean hasBeenOpen(@NotNull VirtualFile f) {
     for (HistoryEntry each : myEntriesList) {
       if (Comparing.equal(each.myFile, f)) return true;
     }
@@ -276,13 +284,13 @@ public final class EditorHistoryManager extends AbstractProjectComponent impleme
    * Removes specified <code>file</code> from history. The method does
    * nothing if <code>file</code> is not in the history.
    *
-   * @exception java.lang.IllegalArgumentException if <code>file</code>
+   * @exception IllegalArgumentException if <code>file</code>
    * is <code>null</code>
    */
-  public void removeFile(@NotNull final VirtualFile file){
+  public synchronized void removeFile(@NotNull final VirtualFile file){
     final HistoryEntry entry = getEntry(file);
     if(entry != null){
-      myEntriesList.remove(entry);
+      removeEntry(entry);
     }
   }
 
@@ -301,7 +309,7 @@ public final class EditorHistoryManager extends AbstractProjectComponent impleme
     return entry != null ? entry.mySelectedProvider : null;
   }
 
-  private HistoryEntry getEntry(@NotNull VirtualFile file){
+  private synchronized HistoryEntry getEntry(@NotNull VirtualFile file){
     validateEntries();
     for (int i = myEntriesList.size() - 1; i >= 0; i--) {
       final HistoryEntry entry = myEntriesList.get(i);
@@ -316,7 +324,7 @@ public final class EditorHistoryManager extends AbstractProjectComponent impleme
    * If total number of files in history more then <code>UISettings.RECENT_FILES_LIMIT</code>
    * then removes the oldest ones to fit the history to new size.
    */
-  private void trimToSize(){
+  private synchronized void trimToSize(){
     final int limit = UISettings.getInstance().RECENT_FILES_LIMIT + 1;
     while(myEntriesList.size()>limit){
       myEntriesList.remove(0);
@@ -332,7 +340,7 @@ public final class EditorHistoryManager extends AbstractProjectComponent impleme
   }
 
   @Override
-  public void writeExternal(final Element element){
+  public synchronized void writeExternal(final Element element){
     // update history before saving
     final VirtualFile[] openFiles = FileEditorManager.getInstance(myProject).getOpenFiles();
     for (int i = openFiles.length - 1; i >= 0; i--) {

From 1bdc9a2ceb6145b0018c40c78d5e0de0350c09ca Mon Sep 17 00:00:00 2001
From: Anna Kozlova <anna.kozlova@jetbrains.com>
Date: Thu, 24 Sep 2015 13:40:19 +0300
Subject: [PATCH 11/23] ensure drop target/sources survived commitAllDocuments
 (following IDEA-CR-5169)

---
 .../ide/projectView/impl/ProjectViewDropTarget.java         | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/platform/lang-impl/src/com/intellij/ide/projectView/impl/ProjectViewDropTarget.java b/platform/lang-impl/src/com/intellij/ide/projectView/impl/ProjectViewDropTarget.java
index 56b0d63fa5a1..1e4593f2343d 100644
--- a/platform/lang-impl/src/com/intellij/ide/projectView/impl/ProjectViewDropTarget.java
+++ b/platform/lang-impl/src/com/intellij/ide/projectView/impl/ProjectViewDropTarget.java
@@ -318,6 +318,12 @@ class ProjectViewDropTarget implements DnDNativeTarget {
       final Module module = getModule(targetNode);
       final DataContext dataContext = DataManager.getInstance().getDataContext(myTree);
       PsiDocumentManager.getInstance(myProject).commitAllDocuments();
+
+      if (!targetElement.isValid()) return;
+      for (PsiElement sourceElement : sourceElements) {
+        if (!sourceElement.isValid()) return;
+      }
+
       getActionHandler().invoke(myProject, sourceElements, new DataContext() {
         @Override
         @Nullable

From 882cff938442ca99c4078627267014e416b6a38e Mon Sep 17 00:00:00 2001
From: Anna Kozlova <anna.kozlova@jetbrains.com>
Date: Thu, 24 Sep 2015 14:02:29 +0300
Subject: [PATCH 12/23] ensure valid containing class; cache number of
 constructors EA-65064 - PIEAE: StubBasedPsiElementBase.getContainingFile

---
 .../quickfix/CreateConstructorParameterFromFieldFix.java    | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateConstructorParameterFromFieldFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateConstructorParameterFromFieldFix.java
index 64c7f351753d..6069486d38c9 100644
--- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateConstructorParameterFromFieldFix.java
+++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateConstructorParameterFromFieldFix.java
@@ -57,19 +57,21 @@ public class CreateConstructorParameterFromFieldFix implements IntentionAction {
 
   private final SmartPsiElementPointer<PsiField> myField;
   private final PsiClass myClass;
+  private int myConstructorsLength;
 
   public CreateConstructorParameterFromFieldFix(@NotNull PsiField field) {
     myClass = field.getContainingClass();
     myField = SmartPointerManager.getInstance(field.getProject()).createSmartPsiElementPointer(field);
     if (myClass != null) {
       getFieldsToFix().add(myField);
+      myConstructorsLength = myClass.getConstructors().length;
     }
   }
 
   @Override
   @NotNull
   public String getText() {
-    if (getFieldsToFix().size() > 1 && myClass.getConstructors().length <= 1) return "Add constructor parameters";
+    if (getFieldsToFix().size() > 1 && myConstructorsLength <= 1) return "Add constructor parameters";
     return QuickFixBundle.message("add.constructor.parameter.name");
   }
 
@@ -81,7 +83,7 @@ public class CreateConstructorParameterFromFieldFix implements IntentionAction {
 
   @Override
   public boolean isAvailable(@NotNull Project project, Editor editor, PsiFile file) {
-    return isAvailable(getField());
+    return (myClass == null || myClass.isValid()) && isAvailable(getField());
   }
 
   private static boolean isAvailable(PsiField field) {

From 9ebe7c76c99f9135324adf50a919fe3f8554c236 Mon Sep 17 00:00:00 2001
From: Anna Kozlova <anna.kozlova@jetbrains.com>
Date: Thu, 24 Sep 2015 16:17:48 +0300
Subject: [PATCH 13/23] unused library: bind parameter modifier lists with
 annotation classes (IDEA-145186)

---
 .../codeInspection/reference/RefJavaManagerImpl.java     | 6 ++++++
 .../codeInspection/reference/RefParameterImpl.java       | 9 +++++++++
 .../unusedLibrary/usedInParameterAnnotation/expected.xml | 3 +++
 .../usedInParameterAnnotation/src/MyTest.java            | 4 ++++
 .../codeInspection/UnusedLibraryInspectionTest.java      | 1 +
 5 files changed, 23 insertions(+)
 create mode 100644 java/java-tests/testData/inspection/unusedLibrary/usedInParameterAnnotation/expected.xml
 create mode 100644 java/java-tests/testData/inspection/unusedLibrary/usedInParameterAnnotation/src/MyTest.java

diff --git a/java/java-analysis-impl/src/com/intellij/codeInspection/reference/RefJavaManagerImpl.java b/java/java-analysis-impl/src/com/intellij/codeInspection/reference/RefJavaManagerImpl.java
index 8fe745ca59b6..f1a0f269f7bb 100644
--- a/java/java-analysis-impl/src/com/intellij/codeInspection/reference/RefJavaManagerImpl.java
+++ b/java/java-analysis-impl/src/com/intellij/codeInspection/reference/RefJavaManagerImpl.java
@@ -493,6 +493,12 @@ public class RefJavaManagerImpl extends RefJavaManager {
     public void visitVariable(PsiVariable variable) {
       super.visitVariable(variable);
       myRefUtil.addTypeReference(variable, variable.getType(), myRefManager);
+      if (variable instanceof PsiParameter) {
+        final RefElement reference = myRefManager.getReference(variable);
+        if (reference instanceof RefParameterImpl) {
+          ((RefParameterImpl)reference).buildReferences();
+        }
+      }
     }
 
     @Override
diff --git a/java/java-analysis-impl/src/com/intellij/codeInspection/reference/RefParameterImpl.java b/java/java-analysis-impl/src/com/intellij/codeInspection/reference/RefParameterImpl.java
index f33145fa070e..cef4ea166238 100644
--- a/java/java-analysis-impl/src/com/intellij/codeInspection/reference/RefParameterImpl.java
+++ b/java/java-analysis-impl/src/com/intellij/codeInspection/reference/RefParameterImpl.java
@@ -102,6 +102,15 @@ public class RefParameterImpl extends RefJavaElementImpl implements RefParameter
     return myIndex;
   }
 
+  @Override
+  public void buildReferences() {
+    final RefJavaUtil refUtil = RefJavaUtil.getInstance();
+    final PsiParameter parameter = getElement();
+    if (parameter != null) {
+      refUtil.addReferences(parameter, this, parameter.getModifierList());
+    }
+  }
+
   public void updateTemplateValue(PsiExpression expression) {
     if (myActualValueTemplate == null) return;
 
diff --git a/java/java-tests/testData/inspection/unusedLibrary/usedInParameterAnnotation/expected.xml b/java/java-tests/testData/inspection/unusedLibrary/usedInParameterAnnotation/expected.xml
new file mode 100644
index 000000000000..ec272abeaa3a
--- /dev/null
+++ b/java/java-tests/testData/inspection/unusedLibrary/usedInParameterAnnotation/expected.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<problems/>
+
diff --git a/java/java-tests/testData/inspection/unusedLibrary/usedInParameterAnnotation/src/MyTest.java b/java/java-tests/testData/inspection/unusedLibrary/usedInParameterAnnotation/src/MyTest.java
new file mode 100644
index 000000000000..a82545d98af3
--- /dev/null
+++ b/java/java-tests/testData/inspection/unusedLibrary/usedInParameterAnnotation/src/MyTest.java
@@ -0,0 +1,4 @@
+import junit.framework.TestCase;
+public class MyTest {
+  public static void main(@TestCase String[] args) {}
+}
diff --git a/java/java-tests/testSrc/com/intellij/codeInspection/UnusedLibraryInspectionTest.java b/java/java-tests/testSrc/com/intellij/codeInspection/UnusedLibraryInspectionTest.java
index 7409e200e86a..a06593a2f9cd 100644
--- a/java/java-tests/testSrc/com/intellij/codeInspection/UnusedLibraryInspectionTest.java
+++ b/java/java-tests/testSrc/com/intellij/codeInspection/UnusedLibraryInspectionTest.java
@@ -65,4 +65,5 @@ public class UnusedLibraryInspectionTest extends InspectionTestCase {
   public void testSimple() throws Exception { doTest(); }
   public void testUsedJunit() throws Exception { doTest(); }
   public void testUsedJunitFromField() throws Exception { doTest(); }
+  public void testUsedInParameterAnnotation() throws Exception { doTest(); }
 }

From e63ff426db4dda214e94a5b16464a4f644409515 Mon Sep 17 00:00:00 2001
From: Anna Kozlova <anna.kozlova@jetbrains.com>
Date: Thu, 24 Sep 2015 17:39:56 +0300
Subject: [PATCH 14/23] sm runner: ensure cached children switch performs for
 each suite change

---
 .../sm/runner/GeneralToSMTRunnerEventsConvertor.java            | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/platform/smRunner/src/com/intellij/execution/testframework/sm/runner/GeneralToSMTRunnerEventsConvertor.java b/platform/smRunner/src/com/intellij/execution/testframework/sm/runner/GeneralToSMTRunnerEventsConvertor.java
index dac259da1dac..0b0bea6cac7c 100644
--- a/platform/smRunner/src/com/intellij/execution/testframework/sm/runner/GeneralToSMTRunnerEventsConvertor.java
+++ b/platform/smRunner/src/com/intellij/execution/testframework/sm/runner/GeneralToSMTRunnerEventsConvertor.java
@@ -332,6 +332,7 @@ public class GeneralToSMTRunnerEventsConvertor extends GeneralTestEventsProcesso
         if (mySuite != null) {
           mySuite.setFinished();
           myCurrentChildren.clear();
+          myGetChildren = true;
 
           //fire events
           fireOnSuiteFinished(mySuite);
@@ -520,6 +521,7 @@ public class GeneralToSMTRunnerEventsConvertor extends GeneralTestEventsProcesso
     // current suite shouldn't be null otherwise test runner isn't correct
     // or may be we are in debug mode
     logProblem("Current suite is undefined. Root suite will be used.");
+    myGetChildren = true;
     return myTestsRootNode;
 
   }

From df9e5dd53328dde53509f1c1cfbb4cb3f8dec1ff Mon Sep 17 00:00:00 2001
From: Anna Kozlova <anna.kozlova@jetbrains.com>
Date: Thu, 24 Sep 2015 18:54:42 +0300
Subject: [PATCH 15/23] isEnabledOnElement: reject vetoed elements

---
 .../intellij/refactoring/actions/RenameElementAction.java    | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/platform/lang-impl/src/com/intellij/refactoring/actions/RenameElementAction.java b/platform/lang-impl/src/com/intellij/refactoring/actions/RenameElementAction.java
index 929d7090016c..efe8f3fb8f28 100644
--- a/platform/lang-impl/src/com/intellij/refactoring/actions/RenameElementAction.java
+++ b/platform/lang-impl/src/com/intellij/refactoring/actions/RenameElementAction.java
@@ -24,6 +24,7 @@ import com.intellij.psi.PsiFile;
 import com.intellij.psi.PsiNamedElement;
 import com.intellij.psi.SyntheticElement;
 import com.intellij.refactoring.RefactoringActionHandler;
+import com.intellij.refactoring.rename.PsiElementRenameHandler;
 import com.intellij.refactoring.rename.RenameHandlerRegistry;
 import org.jetbrains.annotations.NotNull;
 
@@ -43,7 +44,9 @@ public class RenameElementAction extends BaseRefactoringAction {
     if (elements.length != 1) return false;
 
     PsiElement element = elements[0];
-    return element instanceof PsiNamedElement && !(element instanceof SyntheticElement);
+    return element instanceof PsiNamedElement &&
+           !(element instanceof SyntheticElement) && 
+           !PsiElementRenameHandler.isVetoed(element);
   }
 
   @Override

From 7d92ec966ff63aad2a019608f4c106d025954f43 Mon Sep 17 00:00:00 2001
From: Anna Kozlova <anna.kozlova@jetbrains.com>
Date: Thu, 24 Sep 2015 19:20:59 +0300
Subject: [PATCH 16/23] new overload resolution: reject candidates with
 applicability level less than asked (IDEA-145505)

---
 .../tree/java/MethodReferenceResolver.java    | 12 ++++++++--
 ...CandidatesWithLowerApplicabilityLevel.java | 23 +++++++++++++++++++
 .../daemon/lambda/OverloadResolutionTest.java |  4 ++++
 3 files changed, 37 insertions(+), 2 deletions(-)
 create mode 100644 java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/overloadResolution/IgnoreCandidatesWithLowerApplicabilityLevel.java

diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/MethodReferenceResolver.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/MethodReferenceResolver.java
index 5f29f99f08c4..01c10792b904 100644
--- a/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/MethodReferenceResolver.java
+++ b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/MethodReferenceResolver.java
@@ -272,11 +272,19 @@ public class MethodReferenceResolver implements ResolveCache.PolyVariantContextR
 
     private boolean resolveConflicts(List<CandidateInfo> firstCandidates, List<CandidateInfo> secondCandidates, int applicabilityLevel) {
 
-      checkApplicability(firstCandidates);
+      final int firstApplicability = checkApplicability(firstCandidates);
       checkSpecifics(firstCandidates, applicabilityLevel, myLanguageLevel);
 
-      checkApplicability(secondCandidates);
+      final int secondApplicability = checkApplicability(secondCandidates);
       checkSpecifics(secondCandidates, applicabilityLevel, myLanguageLevel);
+      
+      if (firstApplicability < secondApplicability) {
+        return secondCandidates.size() == 1;
+      }
+      
+      if (secondApplicability < firstApplicability) {
+        return firstCandidates.size() == 1;
+      }
 
       return firstCandidates.size() + secondCandidates.size() == 1;
     }
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/overloadResolution/IgnoreCandidatesWithLowerApplicabilityLevel.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/overloadResolution/IgnoreCandidatesWithLowerApplicabilityLevel.java
new file mode 100644
index 000000000000..0e95d4b327d7
--- /dev/null
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/overloadResolution/IgnoreCandidatesWithLowerApplicabilityLevel.java
@@ -0,0 +1,23 @@
+import java.util.function.BiConsumer;
+
+class MyTest<T> {
+
+  {
+    BiConsumer<Builder<T>, T> builderTBiConsumer  = Builder::add;
+    BiConsumer<Builder<T>, T> builderTBiConsumer1 = Builder<T>::add;
+
+    System.out.println(builderTBiConsumer);
+    System.out.println(builderTBiConsumer1);
+  }
+
+  public static class Builder<E> {
+
+    public Builder<E> add(E element) {
+      return this;
+    }
+
+    public Builder<E> add(E... elements) {
+      return this;
+    }
+  }
+}
\ No newline at end of file
diff --git a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/lambda/OverloadResolutionTest.java b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/lambda/OverloadResolutionTest.java
index 395830cf8117..7b11e93b5cba 100644
--- a/java/java-tests/testSrc/com/intellij/codeInsight/daemon/lambda/OverloadResolutionTest.java
+++ b/java/java-tests/testSrc/com/intellij/codeInsight/daemon/lambda/OverloadResolutionTest.java
@@ -146,6 +146,10 @@ public class OverloadResolutionTest extends LightDaemonAnalyzerTestCase {
     doTest();
   }
 
+  public void testIgnoreCandidatesWithLowerApplicabilityLevel() throws Exception {
+    doTest();
+  }
+
   private void doTest() {
     doTest(true);
   }

From e8162a75c63c3d78273e61665b95150573623948 Mon Sep 17 00:00:00 2001
From: Anna Kozlova <anna.kozlova@jetbrains.com>
Date: Thu, 24 Sep 2015 19:50:12 +0300
Subject: [PATCH 17/23] remove separate testDiscoveryInstrumenter.jar

---
 build/scripts/libLicenses.gant    |   1 -
 lib/required_for_dist.txt         |   1 -
 lib/testDiscoveryInstrumenter.jar | Bin 23538 -> 0 bytes
 3 files changed, 2 deletions(-)
 delete mode 100644 lib/testDiscoveryInstrumenter.jar

diff --git a/build/scripts/libLicenses.gant b/build/scripts/libLicenses.gant
index 7867afb48412..3007b785c02e 100644
--- a/build/scripts/libLicenses.gant
+++ b/build/scripts/libLicenses.gant
@@ -312,4 +312,3 @@ jetbrainsLibrary("Maven Embedder")
 jetbrainsLibrary("tcServiceMessages")
 jetbrainsLibrary("optimizedFileManager.jar")
 jetbrainsLibrary("KotlinJavaRuntime")
-jetbrainsLibrary("testDiscoveryInstrumenter.jar")
diff --git a/lib/required_for_dist.txt b/lib/required_for_dist.txt
index 54da6b0d7355..9b124ae26c65 100644
--- a/lib/required_for_dist.txt
+++ b/lib/required_for_dist.txt
@@ -66,7 +66,6 @@ snappy-in-java-0.3.1.jar
 swingx-core-1.6.2.jar
 slf4j-api-1.7.10.jar
 slf4j-log4j12-1.7.10.jar
-testDiscoveryInstrumenter.jar
 trove4j.jar
 velocity.jar
 winp-1.23.jar
diff --git a/lib/testDiscoveryInstrumenter.jar b/lib/testDiscoveryInstrumenter.jar
deleted file mode 100644
index 00e07bacc2eddbcabd6adc7e022e7b27216537fb..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 23538
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


From ae204ca8ceadcc354bd0455265fdfbb6fab0a3c3 Mon Sep 17 00:00:00 2001
From: peter <peter@jetbrains.com>
Date: Thu, 24 Sep 2015 18:26:57 +0200
Subject: [PATCH 18/23] use getLastCommittedDocument a bit

---
 .../codeInsight/daemon/impl/JavaLineMarkerProvider.java         | 2 +-
 .../plugins/groovy/codeInsight/GroovyLineMarkerProvider.java    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/JavaLineMarkerProvider.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/JavaLineMarkerProvider.java
index 969d542a8d38..869a6d65d02f 100644
--- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/JavaLineMarkerProvider.java
+++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/JavaLineMarkerProvider.java
@@ -95,7 +95,7 @@ public class JavaLineMarkerProvider implements LineMarkerProvider {
       }
       if (isMember && !(element1 instanceof PsiAnonymousClass || element1.getParent() instanceof PsiAnonymousClass)) {
         PsiFile file = element1.getContainingFile();
-        Document document = file == null ? null : PsiDocumentManager.getInstance(file.getProject()).getDocument(file);
+        Document document = file == null ? null : PsiDocumentManager.getInstance(file.getProject()).getLastCommittedDocument(file);
         boolean drawSeparator = false;
 
         if (document != null) {
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/codeInsight/GroovyLineMarkerProvider.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/codeInsight/GroovyLineMarkerProvider.java
index db2212dd4682..f5e1a04c79df 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/codeInsight/GroovyLineMarkerProvider.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/codeInsight/GroovyLineMarkerProvider.java
@@ -116,7 +116,7 @@ public class GroovyLineMarkerProvider implements LineMarkerProvider {
       }
       if (isMember && !(element1 instanceof PsiAnonymousClass || element1.getParent() instanceof PsiAnonymousClass)) {
         PsiFile file = element1.getContainingFile();
-        Document document = file == null ? null : PsiDocumentManager.getInstance(file.getProject()).getDocument(file);
+        Document document = file == null ? null : PsiDocumentManager.getInstance(file.getProject()).getLastCommittedDocument(file);
         boolean drawSeparator = false;
         if (document != null) {
           CharSequence documentChars = document.getCharsSequence();

From 444c67265947bc454dedc376ea20fcfd1ead7e6e Mon Sep 17 00:00:00 2001
From: Sergey Malenkov <sergey.malenkov@jetbrains.com>
Date: Thu, 24 Sep 2015 20:49:48 +0300
Subject: [PATCH 19/23] fix painting of hidden border in DarculaComboBoxUI

---
 .../com/intellij/ide/ui/laf/darcula/ui/DarculaComboBoxUI.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/ui/DarculaComboBoxUI.java b/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/ui/DarculaComboBoxUI.java
index 37ed4123f72b..fbcc47eb235f 100644
--- a/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/ui/DarculaComboBoxUI.java
+++ b/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/ui/DarculaComboBoxUI.java
@@ -378,7 +378,7 @@ public class DarculaComboBoxUI extends BasicComboBoxUI implements Border {
         g.setColor(getArrowButtonFillColor(getBorderColor()));
         final Shape clip = g.getClip();
         final int offX = xxx + JBUI.scale(5);
-        g.setClip(offX, y, width - offX, height);
+        g.clipRect(offX, y, width - offX, height);
         g.drawRoundRect(JBUI.scale(1), JBUI.scale(1), width - JBUI.scale(2), height - JBUI.scale(2), R, R);
         g.setClip(clip);
       }

From 98b0fd4b7e05d6824bc4d075cdeb8463015cd19e Mon Sep 17 00:00:00 2001
From: "Egor.Ushakov" <egor.ushakov@jetbrains.com>
Date: Thu, 24 Sep 2015 16:21:54 +0300
Subject: [PATCH 20/23] reasonable toString

---
 .../src/com/intellij/debugger/engine/JavaExecutionStack.java | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/java/debugger/impl/src/com/intellij/debugger/engine/JavaExecutionStack.java b/java/debugger/impl/src/com/intellij/debugger/engine/JavaExecutionStack.java
index cb145df147dd..4f234ad2fbcc 100644
--- a/java/debugger/impl/src/com/intellij/debugger/engine/JavaExecutionStack.java
+++ b/java/debugger/impl/src/com/intellij/debugger/engine/JavaExecutionStack.java
@@ -217,4 +217,9 @@ public class JavaExecutionStack extends XExecutionStack {
   public int hashCode() {
     return myThreadProxy.hashCode();
   }
+
+  @Override
+  public String toString() {
+    return getDisplayName();
+  }
 }

From 190b8fa7728ef9af0e94246aae10095ce9908499 Mon Sep 17 00:00:00 2001
From: "Egor.Ushakov" <egor.ushakov@jetbrains.com>
Date: Thu, 24 Sep 2015 20:52:16 +0300
Subject: [PATCH 21/23] IDEA-63378 Switching threads should be optional, not
 forced - correctly show stepping threads in running state

---
 .../debugger/engine/DebugProcessEvents.java   |  1 +
 .../debugger/engine/JavaDebugProcess.java     | 20 ++++++-
 .../debugger/engine/JavaExecutionStack.java   |  5 +-
 .../debugger/engine/JavaStackFrame.java       |  2 +-
 .../debugger/engine/SuspendContextImpl.java   | 14 +++--
 .../debugger/engine/SuspendManagerImpl.java   |  9 +--
 .../debugger/impl/DebuggerContextImpl.java    |  1 -
 .../debugger/impl/DebuggerSession.java        | 58 ++++++++++++-------
 .../debugger/impl/ReloadClassesWorker.java    |  2 +-
 .../debugger/jdi/StackFrameProxyImpl.java     |  1 +
 .../xdebugger/impl/XDebugSessionImpl.java     |  4 ++
 .../src/messages/DebuggerBundle.properties    |  1 +
 12 files changed, 76 insertions(+), 42 deletions(-)

diff --git a/java/debugger/impl/src/com/intellij/debugger/engine/DebugProcessEvents.java b/java/debugger/impl/src/com/intellij/debugger/engine/DebugProcessEvents.java
index 701eec904a61..df4c905f42c2 100644
--- a/java/debugger/impl/src/com/intellij/debugger/engine/DebugProcessEvents.java
+++ b/java/debugger/impl/src/com/intellij/debugger/engine/DebugProcessEvents.java
@@ -416,6 +416,7 @@ public class DebugProcessEvents extends DebugProcessImpl {
       final int nextStepDepth = hint.getNextStepDepth(suspendContext);
       if (nextStepDepth == RequestHint.RESUME) {
         getSession().resetIgnoreStepFiltersFlag();
+        getSession().clearSteppingThrough();
         shouldResume = true;
       }
       else if (nextStepDepth != RequestHint.STOP) {
diff --git a/java/debugger/impl/src/com/intellij/debugger/engine/JavaDebugProcess.java b/java/debugger/impl/src/com/intellij/debugger/engine/JavaDebugProcess.java
index 9b9a571463e3..1b499e146afe 100644
--- a/java/debugger/impl/src/com/intellij/debugger/engine/JavaDebugProcess.java
+++ b/java/debugger/impl/src/com/intellij/debugger/engine/JavaDebugProcess.java
@@ -40,6 +40,7 @@ import com.intellij.icons.AllIcons;
 import com.intellij.openapi.actionSystem.*;
 import com.intellij.openapi.extensions.Extensions;
 import com.intellij.openapi.project.Project;
+import com.intellij.openapi.util.Comparing;
 import com.intellij.openapi.util.Disposer;
 import com.intellij.openapi.util.Pair;
 import com.intellij.openapi.vfs.VirtualFile;
@@ -106,7 +107,7 @@ public class JavaDebugProcess extends XDebugProcess {
             || event == DebuggerSession.Event.REFRESH
                && myJavaSession.isPaused()) {
           final SuspendContextImpl newSuspendContext = newContext.getSuspendContext();
-          if (newSuspendContext != null && newSuspendContext != getSession().getSuspendContext()) {
+          if (newSuspendContext != null && shouldApplyContext(newContext)) {
             process.getManagerThread().schedule(new SuspendContextCommandImpl(newSuspendContext) {
               @Override
               public void contextAction() throws Exception {
@@ -119,10 +120,12 @@ public class JavaDebugProcess extends XDebugProcess {
                   XBreakpoint xBreakpoint = breakpoint.getXBreakpoint();
                   if (xBreakpoint != null) {
                     ((XDebugSessionImpl)getSession()).breakpointReachedNoProcessing(xBreakpoint, newSuspendContext);
+                    unsetPausedIfNeeded(newContext);
                     return;
                   }
                 }
                 getSession().positionReached(newSuspendContext);
+                unsetPausedIfNeeded(newContext);
               }
             });
           }
@@ -181,6 +184,21 @@ public class JavaDebugProcess extends XDebugProcess {
     });
   }
 
+  private void unsetPausedIfNeeded(DebuggerContextImpl context) {
+    SuspendContextImpl suspendContext = context.getSuspendContext();
+    if (suspendContext != null && context.getThreadProxy() != suspendContext.getThread()) {
+      ((XDebugSessionImpl)getSession()).unsetPaused();
+    }
+  }
+
+  private boolean shouldApplyContext(DebuggerContextImpl context) {
+    SuspendContextImpl suspendContext = context.getSuspendContext();
+    SuspendContextImpl currentContext = (SuspendContextImpl)getSession().getSuspendContext();
+    if (suspendContext != null && !suspendContext.equals(currentContext)) return true;
+    JavaExecutionStack currentExecutionStack = currentContext != null ? currentContext.getActiveExecutionStack() : null;
+    return currentExecutionStack == null || !Comparing.equal(context.getThreadProxy(), currentExecutionStack.getThreadProxy());
+  }
+
   public void saveNodeHistory() {
     saveNodeHistory(getDebuggerStateManager().getContext().getFrameProxy());
   }
diff --git a/java/debugger/impl/src/com/intellij/debugger/engine/JavaExecutionStack.java b/java/debugger/impl/src/com/intellij/debugger/engine/JavaExecutionStack.java
index 4f234ad2fbcc..b0d8d3e6539d 100644
--- a/java/debugger/impl/src/com/intellij/debugger/engine/JavaExecutionStack.java
+++ b/java/debugger/impl/src/com/intellij/debugger/engine/JavaExecutionStack.java
@@ -48,14 +48,11 @@ public class JavaExecutionStack extends XExecutionStack {
     super(calcRepresentation(threadProxy), calcIcon(threadProxy, current));
     myThreadProxy = threadProxy;
     myDebugProcess = debugProcess;
-    if (current) {
-      initTopFrame();
-    }
   }
 
   private static Icon calcIcon(ThreadReferenceProxyImpl threadProxy, boolean current) {
     if (current) {
-      return AllIcons.Debugger.ThreadCurrent;
+      return threadProxy.isSuspended() ? AllIcons.Debugger.ThreadCurrent : AllIcons.Debugger.ThreadRunning;
     }
     else if (threadProxy.isAtBreakpoint()) {
       return AllIcons.Debugger.ThreadAtBreakpoint;
diff --git a/java/debugger/impl/src/com/intellij/debugger/engine/JavaStackFrame.java b/java/debugger/impl/src/com/intellij/debugger/engine/JavaStackFrame.java
index 3a8c2b6bac48..8d08444e9b86 100644
--- a/java/debugger/impl/src/com/intellij/debugger/engine/JavaStackFrame.java
+++ b/java/debugger/impl/src/com/intellij/debugger/engine/JavaStackFrame.java
@@ -138,7 +138,7 @@ public class JavaStackFrame extends XStackFrame {
       xFrame.computeChildren(node);
       return;
     }
-    myDebugProcess.getManagerThread().schedule(new DebuggerContextCommandImpl(myDebugProcess.getDebuggerContext()) {
+    myDebugProcess.getManagerThread().schedule(new DebuggerContextCommandImpl(myDebugProcess.getDebuggerContext(), myDescriptor.getFrameProxy().threadProxy()) {
       @Override
       public Priority getPriority() {
         return Priority.NORMAL;
diff --git a/java/debugger/impl/src/com/intellij/debugger/engine/SuspendContextImpl.java b/java/debugger/impl/src/com/intellij/debugger/engine/SuspendContextImpl.java
index 2a4dd9de6156..e0cacfe51ccd 100644
--- a/java/debugger/impl/src/com/intellij/debugger/engine/SuspendContextImpl.java
+++ b/java/debugger/impl/src/com/intellij/debugger/engine/SuspendContextImpl.java
@@ -26,7 +26,6 @@ import com.intellij.debugger.jdi.ThreadReferenceProxyImpl;
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.util.Comparing;
 import com.intellij.util.containers.HashSet;
-import com.intellij.xdebugger.frame.XExecutionStack;
 import com.intellij.xdebugger.frame.XSuspendContext;
 import com.sun.jdi.ObjectReference;
 import com.sun.jdi.ThreadReference;
@@ -229,15 +228,18 @@ public abstract class SuspendContextImpl extends XSuspendContext implements Susp
 
   @Nullable
   @Override
-  public XExecutionStack getActiveExecutionStack() {
+  public JavaExecutionStack getActiveExecutionStack() {
     return myActiveExecutionStack;
   }
 
-  public void initExecutionStacks(ThreadReferenceProxyImpl newThread) {
+  public void initExecutionStacks(ThreadReferenceProxyImpl activeThread) {
     DebuggerManagerThreadImpl.assertIsManagerThread();
-    myThread = newThread;
-    if (newThread != null) {
-      myActiveExecutionStack = new JavaExecutionStack(newThread, myDebugProcess, true);
+    if (myThread == null) {
+      myThread = activeThread;
+    }
+    if (activeThread != null) {
+      myActiveExecutionStack = new JavaExecutionStack(activeThread, myDebugProcess, myThread == activeThread);
+      myActiveExecutionStack.initTopFrame();
     }
   }
 
diff --git a/java/debugger/impl/src/com/intellij/debugger/engine/SuspendManagerImpl.java b/java/debugger/impl/src/com/intellij/debugger/engine/SuspendManagerImpl.java
index 2edc16ff6953..0fe1e45cc5dc 100644
--- a/java/debugger/impl/src/com/intellij/debugger/engine/SuspendManagerImpl.java
+++ b/java/debugger/impl/src/com/intellij/debugger/engine/SuspendManagerImpl.java
@@ -115,13 +115,6 @@ public class SuspendManagerImpl implements SuspendManager {
     return suspendContext;
   }
 
-  public SuspendContextImpl createDummyContext(@MagicConstant(flagsFromClass = EventRequest.class) int suspendPolicy) {
-    return new SuspendContextImpl(myDebugProcess, suspendPolicy, 0, null) {
-      @Override
-      protected void resumeImpl() {}
-    };
-  }
-
   @Override
   public SuspendContextImpl pushSuspendContext(final EventSet set) {
     SuspendContextImpl suspendContext = new SuspendContextImpl(myDebugProcess, set.suspendPolicy(), set.size(), set) {
@@ -360,7 +353,7 @@ public class SuspendManagerImpl implements SuspendManager {
     processVote(suspendContext);
   }
 
-  LinkedList<SuspendContextImpl> getPausedContexts() {
+  public List<SuspendContextImpl> getPausedContexts() {
     return myPausedContexts;
   }
 }
diff --git a/java/debugger/impl/src/com/intellij/debugger/impl/DebuggerContextImpl.java b/java/debugger/impl/src/com/intellij/debugger/impl/DebuggerContextImpl.java
index ad9e01e26409..336871008856 100644
--- a/java/debugger/impl/src/com/intellij/debugger/impl/DebuggerContextImpl.java
+++ b/java/debugger/impl/src/com/intellij/debugger/impl/DebuggerContextImpl.java
@@ -151,7 +151,6 @@ public final class DebuggerContextImpl implements DebuggerContext {
                                                           ThreadReferenceProxyImpl threadProxy,
                                                           StackFrameProxyImpl frameProxy) {
     LOG.assertTrue(frameProxy == null || threadProxy == null || threadProxy == frameProxy.threadProxy());
-    LOG.assertTrue(session == null || session.getProcess() != null);
     return new DebuggerContextImpl(session, session != null ? session.getProcess() : null, context, threadProxy, frameProxy, null, null, context == null);
   }
 
diff --git a/java/debugger/impl/src/com/intellij/debugger/impl/DebuggerSession.java b/java/debugger/impl/src/com/intellij/debugger/impl/DebuggerSession.java
index 57f2bbc092a0..b33789a5bc6c 100644
--- a/java/debugger/impl/src/com/intellij/debugger/impl/DebuggerSession.java
+++ b/java/debugger/impl/src/com/intellij/debugger/impl/DebuggerSession.java
@@ -111,7 +111,7 @@ public class DebuggerSession implements AbstractDebuggerSession {
     mySteppingThroughThread.set(threadProxy);
   }
 
-  void clearSteppingThrough() {
+  public void clearSteppingThrough() {
     mySteppingThroughThread.set(null);
   }
 
@@ -469,6 +469,8 @@ public class DebuggerSession implements AbstractDebuggerSession {
         LOG.debug("paused");
       }
 
+      ThreadReferenceProxyImpl currentThread = suspendContext.getThread();
+
       if (!shouldSetAsActiveContext(suspendContext)) {
         DebuggerInvocationUtil.invokeLater(getProject(), new Runnable() {
           @Override
@@ -476,7 +478,7 @@ public class DebuggerSession implements AbstractDebuggerSession {
             getContextManager().fireStateChanged(getContextManager().getContext(), Event.THREADS_REFRESH);
           }
         });
-        final ThreadReferenceProxyImpl thread = suspendContext.getThread();
+        ThreadReferenceProxyImpl thread = suspendContext.getThread();
         if (thread != null) {
           List<Pair<Breakpoint, com.sun.jdi.event.Event>> descriptors = DebuggerUtilsEx.getEventDescriptors(suspendContext);
           if (!descriptors.isEmpty()) {
@@ -492,7 +494,7 @@ public class DebuggerSession implements AbstractDebuggerSession {
                       @Override
                       public void contextAction() throws Exception {
                         final DebuggerContextImpl debuggerContext =
-                          DebuggerContextImpl.createDebuggerContext(DebuggerSession.this, suspendContext, thread, null);
+                          DebuggerContextUtil.createDebuggerContext(DebuggerSession.this, suspendContext);
 
                         DebuggerInvocationUtil.invokeLater(getProject(), new Runnable() {
                           @Override
@@ -507,12 +509,17 @@ public class DebuggerSession implements AbstractDebuggerSession {
               }).notify(getProject());
           }
         }
-        return;
+        if (((SuspendManagerImpl)myDebugProcess.getSuspendManager()).getPausedContexts().size() > 1) {
+          return;
+        }
+        else {
+          currentThread = mySteppingThroughThread.get();
+        }
+      }
+      else {
+        setSteppingThrough(currentThread);
       }
 
-      setSteppingThrough(suspendContext.getThread());
-
-      ThreadReferenceProxyImpl currentThread   = suspendContext.getThread();
       final StackFrameContext positionContext;
 
       if (currentThread == null) {
@@ -626,7 +633,7 @@ public class DebuggerSession implements AbstractDebuggerSession {
       DebuggerInvocationUtil.invokeLater(getProject(), new Runnable() {
         @Override
         public void run() {
-          getContextManager().setState(debuggerContext, State.PAUSED, Event.PAUSE, null);
+          getContextManager().setState(debuggerContext, State.PAUSED, Event.PAUSE, getDescription(debuggerContext));
         }
       });
     }
@@ -650,25 +657,28 @@ public class DebuggerSession implements AbstractDebuggerSession {
 
     @Override
     public void resumed(SuspendContextImpl suspendContext) {
-      SuspendManager suspendManager = getProcess().getSuspendManager();
-      SuspendContextImpl context = suspendManager.getPausedContext();
+      SuspendContextImpl context = getProcess().getSuspendManager().getPausedContext();
+      ThreadReferenceProxyImpl steppingThread = null;
       // single thread stepping
-      if (suspendContext != null
+      if (context != null
+          && suspendContext != null
           && suspendContext.getSuspendPolicy() == EventRequest.SUSPEND_EVENT_THREAD
           && isSteppingThrough(suspendContext.getThread())) {
-        ThreadReferenceProxyImpl thread = suspendContext.getThread();
-        if (context == null || !Comparing.equal(context.getThread(), thread)) {
-          context = ((SuspendManagerImpl)suspendManager).createDummyContext(suspendContext.getSuspendPolicy());
-          context.setThread(thread.getThreadReference());
-        }
+          steppingThread = suspendContext.getThread();
       }
-      final SuspendContextImpl currentContext = context;
+      final DebuggerContextImpl debuggerContext =
+        context != null ?
+          DebuggerContextImpl.createDebuggerContext(DebuggerSession.this,
+                                                                    context,
+                                                                    steppingThread != null ? steppingThread : context.getThread(),
+                                                                    null)
+          : null;
+
       DebuggerInvocationUtil.invokeLater(getProject(), new Runnable() {
         @Override
         public void run() {
-          if (currentContext != null) {
-            getContextManager().setState(DebuggerContextUtil.createDebuggerContext(DebuggerSession.this, currentContext),
-                                         State.PAUSED, Event.CONTEXT, null);
+          if (debuggerContext != null) {
+            getContextManager().setState(debuggerContext, State.PAUSED, Event.CONTEXT, getDescription(debuggerContext));
           }
           else {
             getContextManager().setState(SESSION_EMPTY_CONTEXT, State.RUNNING, Event.CONTEXT, null);
@@ -756,6 +766,14 @@ public class DebuggerSession implements AbstractDebuggerSession {
     }
   }
 
+  private static String getDescription(DebuggerContextImpl debuggerContext) {
+    SuspendContextImpl suspendContext = debuggerContext.getSuspendContext();
+    if (suspendContext != null && debuggerContext.getThreadProxy() != suspendContext.getThread()) {
+      return DebuggerBundle.message("status.paused.in.another.thread");
+    }
+    return null;
+  }
+
   private class MyEvaluationListener implements EvaluationListener {
     @Override
     public void evaluationStarted(SuspendContextImpl context) {
diff --git a/java/debugger/impl/src/com/intellij/debugger/impl/ReloadClassesWorker.java b/java/debugger/impl/src/com/intellij/debugger/impl/ReloadClassesWorker.java
index 7b3f46e27c8e..6693150f03aa 100644
--- a/java/debugger/impl/src/com/intellij/debugger/impl/ReloadClassesWorker.java
+++ b/java/debugger/impl/src/com/intellij/debugger/impl/ReloadClassesWorker.java
@@ -176,7 +176,7 @@ class ReloadClassesWorker {
     SuspendContextImpl suspendContext = context.getSuspendContext();
     if (suspendContext != null) {
       XExecutionStack stack = suspendContext.getActiveExecutionStack();
-      if (stack instanceof JavaExecutionStack) {
+      if (stack != null) {
         ((JavaExecutionStack)stack).initTopFrame();
       }
     }
diff --git a/java/debugger/impl/src/com/intellij/debugger/jdi/StackFrameProxyImpl.java b/java/debugger/impl/src/com/intellij/debugger/jdi/StackFrameProxyImpl.java
index 957ada3482a2..c75a41f1f613 100644
--- a/java/debugger/impl/src/com/intellij/debugger/jdi/StackFrameProxyImpl.java
+++ b/java/debugger/impl/src/com/intellij/debugger/jdi/StackFrameProxyImpl.java
@@ -193,6 +193,7 @@ public class StackFrameProxyImpl extends JdiProxy implements StackFrameProxy {
     throw new EvaluateException(error.getMessage(), error);
   }
 
+  @NotNull
   @Override
   public ThreadReferenceProxyImpl threadProxy() {
     return myThreadProxy;
diff --git a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/XDebugSessionImpl.java b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/XDebugSessionImpl.java
index 91c788c742c8..40359b2a6dd4 100644
--- a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/XDebugSessionImpl.java
+++ b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/XDebugSessionImpl.java
@@ -814,6 +814,10 @@ public class XDebugSessionImpl implements XDebugSession {
     });
   }
 
+  public void unsetPaused() {
+    myPaused.set(false);
+  }
+
   @Override
   public void positionReached(@NotNull final XSuspendContext suspendContext) {
     enableBreakpoints();
diff --git a/resources-en/src/messages/DebuggerBundle.properties b/resources-en/src/messages/DebuggerBundle.properties
index 8c24513cc9d7..3eb9637f6ca6 100644
--- a/resources-en/src/messages/DebuggerBundle.properties
+++ b/resources-en/src/messages/DebuggerBundle.properties
@@ -91,6 +91,7 @@ status.step.into=Stepping into
 status.step.over=Stepping over
 status.run.to.cursor=Run to cursor
 status.process.resumed=Process resumed
+status.paused.in.another.thread=Paused in another thread
 error.pop.bottom.stackframe=Cannot pop bottom frame
 error.pop.stackframe=An error occurred while popping stack frame: {0}
 error.class.not.loaded=Class not loaded : {0}

From 3bc7199097aae6b2e5317ecab04958fc7de9865a Mon Sep 17 00:00:00 2001
From: "Gregory.Shrago" <gregory.shrago@jetbrains.com>
Date: Thu, 24 Sep 2015 21:13:38 +0300
Subject: [PATCH 22/23] FileReferenceSet: support different separators &
 escaping. last touch amends

---
 .../resolve/reference/impl/providers/FileReferenceSet.java      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/platform/analysis-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/FileReferenceSet.java b/platform/analysis-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/FileReferenceSet.java
index 29e0cf6c39e6..5d8cc29ae831 100644
--- a/platform/analysis-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/FileReferenceSet.java
+++ b/platform/analysis-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/FileReferenceSet.java
@@ -266,7 +266,7 @@ public class FileReferenceSet {
     if (curSep >= 0 && decoded.length() == wsHead + sepLen + wsTail) {
       // add extra reference for the only & leading "/"
       TextRange r = TextRange.create(startInElement, offset(curSep + Math.max(0, sepLen - 1), escaper, valueRange) + 1);
-      referencesList.add(createFileReference(r, 0, decoded.subSequence(curSep, curSep + sepLen).toString()));
+      referencesList.add(createFileReference(r, index ++, decoded.subSequence(curSep, curSep + sepLen).toString()));
     }
     curSep = curSep == wsHead ? curSep + sepLen : wsHead; // reset offsets & start again for simplicity
     sepLen = 0;

From 2dcecc7f810a91dc19df462df08a3a8d16021605 Mon Sep 17 00:00:00 2001
From: Sergey Malenkov <sergey.malenkov@jetbrains.com>
Date: Thu, 24 Sep 2015 21:16:35 +0300
Subject: [PATCH 23/23] fix painting of hidden border in DarculaComboBoxUI
 (focused state)

---
 .../ide/ui/laf/darcula/ui/DarculaComboBoxUI.java     | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/ui/DarculaComboBoxUI.java b/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/ui/DarculaComboBoxUI.java
index fbcc47eb235f..cebbc42aa245 100644
--- a/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/ui/DarculaComboBoxUI.java
+++ b/platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/ui/DarculaComboBoxUI.java
@@ -329,18 +329,18 @@ public class DarculaComboBoxUI extends BasicComboBoxUI implements Border {
 
     hasFocus = false;
     checkFocus();
-    final Graphics2D g = (Graphics2D)g2;
+    final Graphics2D g = (Graphics2D)g2.create();
     final Rectangle arrowButtonBounds = arrowButton.getBounds();
     final int xxx = arrowButtonBounds.x - JBUI.scale(5);
     final int H = height - JBUI.scale(2);
     final int W = width - JBUI.scale(2);
 
-    final GraphicsConfig config = new GraphicsConfig(g);
+    final Shape clip = g.getClip();
     g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
     g.setRenderingHint(RenderingHints.KEY_STROKE_CONTROL, RenderingHints.VALUE_STROKE_NORMALIZE);
     final int R = JBUI.scale(5);
     if (hasFocus) {
-      g.setClip(JBUI.scale(2), JBUI.scale(2), comboBox.getWidth()- JBUI.scale(4), comboBox.getHeight() - JBUI.scale(4));
+      g.clipRect(JBUI.scale(2), JBUI.scale(2), comboBox.getWidth()- JBUI.scale(4), comboBox.getHeight() - JBUI.scale(4));
     }
     if (editor != null && comboBox.isEditable()) {
       ((JComponent)editor).setBorder(null);
@@ -368,7 +368,7 @@ public class DarculaComboBoxUI extends BasicComboBoxUI implements Border {
     paintCurrentValue(g, r, false);
 
     if (hasFocus) {
-      g.setClip(0, 0, comboBox.getWidth(), comboBox.getHeight());
+      g.setClip(clip);
       DarculaUIUtil.paintFocusRing(g, JBUI.scale(2), JBUI.scale(2), width - JBUI.scale(4), height - JBUI.scale(4));
     }
     else {
@@ -376,14 +376,12 @@ public class DarculaComboBoxUI extends BasicComboBoxUI implements Border {
       g.drawRoundRect(JBUI.scale(1), JBUI.scale(1), width - JBUI.scale(2), height - JBUI.scale(2), R, R);
       if (!UIUtil.isUnderDarcula() && comboBox.isEnabled()) {
         g.setColor(getArrowButtonFillColor(getBorderColor()));
-        final Shape clip = g.getClip();
         final int offX = xxx + JBUI.scale(5);
         g.clipRect(offX, y, width - offX, height);
         g.drawRoundRect(JBUI.scale(1), JBUI.scale(1), width - JBUI.scale(2), height - JBUI.scale(2), R, R);
-        g.setClip(clip);
       }
     }
-    config.restore();
+    g.dispose();
   }
 
   private void checkFocus() {