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

Make DocCommentPolicy non-generic; type parameter is not very useful here

Browse Source 
GitOrigin-RevId: e5c1e431e67c1aeb24a237172aaee85b37433cd3
This commit is contained in:
Tagir Valeev
2024-09-13 16:24:58 +02:00
committed by intellij-monorepo-bot
parent 05de6a6bdb
commit 037c7339b0
35 changed files with 65 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
java/java-impl-refactorings/src/com/intellij/refactoring/encapsulateFields/EncapsulateFieldsProcessor.java
View File

@@ -289,7 +289,7 @@ public class EncapsulateFieldsProcessor extends BaseRefactoringProcessor {
myNameToSetter = new HashMap<>();
for (FieldDescriptor fieldDescriptor : myFieldDescriptors) {
final DocCommentPolicy<PsiDocComment> commentPolicy = new DocCommentPolicy<>(myDescriptor.getJavadocPolicy());
final DocCommentPolicy commentPolicy = new DocCommentPolicy(myDescriptor.getJavadocPolicy());
PsiField field = fieldDescriptor.getField();
final PsiDocComment docComment = field.getDocComment();

2
java/java-impl-refactorings/src/com/intellij/refactoring/extractInterface/ExtractInterfaceDialog.java
View File

@@ -136,7 +136,7 @@ class ExtractInterfaceDialog extends JavaExtractSuperBaseDialog {
protected ExtractSuperBaseProcessor createProcessor() {
return new ExtractInterfaceProcessor(myProject, false, getTargetDirectory(), getExtractedSuperName(),
mySourceClass, getSelectedMemberInfos().toArray(new MemberInfo[0]),
new DocCommentPolicy<>(getDocCommentPolicy()));
new DocCommentPolicy(getDocCommentPolicy()));
}
@Override

6
java/java-impl-refactorings/src/com/intellij/refactoring/extractInterface/ExtractInterfaceHandler.java
View File

@@ -40,7 +40,7 @@ public class ExtractInterfaceHandler implements ElementsHandler, ContextAwareAct
private String myInterfaceName;
private MemberInfo[] mySelectedMembers;
private PsiDirectory myTargetDir;
private DocCommentPolicy<?> myJavaDocPolicy;
private DocCommentPolicy myJavaDocPolicy;
@Override
public boolean isAvailableForQuickList(@NotNull Editor editor, @NotNull PsiFile file, @NotNull DataContext dataContext) {
@@ -100,7 +100,7 @@ public class ExtractInterfaceHandler implements ElementsHandler, ContextAwareAct
myInterfaceName = dialog.getExtractedSuperName();
mySelectedMembers = dialog.getSelectedMemberInfos().toArray(new MemberInfo[0]);
myTargetDir = dialog.getTargetDirectory();
myJavaDocPolicy = new DocCommentPolicy<>(dialog.getDocCommentPolicy());
myJavaDocPolicy = new DocCommentPolicy(dialog.getDocCommentPolicy());
LocalHistoryAction a = LocalHistory.getInstance().startAction(getCommandName());
try {
return extractInterface(myTargetDir, myClass, myInterfaceName, mySelectedMembers, myJavaDocPolicy);
@@ -116,7 +116,7 @@ public class ExtractInterfaceHandler implements ElementsHandler, ContextAwareAct
PsiClass aClass,
String interfaceName,
MemberInfo[] selectedMembers,
DocCommentPolicy<?> javaDocPolicy) {
DocCommentPolicy javaDocPolicy) {
final Project project = aClass.getProject();
project.getMessageBus().syncPublisher(RefactoringEventListener.REFACTORING_EVENT_TOPIC)
.refactoringStarted(ExtractSuperClassUtil.REFACTORING_EXTRACT_SUPER_ID, ExtractSuperClassUtil.createBeforeData(aClass, selectedMembers));

2
java/java-impl-refactorings/src/com/intellij/refactoring/extractInterface/ExtractInterfaceProcessor.java
View File

@@ -15,7 +15,7 @@ public class ExtractInterfaceProcessor extends ExtractSuperBaseProcessor {
String newClassName,
PsiClass aClass,
MemberInfo[] memberInfos,
DocCommentPolicy<?> javaDocPolicy) {
DocCommentPolicy javaDocPolicy) {
super(project, replaceInstanceOf, targetDirectory, newClassName, aClass, memberInfos, javaDocPolicy);
}

4
java/java-impl-refactorings/src/com/intellij/refactoring/extractSuperclass/ExtractSuperBaseProcessor.java
View File

@@ -31,14 +31,14 @@ public abstract class ExtractSuperBaseProcessor extends TurnRefsToSuperProcessor
protected PsiDirectory myTargetDirectory;
protected final String myNewClassName;
protected final MemberInfo[] myMemberInfos;
protected final DocCommentPolicy<?> myJavaDocPolicy;
protected final DocCommentPolicy myJavaDocPolicy;
public ExtractSuperBaseProcessor(Project project,
boolean replaceInstanceOf,
PsiDirectory targetDirectory,
String newClassName,
PsiClass aClass, MemberInfo[] memberInfos, DocCommentPolicy<?> javaDocPolicy) {
PsiClass aClass, MemberInfo[] memberInfos, DocCommentPolicy javaDocPolicy) {
super(project, replaceInstanceOf, newClassName);
myTargetDirectory = targetDirectory;
myNewClassName = newClassName;

2
java/java-impl-refactorings/src/com/intellij/refactoring/extractSuperclass/ExtractSuperClassProcessor.java
View File

@@ -11,7 +11,7 @@ public class ExtractSuperClassProcessor extends ExtractSuperBaseProcessor {
public ExtractSuperClassProcessor(Project project,
PsiDirectory targetDirectory, String newClassName, PsiClass aClass, MemberInfo[] memberInfos, boolean replaceInstanceOf,
DocCommentPolicy<?> javaDocPolicy) {
DocCommentPolicy javaDocPolicy) {
super(project, replaceInstanceOf, targetDirectory, newClassName, aClass, memberInfos, javaDocPolicy);
}

2
java/java-impl-refactorings/src/com/intellij/refactoring/extractSuperclass/ExtractSuperClassUtil.java
View File

@@ -44,7 +44,7 @@ public final class ExtractSuperClassUtil {
final String superclassName,
final PsiClass subclass,
final MemberInfo[] selectedMemberInfos,
final DocCommentPolicy<?> javaDocPolicy)
final DocCommentPolicy javaDocPolicy)
throws IncorrectOperationException {
project.getMessageBus().syncPublisher(RefactoringEventListener.REFACTORING_EVENT_TOPIC)

2
java/java-impl-refactorings/src/com/intellij/refactoring/extractSuperclass/ExtractSuperclassDialog.java
View File

@@ -142,7 +142,7 @@ class ExtractSuperclassDialog extends JavaExtractSuperBaseDialog {
protected ExtractSuperBaseProcessor createProcessor() {
return new ExtractSuperClassProcessor(myProject, getTargetDirectory(), getExtractedSuperName(),
mySourceClass, getSelectedMemberInfos().toArray(new MemberInfo[0]), false,
new DocCommentPolicy<>(getDocCommentPolicy()));
new DocCommentPolicy(getDocCommentPolicy()));
}
@Override

2
java/java-impl-refactorings/src/com/intellij/refactoring/extractSuperclass/ExtractSuperclassHandler.java
View File

@@ -152,7 +152,7 @@ public class ExtractSuperclassHandler implements ElementsHandler, ExtractSupercl
final String superclassName = dialog.getExtractedSuperName();
final PsiDirectory targetDirectory = dialog.getTargetDirectory();
final MemberInfo[] selectedMemberInfos = dialog.getSelectedMemberInfos().toArray(new MemberInfo[0]);
final DocCommentPolicy<?> javaDocPolicy = new DocCommentPolicy<>(dialog.getDocCommentPolicy());
final DocCommentPolicy javaDocPolicy = new DocCommentPolicy(dialog.getDocCommentPolicy());
LocalHistoryAction a = LocalHistory.getInstance().startAction(getCommandName(subclass, superclassName));
try {
return ExtractSuperClassUtil.extractSuperClass(project, targetDirectory, superclassName, subclass, selectedMemberInfos, javaDocPolicy);

2
java/java-impl-refactorings/src/com/intellij/refactoring/inlineSuperClass/InlineSuperClassRefactoringProcessor.java
View File

@@ -316,7 +316,7 @@ public class InlineSuperClassRefactoringProcessor extends FixableUsagesRefactori
protected void performRefactoring(final UsageInfo @NotNull [] usages) {
try {
final UsageInfo[] infos = ContainerUtil.map2Array(myTargetClasses, UsageInfo.class, UsageInfo::new);
new PushDownProcessor<>(mySuperClass, Arrays.asList(myMemberInfos), new DocCommentPolicy<>(myPolicy), myCurrentInheritor!=null)
new PushDownProcessor<>(mySuperClass, Arrays.asList(myMemberInfos), new DocCommentPolicy(myPolicy), myCurrentInheritor!=null)
.pushDownToClasses(infos);
CommonRefactoringUtil.sortDepthFirstRightLeftOrder(usages);

4
java/java-impl-refactorings/src/com/intellij/refactoring/memberPullUp/JavaPullUpHandler.java
View File

@@ -64,7 +64,7 @@ public class JavaPullUpHandler implements PullUpDialog.Callback, ElementsHandler
@Override
public void runSilently(@NotNull PsiClass sourceClass,
PsiClass targetSuperClass,
MemberInfo[] membersToMove, DocCommentPolicy<?> javaDocPolicy) {
MemberInfo[] membersToMove, DocCommentPolicy javaDocPolicy) {
new PullUpProcessor(sourceClass, targetSuperClass, membersToMove, javaDocPolicy).run();
}
@@ -152,7 +152,7 @@ public class JavaPullUpHandler implements PullUpDialog.Callback, ElementsHandler
}), RefactoringBundle.message("detecting.possible.conflicts"), true, myProject)) return false;
if (!conflicts.isEmpty()) {
ConflictsDialog conflictsDialog = new ConflictsDialog(myProject, conflicts, () ->
new PullUpProcessor(mySubclass, superClass, infos.toArray(new MemberInfo[0]), new DocCommentPolicy<>(dialog.getJavaDocPolicy())).run());
new PullUpProcessor(mySubclass, superClass, infos.toArray(new MemberInfo[0]), new DocCommentPolicy(dialog.getJavaDocPolicy())).run());
boolean ok = conflictsDialog.showAndGet();
if (!ok && conflictsDialog.isShowConflicts()) dialog.close(DialogWrapper.CANCEL_EXIT_CODE);
return ok;

2
java/java-impl-refactorings/src/com/intellij/refactoring/memberPullUp/JavaPullUpHelper.java
View File

@@ -40,7 +40,7 @@ public class JavaPullUpHelper implements PullUpHelper<MemberInfo> {
private final PsiClass mySourceClass;
private final PsiClass myTargetSuperClass;
private final boolean myIsTargetInterface;
private final DocCommentPolicy<?> myJavaDocPolicy;
private final DocCommentPolicy myJavaDocPolicy;
private final Set<PsiMember> myMembersAfterMove;
private final Set<PsiMember> myMembersToMove;
private final Project myProject;

2
java/java-impl-refactorings/src/com/intellij/refactoring/memberPullUp/PullUpDialog.java
View File

@@ -136,7 +136,7 @@ public class PullUpDialog extends PullUpDialogBase<MemberInfoStorage, MemberInfo
List<MemberInfo> infos = getSelectedMemberInfos();
invokeRefactoring(new PullUpProcessor(myClass, superClass, infos.toArray(new MemberInfo[0]),
new DocCommentPolicy<>(getJavaDocPolicy())));
new DocCommentPolicy(getJavaDocPolicy())));
close(OK_EXIT_CODE);
}

6
java/java-impl-refactorings/src/com/intellij/refactoring/memberPullUp/PullUpProcessor.java
View File

@@ -43,12 +43,12 @@ public class PullUpProcessor extends BaseRefactoringProcessor implements PullUpD
private final PsiClass mySourceClass;
private final PsiClass myTargetSuperClass;
private final MemberInfo[] myMembersToMove;
private final DocCommentPolicy<?> myJavaDocPolicy;
private final DocCommentPolicy myJavaDocPolicy;
private Set<PsiMember> myMembersAfterMove;
private Set<PsiMember> myMovedMembers;
private final Map<Language, PullUpHelper<MemberInfo>> myProcessors = new HashMap<>();
public PullUpProcessor(@NotNull PsiClass sourceClass, PsiClass targetSuperClass, MemberInfo[] membersToMove, DocCommentPolicy<?> javaDocPolicy) {
public PullUpProcessor(@NotNull PsiClass sourceClass, PsiClass targetSuperClass, MemberInfo[] membersToMove, DocCommentPolicy javaDocPolicy) {
super(sourceClass.getProject());
mySourceClass = sourceClass;
myTargetSuperClass = targetSuperClass;
@@ -273,7 +273,7 @@ public class PullUpProcessor extends BaseRefactoringProcessor implements PullUpD
}
@Override
public DocCommentPolicy<?> getDocCommentPolicy() {
public DocCommentPolicy getDocCommentPolicy() {
return myJavaDocPolicy;
}

2
java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/PullAsAbstractUpFix.java
View File

@@ -127,7 +127,7 @@ public class PullAsAbstractUpFix extends LocalQuickFixAndIntentionActionOnPsiEle
if (handler == null) {
throw new IllegalStateException("Handler is null, supportProvider class = " + supportProvider.getClass());
}
handler.runSilently(containingClass, baseClass, new MemberInfo[]{memberInfo}, new DocCommentPolicy<>(DocCommentPolicy.ASIS));
handler.runSilently(containingClass, baseClass, new MemberInfo[]{memberInfo}, new DocCommentPolicy(DocCommentPolicy.ASIS));
}
@Override

2
java/java-impl/src/com/intellij/refactoring/memberPullUp/JavaPullUpHandlerBase.java
View File

@@ -11,5 +11,5 @@ public interface JavaPullUpHandlerBase extends RefactoringActionHandler {
void runSilently(@NotNull PsiClass sourceClass,
PsiClass targetSuperClass,
MemberInfo[] membersToMove,
DocCommentPolicy<?> javaDocPolicy);
DocCommentPolicy javaDocPolicy);
}

4
java/java-tests/testSrc/com/intellij/java/refactoring/ExtractSuperClassTest.java
View File

@@ -161,7 +161,7 @@ public class ExtractSuperClassTest extends LightMultiFileTestCase {
}
WriteCommandAction.writeCommandAction(getProject()).run(() -> ExtractSuperClassUtil
.extractSuperClass(getProject(), psiClass.getContainingFile().getContainingDirectory(), "TestSubclass", anonymousClass,
infos.toArray(new MemberInfo[0]), new DocCommentPolicy<>(DocCommentPolicy.ASIS)));
infos.toArray(new MemberInfo[0]), new DocCommentPolicy(DocCommentPolicy.ASIS)));
});
}
@@ -186,7 +186,7 @@ public class ExtractSuperClassTest extends LightMultiFileTestCase {
assertNotNull(psiClass);
final MemberInfo[] members = RefactoringTestUtil.findMembers(psiClass, membersToFind);
doTest(members, targetPackageName, psiClass, conflicts,
targetDirectory -> new ExtractSuperClassProcessor(getProject(), targetDirectory, newClassName, psiClass, members, false, new DocCommentPolicy<>(DocCommentPolicy.ASIS)));
targetDirectory -> new ExtractSuperClassProcessor(getProject(), targetDirectory, newClassName, psiClass, members, false, new DocCommentPolicy(DocCommentPolicy.ASIS)));
});
}

2
java/java-tests/testSrc/com/intellij/java/refactoring/ExtractSuperInterfaceTest.java
View File

@@ -32,7 +32,7 @@ public class ExtractSuperInterfaceTest extends ExtractSuperClassTest {
assertNotNull(psiClass);
final MemberInfo[] members = RefactoringTestUtil.findMembers(psiClass, membersToFind);
doTest(members, null, psiClass, null,
targetDirectory -> new ExtractInterfaceProcessor(getProject(), false, targetDirectory, newClassName, psiClass, members, new DocCommentPolicy<>(DocCommentPolicy.ASIS)));
targetDirectory -> new ExtractInterfaceProcessor(getProject(), false, targetDirectory, newClassName, psiClass, members, new DocCommentPolicy(DocCommentPolicy.ASIS)));
});
}

4
java/java-tests/testSrc/com/intellij/java/refactoring/PullUpMultifileTest.java
View File

@@ -57,7 +57,7 @@ public class PullUpMultifileTest extends LightMultiFileTestCase {
PullUpConflictsUtil.checkConflicts(membersToMove, srcClass, targetClass, targetPackage, targetDirectory,
psiMethod -> PullUpProcessor.checkedInterfacesContain(Arrays.asList(membersToMove), psiMethod)));
new PullUpProcessor(srcClass, targetClass, membersToMove, new DocCommentPolicy<>(DocCommentPolicy.ASIS)).run();
new PullUpProcessor(srcClass, targetClass, membersToMove, new DocCommentPolicy(DocCommentPolicy.ASIS)).run();
});
if (conflicts.length != 0 && conflictsMap.isEmpty()) {
@@ -107,7 +107,7 @@ public class PullUpMultifileTest extends LightMultiFileTestCase {
final MemberInfo memberInfo = new MemberInfo(methods[0]);
memberInfo.setChecked(true);
membersToMove[0] = memberInfo;
new PullUpProcessor(srcClass, targetClass, membersToMove, new DocCommentPolicy<>(DocCommentPolicy.ASIS)).run();
new PullUpProcessor(srcClass, targetClass, membersToMove, new DocCommentPolicy(DocCommentPolicy.ASIS)).run();
});
}
}

2
java/java-tests/testSrc/com/intellij/java/refactoring/PullUpTest.java
View File

@@ -302,7 +302,7 @@ public class PullUpTest extends LightRefactoringTestCase {
.checkConflicts(infos, sourceClass, targetClass, targetPackage, targetDirectory,
psiMethod -> PullUpProcessor.checkedInterfacesContain(Arrays.asList(infos), psiMethod))
);
final PullUpProcessor helper = new PullUpProcessor(sourceClass, targetClass, infos, new DocCommentPolicy<>(DocCommentPolicy.ASIS));
final PullUpProcessor helper = new PullUpProcessor(sourceClass, targetClass, infos, new DocCommentPolicy(DocCommentPolicy.ASIS));
helper.run();
UIUtil.dispatchAllInvocationEvents();
JavaRefactoringListenerManager.getInstance(getProject()).removeMoveMembersListener(listener);

4
java/java-tests/testSrc/com/intellij/java/refactoring/PushDownMultifileTest.java
View File

@@ -56,7 +56,7 @@ public class PushDownMultifileTest extends LightMultiFileTestCase {
assertTrue("No methods found", methods.length > 0);
final MemberInfo memberInfo = new MemberInfo(methods[0]);
memberInfo.setChecked(true);
new PushDownProcessor<>(srcClass, Collections.singletonList(memberInfo), new DocCommentPolicy<>(DocCommentPolicy.ASIS)).run();
new PushDownProcessor<>(srcClass, Collections.singletonList(memberInfo), new DocCommentPolicy(DocCommentPolicy.ASIS)).run();
//LocalFileSystem.getInstance().refresh(false);
@@ -108,7 +108,7 @@ public class PushDownMultifileTest extends LightMultiFileTestCase {
assertTrue("No methods found", fields.length > 0);
final MemberInfo memberInfo = new MemberInfo(fields[0]);
memberInfo.setChecked(true);
new PushDownProcessor<>(srcClass, Collections.singletonList(memberInfo), new DocCommentPolicy<>(DocCommentPolicy.ASIS)).run();
new PushDownProcessor<>(srcClass, Collections.singletonList(memberInfo), new DocCommentPolicy(DocCommentPolicy.ASIS)).run();
//LocalFileSystem.getInstance().refresh(false);

4
java/java-tests/testSrc/com/intellij/java/refactoring/PushDownTest.java
View File

@@ -174,7 +174,7 @@ public class PushDownTest extends LightRefactoringTestCase {
membersToMove.add(memberInfo);
new PushDownProcessor<>(currentClass, membersToMove,
new DocCommentPolicy<>(DocCommentPolicy.ASIS)) {
new DocCommentPolicy(DocCommentPolicy.ASIS)) {
@Override
protected boolean showConflicts(@NotNull MultiMap<PsiElement, String> conflicts, UsageInfo[] usages) {
checkConflicts.accept(conflicts);
@@ -207,7 +207,7 @@ public class PushDownTest extends LightRefactoringTestCase {
}
new PushDownProcessor<>(currentClass, members,
new DocCommentPolicy<>(DocCommentPolicy.ASIS)) {
new DocCommentPolicy(DocCommentPolicy.ASIS)) {
@Override
protected boolean showConflicts(@NotNull MultiMap<PsiElement, String> conflicts, UsageInfo[] usages) {
if (failure == conflicts.isEmpty()) {

2
java/openapi/src/com/intellij/refactoring/memberPullUp/PullUpData.java
View File

@@ -27,7 +27,7 @@ public interface PullUpData {
PsiClass getTargetClass();
DocCommentPolicy<?> getDocCommentPolicy();
DocCommentPolicy getDocCommentPolicy();
Set<PsiMember> getMembersToMove();

8
platform/lang-api/src/com/intellij/refactoring/util/DocCommentPolicy.java
View File

@@ -19,7 +19,7 @@ package com.intellij.refactoring.util;
import com.intellij.psi.PsiComment;
import com.intellij.util.IncorrectOperationException;
public class DocCommentPolicy<T extends PsiComment> {
public class DocCommentPolicy {
public static final int ASIS = 0;
public static final int MOVE = 1;
public static final int COPY = 2;
@@ -30,7 +30,7 @@ public class DocCommentPolicy<T extends PsiComment> {
myJavaDocPolicy = javaDocPolicy;
}
public void processCopiedJavaDoc(T newDocComment, T docComment, boolean willOldBeDeletedAnyway)
public void processCopiedJavaDoc(PsiComment newDocComment, PsiComment docComment, boolean willOldBeDeletedAnyway)
throws IncorrectOperationException{
if(myJavaDocPolicy == COPY || docComment == null) return;
@@ -42,13 +42,13 @@ public class DocCommentPolicy<T extends PsiComment> {
}
}
public void processNewJavaDoc(T newDocComment) throws IncorrectOperationException {
public void processNewJavaDoc(PsiComment newDocComment) throws IncorrectOperationException {
if(myJavaDocPolicy == ASIS && newDocComment != null) {
newDocComment.delete();
}
}
public void processOldJavaDoc(T oldDocComment) throws IncorrectOperationException {
public void processOldJavaDoc(PsiComment oldDocComment) throws IncorrectOperationException {
if(myJavaDocPolicy == MOVE && oldDocComment != null) {
oldDocComment.delete();
}

2
platform/lang-impl/src/com/intellij/refactoring/memberPushDown/AbstractPushDownDialog.java
View File

@@ -103,6 +103,6 @@ public abstract class AbstractPushDownDialog<MemberInfo extends MemberInfoBase<M
protected void doAction() {
if(!isOKActionEnabled()) return;
invokeRefactoring(new PushDownProcessor<>(myClass, getSelectedMemberInfos(), new DocCommentPolicy<>(myJavaDocPanel.getPolicy())));
invokeRefactoring(new PushDownProcessor<>(myClass, getSelectedMemberInfos(), new DocCommentPolicy(myJavaDocPanel.getPolicy())));
}
}

8
platform/lang-impl/src/com/intellij/refactoring/memberPushDown/PushDownData.java
View File

@@ -13,19 +13,19 @@ public final class PushDownData<MemberInfo extends MemberInfoBase<Member>,
Member extends PsiElement> {
private PsiElement mySourceClass;
private final List<MemberInfo> myMembersToMove;
private final DocCommentPolicy<?> myCommentPolicy;
private final DocCommentPolicy myCommentPolicy;
private final boolean myPreserveLinks;
PushDownData(@NotNull PsiElement sourceClass,
@NotNull List<MemberInfo> membersToMove,
@NotNull DocCommentPolicy<?> commentPolicy) {
@NotNull DocCommentPolicy commentPolicy) {
this(sourceClass, membersToMove, commentPolicy, false);
}
@ApiStatus.Experimental
PushDownData(@NotNull PsiElement sourceClass,
@NotNull List<MemberInfo> membersToMove,
@NotNull DocCommentPolicy<?> commentPolicy,
@NotNull DocCommentPolicy commentPolicy,
boolean preserveExternalLinks) {
mySourceClass = sourceClass;
myMembersToMove = membersToMove;
@@ -42,7 +42,7 @@ public final class PushDownData<MemberInfo extends MemberInfoBase<Member>,
public @NotNull List<MemberInfo> getMembersToMove() {
return myMembersToMove;
}
public @NotNull DocCommentPolicy<?> getCommentPolicy() {
public @NotNull DocCommentPolicy getCommentPolicy() {
return myCommentPolicy;
}

4
platform/lang-impl/src/com/intellij/refactoring/memberPushDown/PushDownProcessor.java
View File

@@ -39,14 +39,14 @@ public class PushDownProcessor<MemberInfo extends MemberInfoBase<Member>,
public PushDownProcessor(@NotNull Klass sourceClass,
@NotNull List<MemberInfo> memberInfos,
@NotNull DocCommentPolicy<?> javaDocPolicy) {
@NotNull DocCommentPolicy javaDocPolicy) {
this(sourceClass, memberInfos, javaDocPolicy, false);
}
@ApiStatus.Experimental
public PushDownProcessor(@NotNull Klass sourceClass,
@NotNull List<MemberInfo> memberInfos,
@NotNull DocCommentPolicy<?> javaDocPolicy,
@NotNull DocCommentPolicy javaDocPolicy,
boolean preserveExternalLinks) {
super(sourceClass.getProject());
myDelegate = PushDownDelegate.findDelegate(sourceClass);

2
plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/memberPullUp/GrPullUpHelper.java
View File

@@ -62,7 +62,7 @@ public class GrPullUpHelper implements PullUpHelper<MemberInfo> {
private final Set<PsiMember> myMembersToMove;
private final PsiClass mySourceClass;
private final Project myProject;
private final DocCommentPolicy<?> myDocCommentPolicy;
private final DocCommentPolicy myDocCommentPolicy;
private final Set<PsiMember> myMembersAfterMove;
final ExplicitSuperDeleter myExplicitSuperDeleter;

2
plugins/groovy/test/org/jetbrains/plugins/groovy/refactoring/memberPullUp/GrPullUpTest.groovy
View File

@@ -192,7 +192,7 @@ class GrPullUpTest extends LightGroovyTestCase {
}
}
JavaRefactoringListenerManager.getInstance(getProject()).addMoveMembersListener(listener)
final PullUpProcessor helper = new PullUpProcessor(sourceClass, targetClass, infos, new DocCommentPolicy<>(DocCommentPolicy.ASIS))
final PullUpProcessor helper = new PullUpProcessor(sourceClass, targetClass, infos, new DocCommentPolicy(DocCommentPolicy.ASIS))
helper.run()
UIUtil.dispatchAllInvocationEvents()
JavaRefactoringListenerManager.getInstance(getProject()).removeMoveMembersListener(listener)

5
plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractClass/ExtractSuperRefactoring.kt
View File

@@ -58,9 +58,6 @@ import org.jetbrains.kotlin.resolve.BindingContext
import org.jetbrains.kotlin.resolve.descriptorUtil.getSuperClassNotAny
import org.jetbrains.kotlin.resolve.lazy.BodyResolveMode
import org.jetbrains.kotlin.resolve.scopes.utils.findClassifier
import kotlin.collections.component1
import kotlin.collections.component2
import kotlin.collections.set
data class ExtractSuperInfo(
val originalClass: KtClassOrObject,
@@ -69,7 +66,7 @@ data class ExtractSuperInfo(
val targetFileName: String,
val newClassName: String,
val isInterface: Boolean,
val docPolicy: DocCommentPolicy<*>
val docPolicy: DocCommentPolicy
)
class ExtractSuperRefactoring(

7
plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractClass/ui/KotlinExtractSuperDialogBase.kt
View File

@@ -2,7 +2,6 @@
package org.jetbrains.kotlin.idea.refactoring.introduce.extractClass.ui
import com.intellij.psi.PsiComment
import com.intellij.psi.PsiDirectory
import com.intellij.psi.PsiElement
import com.intellij.refactoring.RefactoringBundle
@@ -15,10 +14,10 @@ import com.intellij.util.ui.FormBuilder
import org.jetbrains.annotations.Nls
import org.jetbrains.kotlin.asJava.toLightClass
import org.jetbrains.kotlin.asJava.unwrapped
import org.jetbrains.kotlin.idea.base.util.onTextChange
import org.jetbrains.kotlin.idea.base.resources.KotlinBundle
import org.jetbrains.kotlin.idea.KotlinFileType
import org.jetbrains.kotlin.idea.base.psi.unquoteKotlinIdentifier
import org.jetbrains.kotlin.idea.base.resources.KotlinBundle
import org.jetbrains.kotlin.idea.base.util.onTextChange
import org.jetbrains.kotlin.idea.refactoring.introduce.extractClass.ExtractSuperInfo
import org.jetbrains.kotlin.idea.refactoring.memberInfo.KotlinMemberInfo
import org.jetbrains.kotlin.idea.refactoring.memberInfo.KotlinMemberSelectionPanel
@@ -177,7 +176,7 @@ abstract class KotlinExtractSuperDialogBase(
targetFileName,
extractedSuperName.quoteIfNeeded(),
isExtractInterface,
DocCommentPolicy<PsiComment>(docCommentPolicy)
DocCommentPolicy(docCommentPolicy)
)
refactoring(extractInfo)
}

3
plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/refactoring/pullUp/KotlinPullUpDialog.kt
View File

@@ -5,7 +5,6 @@ package org.jetbrains.kotlin.idea.refactoring.pullUp
import com.intellij.openapi.project.Project
import com.intellij.openapi.ui.DialogWrapper
import com.intellij.psi.PsiClass
import com.intellij.psi.PsiComment
import com.intellij.psi.PsiNamedElement
import com.intellij.refactoring.RefactoringBundle
import com.intellij.refactoring.classMembers.MemberInfoChange
@@ -157,7 +156,7 @@ class KotlinPullUpDialog(
sourceClass.toLightClass() ?: error("can't build lightClass for $sourceClass"),
targetPsiClass,
memberInfos.mapNotNull { it.toJavaMemberInfo() }.toTypedArray(),
DocCommentPolicy<PsiComment>(KotlinRefactoringSettings.instance.PULL_UP_MEMBERS_JAVADOC)
DocCommentPolicy(KotlinRefactoringSettings.instance.PULL_UP_MEMBERS_JAVADOC)
)
}
}

10
plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/refactoring/introduce/AbstractExtractionTest.kt
View File

@@ -16,7 +16,10 @@ import com.intellij.openapi.project.Project
import com.intellij.openapi.util.io.FileUtil
import com.intellij.openapi.util.registry.Registry
import com.intellij.openapi.vfs.VfsUtil
import com.intellij.psi.*
import com.intellij.psi.PsiElement
import com.intellij.psi.PsiFile
import com.intellij.psi.PsiJavaFile
import com.intellij.psi.PsiManager
import com.intellij.psi.codeStyle.JavaCodeStyleManager
import com.intellij.psi.codeStyle.VariableKind
import com.intellij.refactoring.BaseRefactoringProcessor.ConflictsInTestsException
@@ -33,7 +36,8 @@ import com.intellij.refactoring.util.occurrences.ExpressionOccurrenceManager
import com.intellij.testFramework.EditorTestUtil
import com.intellij.testFramework.IdeaTestUtil
import com.intellij.testFramework.TestLoggerFactory
import com.intellij.testFramework.fixtures.*
import com.intellij.testFramework.fixtures.CodeInsightTestFixture
import com.intellij.testFramework.fixtures.JavaCodeInsightTestFixture
import com.intellij.testFramework.runInEdtAndWait
import org.jetbrains.kotlin.asJava.elements.KtLightMethod
import org.jetbrains.kotlin.descriptors.FunctionDescriptor
@@ -447,7 +451,7 @@ abstract class AbstractExtractionTest : KotlinLightCodeInsightFixtureTestCase()
targetFileName,
className,
isInterface,
DocCommentPolicy<PsiComment>(DocCommentPolicy.ASIS)
DocCommentPolicy(DocCommentPolicy.ASIS)
)
ExtractSuperRefactoring(extractInfo).performRefactoring()
}

9
plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/refactoring/pullUp/AbstractPullUpTest.kt
View File

@@ -2,7 +2,10 @@
package org.jetbrains.kotlin.idea.refactoring.pullUp
import com.intellij.psi.*
import com.intellij.psi.PsiClass
import com.intellij.psi.PsiFile
import com.intellij.psi.PsiMethod
import com.intellij.psi.PsiNamedElement
import com.intellij.psi.util.PsiTreeUtil
import com.intellij.refactoring.BaseRefactoringProcessor
import com.intellij.refactoring.memberPullUp.PullUpConflictsUtil
@@ -11,12 +14,12 @@ import com.intellij.refactoring.util.DocCommentPolicy
import com.intellij.refactoring.util.RefactoringHierarchyUtil
import com.intellij.refactoring.util.classMembers.MemberInfoStorage
import com.intellij.util.ui.UIUtil
import org.jetbrains.kotlin.idea.base.test.InTextDirectivesUtils
import org.jetbrains.kotlin.idea.core.getPackage
import org.jetbrains.kotlin.idea.refactoring.AbstractMemberPullPushTest
import org.jetbrains.kotlin.idea.refactoring.chooseMembers
import org.jetbrains.kotlin.idea.refactoring.memberInfo.KotlinMemberInfo
import org.jetbrains.kotlin.idea.refactoring.memberInfo.qualifiedClassNameForRendering
import org.jetbrains.kotlin.idea.base.test.InTextDirectivesUtils
abstract class AbstractPullUpTest : AbstractMemberPullPushTest() {
private fun getTargetClassName(file: PsiFile) = InTextDirectivesUtils.findStringWithPrefixes(file.text, "// TARGET_CLASS: ")
@@ -66,7 +69,7 @@ abstract class AbstractPullUpTest : AbstractMemberPullPushTest() {
)
if (!conflicts.isEmpty) throw BaseRefactoringProcessor.ConflictsInTestsException(conflicts.values())
PullUpProcessor(sourceClass, targetClass, memberInfos, DocCommentPolicy<PsiComment>(DocCommentPolicy.ASIS)).run()
PullUpProcessor(sourceClass, targetClass, memberInfos, DocCommentPolicy(DocCommentPolicy.ASIS)).run()
UIUtil.dispatchAllInvocationEvents()
}
}

3
plugins/kotlin/idea/tests/test/org/jetbrains/kotlin/idea/refactoring/pushDown/AbstractPushDownTest.kt
View File

@@ -3,7 +3,6 @@
package org.jetbrains.kotlin.idea.refactoring.pushDown
import com.intellij.psi.PsiClass
import com.intellij.psi.PsiComment
import com.intellij.psi.util.PsiTreeUtil
import com.intellij.refactoring.memberPushDown.PushDownProcessor
import com.intellij.refactoring.util.DocCommentPolicy
@@ -32,7 +31,7 @@ abstract class AbstractPushDownTest : AbstractMemberPullPushTest() {
val storage = MemberInfoStorage(sourceClass) { true }
val memberInfos = chooseMembers(storage.getClassMemberInfos(sourceClass))
PushDownProcessor(sourceClass, memberInfos, DocCommentPolicy<PsiComment>(DocCommentPolicy.ASIS)).run()
PushDownProcessor(sourceClass, memberInfos, DocCommentPolicy(DocCommentPolicy.ASIS)).run()
UIUtil.dispatchAllInvocationEvents()
}
}