summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/PluginStartupActivity.kt4
-rw-r--r--plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/conversion/copy/PlainTextPasteImportResolver.kt2
-rw-r--r--plugins/kotlin/jvm-debugger/util/src/org/jetbrains/kotlin/idea/debugger/kotlinMethodBytecodeInfo.kt29
3 files changed, 24 insertions, 11 deletions
diff --git a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/PluginStartupActivity.kt b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/PluginStartupActivity.kt
index f34b849fb3e2..20ac4d9f01bf 100644
--- a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/PluginStartupActivity.kt
+++ b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/PluginStartupActivity.kt
@@ -31,7 +31,9 @@ internal class PluginStartupActivity : StartupActivity.Background {
initializeDiagnostics()
excludedFromUpdateCheckPlugins.add("org.jetbrains.kotlin")
- checkCompatibility()
+ // Android Studio (b/261747757): this compatibility check is inconvenient during the IJ merge process,
+ // and its value is limited anyway because we generally disallow out-of-band Kotlin plugin updates.
+ // checkCompatibility()
setupReportingFromRelease()
//todo[Sedunov]: wait for fix in platform to avoid misunderstood from Java newbies (also ConfigureKotlinInTempDirTest)
diff --git a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/conversion/copy/PlainTextPasteImportResolver.kt b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/conversion/copy/PlainTextPasteImportResolver.kt
index 982520cecbb3..f934a78e4714 100644
--- a/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/conversion/copy/PlainTextPasteImportResolver.kt
+++ b/plugins/kotlin/idea/src/org/jetbrains/kotlin/idea/conversion/copy/PlainTextPasteImportResolver.kt
@@ -44,7 +44,7 @@ class PlainTextPasteImportResolver(private val dataForConversion: DataForConvers
private val resolutionFacade = targetFile.getResolutionFacade()
private val shortNameCache = PsiShortNamesCache.getInstance(project)
- private val scope = file.resolveScope
+ private val scope = targetFile.resolveScope
private val failedToResolveReferenceNames = HashSet<String>()
private var ambiguityInResolution = false
diff --git a/plugins/kotlin/jvm-debugger/util/src/org/jetbrains/kotlin/idea/debugger/kotlinMethodBytecodeInfo.kt b/plugins/kotlin/jvm-debugger/util/src/org/jetbrains/kotlin/idea/debugger/kotlinMethodBytecodeInfo.kt
index fee7bf15dd38..8405e97d3cf7 100644
--- a/plugins/kotlin/jvm-debugger/util/src/org/jetbrains/kotlin/idea/debugger/kotlinMethodBytecodeInfo.kt
+++ b/plugins/kotlin/jvm-debugger/util/src/org/jetbrains/kotlin/idea/debugger/kotlinMethodBytecodeInfo.kt
@@ -8,17 +8,24 @@ import org.jetbrains.org.objectweb.asm.MethodVisitor
import org.jetbrains.org.objectweb.asm.Opcodes
fun Method.isSimpleGetter() =
- isSimpleMemberVariableGetter() ||
- isSimpleStaticVariableGetter() ||
- isJVMStaticVariableGetter()
+ // TODO(KTIJ-23684): Add support for DEX
+ if (virtualMachine().isDexDebug()) false
+ else isSimpleMemberVariableGetter() ||
+ isSimpleStaticVariableGetter() ||
+ isJVMStaticVariableGetter()
fun Method.isLateinitVariableGetter() =
- isOldBackendLateinitVariableGetter() ||
- isIRBackendLateinitVariableGetter() ||
- isIRBackendLateinitVariableGetterReturningAny()
+ // TODO(KTIJ-23684): Add support for DEX
+ if (virtualMachine().isDexDebug()) false
+ else isOldBackendLateinitVariableGetter() ||
+ isIRBackendLateinitVariableGetter() ||
+ isIRBackendLateinitVariableGetterReturningAny()
fun Method.isOldBackendLateinitVariableGetter() =
- verifyMethod(14,
+ // TODO(KTIJ-23684): Add support for DEX
+ if (virtualMachine().isDexDebug()) false
+ else verifyMethod(
+ 14,
intArrayOf(
Opcodes.ALOAD,
Opcodes.GETFIELD,
@@ -30,13 +37,17 @@ fun Method.isOldBackendLateinitVariableGetter() =
)
fun Method.isIRBackendLateinitVariableGetterReturningAny() =
- verifyMethod(
+ // TODO(KTIJ-23684): Add support for DEX
+ if (virtualMachine().isDexDebug()) false
+ else verifyMethod(
expectedNumOfBytecodes = 19,
MethodBytecodeVerifierFromArray(lateinitVarReturningAnyBytecodes)
)
fun Method.isIRBackendLateinitVariableGetter() =
- verifyMethod(
+ // TODO(KTIJ-23684): Add support for DEX
+ if (virtualMachine().isDexDebug()) false
+ else verifyMethod(
expectedNumOfBytecodes = 17,
MethodBytecodeVerifierFromArray(lateinitVarPropertyBytecodes)
)