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

Revert "API to execute typed handler postprocessing in a separate command"

Browse Source 
This reverts commit da2d095
This commit is contained in:
Dmitry Jemerov
2018-04-19 11:46:58 +02:00
parent 5f34c4c223
commit abee26e09e
11 changed files with 54 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-tests/testData/codeInsight/typing/indentRBrace_after.java
-7
View File
@@ -1,7 +0,0 @@
class Foo {
void m() {
if (true) {
System.out.println();
}<caret>
}
}
java/java-tests/testData/codeInsight/typing/indentRBrace_afterUndo.java
-7
View File
@@ -1,7 +0,0 @@
class Foo {
void m() {
if (true) {
System.out.println();
}<caret>
}
}
java/java-tests/testData/codeInsight/typing/indentRBrace_before.java
-7
View File
@@ -1,7 +0,0 @@
class Foo {
void m() {
if (true) {
System.out.println();
<caret>
}
}
java/java-tests/testSrc/com/intellij/java/codeInsight/JavaTypingTest.java
-14
View File
@@ -1,10 +1,7 @@
// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
package com.intellij.java.codeInsight;
import com.intellij.openapi.command.undo.UndoManager;
import com.intellij.openapi.editor.ex.EditorEx;
import com.intellij.openapi.fileEditor.TextEditor;
import com.intellij.openapi.fileEditor.impl.text.TextEditorProvider;
import com.intellij.psi.PsiDocumentManager;
import com.intellij.testFramework.PlatformTestUtil;
import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase;
@@ -18,11 +15,6 @@ import java.util.regex.Matcher;
import java.util.regex.Pattern;
public class JavaTypingTest extends LightPlatformCodeInsightFixtureTestCase {
public void testIndentRBrace() {
doTest('}');
doTestUndo();
}
public void testMulticaretIndentLBrace() {
doTest('{');
}
@@ -138,12 +130,6 @@ public class JavaTypingTest extends LightPlatformCodeInsightFixtureTestCase {
myFixture.checkResultByFile(getTestName(true) + "_after.java");
}
private void doTestUndo() {
TextEditor fileEditor = TextEditorProvider.getInstance().getTextEditor(myFixture.getEditor());
UndoManager.getInstance(getProject()).undo(fileEditor);
myFixture.checkResultByFile(getTestName(true) + "_afterUndo.java");
}
private void doMultiTypeTest(char c) {
myFixture.configureByFile(getTestName(true) + "_before.java");
List<Integer> whereToType = findWhereToType(myFixture.getEditor().getDocument().getImmutableCharSequence());
platform/core-impl/src/com/intellij/openapi/command/CommandProcessorEx.java
+2 -2
View File
@@ -14,7 +14,7 @@ public abstract class CommandProcessorEx extends CommandProcessor {
public abstract void leaveModal();
@Nullable
public abstract Object startCommand(@Nullable Project project, @Nls String name, @Nullable Object groupId, @NotNull UndoConfirmationPolicy undoConfirmationPolicy);
public abstract Object startCommand(@NotNull Project project, @Nls String name, Object groupId, @NotNull UndoConfirmationPolicy undoConfirmationPolicy);
public abstract void finishCommand(@Nullable Project project, @NotNull final Object command, @Nullable Throwable throwable);
public abstract void finishCommand(Project project, final Object command, Throwable throwable);
}
platform/core-impl/src/com/intellij/openapi/command/impl/CoreCommandProcessor.java
+4 -4
View File
@@ -147,12 +147,12 @@ public class CoreCommandProcessor extends CommandProcessorEx {
@Override
@Nullable
public Object startCommand(@Nullable final Project project,
public Object startCommand(@NotNull final Project project,
@Nls final String name,
@Nullable final Object groupId,
final Object groupId,
@NotNull final UndoConfirmationPolicy undoConfirmationPolicy) {
ApplicationManager.getApplication().assertIsDispatchThread();
if (project != null && project.isDisposed()) return null;
if (project.isDisposed()) return null;
if (CommandLog.LOG.isDebugEnabled()) {
CommandLog.LOG.debug("startCommand: name = " + name + ", groupId = " + groupId);
@@ -169,7 +169,7 @@ public class CoreCommandProcessor extends CommandProcessorEx {
}
@Override
public void finishCommand(@Nullable final Project project, @NotNull final Object command, @Nullable Throwable throwable) {
public void finishCommand(final Project project, final Object command, final Throwable throwable) {
ApplicationManager.getApplication().assertIsDispatchThread();
CommandLog.LOG.assertTrue(myCurrentCommand != null, "no current command in progress");
fireCommandFinished();
platform/lang-impl/src/com/intellij/codeInsight/editorActions/TypedHandler.java
-6
View File
@@ -19,13 +19,10 @@ import com.intellij.openapi.command.CommandProcessor;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.editor.*;
import com.intellij.openapi.editor.actionSystem.ActionPlan;
import com.intellij.openapi.editor.actionSystem.EditorActionManager;
import com.intellij.openapi.editor.actionSystem.TypedActionHandler;
import com.intellij.openapi.editor.ex.EditorEx;
import com.intellij.openapi.editor.highlighter.EditorHighlighter;
import com.intellij.openapi.editor.highlighter.HighlighterIterator;
import com.intellij.openapi.editor.impl.DefaultRawTypedHandler;
import com.intellij.openapi.editor.impl.EditorActionManagerImpl;
import com.intellij.openapi.extensions.Extensions;
import com.intellij.openapi.fileTypes.FileType;
import com.intellij.openapi.fileTypes.FileTypes;
@@ -629,9 +626,6 @@ public class TypedHandler extends TypedActionHandlerBase {
);
}
if (element.getNode() != null && isBrace) {
DefaultRawTypedHandler handler = ((EditorActionManagerImpl) EditorActionManager.getInstance()).getDefaultRawTypedHandler();
handler.beginUndoablePostProcessing(project);
final int finalLBraceOffset = lBraceOffset;
ApplicationManager.getApplication().runWriteAction(() -> {
try{
platform/platform-api/src/com/intellij/openapi/editor/actionSystem/TypedAction.java
+47
View File
@@ -1,9 +1,12 @@
// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
package com.intellij.openapi.editor.actionSystem;
import com.intellij.codeInsight.hint.HintManager;
import com.intellij.openapi.actionSystem.CommonDataKeys;
import com.intellij.openapi.actionSystem.DataContext;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.command.CommandProcessor;
import com.intellij.openapi.command.UndoConfirmationPolicy;
import com.intellij.openapi.editor.*;
import com.intellij.openapi.extensions.Extensions;
import com.intellij.openapi.project.Project;
@@ -17,12 +20,14 @@ import org.jetbrains.annotations.Nullable;
* @see EditorActionManager#getTypedAction()
*/
public class TypedAction {
@NotNull
private TypedActionHandler myRawHandler;
private TypedActionHandler myHandler;
private boolean myHandlersLoaded;
public TypedAction() {
myHandler = new Handler();
myRawHandler = new DefaultRawHandler();
}
private void ensureHandlersLoaded() {
@@ -104,6 +109,7 @@ public class TypedAction {
* @see #getHandler()
* @see #setupHandler(TypedActionHandler)
*/
@NotNull
public TypedActionHandler setupRawHandler(@NotNull TypedActionHandler handler) {
TypedActionHandler tmp = myRawHandler;
myRawHandler = handler;
@@ -121,4 +127,45 @@ public class TypedAction {
Project project = CommonDataKeys.PROJECT.getData(dataContext);
FreezeLogger.getInstance().runUnderPerformanceMonitor(project, () -> myRawHandler.execute(editor, charTyped, dataContext));
}
private class DefaultRawHandler implements TypedActionHandlerEx {
@Override
public void beforeExecute(@NotNull Editor editor, char c, @NotNull DataContext context, @NotNull ActionPlan plan) {
if (editor.isViewer() || !editor.getDocument().isWritable()) return;
TypedActionHandler handler = getHandler();
if (handler instanceof TypedActionHandlerEx) {
((TypedActionHandlerEx)handler).beforeExecute(editor, c, context, plan);
}
}
@Override
public void execute(@NotNull final Editor editor, final char charTyped, @NotNull final DataContext dataContext) {
CommandProcessor.getInstance().executeCommand(
CommonDataKeys.PROJECT.getData(dataContext), () -> {
if (!EditorModificationUtil.requestWriting(editor)) {
HintManager.getInstance().showInformationHint(editor, "File is not writable");
return;
}
ApplicationManager.getApplication().runWriteAction(new DocumentRunnable(editor.getDocument(), editor.getProject()) {
@Override
public void run() {
Document doc = editor.getDocument();
doc.startGuardedBlockChecking();
try {
getHandler().execute(editor, charTyped, dataContext);
}
catch (ReadOnlyFragmentModificationException e) {
EditorActionManager.getInstance().getReadonlyFragmentModificationHandler(doc).handle(e);
}
finally {
doc.stopGuardedBlockChecking();
}
}
});
},
"", editor.getDocument(), UndoConfirmationPolicy.DEFAULT, editor.getDocument());
}
}
}
platform/platform-impl/src/com/intellij/openapi/command/impl/CommandProcessorImpl.java
+1 -2
View File
@@ -9,11 +9,10 @@ import com.intellij.openapi.ui.Messages;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.util.ExceptionUtil;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
class CommandProcessorImpl extends CoreCommandProcessor {
@Override
public void finishCommand(@Nullable Project project, @NotNull final Object command, @Nullable final Throwable throwable) {
public void finishCommand(final Project project, final Object command, final Throwable throwable) {
if (myCurrentCommand != command) return;
final boolean failed;
try {
platform/platform-impl/src/com/intellij/openapi/editor/impl/DefaultRawTypedHandler.java
-76
View File
@@ -1,76 +0,0 @@
// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
package com.intellij.openapi.editor.impl;
import com.intellij.codeInsight.hint.HintManager;
import com.intellij.openapi.actionSystem.CommonDataKeys;
import com.intellij.openapi.actionSystem.DataContext;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.command.CommandProcessor;
import com.intellij.openapi.command.CommandProcessorEx;
import com.intellij.openapi.command.UndoConfirmationPolicy;
import com.intellij.openapi.editor.*;
import com.intellij.openapi.editor.actionSystem.*;
import com.intellij.openapi.project.Project;
import org.jetbrains.annotations.NotNull;
public class DefaultRawTypedHandler implements TypedActionHandlerEx {
private final TypedAction myAction;
private Object myCurrentCommandToken;
public DefaultRawTypedHandler(TypedAction action) {
myAction = action;
}
@Override
public void beforeExecute(@NotNull Editor editor, char c, @NotNull DataContext context, @NotNull ActionPlan plan) {
if (editor.isViewer() || !editor.getDocument().isWritable()) return;
TypedActionHandler handler = myAction.getHandler();
if (handler instanceof TypedActionHandlerEx) {
((TypedActionHandlerEx)handler).beforeExecute(editor, c, context, plan);
}
}
@Override
public void execute(@NotNull final Editor editor, final char charTyped, @NotNull final DataContext dataContext) {
CommandProcessorEx commandProcessorEx = (CommandProcessorEx)CommandProcessor.getInstance();
Project project = CommonDataKeys.PROJECT.getData(dataContext);
myCurrentCommandToken = commandProcessorEx.startCommand(project, "", editor.getDocument(), UndoConfirmationPolicy.DEFAULT);
try {
if (!EditorModificationUtil.requestWriting(editor)) {
HintManager.getInstance().showInformationHint(editor, "File is not writable");
return;
}
ApplicationManager.getApplication().runWriteAction(new DocumentRunnable(editor.getDocument(), editor.getProject()) {
@Override
public void run() {
Document doc = editor.getDocument();
doc.startGuardedBlockChecking();
try {
myAction.getHandler().execute(editor, charTyped, dataContext);
}
catch (ReadOnlyFragmentModificationException e) {
EditorActionManager.getInstance().getReadonlyFragmentModificationHandler(doc).handle(e);
}
finally {
doc.stopGuardedBlockChecking();
}
}
});
}
finally {
commandProcessorEx.finishCommand(project, myCurrentCommandToken, null);
myCurrentCommandToken = null;
}
}
public void beginUndoablePostProcessing(Project project) {
if (myCurrentCommandToken == null) {
throw new IllegalStateException("Not in a typed action at this time");
}
CommandProcessorEx commandProcessorEx = (CommandProcessorEx)CommandProcessor.getInstance();
commandProcessorEx.finishCommand(project, myCurrentCommandToken, null);
myCurrentCommandToken = commandProcessorEx.startCommand(project, "", null, UndoConfirmationPolicy.DEFAULT);
}
}
platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorActionManagerImpl.java
-7
View File
@@ -12,14 +12,11 @@ import org.jetbrains.annotations.NotNull;
public class EditorActionManagerImpl extends EditorActionManager {
private final TypedAction myTypedAction = new TypedAction();
private final DefaultRawTypedHandler myDefaultRawTypedHandler;
private ReadonlyFragmentModificationHandler myReadonlyFragmentsHandler = new DefaultReadOnlyFragmentModificationHandler();
private final ActionManager myActionManager;
public EditorActionManagerImpl(ActionManager actionManager) {
myActionManager = actionManager;
myDefaultRawTypedHandler = new DefaultRawTypedHandler(myTypedAction);
myTypedAction.setupRawHandler(myDefaultRawTypedHandler);
}
@Override
@@ -75,9 +72,5 @@ public class EditorActionManagerImpl extends EditorActionManager {
EditorBundle.message("guarded.block.modification.attempt.error.title"));
}
}
public DefaultRawTypedHandler getDefaultRawTypedHandler() {
return myDefaultRawTypedHandler;
}
}