MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

cleanup: prefer to use resolvedPromise

Browse Source
This commit is contained in:
Vladimir Krivosheev
2016-09-16 11:00:00 +02:00
parent 2e1e7d4ef8
commit 30f4d60301
2 changed files with 5 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-impl/src/org/jetbrains/concurrency/AsyncValueLoader.java
+1 -6
View File
@@ -143,12 +143,7 @@ public abstract class AsyncValueLoader<T> {
effectivePromise.done(doneHandler);
if (isCancelOnReject()) {
effectivePromise.rejected(new Consumer<Throwable>() {
@Override
public void consume(Throwable throwable) {
ref.compareAndSet(effectivePromise, null);
}
});
effectivePromise.rejected(throwable -> ref.compareAndSet(effectivePromise, null));
}
if (effectivePromise != promise) {
platform/script-debugger/backend/src/org/jetbrains/debugger/values/ObjectValueBase.kt
+4 -8
View File
@@ -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<Variable>, names: List<String>, evalu
}
if (getterCount == 0) {
return Promise.resolve(properties)
return resolvedPromise(properties)
}
else {
val promises = SmartList<Promise<*>>()
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)