From 4dc47c734c52774cf6495c3351db7622fe07c9d8 Mon Sep 17 00:00:00 2001 From: Stanislav Erokhin Date: Thu, 14 Sep 2017 19:42:10 +0300 Subject: [PATCH] Rename has[Header|Impl]Modifier() to has[Expect|Actual]Modifier() --- .../org/jetbrains/kotlin/codegen/PackageCodegenImpl.java | 2 +- .../org/jetbrains/kotlin/codegen/PackagePartCodegen.java | 2 +- compiler/frontend/src/org/jetbrains/kotlin/psi/KtFile.kt | 4 ++-- .../src/org/jetbrains/kotlin/psi/psiUtil/psiUtils.kt | 8 ++++---- .../org/jetbrains/kotlin/resolve/DeclarationsChecker.kt | 4 ++-- .../org/jetbrains/kotlin/resolve/DescriptorResolver.java | 6 +++--- .../kotlin/resolve/FunctionDescriptorResolver.kt | 8 ++++---- .../resolve/checkers/HeaderImplDeclarationChecker.kt | 4 ++-- .../resolve/lazy/descriptors/LazyClassDescriptor.java | 4 ++-- .../resolve/lazy/descriptors/LazyTypeAliasDescriptor.kt | 4 ++-- .../asJava/classes/KtLightClassForSourceDeclaration.kt | 4 ++-- .../kotlin/idea/highlighter/PlatformHeaderAnnotator.kt | 6 +++--- .../core/overrideImplement/OverrideMemberChooserObject.kt | 4 ++-- .../idea/highlighter/markers/DeclaredHeaderMarker.kt | 4 ++-- .../idea/highlighter/markers/KotlinLineMarkerProvider.kt | 8 ++++---- .../kotlin/idea/inspections/UnusedSymbolInspection.kt | 4 ++-- 16 files changed, 38 insertions(+), 38 deletions(-) diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/PackageCodegenImpl.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/PackageCodegenImpl.java index a5a8257e117..7a635d9a4ec 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/PackageCodegenImpl.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/PackageCodegenImpl.java @@ -99,7 +99,7 @@ public class PackageCodegenImpl implements PackageCodegen { List classOrObjects = new ArrayList<>(); for (KtDeclaration declaration : file.getDeclarations()) { - if (PsiUtilsKt.hasHeaderModifier(declaration)) continue; + if (PsiUtilsKt.hasExpectModifier(declaration)) continue; if (declaration instanceof KtProperty || declaration instanceof KtNamedFunction || declaration instanceof KtTypeAlias) { generatePackagePart = true; diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/PackagePartCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/PackagePartCodegen.java index f737211ae65..67057075f71 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/PackagePartCodegen.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/PackagePartCodegen.java @@ -89,7 +89,7 @@ public class PackagePartCodegen extends MemberCodegen { @Override protected void generateBody() { for (KtDeclaration declaration : element.getDeclarations()) { - if (PsiUtilsKt.hasHeaderModifier(declaration)) continue; + if (PsiUtilsKt.hasExpectModifier(declaration)) continue; if (declaration instanceof KtNamedFunction || declaration instanceof KtProperty || declaration instanceof KtTypeAlias) { genSimpleMember(declaration); diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/KtFile.kt b/compiler/frontend/src/org/jetbrains/kotlin/psi/KtFile.kt index 65b951a8eab..bada78df856 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/psi/KtFile.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/KtFile.kt @@ -30,7 +30,7 @@ import org.jetbrains.kotlin.idea.KotlinLanguage import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.parsing.KotlinParserDefinition import org.jetbrains.kotlin.psi.psiUtil.getChildOfType -import org.jetbrains.kotlin.psi.psiUtil.hasHeaderModifier +import org.jetbrains.kotlin.psi.psiUtil.hasExpectModifier import org.jetbrains.kotlin.psi.stubs.KotlinFileStub import org.jetbrains.kotlin.psi.stubs.elements.KtPlaceHolderStubElementType import org.jetbrains.kotlin.psi.stubs.elements.KtStubElementTypes @@ -171,7 +171,7 @@ open class KtFile(viewProvider: FileViewProvider, val isCompiled: Boolean) : (it is KtProperty || it is KtNamedFunction || it is KtScript || - it is KtTypeAlias) && !it.hasHeaderModifier() + it is KtTypeAlias) && !it.hasExpectModifier() } hasTopLeveCallables = result diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/psiUtil/psiUtils.kt b/compiler/frontend/src/org/jetbrains/kotlin/psi/psiUtil/psiUtils.kt index 3bed53df4dc..fac6bec9724 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/psi/psiUtil/psiUtils.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/psiUtil/psiUtils.kt @@ -383,9 +383,9 @@ fun PsiElement.before(element: PsiElement) = textRange.endOffset <= element.text inline fun PsiElement.getLastParentOfTypeInRow() = parents.takeWhile { it is T }.lastOrNull() as? T -fun KtModifierListOwner.hasHeaderModifier() = hasModifier(KtTokens.HEADER_KEYWORD) -fun KtModifierList.hasHeaderModifier() = hasModifier(KtTokens.HEADER_KEYWORD) +fun KtModifierListOwner.hasExpectModifier() = hasModifier(KtTokens.HEADER_KEYWORD) +fun KtModifierList.hasExpectModifier() = hasModifier(KtTokens.HEADER_KEYWORD) -fun KtModifierListOwner.hasImplModifier() = hasModifier(KtTokens.IMPL_KEYWORD) -fun KtModifierList.hasImplModifier() = hasModifier(KtTokens.IMPL_KEYWORD) +fun KtModifierListOwner.hasActualModifier() = hasModifier(KtTokens.IMPL_KEYWORD) +fun KtModifierList.hasActualModifier() = hasModifier(KtTokens.IMPL_KEYWORD) diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/DeclarationsChecker.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/DeclarationsChecker.kt index 96f057382e3..404de14ec6f 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/DeclarationsChecker.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/DeclarationsChecker.kt @@ -29,7 +29,7 @@ import org.jetbrains.kotlin.diagnostics.Errors import org.jetbrains.kotlin.diagnostics.Errors.* import org.jetbrains.kotlin.lexer.KtTokens import org.jetbrains.kotlin.psi.* -import org.jetbrains.kotlin.psi.psiUtil.hasImplModifier +import org.jetbrains.kotlin.psi.psiUtil.hasActualModifier import org.jetbrains.kotlin.psi.psiUtil.visibilityModifier import org.jetbrains.kotlin.resolve.BindingContext.* import org.jetbrains.kotlin.resolve.DescriptorUtils.classCanHaveAbstractMembers @@ -166,7 +166,7 @@ class DeclarationsChecker( } } - if (declaration.hasImplModifier()) { + if (declaration.hasActualModifier()) { checkImplTypeAlias(declaration, typeAliasDescriptor) } } diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/DescriptorResolver.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/DescriptorResolver.java index d4fe68ca01c..2e5e38cb559 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/DescriptorResolver.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/DescriptorResolver.java @@ -874,9 +874,9 @@ public class DescriptorResolver { KotlinSourceElementKt.toSourceElement(variableDeclaration), modifierList != null && modifierList.hasModifier(KtTokens.LATEINIT_KEYWORD), modifierList != null && modifierList.hasModifier(KtTokens.CONST_KEYWORD), - modifierList != null && PsiUtilsKt.hasHeaderModifier(modifierList) && container instanceof PackageFragmentDescriptor || + modifierList != null && PsiUtilsKt.hasExpectModifier(modifierList) && container instanceof PackageFragmentDescriptor || container instanceof ClassDescriptor && ((ClassDescriptor) container).isHeader(), - modifierList != null && PsiUtilsKt.hasImplModifier(modifierList), + modifierList != null && PsiUtilsKt.hasActualModifier(modifierList), modifierList != null && modifierList.hasModifier(KtTokens.EXTERNAL_KEYWORD), propertyInfo.getHasDelegate() ); @@ -1202,7 +1202,7 @@ public class DescriptorResolver { false, false, classDescriptor.isHeader(), - modifierList != null && PsiUtilsKt.hasImplModifier(modifierList), + modifierList != null && PsiUtilsKt.hasActualModifier(modifierList), false, false ); diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/FunctionDescriptorResolver.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/FunctionDescriptorResolver.kt index c186ceca707..86160ee8bbd 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/FunctionDescriptorResolver.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/FunctionDescriptorResolver.kt @@ -33,8 +33,8 @@ import org.jetbrains.kotlin.diagnostics.Errors.* import org.jetbrains.kotlin.lexer.KtTokens import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.psi.* -import org.jetbrains.kotlin.psi.psiUtil.hasHeaderModifier -import org.jetbrains.kotlin.psi.psiUtil.hasImplModifier +import org.jetbrains.kotlin.psi.psiUtil.hasExpectModifier +import org.jetbrains.kotlin.psi.psiUtil.hasActualModifier import org.jetbrains.kotlin.resolve.DescriptorResolver.getDefaultModality import org.jetbrains.kotlin.resolve.DescriptorResolver.getDefaultVisibility import org.jetbrains.kotlin.resolve.DescriptorUtils.getDispatchReceiverParameterIfNeeded @@ -184,9 +184,9 @@ class FunctionDescriptorResolver( functionDescriptor.isInline = function.hasModifier(KtTokens.INLINE_KEYWORD) functionDescriptor.isTailrec = function.hasModifier(KtTokens.TAILREC_KEYWORD) functionDescriptor.isSuspend = function.hasModifier(KtTokens.SUSPEND_KEYWORD) - functionDescriptor.isHeader = container is PackageFragmentDescriptor && function.hasHeaderModifier() || + functionDescriptor.isHeader = container is PackageFragmentDescriptor && function.hasExpectModifier() || container is ClassDescriptor && container.isHeader - functionDescriptor.isImpl = function.hasImplModifier() + functionDescriptor.isImpl = function.hasActualModifier() receiverType?.let { ForceResolveUtil.forceResolveAllContents(it.annotations) } for (valueParameterDescriptor in valueParameterDescriptors) { diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/checkers/HeaderImplDeclarationChecker.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/checkers/HeaderImplDeclarationChecker.kt index 670bfbb3f21..c674ba8fe53 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/checkers/HeaderImplDeclarationChecker.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/checkers/HeaderImplDeclarationChecker.kt @@ -28,7 +28,7 @@ import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.psi.KtConstructor import org.jetbrains.kotlin.psi.KtDeclaration import org.jetbrains.kotlin.psi.KtElement -import org.jetbrains.kotlin.psi.psiUtil.hasImplModifier +import org.jetbrains.kotlin.psi.psiUtil.hasActualModifier import org.jetbrains.kotlin.resolve.BindingContext import org.jetbrains.kotlin.resolve.DescriptorToSourceUtils import org.jetbrains.kotlin.resolve.DescriptorUtils @@ -127,7 +127,7 @@ object HeaderImplDeclarationChecker : DeclarationChecker { // TODO: use common module here val compatibility = findHeaderForImpl(descriptor, descriptor.module) ?: return - val hasImplModifier = descriptor.isImpl && reportOn.hasImplModifier() + val hasImplModifier = descriptor.isImpl && reportOn.hasActualModifier() if (!hasImplModifier) { if (Compatible !in compatibility) return diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyClassDescriptor.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyClassDescriptor.java index b2fa086ddd5..a4f956aab8c 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyClassDescriptor.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyClassDescriptor.java @@ -166,9 +166,9 @@ 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.hasImplModifier(modifierList); + this.isImpl = modifierList != null && PsiUtilsKt.hasActualModifier(modifierList); - this.isHeader = modifierList != null && PsiUtilsKt.hasHeaderModifier(modifierList) || + this.isHeader = modifierList != null && PsiUtilsKt.hasExpectModifier(modifierList) || containingDeclaration instanceof ClassDescriptor && ((ClassDescriptor) containingDeclaration).isHeader(); // Annotation entries are taken from both own annotations (if any) and object literal annotations (if any) diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyTypeAliasDescriptor.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyTypeAliasDescriptor.kt index b45dd5fed61..3909553be11 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyTypeAliasDescriptor.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyTypeAliasDescriptor.kt @@ -22,7 +22,7 @@ import org.jetbrains.kotlin.descriptors.impl.AbstractTypeAliasDescriptor import org.jetbrains.kotlin.descriptors.impl.TypeAliasConstructorDescriptor import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.psi.KtTypeAlias -import org.jetbrains.kotlin.psi.psiUtil.hasImplModifier +import org.jetbrains.kotlin.psi.psiUtil.hasActualModifier import org.jetbrains.kotlin.resolve.BindingTrace import org.jetbrains.kotlin.resolve.source.getPsi import org.jetbrains.kotlin.storage.NotNullLazyValue @@ -49,7 +49,7 @@ class LazyTypeAliasDescriptor( private lateinit var expandedTypeImpl: NotNullLazyValue private lateinit var defaultTypeImpl: NotNullLazyValue private lateinit var classDescriptorImpl: NullableLazyValue - private val isImpl = (source.getPsi() as? KtTypeAlias)?.hasImplModifier() == true + private val isImpl = (source.getPsi() as? KtTypeAlias)?.hasActualModifier() == true override val underlyingType: SimpleType get() = underlyingTypeImpl() override val expandedType: SimpleType get() = expandedTypeImpl() diff --git a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/classes/KtLightClassForSourceDeclaration.kt b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/classes/KtLightClassForSourceDeclaration.kt index 914318ee78b..5fa7c856abf 100644 --- a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/classes/KtLightClassForSourceDeclaration.kt +++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/classes/KtLightClassForSourceDeclaration.kt @@ -58,7 +58,7 @@ import org.jetbrains.kotlin.platform.JavaToKotlinClassMap import org.jetbrains.kotlin.psi.* import org.jetbrains.kotlin.psi.debugText.getDebugText import org.jetbrains.kotlin.psi.psiUtil.getElementTextWithContext -import org.jetbrains.kotlin.psi.psiUtil.hasHeaderModifier +import org.jetbrains.kotlin.psi.psiUtil.hasExpectModifier import org.jetbrains.kotlin.psi.stubs.KotlinClassOrObjectStub import org.jetbrains.kotlin.resolve.DescriptorUtils import java.util.* @@ -334,7 +334,7 @@ abstract class KtLightClassForSourceDeclaration(protected val classOrObject: KtC fun create(classOrObject: KtClassOrObject): KtLightClassForSourceDeclaration? { - if (classOrObject.hasHeaderModifier()) { + if (classOrObject.hasExpectModifier()) { return null } diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/PlatformHeaderAnnotator.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/PlatformHeaderAnnotator.kt index 7d21d6f7c82..17331850579 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/PlatformHeaderAnnotator.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/PlatformHeaderAnnotator.kt @@ -31,7 +31,7 @@ import org.jetbrains.kotlin.idea.project.TargetPlatformDetector import org.jetbrains.kotlin.psi.KtClassOrObject import org.jetbrains.kotlin.psi.KtDeclaration import org.jetbrains.kotlin.psi.KtPsiUtil -import org.jetbrains.kotlin.psi.psiUtil.hasHeaderModifier +import org.jetbrains.kotlin.psi.psiUtil.hasExpectModifier import org.jetbrains.kotlin.resolve.BindingTraceContext import org.jetbrains.kotlin.resolve.TargetPlatform import org.jetbrains.kotlin.resolve.checkers.HeaderImplDeclarationChecker @@ -81,7 +81,7 @@ class PlatformHeaderAnnotator : Annotator { } private fun isHeaderDeclaration(declaration: KtDeclaration): Boolean { - return declaration.hasHeaderModifier() || - declaration is KtClassOrObject && KtPsiUtil.getOutermostClassOrObject(declaration)?.hasHeaderModifier() == true + return declaration.hasExpectModifier() || + declaration is KtClassOrObject && KtPsiUtil.getOutermostClassOrObject(declaration)?.hasExpectModifier() == true } } diff --git a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/overrideImplement/OverrideMemberChooserObject.kt b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/overrideImplement/OverrideMemberChooserObject.kt index 0ebfbb1033c..4c116a42153 100644 --- a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/overrideImplement/OverrideMemberChooserObject.kt +++ b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/overrideImplement/OverrideMemberChooserObject.kt @@ -35,7 +35,7 @@ import org.jetbrains.kotlin.idea.util.approximateFlexibleTypes import org.jetbrains.kotlin.lexer.KtTokens import org.jetbrains.kotlin.psi.* import org.jetbrains.kotlin.psi.findDocComment.findDocComment -import org.jetbrains.kotlin.psi.psiUtil.hasHeaderModifier +import org.jetbrains.kotlin.psi.psiUtil.hasExpectModifier import org.jetbrains.kotlin.renderer.* import org.jetbrains.kotlin.resolve.descriptorUtil.setSingleOverridden @@ -100,7 +100,7 @@ interface OverrideMemberChooserObject : ClassMember { fun OverrideMemberChooserObject.generateMember(targetClass: KtClassOrObject, copyDoc: Boolean): KtCallableDeclaration { val project = targetClass.project - val bodyType = if (targetClass.hasHeaderModifier()) OverrideMemberChooserObject.BodyType.NO_BODY else bodyType + val bodyType = if (targetClass.hasExpectModifier()) OverrideMemberChooserObject.BodyType.NO_BODY else bodyType val descriptor = immediateSuper if (preferConstructorParameter && descriptor is PropertyDescriptor) return generateConstructorParameter(project, descriptor) diff --git a/idea/src/org/jetbrains/kotlin/idea/highlighter/markers/DeclaredHeaderMarker.kt b/idea/src/org/jetbrains/kotlin/idea/highlighter/markers/DeclaredHeaderMarker.kt index 1181f5286f6..1874d308368 100644 --- a/idea/src/org/jetbrains/kotlin/idea/highlighter/markers/DeclaredHeaderMarker.kt +++ b/idea/src/org/jetbrains/kotlin/idea/highlighter/markers/DeclaredHeaderMarker.kt @@ -23,7 +23,7 @@ import org.jetbrains.kotlin.idea.core.toDescriptor import org.jetbrains.kotlin.idea.highlighter.sourceKind import org.jetbrains.kotlin.psi.KtDeclaration import org.jetbrains.kotlin.psi.psiUtil.containingClassOrObject -import org.jetbrains.kotlin.psi.psiUtil.hasHeaderModifier +import org.jetbrains.kotlin.psi.psiUtil.hasExpectModifier import org.jetbrains.kotlin.resolve.DescriptorToSourceUtils import org.jetbrains.kotlin.resolve.MultiTargetPlatform import org.jetbrains.kotlin.resolve.checkers.HeaderImplDeclarationChecker @@ -66,7 +66,7 @@ internal fun KtDeclaration.headerDeclarationIfAny(): KtDeclaration? { } internal fun KtDeclaration.isHeaderOrHeaderClassMember() = - hasHeaderModifier() || (containingClassOrObject?.hasHeaderModifier() ?: false) + hasExpectModifier() || (containingClassOrObject?.hasExpectModifier() ?: false) internal fun DeclarationDescriptor.liftToHeader(): DeclarationDescriptor? { if (this is MemberDescriptor) { diff --git a/idea/src/org/jetbrains/kotlin/idea/highlighter/markers/KotlinLineMarkerProvider.kt b/idea/src/org/jetbrains/kotlin/idea/highlighter/markers/KotlinLineMarkerProvider.kt index 5beeea18a10..bacfb43d008 100644 --- a/idea/src/org/jetbrains/kotlin/idea/highlighter/markers/KotlinLineMarkerProvider.kt +++ b/idea/src/org/jetbrains/kotlin/idea/highlighter/markers/KotlinLineMarkerProvider.kt @@ -48,8 +48,8 @@ import org.jetbrains.kotlin.idea.highlighter.allImplementingCompatibleModules import org.jetbrains.kotlin.idea.util.ProjectRootsUtil import org.jetbrains.kotlin.lexer.KtTokens import org.jetbrains.kotlin.psi.* -import org.jetbrains.kotlin.psi.psiUtil.hasHeaderModifier -import org.jetbrains.kotlin.psi.psiUtil.hasImplModifier +import org.jetbrains.kotlin.psi.psiUtil.hasExpectModifier +import org.jetbrains.kotlin.psi.psiUtil.hasActualModifier import java.awt.event.MouseEvent import java.util.* import javax.swing.Icon @@ -100,10 +100,10 @@ class KotlinLineMarkerProvider : LineMarkerProvider { for (element in elements) { if (element !is KtNamedDeclaration) continue - if (element.hasHeaderModifier()) { + if (element.hasExpectModifier()) { collectImplementationMarkers(element, result) } - else if (element.hasImplModifier()) { + else if (element.hasActualModifier()) { collectHeaderMarkers(element, result) } } diff --git a/idea/src/org/jetbrains/kotlin/idea/inspections/UnusedSymbolInspection.kt b/idea/src/org/jetbrains/kotlin/idea/inspections/UnusedSymbolInspection.kt index d31f3de5f21..28119f02cdc 100644 --- a/idea/src/org/jetbrains/kotlin/idea/inspections/UnusedSymbolInspection.kt +++ b/idea/src/org/jetbrains/kotlin/idea/inspections/UnusedSymbolInspection.kt @@ -326,10 +326,10 @@ class UnusedSymbolInspection : AbstractKotlinInspection() { } private fun isPlatformImplementation(declaration: KtNamedDeclaration) = - declaration.hasImplModifier() + declaration.hasActualModifier() private fun hasPlatformImplementations(declaration: KtNamedDeclaration, descriptor: DeclarationDescriptor?): Boolean { - if (!declaration.hasHeaderModifier()) return false + if (!declaration.hasExpectModifier()) return false descriptor as? MemberDescriptor ?: return false val commonModuleDescriptor = declaration.containingKtFile.findModuleDescriptor()