MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-04-19 13:02:30 +07:00
Code Issues Packages Projects Releases Wiki Activity

replace unused parameter fix with safe delete in onTheFly mode: deep parameter delete is enabled this way

Browse Source
This commit is contained in:
Anna Kozlova
2014-11-20 11:41:23 +01:00
parent 2382102e7b
commit 6d73d68b6a
6 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/SafeDeleteFix.java
View File

@@ -23,8 +23,10 @@ import com.intellij.openapi.editor.Editor;
import com.intellij.openapi.project.Project;
import com.intellij.psi.PsiElement;
import com.intellij.psi.PsiFile;
import com.intellij.psi.PsiParameter;
import com.intellij.psi.PsiSubstitutor;
import com.intellij.refactoring.safeDelete.SafeDeleteHandler;
import com.intellij.refactoring.safeDelete.SafeDeleteProcessor;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -53,7 +55,12 @@ public class SafeDeleteFix extends LocalQuickFixAndIntentionActionOnPsiElement {
@NotNull PsiElement startElement,
@NotNull PsiElement endElement) {
if (!FileModificationService.getInstance().prepareFileForWrite(file)) return;
SafeDeleteHandler.invoke(project, new PsiElement[]{startElement}, false);
final PsiElement[] elements = {startElement};
if (startElement instanceof PsiParameter) {
SafeDeleteProcessor.createInstance(project, null, elements, false, false, true).run();
} else {
SafeDeleteHandler.invoke(project, elements, false);
}
}
@Override

2
java/java-impl/src/com/intellij/codeInsight/intention/impl/config/QuickFixFactoryImpl.java
View File

@@ -665,7 +665,7 @@ public class QuickFixFactoryImpl extends QuickFixFactory {
Collections.addAll(options, SuppressIntentionActionFromFix.convertBatchToSuppressIntentionActions(batchSuppressActions));
}
//need suppress from Unused Parameters but settings from Unused Symbol
QuickFixAction.registerQuickFixAction((HighlightInfo)highlightInfo, new RemoveUnusedParameterFix(parameter),
QuickFixAction.registerQuickFixAction((HighlightInfo)highlightInfo, new SafeDeleteFix(parameter),
options, HighlightDisplayKey.getDisplayNameByKey(myUnusedSymbolKey));
}

2
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/removeUnusedParameter/after1.java
View File

@@ -1,4 +1,4 @@
// "Remove Parameter 'i'" "true"
// "Safe delete 'i'" "true"
import java.io.*;
class a {

2
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/removeUnusedParameter/after2.java
View File

@@ -1,4 +1,4 @@
// "Remove Parameter 'i'" "true"
// "Safe delete 'i'" "true"
import java.io.*;
class a {

2
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/removeUnusedParameter/before1.java
View File

@@ -1,4 +1,4 @@
// "Remove Parameter 'i'" "true"
// "Safe delete 'i'" "true"
import java.io.*;
class a {

2
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/removeUnusedParameter/before2.java
View File

@@ -1,4 +1,4 @@
// "Remove Parameter 'i'" "true"
// "Safe delete 'i'" "true"
import java.io.*;
class a {