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

check methods moved to interface as default (IDEA-151809)

Browse Source
This commit is contained in:
Anna Kozlova
2016-02-19 20:30:26 +01:00
parent 8b16402ca3
commit e1f2670f5a
3 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/refactoring/memberPullUp/PullUpConflictsUtil.java
+1 -1
View File
@@ -85,7 +85,7 @@ public class PullUpConflictsUtil {
for (MemberInfoBase<? extends PsiMember> info : infos) {
PsiMember member = info.getMember();
if (member instanceof PsiMethod) {
if (!info.isToAbstract() && !isInterfaceTarget) {
if (!info.isToAbstract()) {
movedMembers.add(member);
}
else {
java/java-tests/testData/refactoring/pullUp/PullToInterfaceAsDefault.java
+9
View File
@@ -0,0 +1,9 @@
interface IPlanet {}
class SimplePlanet implements IPlanet {
double mass;
private double ma<caret>ss() {
return mass;
}
}
java/java-tests/testSrc/com/intellij/refactoring/PullUpTest.java
+5 -1
View File
@@ -25,7 +25,6 @@ import com.intellij.refactoring.listeners.MoveMemberListener;
import com.intellij.refactoring.memberPullUp.PullUpConflictsUtil;
import com.intellij.refactoring.memberPullUp.PullUpProcessor;
import com.intellij.refactoring.util.DocCommentPolicy;
import com.intellij.refactoring.util.classMembers.InterfaceContainmentVerifier;
import com.intellij.refactoring.util.classMembers.MemberInfo;
import com.intellij.testFramework.IdeaTestUtil;
import com.intellij.util.containers.MultiMap;
@@ -100,6 +99,11 @@ public class PullUpTest extends LightRefactoringTestCase {
doTest(true, "Functional expression demands functional interface to have exact one method", new RefactoringTestUtil.MemberDescriptor("get", PsiMethod.class, true));
}
public void testPullToInterfaceAsDefault() throws Exception {
setLanguageLevel(LanguageLevel.JDK_1_8);
doTest(true, "Method <b><code>mass()</code></b> uses field <b><code>SimplePlanet.mass</code></b>, which is not moved to the superclass", new RefactoringTestUtil.MemberDescriptor("mass", PsiMethod.class, false));
}
public void testStillFunctional() {
setLanguageLevel(LanguageLevel.JDK_1_8);
doTest(true, new RefactoringTestUtil.MemberDescriptor("get", PsiMethod.class, false));