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

IDEA-144316 Copy Reference should work for excluded subfolders same way as it works for regular project subdirs

Browse Source
This commit is contained in:
Anton Makeev
2015-08-25 18:36:17 +02:00
parent f226b597e4
commit 3ef6388d96
2 changed files with 25 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-tests/testSrc/com/intellij/codeInsight/CopyReferenceActionFilesTest.groovy
+24
View File
@@ -124,4 +124,28 @@ public class CopyReferenceActionFilesTest extends CodeInsightTestCase {
assertEquals("dir_dir", CopyReferenceAction.elementToFqn(PsiManager.getInstance(project).findDirectory(dir_dir)));
assertEquals("dir_dir/file.txt", CopyReferenceAction.elementToFqn(PsiManager.getInstance(project).findFile(dir_dir_file)));
}
public void testCopyFile_UnderExcludeRoot_ShouldContainPathFromTheCorrespondingContentRoot() throws Exception {
// IDEA-144316 Copy Reference should work for excluded subfolders same way as it works for regular project subdirs
VirtualFile dir
VirtualFile dir_dir
VirtualFile dir_dir_file
ApplicationManager.application.runWriteAction(new Runnable() {
@Override
void run() {
dir = additionalRoot.createChildDirectory(this, "dir");
dir_dir = dir.createChildDirectory(this, "dir_dir");
dir_dir_file = dir_dir.createChildData(this, "file.txt");
PsiTestUtil.addContentRoot(getModule(), dir);
PsiTestUtil.addExcludedRoot(getModule(), dir_dir);
}
})
assertEquals(dir.getPath(), CopyReferenceAction.elementToFqn(PsiManager.getInstance(project).findDirectory(dir)));
assertEquals("dir_dir", CopyReferenceAction.elementToFqn(PsiManager.getInstance(project).findDirectory(dir_dir)));
assertEquals("dir_dir/file.txt", CopyReferenceAction.elementToFqn(PsiManager.getInstance(project).findFile(dir_dir_file)));
}
}
platform/lang-impl/src/com/intellij/ide/actions/CopyReferenceAction.java
+1 -1
View File
@@ -291,7 +291,7 @@ public class CopyReferenceAction extends DumbAwareAction {
VirtualFile outerMostRoot = null;
VirtualFile each = virtualFile;
ProjectFileIndex index = ProjectRootManager.getInstance(project).getFileIndex();
while (each != null && (each = index.getContentRootForFile(each)) != null) {
while (each != null && (each = index.getContentRootForFile(each, false)) != null) {
outerMostRoot = each;
each = each.getParent();
}