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

inline: accept to inline constant from library (IDEA-106167)

Browse Source
This commit is contained in:
anna
2013-04-25 14:14:49 +02:00
parent 16244342e4
commit 7463ed3c9b
5 changed files with 38 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-tests/testData/refactoring/inlineConstantField/ConstantFromLibrary.java
+5
View File
@@ -0,0 +1,5 @@
import java.io.File;
public class Test {
private static final String c = File.separa<caret>tor;
}
java/java-tests/testData/refactoring/inlineConstantField/ConstantFromLibrary.java.after
+5
View File
@@ -0,0 +1,5 @@
import java.io.File;
public class Test {
private static final String c = "" + File.separatorChar;
}
java/java-tests/testSrc/com/intellij/refactoring/inline/InlineConstantFieldTest.java
+7 -6
View File
@@ -2,10 +2,7 @@ package com.intellij.refactoring.inline;
import com.intellij.JavaTestUtil;
import com.intellij.codeInsight.TargetElementUtilBase;
import com.intellij.psi.PsiElement;
import com.intellij.psi.PsiField;
import com.intellij.psi.PsiReference;
import com.intellij.psi.PsiReferenceExpression;
import com.intellij.psi.*;
import com.intellij.refactoring.LightRefactoringTestCase;
import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.NotNull;
@@ -37,6 +34,10 @@ public class InlineConstantFieldTest extends LightRefactoringTestCase {
doTest();
}
public void testConstantFromLibrary() throws Exception {
doTest();
}
private void doTest() throws Exception {
String name = getTestName(false);
@NonNls String fileName = "/refactoring/inlineConstantField/" + name + ".java";
@@ -51,7 +52,7 @@ public class InlineConstantFieldTest extends LightRefactoringTestCase {
final PsiReference ref = myFile.findReferenceAt(myEditor.getCaretModel().getOffset());
PsiReferenceExpression refExpr = ref instanceof PsiReferenceExpression ? (PsiReferenceExpression)ref : null;
assertTrue(element instanceof PsiField);
PsiField field = (PsiField)element;
new InlineConstantFieldProcessor(field, getProject(), refExpr, false).run();
PsiField field = (PsiField)element.getNavigationElement();
new InlineConstantFieldProcessor(field, getProject(), refExpr, element instanceof PsiCompiledElement).run();
}
}