azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move: Fix tests in IDEA 2017.1

Browse Source 
Do not prevent usages search if target directory is not known yet.
Force content root configuration for multi-module tests
This commit is contained in:
Alexey Sedunov
2017-03-17 14:28:41 +03:00
committed by Dmitry Jemerov
parent 496a21254b
commit b65460c12f
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-test-framework/src/org/jetbrains/kotlin/idea/test/KotlinMultiFileTestCase.kt
+3 -1
View File
@@ -42,7 +42,9 @@ abstract class KotlinMultiFileTestCase : MultiFileTestCase() {
object : VirtualFileVisitor<Any>() { object : VirtualFileVisitor<Any>() {
override fun visitFile(file: VirtualFile): Boolean { override fun visitFile(file: VirtualFile): Boolean {
if (!file.isDirectory && file.name.endsWith(ModuleFileType.DOT_DEFAULT_EXTENSION)) { 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 return false
} }
idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveFilesOrDirectories/MoveKotlinFileHandler.kt
-1
View File
@@ -69,7 +69,6 @@ class MoveKotlinFileHandler : MoveFileHandler() {
fun initMoveProcessor(psiFile: PsiFile, newParent: PsiDirectory?): MoveKotlinDeclarationsProcessor? { fun initMoveProcessor(psiFile: PsiFile, newParent: PsiDirectory?): MoveKotlinDeclarationsProcessor? {
if (psiFile !is KtFile) return null if (psiFile !is KtFile) return null
if (newParent == null) return null
val packageNameInfo = psiFile.getPackageNameInfo(newParent, false) ?: return null val packageNameInfo = psiFile.getPackageNameInfo(newParent, false) ?: return null
val project = psiFile.project val project = psiFile.project