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

copy: notify about errors & disable copy classes for package-info.class

Browse Source 
IDEA-178002: compiled file contains class though source has no classes, thus was copied as file
This commit is contained in:
Anna Kozlova
2017-09-06 10:53:09 +03:00
parent ee172fe592
commit 9c9f66e72e
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/refactoring/copy/CopyClassesHandler.java
+1
View File
@@ -84,6 +84,7 @@ public class CopyClassesHandler extends CopyHandlerDelegateBase {
final PsiFile containingFile = navigationElement.getContainingFile();
if (!(containingFile instanceof PsiClassOwner &&
JavaProjectRootsUtil.isOutsideJavaSourceRoot(containingFile))) {
if (PsiPackage.PACKAGE_INFO_CLS_FILE.equals(containingFile.getName())) continue;
PsiClass[] topLevelClasses = getTopLevelClasses(element);
if (topLevelClasses == null) {
if (element instanceof PsiDirectory) {
platform/lang-impl/src/com/intellij/refactoring/copy/CopyFilesOrDirectoriesHandler.java
+1 -1
View File
@@ -228,7 +228,7 @@ public class CopyFilesOrDirectoriesHandler extends CopyHandlerDelegateBase {
}
final Project project = targetDirectory.getProject();
if (!CommonRefactoringUtil.checkReadOnlyStatus(project, Collections.singleton(targetDirectory), false)) {
if (!CommonRefactoringUtil.checkReadOnlyStatus(project, Collections.singleton(targetDirectory), true)) {
return;
}