MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-13 21:55:01 +07:00
Code Issues Packages Projects Releases Wiki Activity

enable 'apply change signature' for move stmt left/right

Browse Source
This commit is contained in:
Anna Kozlova
2016-01-25 18:52:15 +03:00
parent 7b2e554b0a
commit 7de02f09ff
1 changed files with 24 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/refactoring/changeSignature/ChangeSignatureGestureDetector.java
+24 -9
View File
@@ -16,6 +16,7 @@
package com.intellij.refactoring.changeSignature;
import com.intellij.codeInsight.template.TemplateManager;
import com.intellij.idea.ActionsBundle;
import com.intellij.openapi.Disposable;
import com.intellij.openapi.command.CommandProcessor;
import com.intellij.openapi.diagnostic.Logger;
@@ -260,8 +261,14 @@ public class ChangeSignatureGestureDetector extends PsiTreeChangeAdapter impleme
}
private class MyDocumentChangeAdapter extends DocumentAdapter {
private final @NonNls String PASTE_COMMAND_NAME = EditorBundle.message("paste.command.name");
private final @NonNls String TYPING_COMMAND_NAME = EditorBundle.message("typing.in.editor.command.name");
private final @NonNls String [] COMMANDS = {
EditorBundle.message("paste.command.name"),
EditorBundle.message("typing.in.editor.command.name"),
ActionsBundle.message("action.MoveStatementLeft.text"),
ActionsBundle.message("action.MoveStatementRight.text"),
"Cut",
LanguageChangeSignatureDetector.MOVE_PARAMETER
};
private String myInitialText;
private String myInitialName;
@@ -327,13 +334,8 @@ public class ChangeSignatureGestureDetector extends PsiTreeChangeAdapter impleme
final CommandProcessor processor = CommandProcessor.getInstance();
final String currentCommandName = processor.getCurrentCommandName();
if (!Comparing.strEqual(TYPING_COMMAND_NAME, currentCommandName) &&
!Comparing.strEqual(PASTE_COMMAND_NAME, currentCommandName) &&
!Comparing.strEqual("Cut", currentCommandName) &&
!Comparing.strEqual(LanguageChangeSignatureDetector.MOVE_PARAMETER, currentCommandName) &&
!Comparing.equal(EditorActionUtil.DELETE_COMMAND_GROUP, processor.getCurrentCommandGroupId())) {
return;
}
if (!isPredefinedCommand(processor, currentCommandName)) return;
final PsiFile file = documentManager.getPsiFile(document);
if (file != null) {
final PsiElement element = file.findElementAt(e.getOffset());
@@ -355,6 +357,19 @@ public class ChangeSignatureGestureDetector extends PsiTreeChangeAdapter impleme
}
}
private boolean isPredefinedCommand(CommandProcessor processor, String currentCommandName) {
if (Comparing.equal(EditorActionUtil.DELETE_COMMAND_GROUP, processor.getCurrentCommandGroupId())) {
return true;
}
for (String commandName : COMMANDS) {
if (Comparing.strEqual(commandName, currentCommandName)){
return true;
}
}
return false;
}
public ChangeInfo getInitialChangeInfo() {
return myInitialChangeInfo;
}