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

Fix KotlinLintTestGenerated.testParcel + extensions registrations fixes

Browse Source
This commit is contained in:
Igor Yakovlev
2019-09-13 16:04:52 +03:00
parent c3265a8bf0
commit 27accbb089
8 changed files with 30 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/android-extensions/android-extensions-idea/src/org/jetbrains/kotlin/android/parcel/IDEParcelableApplicabilityExtension.kt
+2 -10
View File
@@ -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
+2
View File
@@ -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
+1 -9
View File
@@ -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
+2 -2
View File
@@ -5,8 +5,8 @@
package org.jetbrains.kotlinx.serialization.idea
import org.jetbrains.kotlin.annotation.plugin.ide.isAnnotated
import org.jetbrains.kotlin.annotation.plugin.ide.isOrdinaryClass
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