From e87f9633be2219ba0cb9aec07fb2b437b3089728 Mon Sep 17 00:00:00 2001 From: Alexey Sedunov Date: Tue, 19 Sep 2017 20:22:29 +0300 Subject: [PATCH] Copy: Do not check conflicts for cross-project copying #KT-19949 Fixed #KT-19972 Fixed #EA-105637 Fixed --- .../idea/refactoring/copy/CopyKotlinDeclarationsHandler.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/copy/CopyKotlinDeclarationsHandler.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/copy/CopyKotlinDeclarationsHandler.kt index 40905768eef..720bf2c3d2c 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/copy/CopyKotlinDeclarationsHandler.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/copy/CopyKotlinDeclarationsHandler.kt @@ -313,7 +313,7 @@ class CopyKotlinDeclarationsHandler : CopyHandlerDelegateBase() { if (!(isUnitTestMode && BaseRefactoringProcessor.ConflictsInTestsException.isTestIgnore())) { val targetSourceRootPsi = targetSourceRoot?.toPsiDirectory(project) - if (targetSourceRootPsi != null) { + if (targetSourceRootPsi != null && project == originalFile.project) { val conflictChecker = MoveConflictChecker( project, elementsToCopy,