diff --git a/platform/platform-impl/src/org/jetbrains/concurrency/AsyncValueLoader.java b/platform/platform-impl/src/org/jetbrains/concurrency/AsyncValueLoader.java index d1f85a8f45f1..b1e1824e0e04 100644 --- a/platform/platform-impl/src/org/jetbrains/concurrency/AsyncValueLoader.java +++ b/platform/platform-impl/src/org/jetbrains/concurrency/AsyncValueLoader.java @@ -143,12 +143,7 @@ public abstract class AsyncValueLoader { effectivePromise.done(doneHandler); if (isCancelOnReject()) { - effectivePromise.rejected(new Consumer() { - @Override - public void consume(Throwable throwable) { - ref.compareAndSet(effectivePromise, null); - } - }); + effectivePromise.rejected(throwable -> ref.compareAndSet(effectivePromise, null)); } if (effectivePromise != promise) { diff --git a/platform/script-debugger/backend/src/org/jetbrains/debugger/values/ObjectValueBase.kt b/platform/script-debugger/backend/src/org/jetbrains/debugger/values/ObjectValueBase.kt index 00752737536b..211fee4dc8eb 100644 --- a/platform/script-debugger/backend/src/org/jetbrains/debugger/values/ObjectValueBase.kt +++ b/platform/script-debugger/backend/src/org/jetbrains/debugger/values/ObjectValueBase.kt @@ -16,10 +16,7 @@ package org.jetbrains.debugger.values import com.intellij.util.SmartList -import org.jetbrains.concurrency.Obsolescent -import org.jetbrains.concurrency.ObsolescentFunction -import org.jetbrains.concurrency.Promise -import org.jetbrains.concurrency.all +import org.jetbrains.concurrency.* import org.jetbrains.debugger.EvaluateContext import org.jetbrains.debugger.Variable import org.jetbrains.debugger.VariablesHost @@ -68,15 +65,14 @@ fun getSpecifiedProperties(variables: List, names: List, evalu } if (getterCount == 0) { - return Promise.resolve(properties) + return resolvedPromise(properties) } else { val promises = SmartList>() for (variable in properties) { if (variable.value == null) { - val valueModifier = variable.valueModifier - assert(valueModifier != null) - promises.add(valueModifier!!.evaluateGet(variable, evaluateContext)) + val valueModifier = variable.valueModifier!! + promises.add(valueModifier.evaluateGet(variable, evaluateContext)) } } return all(promises, properties)