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

Drop some unnecessary casts in FIR code

Browse Source
This commit is contained in:
Mikhail Glukhikh
2021-10-22 17:40:44 +03:00
committed by teamcityserver
parent 3263d4d003
commit d91384434c
3 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirConflictsChecker.kt
+1 -1
View File
@@ -84,7 +84,7 @@ object FirConflictsChecker : FirBasicDeclarationChecker() {
) {
conflictingSymbol.ensureResolved(FirResolvePhase.STATUS)
@OptIn(SymbolInternals::class)
val conflicting = conflictingSymbol.fir as? FirDeclaration ?: return
val conflicting = conflictingSymbol.fir
if (declaration.moduleData != conflicting.moduleData) return
val actualConflictingPresentation = conflictingPresentation ?: presenter.represent(conflicting)
if (conflicting == declaration || actualConflictingPresentation != declarationPresentation) return
compiler/fir/providers/src/org/jetbrains/kotlin/fir/resolve/calls/Synthetics.kt
+2 -2
View File
@@ -85,9 +85,9 @@ class FirSyntheticPropertiesScope(
var matchingSetter: FirSimpleFunction? = null
if (getterReturnType != null) {
val setterName = syntheticNamesProvider.setterNameByGetterName(getterName)
baseScope.processFunctionsByName(setterName, fun(setterSymbol: FirFunctionSymbol<*>) {
baseScope.processFunctionsByName(setterName, fun(setterSymbol: FirNamedFunctionSymbol) {
if (matchingSetter != null) return
val setter = setterSymbol.fir as? FirSimpleFunction ?: return
val setter = setterSymbol.fir
val parameter = setter.valueParameters.singleOrNull() ?: return
if (setter.typeParameters.isNotEmpty() || setter.isStatic) return
val parameterType = (parameter.returnTypeRef as? FirResolvedTypeRef)?.type ?: return
compiler/fir/providers/src/org/jetbrains/kotlin/fir/scopes/impl/FirStaticScope.kt
+2 -4
View File
@@ -5,8 +5,6 @@
package org.jetbrains.kotlin.fir.scopes.impl
import org.jetbrains.kotlin.fir.declarations.FirCallableDeclaration
import org.jetbrains.kotlin.fir.declarations.FirSimpleFunction
import org.jetbrains.kotlin.fir.declarations.utils.isStatic
import org.jetbrains.kotlin.fir.resolve.substitution.ConeSubstitutor
import org.jetbrains.kotlin.fir.scopes.FirContainingNamesAwareScope
@@ -22,7 +20,7 @@ class FirStaticScope(private val delegateScope: FirContainingNamesAwareScope) :
override fun processFunctionsByName(name: Name, processor: (FirNamedFunctionSymbol) -> Unit) {
delegateScope.processFunctionsByName(name) {
if ((it.fir as? FirSimpleFunction)?.isStatic == true) {
if (it.fir.isStatic) {
processor(it)
}
}
@@ -30,7 +28,7 @@ class FirStaticScope(private val delegateScope: FirContainingNamesAwareScope) :
override fun processPropertiesByName(name: Name, processor: (FirVariableSymbol<*>) -> Unit) {
delegateScope.processPropertiesByName(name) {
if ((it.fir as? FirCallableDeclaration)?.isStatic == true) {
if (it.fir.isStatic) {
processor(it)
}
}