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

Change Signature: Do not look for Java usages for declarations in JavaScript modules

Browse Source 
#EA-65319 Fixed
This commit is contained in:
Alexey Sedunov
2015-02-24 18:30:26 +03:00
parent 2684ce20d4
commit 5c871c92af
1 changed files with 4 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetChangeInfo.kt
+4 -11
View File
@@ -17,28 +17,19 @@
package org.jetbrains.kotlin.idea.refactoring.changeSignature package org.jetbrains.kotlin.idea.refactoring.changeSignature
import com.intellij.lang.Language import com.intellij.lang.Language
import com.intellij.openapi.util.text.StringUtil
import com.intellij.psi.PsiElement import com.intellij.psi.PsiElement
import com.intellij.psi.PsiMethod import com.intellij.psi.PsiMethod
import com.intellij.psi.PsiModifier import com.intellij.psi.PsiModifier
import com.intellij.psi.PsiType import com.intellij.psi.PsiType
import com.intellij.refactoring.changeSignature.* import com.intellij.refactoring.changeSignature.*
import com.intellij.usageView.UsageInfo import com.intellij.usageView.UsageInfo
import com.intellij.util.Function
import com.intellij.util.VisibilityUtil 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.asJava.*
import org.jetbrains.kotlin.descriptors.FunctionDescriptor import org.jetbrains.kotlin.descriptors.FunctionDescriptor
import org.jetbrains.kotlin.descriptors.ValueParameterDescriptor
import org.jetbrains.kotlin.descriptors.Visibilities import org.jetbrains.kotlin.descriptors.Visibilities
import org.jetbrains.kotlin.descriptors.Visibility 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.resolve.DescriptorToSourceUtils
import org.jetbrains.kotlin.types.JetType import org.jetbrains.kotlin.types.JetType
import org.jetbrains.kotlin.types.TypeSubstitutor
import org.jetbrains.kotlin.builtins.KotlinBuiltIns import org.jetbrains.kotlin.builtins.KotlinBuiltIns
import org.jetbrains.kotlin.lexer.JetTokens import org.jetbrains.kotlin.lexer.JetTokens
import org.jetbrains.kotlin.idea.JetLanguage 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 org.jetbrains.kotlin.idea.util.IdeDescriptorRenderers
import java.util.HashMap import java.util.HashMap
import kotlin.properties.Delegates import kotlin.properties.Delegates
import java.util.ArrayList
import java.util.Collections
import org.jetbrains.kotlin.utils.addToStdlib.singletonOrEmptyList import org.jetbrains.kotlin.utils.addToStdlib.singletonOrEmptyList
import org.jetbrains.kotlin.idea.project.*
import org.jetbrains.kotlin.psi.*
public class JetChangeInfo( public class JetChangeInfo(
val methodDescriptor: JetMethodDescriptor, val methodDescriptor: JetMethodDescriptor,
@@ -224,6 +215,8 @@ public class JetChangeInfo(
} }
public fun getOrCreateJavaChangeInfo(): JavaChangeInfo? { public fun getOrCreateJavaChangeInfo(): JavaChangeInfo? {
if (ProjectStructureUtil.isJsKotlinModule(getMethod().getContainingFile() as JetFile)) return null
if (javaChangeInfo == null) { if (javaChangeInfo == null) {
val currentPsiMethod = getCurrentPsiMethod() val currentPsiMethod = getCurrentPsiMethod()
if (originalPsiMethod == null || currentPsiMethod == null) return null if (originalPsiMethod == null || currentPsiMethod == null) return null