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

introduce parameter object: reuse existing file if already exists (IDEA-154956)

Browse Source
This commit is contained in:
Anna Kozlova
2016-06-10 18:28:22 +03:00
parent 9206458c53
commit 44f86a75cb
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/refactoring/introduceparameterobject/JavaIntroduceParameterObjectClassDescriptor.java
+9 -4
View File
@@ -307,10 +307,15 @@ public class JavaIntroduceParameterObjectClassDescriptor extends IntroduceParame
if (directory != null) {
final CodeStyleManager codeStyleManager = CodeStyleManager.getInstance(method.getManager().getProject());
final PsiElement shortenedFile = JavaCodeStyleManager.getInstance(newFile.getProject()).shortenClassReferences(newFile);
final PsiElement reformattedFile = codeStyleManager.reformat(shortenedFile);
return ((PsiJavaFile)directory.add(reformattedFile)).getClasses()[0];
PsiFile file = directory.findFile(newFile.getName());
if (file == null) {
final CodeStyleManager codeStyleManager = CodeStyleManager.getInstance(method.getManager().getProject());
final PsiElement shortenedFile = JavaCodeStyleManager.getInstance(newFile.getProject()).shortenClassReferences(newFile);
final PsiElement reformattedFile = codeStyleManager.reformat(shortenedFile);
file = (PsiFile)directory.add(reformattedFile);
}
return ((PsiJavaFile)file).getClasses()[0];
}
}
}