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

[FE] Cleanup: rename areXyzCompatible -> getXyzCompatibility

Browse Source 
Review: https://jetbrains.team/p/kt/reviews/11039/timeline

Motivation:
- Functions with prefix "are" must return Boolean. And
  AbstractExpectActualCompatibilityChecker even already contains some
  functions with prefix "are" that return Boolean (e.g.
  `areCompatibleCallableVisibilities`,
  `areCompatibleSupertypesOneByOne`, etc)
- Unification with functions that are prefixed with "are" and return
  Boolean
This commit is contained in:
Nikita Bobko
2023-08-08 16:21:39 +02:00
committed by teamcity
parent d4758014ec
commit 52f0f75175
3 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/resolution/src/org/jetbrains/kotlin/resolve/multiplatform/ExpectedActualResolver.kt
+4 -4
View File
@@ -29,7 +29,7 @@ object ExpectedActualResolver {
// TODO: support non-source definitions (e.g. from Java)
actual.couldHaveASource
}.groupBy { actual ->
AbstractExpectActualCompatibilityChecker.areCompatibleCallables(
AbstractExpectActualCompatibilityChecker.getCallablesCompatibility(
expected,
actual,
parentSubstitutor = null,
@@ -43,7 +43,7 @@ object ExpectedActualResolver {
context.findClassifiersFromModule(expected.classId, platformModule, moduleVisibilityFilter).filter { actual ->
expected != actual && !actual.isExpect && actual.couldHaveASource
}.groupBy { actual ->
AbstractExpectActualCompatibilityChecker.areCompatibleClassifiers(
AbstractExpectActualCompatibilityChecker.getClassifiersCompatibility(
expected,
actual,
context
@@ -100,7 +100,7 @@ object ExpectedActualResolver {
}
else -> null
}
AbstractExpectActualCompatibilityChecker.areCompatibleCallables(
AbstractExpectActualCompatibilityChecker.getCallablesCompatibility(
expectDeclaration = declaration,
actualDeclaration = actual,
parentSubstitutor = substitutor,
@@ -114,7 +114,7 @@ object ExpectedActualResolver {
context.findClassifiersFromModule(actual.classId, actual.module, moduleFilter).filter { declaration ->
actual != declaration && declaration is ClassDescriptor && declaration.isExpect
}.groupBy { expected ->
AbstractExpectActualCompatibilityChecker.areCompatibleClassifiers(
AbstractExpectActualCompatibilityChecker.getClassifiersCompatibility(
expected as ClassDescriptor,
actual,
context