From 4cb053be35ea9be0028404a1c2ef7e47f728441d Mon Sep 17 00:00:00 2001
From: Vladimir Krivosheev <vladimir.krivosheev@jetbrains.com>
Date: Fri, 28 Nov 2014 12:13:12 +0100
Subject: [PATCH] fix nodejs debug regression (master)

---
 .../backend/src/org/jetbrains/concurrency/DonePromise.java  | 6 ++----
 .../backend/src/org/jetbrains/debugger/CallFrame.java       | 4 ++--
 .../src/org/jetbrains/debugger/ScopeVariablesGroup.java     | 4 ++--
 .../debugger-ui/src/org/jetbrains/debugger/Variables.java   | 5 ++---
 4 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/platform/script-debugger/backend/src/org/jetbrains/concurrency/DonePromise.java b/platform/script-debugger/backend/src/org/jetbrains/concurrency/DonePromise.java
index b3cfacdab595..ff6920a47135 100644
--- a/platform/script-debugger/backend/src/org/jetbrains/concurrency/DonePromise.java
+++ b/platform/script-debugger/backend/src/org/jetbrains/concurrency/DonePromise.java
@@ -33,15 +33,13 @@ class DonePromise<T> extends Promise<T> implements Getter<T> {
   @NotNull
   @Override
   public <SUB_RESULT> Promise<SUB_RESULT> then(@NotNull Function<T, SUB_RESULT> done) {
-    //noinspection unchecked
-    return (Promise<SUB_RESULT>)this;
+    return Promise.resolve(done.fun(result));
   }
 
   @NotNull
   @Override
   public <SUB_RESULT> Promise<SUB_RESULT> then(@NotNull AsyncFunction<T, SUB_RESULT> done) {
-    //noinspection unchecked
-    return (Promise<SUB_RESULT>)this;
+    return done.fun(result);
   }
 
   @NotNull
diff --git a/platform/script-debugger/backend/src/org/jetbrains/debugger/CallFrame.java b/platform/script-debugger/backend/src/org/jetbrains/debugger/CallFrame.java
index dc386525ae60..6ffa5d4c4612 100755
--- a/platform/script-debugger/backend/src/org/jetbrains/debugger/CallFrame.java
+++ b/platform/script-debugger/backend/src/org/jetbrains/debugger/CallFrame.java
@@ -1,8 +1,8 @@
 package org.jetbrains.debugger;
 
-import com.intellij.openapi.util.AsyncResult;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
+import org.jetbrains.concurrency.Promise;
 
 import java.util.List;
 
@@ -19,7 +19,7 @@ public interface CallFrame {
    * Computed variable must be null if no receiver variable, call {@link com.intellij.openapi.util.AsyncResult#setDone(Object null)}
    */
   @NotNull
-  AsyncResult<Variable> getReceiverVariable();
+  Promise<Variable> getReceiverVariable();
 
   int getLine();
 
diff --git a/platform/script-debugger/debugger-ui/src/org/jetbrains/debugger/ScopeVariablesGroup.java b/platform/script-debugger/debugger-ui/src/org/jetbrains/debugger/ScopeVariablesGroup.java
index a8577ccccf53..74cbdd8fa331 100644
--- a/platform/script-debugger/debugger-ui/src/org/jetbrains/debugger/ScopeVariablesGroup.java
+++ b/platform/script-debugger/debugger-ui/src/org/jetbrains/debugger/ScopeVariablesGroup.java
@@ -97,14 +97,14 @@ public class ScopeVariablesGroup extends XValueGroup {
             return;
           }
 
-          callFrame.getReceiverVariable().doWhenDone(new Consumer<Variable>() {
+          callFrame.getReceiverVariable().done(new Consumer<Variable>() {
             @Override
             public void consume(Variable variable) {
               if (!node.isObsolete()) {
                 node.addChildren(variable == null ? XValueChildrenList.EMPTY : XValueChildrenList.singleton(CallFrameBase.RECEIVER_NAME, new VariableView(variable, context)), true);
               }
             }
-          }).doWhenRejected(new Consumer<String>() {
+          }).rejected(new Consumer<String>() {
             @Override
             public void consume(@Nullable String error) {
               if (!node.isObsolete()) {
diff --git a/platform/script-debugger/debugger-ui/src/org/jetbrains/debugger/Variables.java b/platform/script-debugger/debugger-ui/src/org/jetbrains/debugger/Variables.java
index d4ab4393dee6..7d573bcb632e 100644
--- a/platform/script-debugger/debugger-ui/src/org/jetbrains/debugger/Variables.java
+++ b/platform/script-debugger/debugger-ui/src/org/jetbrains/debugger/Variables.java
@@ -2,7 +2,6 @@ package org.jetbrains.debugger;
 
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.util.SmartList;
-import com.intellij.util.containers.ContainerUtil;
 import com.intellij.xdebugger.frame.XCompositeNode;
 import com.intellij.xdebugger.frame.XValueChildrenList;
 import org.jetbrains.annotations.NotNull;
@@ -57,7 +56,7 @@ public final class Variables {
           }
         }
 
-        ContainerUtil.sort(properties, memberFilter.hasNameMappings() ? new Comparator<Variable>() {
+        Collections.sort(properties, memberFilter.hasNameMappings() ? new Comparator<Variable>() {
           @Override
           public int compare(@NotNull Variable o1, @NotNull Variable o2) {
             return naturalCompare(memberFilter.getName(o1), memberFilter.getName(o2));
@@ -144,7 +143,7 @@ public final class Variables {
   }
 
   private static void sort(@NotNull List<Variable> result) {
-    ContainerUtil.sort(result, NATURAL_NAME_COMPARATOR);
+    Collections.sort(result, NATURAL_NAME_COMPARATOR);
   }
 
   // prefixed '_' must be last, fixed case sensitive natural compare