Projects >> kotlin >>3066ac3d07bcbd44c238de5c7988ed3873876351

Chunk
Conflicting content 
        );
    }

<<<<<<< HEAD
=======
    private static void findKotlinOverrides(ChangeInfo changeInfo, Set result) {
        PsiElement method = changeInfo.getMethod();
        if (!JetRefactoringUtilKt.isTrueJavaMethod(method)) return;

        for (PsiMethod overridingMethod : OverridingMethodsSearch.search((PsiMethod) method)) {
            PsiElement unwrappedElement = LightClassUtilsKt.getNamedUnwrappedElement(overridingMethod);
            if (!(unwrappedElement instanceof JetNamedFunction)) continue;

            JetNamedFunction function = (JetNamedFunction) unwrappedElement;
            FunctionDescriptor functionDescriptor = (FunctionDescriptor) ResolutionUtils.resolveToDescriptor(function);

            result.add(new DeferredJavaMethodOverrideOrSAMUsage(function, functionDescriptor, null));

            findDeferredUsagesOfParameters(changeInfo, result, function, functionDescriptor);
        }
    }

>>>>>>> b2470a6aad07a5b0a144babcb6652d229a79e8cb
    private static void findKotlinCallers(JavaChangeInfo changeInfo, Set result) {
        PsiElement method = changeInfo.getMethod();
        if (!JetRefactoringUtilKt.isTrueJavaMethod(method)) return;
Solution content 
        );
    }

    private static void findKotlinCallers(JavaChangeInfo changeInfo, Set result) {
        PsiElement method = changeInfo.getMethod();
        if (!JetRefactoringUtilKt.isTrueJavaMethod(method)) return;
File
JetChangeSignatureUsageProcessor.java
Developer's decision
Version 1
Kind of conflict
Method declaration
Chunk
Conflicting content 
import com.intellij.codeInsight.daemon.quickFix.LightQuickFixTestCase;
import com.intellij.openapi.vfs.newvfs.impl.VfsRootAccess;
<<<<<<< HEAD
=======
import org.jetbrains.kotlin.idea.test.RunnableWithException;
import org.jetbrains.kotlin.idea.test.TestUtilsKt;
>>>>>>> b2470a6aad07a5b0a144babcb6652d229a79e8cb
import org.jetbrains.kotlin.test.JetTestUtils;

abstract public class KotlinLightQuickFixTestCase extends LightQuickFixTestCase {
Solution content 
import com.intellij.codeInsight.daemon.quickFix.LightQuickFixTestCase;
import com.intellij.openapi.vfs.newvfs.impl.VfsRootAccess;
import org.jetbrains.kotlin.idea.test.RunnableWithException;
import org.jetbrains.kotlin.idea.test.TestUtilsKt;
import org.jetbrains.kotlin.test.JetTestUtils;

abstract public class KotlinLightQuickFixTestCase extends LightQuickFixTestCase {
File
KotlinLightQuickFixTestCase.java
Developer's decision
Version 2
Kind of conflict
Import
Chunk
Conflicting content 
    @Override
    protected void tearDown() throws Exception {
        VfsRootAccess.disallowRootAccess(JetTestUtils.getHomeDirectory());
<<<<<<< HEAD
        super.tearDown();
=======

        TestUtilsKt.unInvalidateBuiltinsAndStdLib(getProject(), new RunnableWithException() {
            @Override
            public void run() throws Exception {
                KotlinLightQuickFixTestCase.super.tearDown();
            }
        });
>>>>>>> b2470a6aad07a5b0a144babcb6652d229a79e8cb
    }
}
Solution content 
    @Override
    protected void tearDown() throws Exception {
        VfsRootAccess.disallowRootAccess(JetTestUtils.getHomeDirectory());

        TestUtilsKt.unInvalidateBuiltinsAndStdLib(getProject(), new RunnableWithException() {
            @Override
            public void run() throws Exception {
                KotlinLightQuickFixTestCase.super.tearDown();
            }
        });
    }
}
File
KotlinLightQuickFixTestCase.java
Developer's decision
Version 2
Kind of conflict
Method invocation
Chunk
Conflicting content 
import org.jetbrains.annotations.Nullable;
import org.jetbrains.kotlin.idea.KotlinLightQuickFixTestCase;
import org.jetbrains.kotlin.idea.js.KotlinJavaScriptLibraryManager;
<<<<<<< HEAD
import org.jetbrains.kotlin.idea.references.BuiltInsReferenceResolver;
import org.jetbrains.kotlin.idea.quickfix.utils.UtilsPackage;
=======
import org.jetbrains.kotlin.idea.quickfix.utils.QuickfixTestUtilsKt;
>>>>>>> b2470a6aad07a5b0a144babcb6652d229a79e8cb
import org.jetbrains.kotlin.idea.test.ConfigLibraryUtil;
import org.jetbrains.kotlin.idea.test.DirectiveBasedActionUtils;
import org.jetbrains.kotlin.idea.test.PluginTestCaseBase;
Solution content 
import org.jetbrains.annotations.Nullable;
import org.jetbrains.kotlin.idea.KotlinLightQuickFixTestCase;
import org.jetbrains.kotlin.idea.js.KotlinJavaScriptLibraryManager;
import org.jetbrains.kotlin.idea.references.BuiltInsReferenceResolver;
import org.jetbrains.kotlin.idea.quickfix.utils.UtilsPackage;
import org.jetbrains.kotlin.idea.quickfix.utils.QuickfixTestUtilsKt;
import org.jetbrains.kotlin.idea.test.ConfigLibraryUtil;
import org.jetbrains.kotlin.idea.test.DirectiveBasedActionUtils;
import org.jetbrains.kotlin.idea.test.PluginTestCaseBase;
File
AbstractQuickFixTest.java
Developer's decision
Concatenation
Kind of conflict
Import
Chunk
Conflicting content 
import org.jetbrains.android.sdk.AndroidSdkAdditionalData;
import org.jetbrains.android.sdk.AndroidSdkData;
import org.jetbrains.android.sdk.AndroidSdkType;
<<<<<<< HEAD
=======
import org.jetbrains.kotlin.idea.test.RunnableWithException;
import org.jetbrains.kotlin.idea.test.TestUtilsKt;
>>>>>>> b2470a6aad07a5b0a144babcb6652d229a79e8cb
import org.jetbrains.kotlin.test.JetTestUtils;

import java.io.File;
Solution content 
import org.jetbrains.android.sdk.AndroidSdkAdditionalData;
import org.jetbrains.android.sdk.AndroidSdkData;
import org.jetbrains.android.sdk.AndroidSdkType;
import org.jetbrains.kotlin.idea.test.RunnableWithException;
import org.jetbrains.kotlin.idea.test.TestUtilsKt;
import org.jetbrains.kotlin.test.JetTestUtils;

import java.io.File;
File
KotlinAndroidTestCaseBase.java
Developer's decision
Version 2
Kind of conflict
Import
Chunk
Conflicting content 
        return getTestDataPath() + "/sdk1.5";
    }

<<<<<<< HEAD
=======
    @Override
    protected void tearDown() throws Exception {
        TestUtilsKt.unInvalidateBuiltinsAndStdLib(getProject(), new RunnableWithException() {
            @Override
            public void run() throws Exception {
                KotlinAndroidTestCaseBase.super.tearDown();
                androidJar = null;
                androidSdk = null;
            }
        });
    }

>>>>>>> b2470a6aad07a5b0a144babcb6652d229a79e8cb
    public String getDefaultPlatformDir() {
        return "android-1.5";
    }
Solution content 
            @Override
        return getTestDataPath() + "/sdk1.5";
    }

    @Override
    protected void tearDown() throws Exception {
        TestUtilsKt.unInvalidateBuiltinsAndStdLib(getProject(), new RunnableWithException() {
            public void run() throws Exception {
                KotlinAndroidTestCaseBase.super.tearDown();
                androidJar = null;
                androidSdk = null;
            }
        });
    }

    public String getDefaultPlatformDir() {
        return "android-1.5";
    }
File
KotlinAndroidTestCaseBase.java
Developer's decision
Version 2
Kind of conflict
Annotation
Method declaration