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

Minor: don't use deprecated HashSet class in KotlinChangeSignatureUsageProcessor

Browse Source
This commit is contained in:
Ilya Kirillov
2020-04-15 22:02:27 +03:00
parent 00a85f03ca
commit e271015382
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/KotlinChangeSignatureUsageProcessor.kt
+3 -4
View File
@@ -21,7 +21,6 @@ import com.intellij.refactoring.util.CommonRefactoringUtil
import com.intellij.refactoring.util.MoveRenameUsageInfo import com.intellij.refactoring.util.MoveRenameUsageInfo
import com.intellij.refactoring.util.RefactoringUIUtil import com.intellij.refactoring.util.RefactoringUIUtil
import com.intellij.usageView.UsageInfo import com.intellij.usageView.UsageInfo
import com.intellij.util.containers.HashSet
import com.intellij.util.containers.MultiMap import com.intellij.util.containers.MultiMap
import org.jetbrains.kotlin.asJava.elements.KtLightMethod import org.jetbrains.kotlin.asJava.elements.KtLightMethod
import org.jetbrains.kotlin.asJava.namedUnwrappedElement import org.jetbrains.kotlin.asJava.namedUnwrappedElement
@@ -99,7 +98,7 @@ class KotlinChangeSignatureUsageProcessor : ChangeSignatureUsageProcessor {
initializedOriginalDescriptor = false initializedOriginalDescriptor = false
val result = HashSet<UsageInfo>() val result = hashSetOf<UsageInfo>()
result.add(OriginalJavaMethodDescriptorWrapper(info.method)) result.add(OriginalJavaMethodDescriptorWrapper(info.method))
@@ -163,7 +162,7 @@ class KotlinChangeSignatureUsageProcessor : ChangeSignatureUsageProcessor {
val body = element.getDeclarationBody() ?: return val body = element.getDeclarationBody() ?: return
val callerDescriptor = element.resolveToDescriptorIfAny() ?: return val callerDescriptor = element.resolveToDescriptorIfAny() ?: return
val context = body.analyze() val context = body.analyze()
val newParameterNames = changeInfo.getNonReceiverParameters().mapTo(HashSet<String>()) { it.name } val newParameterNames = changeInfo.getNonReceiverParameters().mapTo(hashSetOf()) { it.name }
body.accept( body.accept(
object : KtTreeVisitorVoid() { object : KtTreeVisitorVoid() {
override fun visitSimpleNameExpression(expression: KtSimpleNameExpression) { override fun visitSimpleNameExpression(expression: KtSimpleNameExpression) {
@@ -535,7 +534,7 @@ class KotlinChangeSignatureUsageProcessor : ChangeSignatureUsageProcessor {
val ktChangeInfo = info.delegate!! val ktChangeInfo = info.delegate!!
val parameterNames = HashSet<String>() val parameterNames = hashSetOf<String>()
val function = info.method val function = info.method
val bindingContext = (function as KtElement).analyze(BodyResolveMode.FULL) val bindingContext = (function as KtElement).analyze(BodyResolveMode.FULL)
val oldDescriptor = ktChangeInfo.originalBaseFunctionDescriptor val oldDescriptor = ktChangeInfo.originalBaseFunctionDescriptor