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

Java: fix CCE when converting interface to class and there is a comment between the interface keyword and identifier

Browse Source 
GitOrigin-RevId: fd2ee4537423961785fdb2bee2e0a46411c6a91e
This commit is contained in:
Bas Leijdekkers
2024-01-23 16:42:44 +01:00
committed by intellij-monorepo-bot
parent c186579d84
commit a18169660e
3 changed files with 13 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ConvertInterfaceToClassIntention.java
View File

@@ -6,11 +6,11 @@ import com.intellij.codeInsight.intention.PriorityAction;
import com.intellij.codeInsight.intention.preview.IntentionPreviewUtils;
import com.intellij.codeInspection.util.IntentionFamilyName;
import com.intellij.modcommand.*;
import com.intellij.openapi.project.Project;
import com.intellij.psi.*;
import com.intellij.psi.presentation.java.ClassPresentationUtil;
import com.intellij.psi.search.searches.ClassInheritorsSearch;
import com.intellij.psi.search.searches.FunctionalExpressionSearch;
import com.intellij.psi.util.PsiTreeUtil;
import com.intellij.psi.util.PsiUtil;
import com.intellij.refactoring.util.RefactoringUIUtil;
import com.intellij.util.containers.ContainerUtil;
@@ -118,16 +118,9 @@ public final class ConvertInterfaceToClassIntention extends PsiBasedModCommandAc
private static void changeInterfaceToClass(PsiClass anInterface) {
final PsiIdentifier nameIdentifier = anInterface.getNameIdentifier();
assert nameIdentifier != null;
final PsiElement whiteSpace = nameIdentifier.getPrevSibling();
assert whiteSpace != null;
final PsiElement interfaceToken = whiteSpace.getPrevSibling();
assert interfaceToken != null;
final PsiKeyword interfaceKeyword = (PsiKeyword)interfaceToken.getOriginalElement();
final Project project = anInterface.getProject();
final JavaPsiFacade psiFacade = JavaPsiFacade.getInstance(project);
final PsiElementFactory factory = psiFacade.getElementFactory();
final PsiKeyword classKeyword = factory.createKeyword("class");
final PsiKeyword interfaceKeyword = PsiTreeUtil.getPrevSiblingOfType(nameIdentifier, PsiKeyword.class);
assert interfaceKeyword != null;
final PsiKeyword classKeyword = JavaPsiFacade.getInstance(anInterface.getProject()).getElementFactory().createKeyword("class");
interfaceKeyword.replace(classKeyword);
final PsiModifierList classModifierList = anInterface.getModifierList();
@@ -141,8 +134,7 @@ public final class ConvertInterfaceToClassIntention extends PsiBasedModCommandAc
classModifierList.setModifierProperty(PsiModifier.STATIC, true);
}
final PsiMethod[] methods = anInterface.getMethods();
for (final PsiMethod method : methods) {
for (final PsiMethod method : anInterface.getMethods()) {
PsiUtil.setModifierProperty(method, PsiModifier.PUBLIC, true);
if (method.hasModifierProperty(PsiModifier.DEFAULT)) {
PsiUtil.setModifierProperty(method, PsiModifier.DEFAULT, false);
@@ -152,8 +144,7 @@ public final class ConvertInterfaceToClassIntention extends PsiBasedModCommandAc
}
}
final PsiField[] fields = anInterface.getFields();
for (final PsiField field : fields) {
for (final PsiField field : anInterface.getFields()) {
final PsiModifierList modifierList = field.getModifierList();
if (modifierList != null) {
modifierList.setModifierProperty(PsiModifier.PUBLIC, true);
@@ -162,8 +153,7 @@ public final class ConvertInterfaceToClassIntention extends PsiBasedModCommandAc
}
}
final PsiClass[] innerClasses = anInterface.getInnerClasses();
for (PsiClass innerClass : innerClasses) {
for (PsiClass innerClass : anInterface.getInnerClasses()) {
final PsiModifierList modifierList = innerClass.getModifierList();
if (modifierList != null) {
modifierList.setModifierProperty(PsiModifier.PUBLIC, true);

3
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertInterfaceToClass/afterComment.java Normal file
View File

@@ -0,0 +1,3 @@
// "Convert to 'class'" "true-preview"
abstract class /*1*/ X {}

3
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/convertInterfaceToClass/beforeComment.java Normal file
View File

@@ -0,0 +1,3 @@
// "Convert to 'class'" "true-preview"
interface /*1*/ X<caret> {}