Fix KotlinLintTestGenerated.testParcel + extensions registrations fixes

compiler/frontend/src/org/jetbrains/kotlin/util/declarationUtil.kt

@@ -6,6 +6,8 @@
 package org.jetbrains.kotlin.util
 
 import org.jetbrains.kotlin.cfg.pseudocode.containingDeclarationForPseudocode
+import org.jetbrains.kotlin.lexer.KtTokens
+import org.jetbrains.kotlin.psi.KtClass
 import org.jetbrains.kotlin.psi.KtDeclaration
 import org.jetbrains.kotlin.psi.KtElement
 import org.jetbrains.kotlin.psi.KtPsiUtil
@@ -16,4 +18,12 @@ fun KtElement.containingNonLocalDeclaration(): KtDeclaration? {
         container = container.containingDeclarationForPseudocode
     }
     return container
-}
+}
+
+val KtDeclaration.isOrdinaryClass
+    get() = this is KtClass &&
+            !this.hasModifier(KtTokens.INLINE_KEYWORD) &&
+            !this.isAnnotation() &&
+            !this.isInterface()
+
+val KtDeclaration.isAnnotated get() = this.annotationEntries.isNotEmpty()

idea/resources/META-INF/extensions/ide.xml

@@ -7,16 +7,16 @@
                         interface="org.jetbrains.kotlin.extensions.DeclarationAttributeAltererExtension"
                         area="IDEA_PROJECT"/>
 
-        <extensionPoint qualifiedName="org.jetbrains.kotlin.lightClassApplicabilityCheckExtension"
-                        interface="org.jetbrains.kotlin.extensions.LightClassApplicabilityCheckExtension"
-                        area="IDEA_PROJECT"/>
-
         <extensionPoint qualifiedName="org.jetbrains.kotlin.idePlatformKindResolution"
                         interface="org.jetbrains.kotlin.caches.resolve.IdePlatformKindResolution"/>
 
         <extensionPoint qualifiedName="org.jetbrains.kotlin.highlighterExtension"
                         interface="org.jetbrains.kotlin.idea.highlighter.HighlighterExtension"/>
 
+        <extensionPoint qualifiedName="org.jetbrains.kotlin.lightClassApplicabilityCheckExtension"
+                        interface="org.jetbrains.kotlin.extensions.LightClassApplicabilityCheckExtension"
+                        area="IDEA_PROJECT"/>
+
         <extensionPoint name="scratchFileLanguageProvider" beanClass="com.intellij.lang.LanguageExtensionPoint">
             <with attribute="implementationClass" implements="org.jetbrains.kotlin.idea.scratch.ScratchFileLanguageProvider"/>
         </extensionPoint>

idea/resources/META-INF/extensions/ide.xml.183

@@ -21,6 +21,10 @@
         <extensionPoint qualifiedName="org.jetbrains.kotlin.highlighterExtension"
                         interface="org.jetbrains.kotlin.idea.highlighter.HighlighterExtension"/>
 
+        <extensionPoint qualifiedName="org.jetbrains.kotlin.lightClassApplicabilityCheckExtension"
+                        interface="org.jetbrains.kotlin.extensions.LightClassApplicabilityCheckExtension"
+                        area="IDEA_PROJECT"/>
+
         <extensionPoint name="scratchFileLanguageProvider" beanClass="com.intellij.lang.LanguageExtensionPoint">
             <with attribute="implementationClass" implements="org.jetbrains.kotlin.idea.scratch.ScratchFileLanguageProvider"/>
         </extensionPoint>

idea/resources/META-INF/extensions/ide.xml.as34

@@ -12,6 +12,10 @@
 
         <extensionPoint qualifiedName="org.jetbrains.kotlin.highlighterExtension"
                         interface="org.jetbrains.kotlin.idea.highlighter.HighlighterExtension"/>
+						
+        <extensionPoint qualifiedName="org.jetbrains.kotlin.lightClassApplicabilityCheckExtension"
+                        interface="org.jetbrains.kotlin.extensions.LightClassApplicabilityCheckExtension"
+                        area="IDEA_PROJECT"/>
 
         <extensionPoint name="scratchFileLanguageProvider" beanClass="com.intellij.lang.LanguageExtensionPoint">
             <with attribute="implementationClass" implements="org.jetbrains.kotlin.idea.scratch.ScratchFileLanguageProvider"/>

plugins/android-extensions/android-extensions-idea/src/org/jetbrains/kotlin/android/parcel/IDEParcelableApplicabilityExtension.kt

@@ -5,6 +5,8 @@
 
 package org.jetbrains.kotlin.android.parcel
 
+import org.jetbrains.kotlin.util.isAnnotated
+import org.jetbrains.kotlin.util.isOrdinaryClass
 import org.jetbrains.kotlin.descriptors.ClassDescriptor
 import org.jetbrains.kotlin.descriptors.DeclarationDescriptor
 import org.jetbrains.kotlin.extensions.LightClassApplicabilityCheckExtension
@@ -12,16 +14,6 @@ import org.jetbrains.kotlin.extensions.LightClassApplicabilityType
 import org.jetbrains.kotlin.psi.KtDeclaration
 import org.jetbrains.kotlin.extensions.LightClassApplicabilityType.LightClass
 import org.jetbrains.kotlin.extensions.LightClassApplicabilityType.UltraLightClass
-import org.jetbrains.kotlin.lexer.KtTokens
-import org.jetbrains.kotlin.psi.KtClass
-
-private val KtDeclaration.isOrdinaryClass
-    get() = this is KtClass &&
-            !this.hasModifier(KtTokens.INLINE_KEYWORD) &&
-            !this.isAnnotation() &&
-            !this.isInterface()
-
-private val KtDeclaration.isAnnotated get() = this.annotationEntries.isNotEmpty()
 
 class IDEParcelableApplicabilityExtension : LightClassApplicabilityCheckExtension {
 

plugins/annotation-based-compiler-plugins-ide-support/src/AnnotationBasedLightClassApplicabilityExtension.kt

@@ -5,6 +5,8 @@
 
 package org.jetbrains.kotlin.annotation.plugin.ide
 
+import org.jetbrains.kotlin.util.isAnnotated
+import org.jetbrains.kotlin.util.isOrdinaryClass
 import com.intellij.openapi.project.Project
 import org.jetbrains.kotlin.descriptors.ClassDescriptor
 import org.jetbrains.kotlin.descriptors.DeclarationDescriptor

plugins/annotation-based-compiler-plugins-ide-support/src/idePluginUtils.kt

@@ -70,12 +70,4 @@ internal fun modifyCompilerArgumentsForPlugin(
     commonArguments.pluginClasspaths = newPluginClasspaths.toTypedArray()
 
     facetSettings.compilerArguments = commonArguments
-}
+}
-
-val KtDeclaration.isOrdinaryClass
-    get() = this is KtClass &&
-            !this.hasModifier(KtTokens.INLINE_KEYWORD) &&
-            !this.isAnnotation() &&
-            !this.isInterface()
-
-val KtDeclaration.isAnnotated get() = this.annotationEntries.isNotEmpty()

plugins/kotlin-serialization/kotlin-serialization-ide/src/org/jetbrains/kotlinx/serialization/idea/IdeSerializationPluginApplicabilityExtension.kt

@@ -5,8 +5,8 @@
 
 package org.jetbrains.kotlinx.serialization.idea
 
-import org.jetbrains.kotlin.annotation.plugin.ide.isAnnotated
+import org.jetbrains.kotlin.util.isAnnotated
-import org.jetbrains.kotlin.annotation.plugin.ide.isOrdinaryClass
+import org.jetbrains.kotlin.util.isOrdinaryClass
 import org.jetbrains.kotlin.descriptors.ClassDescriptor
 import org.jetbrains.kotlin.descriptors.DeclarationDescriptor
 import org.jetbrains.kotlin.extensions.LightClassApplicabilityCheckExtension