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

Do not depend on MOVE_SEARCH_FOR_REFERENCES_FOR_FILE global setting

Browse Source 
Always search for references if something is under source root and disable search otherwise.

 #KT-11277 Fixed
This commit is contained in:
Nikolay Krasko
2016-03-04 18:39:49 +03:00
parent 8397a4cb5b
commit ea340f2392
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/refactoring/move/moveUtils.kt
+4 -1
View File
@@ -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.KtSimpleNameReference.ShorteningMode
import org.jetbrains.kotlin.idea.references.mainReference import org.jetbrains.kotlin.idea.references.mainReference
import org.jetbrains.kotlin.idea.util.ImportInsertHelper 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.executeCommand
import org.jetbrains.kotlin.idea.util.application.runWriteAction import org.jetbrains.kotlin.idea.util.application.runWriteAction
import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.name.FqName
@@ -398,12 +399,14 @@ fun moveFilesOrDirectories(
} }
} }
val enableSearchReferences = elements.any { ProjectRootsUtil.isInProjectSource(it) }
if (elementsToMove.isNotEmpty()) { if (elementsToMove.isNotEmpty()) {
MoveFilesOrDirectoriesProcessor( MoveFilesOrDirectoriesProcessor(
project, project,
elementsToMove.toTypedArray(), elementsToMove.toTypedArray(),
selectedDir, selectedDir,
RefactoringSettings.getInstance().MOVE_SEARCH_FOR_REFERENCES_FOR_FILE, enableSearchReferences,
false, false,
false, false,
moveCallback, moveCallback,