Rename isImpl to isActual in descriptors

compiler/frontend.java/src/org/jetbrains/kotlin/synthetic/JavaSyntheticPropertiesScope.kt

@@ -296,7 +296,7 @@ class JavaSyntheticPropertiesScope(storageManager: StorageManager, private val l
             source: SourceElement
     ) : SyntheticJavaPropertyDescriptor, PropertyDescriptorImpl(
             containingDeclaration, original, annotations, modality, visibility, isVar, name, kind, source,
-            /* lateInit = */ false, /* isConst = */ false, /* isExpect = */ false, /* isImpl = */ false, /* isExternal = */ false,
+            /* lateInit = */ false, /* isConst = */ false, /* isExpect = */ false, /* isActual = */ false, /* isExternal = */ false,
             /* isDelegated = */ false
     ) {
 

compiler/frontend/src/org/jetbrains/kotlin/cfg/ControlFlowInformationProvider.kt

@@ -665,7 +665,7 @@ class ControlFlowInformationProvider private constructor(
                 if (isMain
                     || functionDescriptor.isOverridableOrOverrides
                     || owner.hasModifier(KtTokens.OVERRIDE_KEYWORD)
-                    || functionDescriptor.isExpect || functionDescriptor.isImpl
+                    || functionDescriptor.isExpect || functionDescriptor.isActual
                     || functionDescriptor.isEffectivelyExternal()
                     || OperatorNameConventions.GET_VALUE == functionName
                     || OperatorNameConventions.SET_VALUE == functionName

compiler/frontend/src/org/jetbrains/kotlin/psi/synthetics/SyntheticClassOrObjectDescriptor.kt

@@ -75,7 +75,7 @@ class SyntheticClassOrObjectDescriptor(
     override fun isInner() = false
     override fun isData() = false
     override fun isExpect() = false
-    override fun isImpl() = false
+    override fun isActual() = false
 
     override fun getCompanionObjectDescriptor() = null
     override fun getTypeConstructor(): TypeConstructor = typeConstructor

compiler/frontend/src/org/jetbrains/kotlin/resolve/FunctionDescriptorResolver.kt

@@ -186,7 +186,7 @@ class FunctionDescriptorResolver(
         functionDescriptor.isSuspend = function.hasModifier(KtTokens.SUSPEND_KEYWORD)
         functionDescriptor.isExpect = container is PackageFragmentDescriptor && function.hasExpectModifier() ||
                                       container is ClassDescriptor && container.isExpect
-        functionDescriptor.isImpl = function.hasActualModifier()
+        functionDescriptor.isActual = function.hasActualModifier()
 
         receiverType?.let { ForceResolveUtil.forceResolveAllContents(it.annotations) }
         for (valueParameterDescriptor in valueParameterDescriptors) {
@@ -299,8 +299,8 @@ class FunctionDescriptorResolver(
         if (classDescriptor.isExpect) {
             constructorDescriptor.isExpect = true
         }
-        if (classDescriptor.isImpl) {
+        if (classDescriptor.isActual) {
-            constructorDescriptor.isImpl = true
+            constructorDescriptor.isActual = true
         }
         if (declarationToTrace is PsiElement)
             trace.record(BindingContext.CONSTRUCTOR, declarationToTrace, constructorDescriptor)

compiler/frontend/src/org/jetbrains/kotlin/resolve/LocalVariableResolver.kt

@@ -154,7 +154,7 @@ class LocalVariableResolver(
                     /* lateInit = */ false,
                     /* isConst = */ false,
                     /* isExpect = */ false,
-                    /* isImpl = */ false,
+                    /* isActual = */ false,
                     /* isExternal = */ false,
                     variable is KtProperty && variable.hasDelegate()
             )

compiler/frontend/src/org/jetbrains/kotlin/resolve/OverloadResolver.kt

@@ -290,7 +290,7 @@ class OverloadResolver(
     private fun isDefinitionsForDifferentPlatforms(member1: DeclarationDescriptorNonRoot, member2: DeclarationDescriptorNonRoot): Boolean {
         if (member1 !is MemberDescriptor || member2 !is MemberDescriptor) return false
 
-        return member1.isImpl && member2.isImpl &&
+        return member1.isActual && member2.isActual &&
                member1.getMultiTargetPlatform() != member2.getMultiTargetPlatform()
     }
 

compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tasks/dynamicCalls.kt

@@ -99,7 +99,7 @@ class DynamicCallableDescriptors(storageManager: StorageManager, builtIns: Kotli
                 /* lateInit = */ false,
                 /* isConst = */ false,
                 /* isExpect = */ false,
-                /* isImpl = */ false,
+                /* isActual = */ false,
                 /* isExternal = */ false,
                 /* isDelegated = */ false
         )

compiler/frontend/src/org/jetbrains/kotlin/resolve/checkers/HeaderImplDeclarationChecker.kt

@@ -127,7 +127,7 @@ object HeaderImplDeclarationChecker : DeclarationChecker {
         // TODO: use common module here
         val compatibility = findHeaderForImpl(descriptor, descriptor.module) ?: return
 
-        val hasImplModifier = descriptor.isImpl && reportOn.hasActualModifier()
+        val hasImplModifier = descriptor.isActual && reportOn.hasActualModifier()
         if (!hasImplModifier) {
             if (Compatible !in compatibility) return
 

compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyClassDescriptor.java

@@ -92,7 +92,7 @@ public class LazyClassDescriptor extends ClassDescriptorBase implements ClassDes
     private final boolean isInner;
     private final boolean isData;
     private final boolean isExpect;
-    private final boolean isImpl;
+    private final boolean isActual;
 
     private final Annotations annotations;
     private final Annotations danglingAnnotations;
@@ -166,7 +166,7 @@ public class LazyClassDescriptor extends ClassDescriptorBase implements ClassDes
 
         this.isInner = modifierList != null && modifierList.hasModifier(INNER_KEYWORD) && !isIllegalInner(this);
         this.isData = modifierList != null && modifierList.hasModifier(KtTokens.DATA_KEYWORD);
-        this.isImpl = modifierList != null && PsiUtilsKt.hasActualModifier(modifierList);
+        this.isActual = modifierList != null && PsiUtilsKt.hasActualModifier(modifierList);
 
         this.isExpect = modifierList != null && PsiUtilsKt.hasExpectModifier(modifierList) ||
                         containingDeclaration instanceof ClassDescriptor && ((ClassDescriptor) containingDeclaration).isExpect();
@@ -503,8 +503,8 @@ public class LazyClassDescriptor extends ClassDescriptorBase implements ClassDes
     }
 
     @Override
-    public boolean isImpl() {
+    public boolean isActual() {
-        return isImpl;
+        return isActual;
     }
 
     @NotNull
@@ -527,7 +527,7 @@ public class LazyClassDescriptor extends ClassDescriptorBase implements ClassDes
     @Override
     public String toString() {
         // not using DescriptorRenderer to preserve laziness
-        return (isExpect ? "header " : isImpl ? "impl " : "") + "class " + getName().toString();
+        return (isExpect ? "header " : isActual ? "impl " : "") + "class " + getName().toString();
     }
 
     @Override

compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyTypeAliasDescriptor.kt

@@ -49,14 +49,14 @@ class LazyTypeAliasDescriptor(
     private lateinit var expandedTypeImpl: NotNullLazyValue<SimpleType>
     private lateinit var defaultTypeImpl: NotNullLazyValue<SimpleType>
     private lateinit var classDescriptorImpl: NullableLazyValue<ClassDescriptor>
-    private val isImpl = (source.getPsi() as? KtTypeAlias)?.hasActualModifier() == true
+    private val isActual = (source.getPsi() as? KtTypeAlias)?.hasActualModifier() == true
 
     override val underlyingType: SimpleType get() = underlyingTypeImpl()
     override val expandedType: SimpleType get() = expandedTypeImpl()
     override val classDescriptor: ClassDescriptor? get() = classDescriptorImpl()
     override fun getDefaultType(): SimpleType = defaultTypeImpl()
 
-    override fun isImpl(): Boolean = isImpl
+    override fun isActual(): Boolean = isActual
 
     fun initialize(
             declaredTypeParameters: List<TypeParameterDescriptor>,

compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/DeepCopyIrTreeWithDescriptoros.kt

@@ -278,7 +278,7 @@ class DeepCopyIrTreeWithDescriptors(val targetDescriptor: FunctionDescriptor,
                 /* lateInit              = */ oldDescriptor.isLateInit,
                 /* isConst               = */ oldDescriptor.isConst,
                 /* isExpect              = */ oldDescriptor.isExpect,
-                /* isImpl                = */ oldDescriptor.isImpl,
+                /* isActual                = */ oldDescriptor.isActual,
                 /* isExternal            = */ oldDescriptor.isExternal,
                 /* isDelegated           = */ oldDescriptor.isDelegated
             ).apply {

compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/IrBuildUtils.kt

@@ -179,7 +179,7 @@ fun BackendContext.createPropertyWithBackingFieldBuilder(startOffset: Int, endOf
                     /* lateInit              = */ false,
                     /* isConst               = */ false,
                     /* isExpect              = */ false,
-                    /* isImpl                = */ false,
+                    /* isActual                = */ false,
                     /* isExternal            = */ false,
                     /* isDelegated           = */ false
             )

compiler/ir/backend.common/src/org/jetbrains/kotlin/backend/common/lower/LocalDeclarationsLowering.kt

@@ -598,7 +598,7 @@ class LocalDeclarationsLowering(val context: BackendContext) : DeclarationContai
                         /* lateInit = */ false,
                         /* isConst = */ false,
                         /* isExpect = */ false,
-                        /* isImpl = */ false,
+                        /* isActual = */ false,
                         /* isExternal = */ false,
                         /* isDelegated = */ false)
 

compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/descriptors/JvmDescriptorWithExtraFlags.kt

@@ -41,10 +41,10 @@ class JvmPropertyDescriptorImpl private constructor(
         isLateInit: Boolean,
         isConst: Boolean,
         isExpect: Boolean,
-        isImpl: Boolean
+        isActual: Boolean
 ) : JvmDescriptorWithExtraFlags, PropertyDescriptorImpl(
         containingDeclaration, original, annotations, modality, visibility, isVar,
-        name, kind, source, isLateInit, isConst, isExpect, isImpl, /* isExternal = */ false, false
+        name, kind, source, isLateInit, isConst, isExpect, isActual, /* isExternal = */ false, false
 ) {
     override fun createSubstitutedCopy(
             newOwner: DeclarationDescriptor,
@@ -56,7 +56,7 @@ class JvmPropertyDescriptorImpl private constructor(
     ): PropertyDescriptorImpl =
             JvmPropertyDescriptorImpl(
                     newOwner, original, annotations, newModality, newVisibility, extraFlags, isVar, newName, kind,
-                    SourceElement.NO_SOURCE, isLateInit, isConst, isExpect, isImpl
+                    SourceElement.NO_SOURCE, isLateInit, isConst, isExpect, isActual
             )
 
     companion object {

compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/descriptors/KnownDescriptors.kt

@@ -144,7 +144,7 @@ open class KnownClassDescriptor(
     override fun isData(): Boolean = false
     override fun isInner(): Boolean = false
     override fun isExpect(): Boolean = false
-    override fun isImpl(): Boolean = false
+    override fun isActual(): Boolean = false
     override fun isExternal(): Boolean = false
 
     override fun <R : Any?, D : Any?> accept(visitor: DeclarationDescriptorVisitor<R, D>, data: D): R {

compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/descriptors/SharedVariablesManager.kt

@@ -53,7 +53,7 @@ class JvmSharedVariablesManager(val builtIns: KotlinBuiltIns) : SharedVariablesM
                 PropertyDescriptorImpl.create(
                         refClass, Annotations.EMPTY, Modality.FINAL, Visibilities.PUBLIC, true,
                         Name.identifier("element"), CallableMemberDescriptor.Kind.DECLARATION, SourceElement.NO_SOURCE,
-                        /* lateInit = */ false, /* isConst = */ false, /* isExpect = */ false, /* isImpl = */ false,
+                        /* lateInit = */ false, /* isConst = */ false, /* isExpect = */ false, /* isActual = */ false,
                         /* isExternal = */ false, /* isDelegated = */ false
                 ).initialize(type, dispatchReceiverParameter = refClass.thisAsReceiverParameter)
     }
@@ -94,7 +94,7 @@ class JvmSharedVariablesManager(val builtIns: KotlinBuiltIns) : SharedVariablesM
                 PropertyDescriptorImpl.create(
                         genericRefClass, Annotations.EMPTY, Modality.FINAL, Visibilities.PUBLIC, true,
                         Name.identifier("element"), CallableMemberDescriptor.Kind.DECLARATION, SourceElement.NO_SOURCE,
-                        /* lateInit = */ false, /* isConst = */ false, /* isExpect = */ false, /* isImpl = */ false,
+                        /* lateInit = */ false, /* isConst = */ false, /* isExpect = */ false, /* isActual = */ false,
                         /* isExternal = */ false, /* isDelegated = */ false
                 ).initialize(
                         type = builtIns.anyType,

compiler/ir/backend.jvm/src/org/jetbrains/kotlin/backend/jvm/descriptors/SpecialDescriptorsFactory.kt

@@ -130,7 +130,7 @@ class SpecialDescriptorsFactory(
                 Annotations.EMPTY, Modality.FINAL, Visibilities.PUBLIC, false,
                 Name.identifier("INSTANCE"),
                 CallableMemberDescriptor.Kind.SYNTHESIZED, SourceElement.NO_SOURCE, /* lateInit = */ false, /* isConst = */ false,
-                /* isExpect = */ false, /* isImpl = */ false, /* isExternal = */ false, /* isDelegated = */ false
+                /* isExpect = */ false, /* isActual = */ false, /* isExternal = */ false, /* isDelegated = */ false
         ).initialize(objectDescriptor.defaultType)
     }
 }

compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/descriptors/IrBuiltinFunctionDescriptor.kt

@@ -55,7 +55,7 @@ abstract class IrBuiltinOperatorDescriptorBase(containingDeclaration: Declaratio
     override fun isSuspend(): Boolean = false
     override fun isTailrec(): Boolean = false
     override fun isExpect(): Boolean = false
-    override fun isImpl(): Boolean = false
+    override fun isActual(): Boolean = false
     override fun hasStableParameterNames(): Boolean = true
     override fun hasSynthesizedParameterNames(): Boolean = false
 

compiler/ir/ir.tree/src/org/jetbrains/kotlin/ir/descriptors/IrDelegateDescriptor.kt

@@ -61,7 +61,7 @@ abstract class IrDelegateDescriptorBase(
         /* lateInit = */ false,
         /* isConst = */ false,
         /* isExpect = */ false,
-        /* isImpl = */ false,
+        /* isActual = */ false,
         /* isExternal = */ false,
         /* isDelegated = */ true
 ) {

core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/lazy/descriptors/LazyJavaClassDescriptor.kt

@@ -103,7 +103,7 @@ class LazyJavaClassDescriptor(
     override fun isData() = false
     override fun isCompanionObject() = false
     override fun isExpect() = false
-    override fun isImpl() = false
+    override fun isActual() = false
 
     private val typeConstructor = LazyJavaClassTypeConstructor()
     override fun getTypeConstructor(): TypeConstructor = typeConstructor

core/descriptors/src/org/jetbrains/kotlin/builtins/functions/FunctionClassDescriptor.kt

@@ -101,7 +101,7 @@ class FunctionClassDescriptor(
     override fun isInner() = false
     override fun isData() = false
     override fun isExpect() = false
-    override fun isImpl() = false
+    override fun isActual() = false
     override fun isExternal() = false
     override val annotations: Annotations get() = Annotations.EMPTY
     override fun getSource(): SourceElement = SourceElement.NO_SOURCE

core/descriptors/src/org/jetbrains/kotlin/descriptors/MemberDescriptor.java

@@ -28,7 +28,7 @@ public interface MemberDescriptor extends DeclarationDescriptorNonRoot, Declarat
 
     boolean isExpect();
 
-    boolean isImpl();
+    boolean isActual();
 
     boolean isExternal();
 }

core/descriptors/src/org/jetbrains/kotlin/descriptors/NotFoundClasses.kt

@@ -79,7 +79,7 @@ class NotFoundClasses(private val storageManager: StorageManager, private val mo
         override fun isCompanionObject() = false
         override fun isData() = false
         override fun isExpect() = false
-        override fun isImpl() = false
+        override fun isActual() = false
         override fun isExternal() = false
         override val annotations: Annotations get() = Annotations.EMPTY
 

core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/AbstractTypeAliasDescriptor.kt

@@ -76,7 +76,7 @@ abstract class AbstractTypeAliasDescriptor(
 
     override fun isExpect(): Boolean = false
 
-    override fun isImpl(): Boolean = false
+    override fun isActual(): Boolean = false
 
     override fun isExternal() = false
 

core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/ClassDescriptorImpl.java

@@ -121,7 +121,7 @@ public class ClassDescriptorImpl extends ClassDescriptorBase {
     }
 
     @Override
-    public boolean isImpl() {
+    public boolean isActual() {
         return false;
     }
 

core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/EnumEntrySyntheticClassDescriptor.java

@@ -160,7 +160,7 @@ public class EnumEntrySyntheticClassDescriptor extends ClassDescriptorBase {
     }
 
     @Override
-    public boolean isImpl() {
+    public boolean isActual() {
         return false;
     }
 

core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/FunctionDescriptorImpl.java

@@ -44,7 +44,7 @@ public abstract class FunctionDescriptorImpl extends DeclarationDescriptorNonRoo
     private boolean isInline = false;
     private boolean isTailrec = false;
     private boolean isExpect = false;
-    private boolean isImpl = false;
+    private boolean isActual = false;
     // Difference between these hidden kinds:
     // 1. isHiddenToOvercomeSignatureClash prohibit calling such functions even in super-call context
     // 2. isHiddenForResolutionEverywhereBesideSupercalls propagates to it's overrides descriptors while isHiddenToOvercomeSignatureClash does not
@@ -140,8 +140,8 @@ public abstract class FunctionDescriptorImpl extends DeclarationDescriptorNonRoo
         this.isExpect = isExpect;
     }
 
-    public void setImpl(boolean isImpl) {
+    public void setActual(boolean isActual) {
-        this.isImpl = isImpl;
+        this.isActual = isActual;
     }
 
     private void setHiddenToOvercomeSignatureClash(boolean hiddenToOvercomeSignatureClash) {
@@ -263,8 +263,8 @@ public abstract class FunctionDescriptorImpl extends DeclarationDescriptorNonRoo
     }
 
     @Override
-    public boolean isImpl() {
+    public boolean isActual() {
-        return isImpl;
+        return isActual;
     }
 
     @Override
@@ -665,7 +665,7 @@ public abstract class FunctionDescriptorImpl extends DeclarationDescriptorNonRoo
         substitutedDescriptor.setTailrec(isTailrec);
         substitutedDescriptor.setSuspend(isSuspend);
         substitutedDescriptor.setExpect(isExpect);
-        substitutedDescriptor.setImpl(isImpl);
+        substitutedDescriptor.setActual(isActual);
         substitutedDescriptor.setHasStableParameterNames(hasStableParameterNames);
         substitutedDescriptor.setHiddenToOvercomeSignatureClash(configuration.isHiddenToOvercomeSignatureClash);
         substitutedDescriptor.setHiddenForResolutionEverywhereBesideSupercalls(configuration.isHiddenForResolutionEverywhereBesideSupercalls);

core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/LazySubstitutingClassDescriptor.java

@@ -232,8 +232,8 @@ public class LazySubstitutingClassDescriptor implements ClassDescriptor {
     }
 
     @Override
-    public boolean isImpl() {
+    public boolean isActual() {
-        return original.isImpl();
+        return original.isActual();
     }
 
     @Override

core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/MutableClassDescriptor.java

@@ -112,7 +112,7 @@ public class MutableClassDescriptor extends ClassDescriptorBase {
     }
 
     @Override
-    public boolean isImpl() {
+    public boolean isActual() {
         return false;
     }
 

core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/PropertyAccessorDescriptorImpl.java

@@ -108,7 +108,7 @@ public abstract class PropertyAccessorDescriptorImpl extends DeclarationDescript
     }
 
     @Override
-    public boolean isImpl() {
+    public boolean isActual() {
         return false;
     }
 

core/descriptors/src/org/jetbrains/kotlin/descriptors/impl/PropertyDescriptorImpl.java

@@ -43,7 +43,7 @@ public class PropertyDescriptorImpl extends VariableDescriptorWithInitializerImp
     private final boolean lateInit;
     private final boolean isConst;
     private final boolean isExpect;
-    private final boolean isImpl;
+    private final boolean isActual;
     private final boolean isExternal;
     private final boolean isDelegated;
 
@@ -67,7 +67,7 @@ public class PropertyDescriptorImpl extends VariableDescriptorWithInitializerImp
             boolean lateInit,
             boolean isConst,
             boolean isExpect,
-            boolean isImpl,
+            boolean isActual,
             boolean isExternal,
             boolean isDelegated
     ) {
@@ -79,7 +79,7 @@ public class PropertyDescriptorImpl extends VariableDescriptorWithInitializerImp
         this.lateInit = lateInit;
         this.isConst = isConst;
         this.isExpect = isExpect;
-        this.isImpl = isImpl;
+        this.isActual = isActual;
         this.isExternal = isExternal;
         this.isDelegated = isDelegated;
     }
@@ -97,13 +97,13 @@ public class PropertyDescriptorImpl extends VariableDescriptorWithInitializerImp
             boolean lateInit,
             boolean isConst,
             boolean isExpect,
-            boolean isImpl,
+            boolean isActual,
             boolean isExternal,
             boolean isDelegated
     ) {
         return new PropertyDescriptorImpl(containingDeclaration, null, annotations,
                                           modality, visibility, isVar, name, kind, source, lateInit, isConst,
-                                          isExpect, isImpl, isExternal, isDelegated);
+                                          isExpect, isActual, isExternal, isDelegated);
     }
 
     public void setType(
@@ -458,7 +458,7 @@ public class PropertyDescriptorImpl extends VariableDescriptorWithInitializerImp
     ) {
         return new PropertyDescriptorImpl(
                 newOwner, original, getAnnotations(), newModality, newVisibility, isVar(), newName, kind, SourceElement.NO_SOURCE,
-                isLateInit(), isConst(), isExpect(), isImpl(), isExternal(), isDelegated()
+                isLateInit(), isConst(), isExpect(), isActual(), isExternal(), isDelegated()
         );
     }
 
@@ -485,8 +485,8 @@ public class PropertyDescriptorImpl extends VariableDescriptorWithInitializerImp
     }
 
     @Override
-    public boolean isImpl() {
+    public boolean isActual() {
-        return isImpl;
+        return isActual;
     }
 
     @Override

core/descriptors/src/org/jetbrains/kotlin/renderer/DescriptorRendererImpl.kt

@@ -510,7 +510,7 @@ internal class DescriptorRendererImpl(
     private fun renderMemberModifiers(descriptor: MemberDescriptor, builder: StringBuilder) {
         renderModifier(builder, descriptor.isExternal, "external")
         renderModifier(builder, DescriptorRendererModifier.HEADER in modifiers && descriptor.isExpect, "header")
-        renderModifier(builder, DescriptorRendererModifier.IMPL in modifiers && descriptor.isImpl, "impl")
+        renderModifier(builder, DescriptorRendererModifier.IMPL in modifiers && descriptor.isActual, "impl")
     }
 
     private fun renderAdditionalModifiers(functionDescriptor: FunctionDescriptor, builder: StringBuilder) {

core/deserialization/src/org/jetbrains/kotlin/serialization/deserialization/descriptors/DeserializedClassDescriptor.kt

@@ -100,7 +100,7 @@ class DeserializedClassDescriptor(
 
     override fun isExpect() = Flags.IS_HEADER_CLASS.get(classProto.flags)
 
-    override fun isImpl() = false
+    override fun isActual() = false
 
     override fun isExternal() = Flags.IS_EXTERNAL_CLASS.get(classProto.flags)
 

idea/src/org/jetbrains/kotlin/idea/highlighter/markers/DeclaredHeaderMarker.kt

@@ -72,7 +72,7 @@ internal fun DeclarationDescriptor.liftToHeader(): DeclarationDescriptor? {
     if (this is MemberDescriptor) {
         return when {
             isExpect -> this
-            isImpl -> headerDescriptor()
+            isActual -> headerDescriptor()
             else -> null
         }
     }

idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/KotlinChangeSignatureHandler.kt

@@ -165,7 +165,7 @@ class KotlinChangeSignatureHandler : ChangeSignatureHandler {
             if (!CommonRefactoringUtil.checkReadOnlyStatus(project, element)) return null
 
             var descriptor = getDescriptor(bindingContext, element)
-            if (descriptor is MemberDescriptor && descriptor.isImpl) {
+            if (descriptor is MemberDescriptor && descriptor.isActual) {
                 descriptor = descriptor.headerDescriptor() ?: descriptor
             }
 

idea/src/org/jetbrains/kotlin/idea/refactoring/rename/AutomaticOverloadsRenamer.kt

@@ -68,7 +68,7 @@ private fun KtNamedFunction.getOverloads(): Collection<FunctionDescriptor> {
     val scope = getResolutionScope(context, resolutionFacade)
     val extensionReceiverClass = descriptor.extensionReceiverParameter?.type?.constructor?.declarationDescriptor as? ClassDescriptor
 
-    if (descriptor.isImpl && descriptor.headerDescriptor() != null) return emptyList()
+    if (descriptor.isActual && descriptor.headerDescriptor() != null) return emptyList()
 
     val result = LinkedHashSet<FunctionDescriptor>()
     result += scope.getAllAccessibleFunctions(name)

js/js.frontend/src/org/jetbrains/kotlin/js/resolve/diagnostics/JsNameClashChecker.kt

@@ -68,7 +68,7 @@ class JsNameClashChecker : SimpleDeclarationChecker {
             val existing = scope[name]
             if (existing != null &&
                 existing != descriptor &&
-                existing.isImpl == descriptor.isImpl &&
+                existing.isActual == descriptor.isActual &&
                 existing.isExpect == descriptor.isExpect &&
                 !bindingContext.isCommonDiagnosticReported(declaration)
             ) {
@@ -109,8 +109,8 @@ class JsNameClashChecker : SimpleDeclarationChecker {
         return diagnostics.forElement(declaration).any { it.factory in COMMON_DIAGNOSTICS }
     }
 
-    private val DeclarationDescriptor.isImpl: Boolean
+    private val DeclarationDescriptor.isActual: Boolean
-        get() = this is MemberDescriptor && this.isImpl
+        get() = this is MemberDescriptor && this.isActual
 
     private val DeclarationDescriptor.isExpect: Boolean
         get() = this is MemberDescriptor && this.isExpect

plugins/android-extensions/android-extensions-compiler/src/org/jetbrains/kotlin/android/synthetic/res/syntheticDescriptorGeneration.kt

@@ -105,7 +105,7 @@ private fun genProperty(
             /* lateInit = */ false,
             /* isConst = */ false,
             /* isExpect = */ false,
-            /* isImpl = */ false,
+            /* isActual = */ false,
             /* isExternal = */ false,
             /* isDelegated = */ false
     ) {