MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-03-22 15:19:59 +07:00
Code Issues Packages Projects Releases Wiki Activity

JPS mappings for incremental compilation refactoring: handle changed [function => property] and [property => function]

Browse Source 
GitOrigin-RevId: dfb6469ffb87e20111854c3d18512cf4dc28d451
This commit is contained in:
Eugene Zhuravlev
2024-03-11 15:08:56 +01:00
committed by intellij-monorepo-bot
parent 7051819c3e
commit ca91e175a5
2 changed files with 28 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
jps/jps-builders/src/org/jetbrains/jps/dependency/kotlin/KotlinAwareJavaDifferentiateStrategy.java
View File

@@ -130,6 +130,18 @@ public final class KotlinAwareJavaDifferentiateStrategy extends JvmDifferentiate
affectSubclasses(context, future, change.getNow().getReferenceID(), true);
}
for (KmFunction removedFunction : metaDiff.functions().removed()) {
JvmMethod method = getJvmMethod(change.getNow(), JvmExtensionsKt.getSignature(removedFunction));
if (method != null && !method.isPrivate()) {
// a function in kotlin code was replaced with a property, but at the bytecode level corresponding methods are preserved
for (JvmClass subClass : filter(flat(map(future.allSubclasses(changedClass.getReferenceID()), id -> future.getNodes(id, JvmClass.class))), n -> isKotlinNode(n))) {
if (find(subClass.getMethods(), m -> !m.isPrivate() && method.isSameByJavaRules(m)) != null) {
affectNodeSources(context, subClass.getReferenceID(), "Kotlin function " + removedFunction.getName() + " has been removed. Affecting corresponding method in subclasses: ");
}
}
}
}
for (Difference.Change<KmFunction, KotlinMeta.KmFunctionsDiff> funChange : metaDiff.functions().changed()) {
KmFunction changedKmFunction = funChange.getPast();
Visibility visibility = Attributes.getVisibility(changedKmFunction);
@@ -161,6 +173,20 @@ public final class KotlinAwareJavaDifferentiateStrategy extends JvmDifferentiate
}
}
for (KmProperty removedProp : metaDiff.properties().removed()) {
List<JvmMethodSignature> propertyAccessors = Arrays.asList(JvmExtensionsKt.getGetterSignature(removedProp), JvmExtensionsKt.getSetterSignature(removedProp));
List<JvmMethod> accessorMethods = collect(filter(map(propertyAccessors, acc -> acc != null? getJvmMethod(change.getNow(), acc) : null), m -> m != null && !m.isPrivate()), new SmartList<>());
if (!accessorMethods.isEmpty()) {
// property in kotlin code was replaced with a function(s), but at the bytecode level corresponding methods are preserved
for (JvmClass subClass : filter(flat(map(future.allSubclasses(changedClass.getReferenceID()), id -> future.getNodes(id, JvmClass.class))), n -> isKotlinNode(n))) {
if (find(subClass.getMethods(), m -> !m.isPrivate() && find(accessorMethods, m::isSameByJavaRules) != null) != null) {
affectNodeSources(context, subClass.getReferenceID(), "Kotlin property " + removedProp.getName() + " has been removed. Affecting corresponding accessor method(s) in subclasses: ");
}
}
}
}
for (Difference.Change<KmProperty, KotlinMeta.KmPropertiesDiff> propChange : metaDiff.properties().changed()) {
KmProperty prop = propChange.getPast();
KotlinMeta.KmPropertiesDiff propDiff = propChange.getDiff();

5
plugins/kotlin/jps/graphImplementationTests/testData/incremental/withJava/javaUsedInKotlin/changeMethodToPropertyInInheritance/build.log
View File

@@ -2,17 +2,16 @@
Cleaning output files:
out/production/module/Base.class
out/production/module/META-INF/module.kotlin_module
End of files
Exit code: NOTHING_DONE
------------------------------------------
Compiling files:
src/Base.kt
End of files
Exit code: OK
------------------------------------------
Cleaning output files:
out/production/module/META-INF/module.kotlin_module
out/production/module/ChildClass.class
out/production/module/META-INF/module.kotlin_module
End of files
Compiling files:
src/ChildClass.kt