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

create subclass: for private inner classes create implementation in the same containing class (IDEA-18954); IDEA-76741

Browse Source
This commit is contained in:
anna
2012-01-13 21:21:38 +01:00
parent 6671490aa8
commit 4fe09fbead
4 changed files with 106 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

133
java/java-impl/src/com/intellij/codeInsight/intention/impl/CreateSubclassAction.java
View File

@@ -124,6 +124,30 @@ public class CreateSubclassAction extends BaseIntentionAction {
PsiElement element = file.findElementAt(editor.getCaretModel().getOffset());
final PsiClass psiClass = PsiTreeUtil.getParentOfType(element, PsiClass.class);
LOG.assertTrue(psiClass != null);
if (psiClass.hasModifierProperty(PsiModifier.PRIVATE) && psiClass.getContainingClass() != null) {
createInnerClass(psiClass);
return;
}
createTopLevelClass(psiClass);
}
public static void createInnerClass(final PsiClass aClass) {
new WriteCommandAction(aClass.getProject(), getTitle(aClass), getTitle(aClass)) {
@Override
protected void run(Result result) throws Throwable {
final PsiClass containingClass = aClass.getContainingClass();
LOG.assertTrue(containingClass != null);
final PsiTypeParameterList oldTypeParameterList = aClass.getTypeParameterList();
PsiClass classFromText = JavaPsiFacade.getElementFactory(aClass.getProject()).createClass(aClass.getName() + IMPL_SUFFIX);
classFromText = (PsiClass)containingClass.addAfter(classFromText, aClass);
startTemplate(oldTypeParameterList, aClass.getProject(), aClass, classFromText, true);
}
}.execute();
}
private static void createTopLevelClass(PsiClass psiClass) {
final CreateClassDialog dlg = chooseSubclassToCreate(psiClass);
if (dlg != null) {
createSubclass(psiClass, dlg.getTargetDirectory(), dlg.getClassName());
@@ -180,55 +204,7 @@ public class CreateSubclassAction extends BaseIntentionAction {
});
return;
}
final PsiElementFactory elementFactory = JavaPsiFacade.getInstance(project).getElementFactory();
PsiJavaCodeReferenceElement ref = elementFactory.createClassReferenceElement(psiClass);
try {
if (psiClass.isInterface()) {
ref = (PsiJavaCodeReferenceElement)targetClass[0].getImplementsList().add(ref);
}
else {
ref = (PsiJavaCodeReferenceElement)targetClass[0].getExtendsList().add(ref);
}
if (psiClass.hasTypeParameters()) {
final Editor editor = CodeInsightUtil.positionCursor(project, targetClass[0].getContainingFile(), targetClass[0].getLBrace());
final TemplateBuilderImpl templateBuilder = editor != null && !ApplicationManager.getApplication().isUnitTestMode() ?
(TemplateBuilderImpl)TemplateBuilderFactory.getInstance().createTemplateBuilder(
targetClass[0]) :
null;
if (oldTypeParameterList != null) {
for (PsiTypeParameter parameter : oldTypeParameterList.getTypeParameters()) {
final PsiElement param = ref.getParameterList().add(elementFactory.createTypeElement(elementFactory.createType(parameter)));
if (templateBuilder != null) {
templateBuilder.replaceElement(param, param.getText());
}
}
}
replaceTypeParamsList(targetClass[0], oldTypeParameterList);
if (templateBuilder != null) {
templateBuilder.setEndVariableBefore(ref);
final Template template = templateBuilder.buildTemplate();
template.addEndVariable();
final PsiFile containingFile = targetClass[0].getContainingFile();
final TextRange textRange = targetClass[0].getTextRange();
PsiDocumentManager.getInstance(project).doPostponedOperationsAndUnblockDocument(editor.getDocument());
editor.getDocument().deleteString(textRange.getStartOffset(), textRange.getEndOffset());
CreateFromUsageBaseFix.startTemplate(editor, template, project, new TemplateEditingAdapter() {
@Override
public void templateFinished(Template template, boolean brokenOff) {
targetClass[0] = ((PsiClassOwner)containingFile).getClasses()[0];
chooseAndImplement(psiClass, project, targetClass[0], editor);
}
}, getTitle(psiClass));
}
}
}
catch (IncorrectOperationException e) {
LOG.error(e);
}
startTemplate(oldTypeParameterList, project, psiClass, targetClass[0], false);
}
}.execute();
if (targetClass[0] == null) return null;
@@ -242,6 +218,65 @@ public class CreateSubclassAction extends BaseIntentionAction {
return targetClass[0];
}
private static void startTemplate(PsiTypeParameterList oldTypeParameterList,
final Project project,
final PsiClass psiClass,
final PsiClass targetClass,
final boolean includeClassName) {
final PsiElementFactory elementFactory = JavaPsiFacade.getInstance(project).getElementFactory();
PsiJavaCodeReferenceElement ref = elementFactory.createClassReferenceElement(psiClass);
try {
if (psiClass.isInterface()) {
ref = (PsiJavaCodeReferenceElement)targetClass.getImplementsList().add(ref);
}
else {
ref = (PsiJavaCodeReferenceElement)targetClass.getExtendsList().add(ref);
}
if (psiClass.hasTypeParameters() || includeClassName) {
final Editor editor = CodeInsightUtil.positionCursor(project, targetClass.getContainingFile(), targetClass.getLBrace());
final TemplateBuilderImpl templateBuilder = editor != null && !ApplicationManager.getApplication().isUnitTestMode()
? (TemplateBuilderImpl)TemplateBuilderFactory.getInstance().createTemplateBuilder(targetClass) : null;
if (includeClassName && templateBuilder != null) {
templateBuilder.replaceElement(targetClass.getNameIdentifier(), targetClass.getName());
}
if (oldTypeParameterList != null) {
for (PsiTypeParameter parameter : oldTypeParameterList.getTypeParameters()) {
final PsiElement param = ref.getParameterList().add(elementFactory.createTypeElement(elementFactory.createType(parameter)));
if (templateBuilder != null) {
templateBuilder.replaceElement(param, param.getText());
}
}
}
replaceTypeParamsList(targetClass, oldTypeParameterList);
if (templateBuilder != null) {
templateBuilder.setEndVariableBefore(ref);
final Template template = templateBuilder.buildTemplate();
template.addEndVariable();
final PsiFile containingFile = targetClass.getContainingFile();
PsiDocumentManager.getInstance(project).doPostponedOperationsAndUnblockDocument(editor.getDocument());
final TextRange textRange = targetClass.getTextRange();
editor.getDocument().deleteString(textRange.getStartOffset(), textRange.getEndOffset());
CreateFromUsageBaseFix.startTemplate(editor, template, project, new TemplateEditingAdapter() {
@Override
public void templateFinished(Template template, boolean brokenOff) {
//todo
chooseAndImplement(psiClass, project, ((PsiClassOwner)containingFile).getClasses()[0], editor);
}
}, getTitle(psiClass));
}
}
}
catch (IncorrectOperationException e) {
LOG.error(e);
}
}
private static PsiElement replaceTypeParamsList(PsiClass psiClass, PsiTypeParameterList oldTypeParameterList) {
final PsiTypeParameterList typeParameterList = psiClass.getTypeParameterList();
assert typeParameterList != null;

6
java/java-tests/testData/codeInsight/createSubclass/innerClass/after/Test.java Normal file
View File

@@ -0,0 +1,6 @@
public class Test {
private interface Inner {}
public class InnerImpl implements Inner {
}
}

3
java/java-tests/testData/codeInsight/createSubclass/innerClass/before/Test.java Normal file
View File

@@ -0,0 +1,3 @@
public class Test {
private interface Inner {}
}

13
java/java-tests/testSrc/com/intellij/codeInsight/intention/CreateSubclassTest.java
View File

@@ -15,6 +15,19 @@ public class CreateSubclassTest extends MultiFileTestCase {
doTest();
}
public void testInnerClass() throws Exception {
doTest(new PerformAction() {
@Override
public void performAction(final VirtualFile rootDir, final VirtualFile rootAfter) throws Exception {
PsiClass superClass = myJavaFacade.findClass("Test", ProjectScope.getAllScope(myProject));
assertNotNull(superClass);
final PsiClass inner = superClass.findInnerClassByName("Inner", false);
assertNotNull(inner);
CreateSubclassAction.createInnerClass(inner);
}
});
}
private void doTest() throws Exception {
doTest(new PerformAction() {
@Override