From b65460c12f135b3ea631e4826cf8b831452f2dd6 Mon Sep 17 00:00:00 2001 From: Alexey Sedunov Date: Fri, 17 Mar 2017 14:28:41 +0300 Subject: [PATCH] Move: Fix tests in IDEA 2017.1 Do not prevent usages search if target directory is not known yet. Force content root configuration for multi-module tests --- .../org/jetbrains/kotlin/idea/test/KotlinMultiFileTestCase.kt | 4 +++- .../move/moveFilesOrDirectories/MoveKotlinFileHandler.kt | 1 - 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/idea/idea-test-framework/src/org/jetbrains/kotlin/idea/test/KotlinMultiFileTestCase.kt b/idea/idea-test-framework/src/org/jetbrains/kotlin/idea/test/KotlinMultiFileTestCase.kt index 71c4b85c7a3..f7a877bfee6 100644 --- a/idea/idea-test-framework/src/org/jetbrains/kotlin/idea/test/KotlinMultiFileTestCase.kt +++ b/idea/idea-test-framework/src/org/jetbrains/kotlin/idea/test/KotlinMultiFileTestCase.kt @@ -42,7 +42,9 @@ abstract class KotlinMultiFileTestCase : MultiFileTestCase() { object : VirtualFileVisitor() { override fun visitFile(file: VirtualFile): Boolean { if (!file.isDirectory && file.name.endsWith(ModuleFileType.DOT_DEFAULT_EXTENSION)) { - createModule(File(file.path), StdModuleTypes.JAVA) + val module = createModule(File(file.path), StdModuleTypes.JAVA) + val contentRoot = file.parent.findChild("src")!! + PsiTestUtil.addSourceContentToRoots(module, contentRoot) return false } diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveFilesOrDirectories/MoveKotlinFileHandler.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveFilesOrDirectories/MoveKotlinFileHandler.kt index 810541d6ff0..dd43aba0ac7 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveFilesOrDirectories/MoveKotlinFileHandler.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveFilesOrDirectories/MoveKotlinFileHandler.kt @@ -69,7 +69,6 @@ class MoveKotlinFileHandler : MoveFileHandler() { fun initMoveProcessor(psiFile: PsiFile, newParent: PsiDirectory?): MoveKotlinDeclarationsProcessor? { if (psiFile !is KtFile) return null - if (newParent == null) return null val packageNameInfo = psiFile.getPackageNameInfo(newParent, false) ?: return null val project = psiFile.project