Skip to content

Commit 88cdbeb

Browse files
committed
remove hard link to impl class
1 parent c25718c commit 88cdbeb

2 files changed

Lines changed: 8 additions & 4 deletions

File tree

plugin/src/main/java/com/intellij/java/impl/codeInsight/daemon/impl/quickfix/CreateLocalVarFromInstanceofAction.java

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@
2525
import consulo.application.ApplicationManager;
2626
import consulo.codeEditor.CaretModel;
2727
import consulo.codeEditor.Editor;
28+
import consulo.codeEditor.action.EditorAction;
2829
import consulo.dataContext.DataManager;
2930
import consulo.document.util.TextRange;
3031
import consulo.ide.impl.idea.codeInsight.CodeInsightUtilBase;
31-
import consulo.ide.impl.idea.openapi.editor.actions.EnterAction;
3232
import consulo.java.analysis.impl.JavaQuickFixBundle;
3333
import consulo.language.codeStyle.CodeStyleManager;
3434
import consulo.language.editor.FileModificationService;
@@ -47,6 +47,8 @@
4747
import consulo.language.util.IncorrectOperationException;
4848
import consulo.logging.Logger;
4949
import consulo.project.Project;
50+
import consulo.ui.ex.action.ActionManager;
51+
import consulo.ui.ex.action.IdeActions;
5052
import consulo.util.collection.ArrayUtil;
5153
import jakarta.annotation.Nonnull;
5254
import jakarta.annotation.Nullable;
@@ -270,7 +272,11 @@ public void templateFinished(Template template, boolean brokenOff) {
270272
if (declarationStatement != null) {
271273
caretModel.moveToOffset(declarationStatement.getTextRange().getEndOffset());
272274
}
273-
new EnterAction().actionPerformed(editor, DataManager.getInstance().getDataContext());
275+
276+
EditorAction action = (EditorAction) ActionManager.getInstance().getAction(IdeActions.ACTION_EDITOR_ENTER);
277+
if (action != null) {
278+
action.actionPerformed(editor, DataManager.getInstance().getDataContext());
279+
}
274280
});
275281
}
276282
});

plugin/src/main/java/com/intellij/java/impl/codeInsight/generation/GenerateMembersHandlerBase.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@
3232
import consulo.document.util.TextRange;
3333
import consulo.ide.impl.idea.codeInsight.CodeInsightUtilBase;
3434
import consulo.ide.impl.idea.ide.util.MemberChooser;
35-
import consulo.ide.impl.idea.openapi.editor.actions.EnterAction;
3635
import consulo.language.editor.WriteCommandAction;
3736
import consulo.language.editor.action.CodeInsightActionHandler;
3837
import consulo.language.editor.generation.ClassMember;
@@ -139,7 +138,6 @@ private void doGenerate(final Project project, final Editor editor, PsiClass aCl
139138
String textBeforeCaret = docText.subSequence(lineStartOffset, offset).toString();
140139
final String afterCaret = docText.subSequence(offset, document.getLineEndOffset(line)).toString();
141140
if (textBeforeCaret.trim().length() > 0 && StringUtil.isEmptyOrSpaces(afterCaret) && !editor.getSelectionModel().hasSelection()) {
142-
EnterAction.insertNewLineAtCaret(editor);
143141
PsiDocumentManager.getInstance(project).commitDocument(document);
144142
offset = editor.getCaretModel().getOffset();
145143
col = editor.getCaretModel().getLogicalPosition().column;

0 commit comments

Comments
 (0)