From 5c871c92af04b5f5d2bc0195f22b46de9215a7d3 Mon Sep 17 00:00:00 2001 From: Alexey Sedunov Date: Tue, 24 Feb 2015 18:30:26 +0300 Subject: [PATCH] Change Signature: Do not look for Java usages for declarations in JavaScript modules #EA-65319 Fixed --- .../refactoring/changeSignature/JetChangeInfo.kt | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetChangeInfo.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetChangeInfo.kt index 76c78b818c5..51b6ea3121c 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetChangeInfo.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetChangeInfo.kt @@ -17,28 +17,19 @@ package org.jetbrains.kotlin.idea.refactoring.changeSignature import com.intellij.lang.Language -import com.intellij.openapi.util.text.StringUtil import com.intellij.psi.PsiElement import com.intellij.psi.PsiMethod import com.intellij.psi.PsiModifier import com.intellij.psi.PsiType import com.intellij.refactoring.changeSignature.* import com.intellij.usageView.UsageInfo -import com.intellij.util.Function import com.intellij.util.VisibilityUtil -import com.intellij.util.containers.ContainerUtil -import kotlin.Function1 -import kotlin.Pair import org.jetbrains.kotlin.asJava.* import org.jetbrains.kotlin.descriptors.FunctionDescriptor -import org.jetbrains.kotlin.descriptors.ValueParameterDescriptor import org.jetbrains.kotlin.descriptors.Visibilities import org.jetbrains.kotlin.descriptors.Visibility -import org.jetbrains.kotlin.psi.JetFunction -import org.jetbrains.kotlin.psi.JetFunctionLiteral import org.jetbrains.kotlin.resolve.DescriptorToSourceUtils import org.jetbrains.kotlin.types.JetType -import org.jetbrains.kotlin.types.TypeSubstitutor import org.jetbrains.kotlin.builtins.KotlinBuiltIns import org.jetbrains.kotlin.lexer.JetTokens import org.jetbrains.kotlin.idea.JetLanguage @@ -47,9 +38,9 @@ import org.jetbrains.kotlin.idea.refactoring.changeSignature.usages.JetFunctionD import org.jetbrains.kotlin.idea.util.IdeDescriptorRenderers import java.util.HashMap import kotlin.properties.Delegates -import java.util.ArrayList -import java.util.Collections import org.jetbrains.kotlin.utils.addToStdlib.singletonOrEmptyList +import org.jetbrains.kotlin.idea.project.* +import org.jetbrains.kotlin.psi.* public class JetChangeInfo( val methodDescriptor: JetMethodDescriptor, @@ -224,6 +215,8 @@ public class JetChangeInfo( } public fun getOrCreateJavaChangeInfo(): JavaChangeInfo? { + if (ProjectStructureUtil.isJsKotlinModule(getMethod().getContainingFile() as JetFile)) return null + if (javaChangeInfo == null) { val currentPsiMethod = getCurrentPsiMethod() if (originalPsiMethod == null || currentPsiMethod == null) return null