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

remove some unnecessary synchronous transactions

Browse Source
This commit is contained in:
peter
2016-03-22 19:38:29 +01:00
parent d935cfd941
commit fc7260a8ea
3 changed files with 9 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/core-api/src/com/intellij/openapi/application/WriteAction.java
+5 -11
View File
@@ -47,24 +47,18 @@ public abstract class WriteAction<T> extends BaseActionRunnable<T> {
LOG.error("Must not start write action from within read action in the other thread - deadlock is coming");
}
application.invokeAndWait(new Runnable() {
TransactionGuard.getInstance().submitTransactionAndWait(TransactionKind.ANY_CHANGE, new Runnable() {
@Override
public void run() {
AccessToken transaction = TransactionGuard.getInstance().startSynchronousTransaction(TransactionKind.ANY_CHANGE);
AccessToken token = start(WriteAction.this.getClass());
try {
AccessToken token = start(WriteAction.this.getClass());
try {
result.run();
}
finally {
token.finish();
}
result.run();
}
finally {
transaction.finish();
token.finish();
}
}
}, ModalityState.defaultModalityState());
});
result.throwException();
return result;
platform/core-api/src/com/intellij/openapi/command/WriteCommandAction.java
+3 -9
View File
@@ -83,18 +83,12 @@ public abstract class WriteCommandAction<T> extends BaseActionRunnable<T> {
performWriteCommandAction(result);
} else {
try {
application.invokeAndWait(new Runnable() {
TransactionGuard.getInstance().submitTransactionAndWait(TransactionKind.ANY_CHANGE, new Runnable() {
@Override
public void run() {
AccessToken token = TransactionGuard.getInstance().startSynchronousTransaction(TransactionKind.ANY_CHANGE);
try {
performWriteCommandAction(result);
}
finally {
token.finish();
}
performWriteCommandAction(result);
}
}, ModalityState.defaultModalityState());
});
}
catch (ProcessCanceledException ignored) { }
}
platform/lang-impl/src/com/intellij/codeInsight/template/impl/editorActions/EscapeHandler.java
+1 -3
View File
@@ -20,8 +20,6 @@ import com.intellij.codeInsight.CodeInsightBundle;
import com.intellij.codeInsight.template.impl.TemplateManagerImpl;
import com.intellij.codeInsight.template.impl.TemplateState;
import com.intellij.openapi.actionSystem.DataContext;
import com.intellij.openapi.application.TransactionGuard;
import com.intellij.openapi.application.TransactionKind;
import com.intellij.openapi.command.CommandProcessor;
import com.intellij.openapi.editor.Editor;
import com.intellij.openapi.editor.actionSystem.EditorActionHandler;
@@ -39,7 +37,7 @@ public class EscapeHandler extends EditorActionHandler {
final TemplateState templateState = TemplateManagerImpl.getTemplateState(editor);
if (templateState != null && !templateState.isFinished()) {
CommandProcessor.getInstance().setCurrentCommandName(CodeInsightBundle.message("finish.template.command"));
TransactionGuard.syncTransaction(TransactionKind.TEXT_EDITING, () -> templateState.gotoEnd(true));
templateState.gotoEnd(true);
return;
}
}