From ea340f239224b868ba9f806c3a4e2e4aa83549ec Mon Sep 17 00:00:00 2001 From: Nikolay Krasko Date: Fri, 4 Mar 2016 18:39:49 +0300 Subject: [PATCH] Do not depend on MOVE_SEARCH_FOR_REFERENCES_FOR_FILE global setting Always search for references if something is under source root and disable search otherwise. #KT-11277 Fixed --- .../org/jetbrains/kotlin/idea/refactoring/move/moveUtils.kt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveUtils.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveUtils.kt index c630ec6aa28..6fa7e8f0283 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveUtils.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveUtils.kt @@ -55,6 +55,7 @@ import org.jetbrains.kotlin.idea.references.KtSimpleNameReference import org.jetbrains.kotlin.idea.references.KtSimpleNameReference.ShorteningMode import org.jetbrains.kotlin.idea.references.mainReference import org.jetbrains.kotlin.idea.util.ImportInsertHelper +import org.jetbrains.kotlin.idea.util.ProjectRootsUtil import org.jetbrains.kotlin.idea.util.application.executeCommand import org.jetbrains.kotlin.idea.util.application.runWriteAction import org.jetbrains.kotlin.name.FqName @@ -398,12 +399,14 @@ fun moveFilesOrDirectories( } } + val enableSearchReferences = elements.any { ProjectRootsUtil.isInProjectSource(it) } + if (elementsToMove.isNotEmpty()) { MoveFilesOrDirectoriesProcessor( project, elementsToMove.toTypedArray(), selectedDir, - RefactoringSettings.getInstance().MOVE_SEARCH_FOR_REFERENCES_FOR_FILE, + enableSearchReferences, false, false, moveCallback,