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

[extract method] IDEA-315737: enable extract method on virtual expressions

Browse Source 
GitOrigin-RevId: a6ca3dea5d3ab7ec8237c21a06e366e3e5c68a89
This commit is contained in:
Alexandr Suhinin
2023-03-20 17:18:51 +00:00
committed by intellij-monorepo-bot
parent 094fff741c
commit b5b3ceda3d
8 changed files with 62 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl-refactorings/src/com/intellij/refactoring/extractMethod/newImpl/ExtractMethodAnalyzer.kt
+1 -1
View File
@@ -58,7 +58,7 @@ fun findExtractOptions(elements: List<PsiElement>): ExtractOptions {
throw ExtractException(JavaRefactoringBundle.message("extract.method.error.many.exits"), flowOutput.statements + listOfNotNull(outputVariable))
}
val targetClass = PsiTreeUtil.getParentOfType(ExtractMethodHelper.getValidParentOf(elements.first()), PsiClass::class.java)
val targetClass = PsiTreeUtil.getContextOfType(elements.first(), PsiClass::class.java)
?: throw ExtractException(JavaRefactoringBundle.message("extract.method.error.class.not.found"), elements.first().containingFile)
var extractOptions = ExtractOptions(targetClass, elements, flowOutput, dataOutput)
java/java-impl-refactorings/src/com/intellij/refactoring/extractMethod/newImpl/inplace/DuplicatesMethodExtractor.kt
+5 -1
View File
@@ -24,6 +24,7 @@ import com.intellij.refactoring.extractMethod.newImpl.ExtractMethodPipeline.addM
import com.intellij.refactoring.extractMethod.newImpl.JavaDuplicatesFinder.Companion.textRangeOf
import com.intellij.refactoring.extractMethod.newImpl.structures.ExtractOptions
import com.intellij.refactoring.extractMethod.newImpl.structures.InputParameter
import com.intellij.refactoring.introduceField.ElementToWorkOn
import com.intellij.refactoring.util.duplicates.DuplicatesImpl
import com.intellij.ui.ReplacePromptDialog
import com.siyeh.ig.psiutils.SideEffectChecker.mayHaveSideEffects
@@ -40,7 +41,10 @@ class DuplicatesMethodExtractor(val extractOptions: ExtractOptions, val targetCl
JavaDuplicatesFinder.linkCopiedClassMembersWithOrigin(file)
val copiedFile = file.copy() as PsiFile
val copiedClass = PsiTreeUtil.findSameElementInCopy(targetClass, copiedFile)
val copiedElements = elements.map { PsiTreeUtil.findSameElementInCopy(it, copiedFile) }
val expression = elements.singleOrNull() as? PsiExpression
val virtualExpressionRange = expression?.getUserData(ElementToWorkOn.TEXT_RANGE)?.textRange
val range = virtualExpressionRange ?:TextRange(elements.first().textRange.startOffset, elements.last().textRange.endOffset)
val copiedElements = ExtractSelector().suggestElementsToExtract(copiedFile, range)
val extractOptions = findExtractOptions(copiedClass, copiedElements, methodName, makeStatic)
return DuplicatesMethodExtractor(extractOptions, targetClass, elements)
}
java/java-impl/src/com/intellij/refactoring/IntroduceVariableUtil.java
+12 -10
View File
@@ -188,8 +188,8 @@ public final class IntroduceVariableUtil {
tempExpr.putUserData(ElementToWorkOn.PREFIX, prefix);
tempExpr.putUserData(ElementToWorkOn.SUFFIX, suffix);
final RangeMarker rangeMarker =
FileDocumentManager.getInstance().getDocument(file.getVirtualFile()).createRangeMarker(startOffset, endOffset);
Document document = PsiDocumentManager.getInstance(project).getDocument(file);
RangeMarker rangeMarker = document != null ? document.createRangeMarker(startOffset, endOffset) : null;
tempExpr.putUserData(ElementToWorkOn.TEXT_RANGE, rangeMarker);
if (parent != null) {
@@ -216,7 +216,7 @@ public final class IntroduceVariableUtil {
final String fakeInitializer = "intellijidearulezzz";
final int[] refIdx = new int[1];
final PsiElement toBeExpression = createReplacement(fakeInitializer, project, prefix, suffix, parent, rangeMarker, refIdx);
final PsiElement toBeExpression = createReplacement(fakeInitializer, project, prefix, suffix, parent, TextRange.create(startOffset, endOffset), refIdx);
if (ErrorUtil.containsDeepError(toBeExpression)) return null;
if (literalExpression != null && toBeExpression instanceof PsiExpression) {
PsiType type = ((PsiExpression)toBeExpression).getType();
@@ -339,22 +339,22 @@ public final class IntroduceVariableUtil {
return null;
}
public static PsiElement createReplacement(final @NonNls String refText, final Project project,
private static PsiElement createReplacement(final @NonNls String refText, final Project project,
final String prefix,
final String suffix,
final PsiElement parent, final RangeMarker rangeMarker, int[] refIdx) {
final PsiElement parent, final TextRange textRange, int[] refIdx) {
String text = refText;
if (parent != null) {
final String allText = parent.getContainingFile().getText();
final TextRange parentRange = parent.getTextRange();
LOG.assertTrue(parentRange.getStartOffset() <= rangeMarker.getStartOffset(), parent + "; prefix:" + prefix + "; suffix:" + suffix);
String beg = allText.substring(parentRange.getStartOffset(), rangeMarker.getStartOffset());
LOG.assertTrue(parentRange.getStartOffset() <= textRange.getStartOffset(), parent + "; prefix:" + prefix + "; suffix:" + suffix);
String beg = allText.substring(parentRange.getStartOffset(), textRange.getStartOffset());
//noinspection SSBasedInspection (suggested replacement breaks behavior)
if (StringUtil.stripQuotesAroundValue(beg).trim().isEmpty() && prefix == null) beg = "";
LOG.assertTrue(rangeMarker.getEndOffset() <= parentRange.getEndOffset(), parent + "; prefix:" + prefix + "; suffix:" + suffix);
String end = allText.substring(rangeMarker.getEndOffset(), parentRange.getEndOffset());
LOG.assertTrue(textRange.getEndOffset() <= parentRange.getEndOffset(), parent + "; prefix:" + prefix + "; suffix:" + suffix);
String end = allText.substring(textRange.getEndOffset(), parentRange.getEndOffset());
//noinspection SSBasedInspection (suggested replacement breaks behavior)
if (StringUtil.stripQuotesAroundValue(end).trim().isEmpty() && suffix == null) end = "";
@@ -459,7 +459,9 @@ public final class IntroduceVariableUtil {
final RangeMarker rangeMarker = expr1.getUserData(ElementToWorkOn.TEXT_RANGE);
LOG.assertTrue(parent != null, expr1);
return parent.replace(createReplacement(ref.getText(), project, prefix, suffix, parent, rangeMarker, new int[1]));
LOG.assertTrue(rangeMarker != null, expr1);
final TextRange textRange = rangeMarker.getTextRange();
return parent.replace(createReplacement(ref.getText(), project, prefix, suffix, parent, textRange, new int[1]));
}
}
}
java/java-tests/testData/refactoring/extractMethodAndDuplicatesInplace/ExtractVirtualExpressionFromPolyadic.java
+5
View File
@@ -0,0 +1,5 @@
class Test {
void test(){
System.out.println(<selection>"one" + "two"</selection> + "three");
}
}
java/java-tests/testData/refactoring/extractMethodAndDuplicatesInplace/ExtractVirtualExpressionFromPolyadic_after.java
+12
View File
@@ -0,0 +1,12 @@
import org.jetbrains.annotations.NotNull;
class Test {
void test(){
System.out.println(getString() + "three");
}
@NotNull
private static String getString() {
return "one" + "two";
}
}
java/java-tests/testData/refactoring/extractMethodAndDuplicatesInplace/ExtractVirtualExpressionFromSubstring.java
+6
View File
@@ -0,0 +1,6 @@
class Test {
void test(){
System.out.println("one" + "two" + "three");
System.out.println("one <selection>two</selection> three");
}
}
java/java-tests/testData/refactoring/extractMethodAndDuplicatesInplace/ExtractVirtualExpressionFromSubstring_after.java
+13
View File
@@ -0,0 +1,13 @@
import org.jetbrains.annotations.NotNull;
class Test {
void test(){
System.out.println("one" + getTwo() + "three");
System.out.println("one " + getTwo() + " three");
}
@NotNull
private static String getTwo() {
return "two";
}
}
java/java-tests/testSrc/com/intellij/java/refactoring/ExtractMethodAndDuplicatesInplaceTest.kt
+8
View File
@@ -468,6 +468,14 @@ class ExtractMethodAndDuplicatesInplaceTest: LightJavaCodeInsightTestCase() {
doTest()
}
fun testExtractVirtualExpressionFromPolyadic(){
doTest()
}
fun testExtractVirtualExpressionFromSubstring(){
doTest()
}
fun testRefactoringListener(){
templateTest {
configureByFile("$BASE_PATH/${getTestName(false)}.java")