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

Fix compilation errors in bunches

Browse Source
This commit is contained in:
Dmitriy Novozhilov
2020-09-03 15:13:59 +03:00
parent a8c68d9e6f
commit b81ec2c8f0
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/KotlinMutableMethodDescriptor.kt
+1 -1
View File
@@ -42,7 +42,7 @@ class KotlinMutableMethodDescriptor(override val original: KotlinMethodDescripto
receiver?.let { parameters.add(it) } receiver?.let { parameters.add(it) }
} }
override fun getVisibility(): DescriptorVisibility? { override fun getVisibility(): DescriptorVisibility {
return original.visibility return original.visibility
} }
} }
idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/KotlinMutableMethodDescriptor.kt.202
+3 -3
View File
@@ -5,7 +5,7 @@
package org.jetbrains.kotlin.idea.refactoring.changeSignature package org.jetbrains.kotlin.idea.refactoring.changeSignature
import org.jetbrains.kotlin.descriptors.Visibility import org.jetbrains.kotlin.descriptors.DescriptorVisibility
class KotlinMutableMethodDescriptor(override val original: KotlinMethodDescriptor) : KotlinMethodDescriptor by original { class KotlinMutableMethodDescriptor(override val original: KotlinMethodDescriptor) : KotlinMethodDescriptor by original {
private val parameters: MutableList<KotlinParameterInfo> = original.parameters private val parameters: MutableList<KotlinParameterInfo> = original.parameters
@@ -42,7 +42,7 @@ class KotlinMutableMethodDescriptor(override val original: KotlinMethodDescripto
receiver?.let { parameters.add(it) } receiver?.let { parameters.add(it) }
} }
override fun getVisibility(): Visibility { override fun getVisibility(): DescriptorVisibility {
return original.visibility return original.visibility
} }
} }
idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/ui/KotlinChangeSignatureCompat.kt.193
+2 -2
View File
@@ -8,7 +8,7 @@ package org.jetbrains.kotlin.idea.refactoring.changeSignature.ui
import com.intellij.openapi.project.Project import com.intellij.openapi.project.Project
import com.intellij.openapi.ui.Messages import com.intellij.openapi.ui.Messages
import com.intellij.openapi.ui.Messages.OkCancelResult import com.intellij.openapi.ui.Messages.OkCancelResult
import org.jetbrains.kotlin.descriptors.Visibility import org.jetbrains.kotlin.descriptors.DescriptorVisibility
import javax.swing.Icon import javax.swing.Icon
// FIX ME WHEN BUNCH 193 REMOVED // FIX ME WHEN BUNCH 193 REMOVED
@@ -28,4 +28,4 @@ fun showOkCancelDialog(
) )
} }
typealias ComboBox = javax.swing.JComboBox<Visibility> typealias ComboBox = javax.swing.JComboBox<DescriptorVisibility>