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

Copy: Do not check conflicts for cross-project copying

Browse Source 
#KT-19949 Fixed
 #KT-19972 Fixed
 #EA-105637 Fixed
This commit is contained in:
Alexey Sedunov
2017-09-19 20:22:29 +03:00
parent 6e59cc2140
commit e87f9633be
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/refactoring/copy/CopyKotlinDeclarationsHandler.kt
+1 -1
View File
@@ -313,7 +313,7 @@ class CopyKotlinDeclarationsHandler : CopyHandlerDelegateBase() {
if (!(isUnitTestMode && BaseRefactoringProcessor.ConflictsInTestsException.isTestIgnore())) { if (!(isUnitTestMode && BaseRefactoringProcessor.ConflictsInTestsException.isTestIgnore())) {
val targetSourceRootPsi = targetSourceRoot?.toPsiDirectory(project) val targetSourceRootPsi = targetSourceRoot?.toPsiDirectory(project)
if (targetSourceRootPsi != null) { if (targetSourceRootPsi != null && project == originalFile.project) {
val conflictChecker = MoveConflictChecker( val conflictChecker = MoveConflictChecker(
project, project,
elementsToCopy, elementsToCopy,