plugins: cleanup 'public', property access syntax

2016-01-07 18:15:44 +01:00
parent d6a11b839b
commit 44138f499e
26 changed files with 72 additions and 72 deletions
@@ -39,17 +39,17 @@ import org.jetbrains.kotlin.resolve.TargetPlatform
 import org.jetbrains.kotlin.resolve.jvm.extensions.PackageFragmentProviderExtension
 import org.jetbrains.kotlin.resolve.jvm.platform.JvmPlatform

-public object AndroidConfigurationKeys {
-    public val VARIANT: CompilerConfigurationKey<List<String>> = CompilerConfigurationKey.create<List<String>>("Android build variant")
-    public val PACKAGE: CompilerConfigurationKey<String> = CompilerConfigurationKey.create<String>("application package fq name")
+object AndroidConfigurationKeys {
+    val VARIANT: CompilerConfigurationKey<List<String>> = CompilerConfigurationKey.create<List<String>>("Android build variant")
+    val PACKAGE: CompilerConfigurationKey<String> = CompilerConfigurationKey.create<String>("application package fq name")
 }

-public class AndroidCommandLineProcessor : CommandLineProcessor {
+class AndroidCommandLineProcessor : CommandLineProcessor {
    companion object {
-        public val ANDROID_COMPILER_PLUGIN_ID: String = "org.jetbrains.kotlin.android"
+        val ANDROID_COMPILER_PLUGIN_ID: String = "org.jetbrains.kotlin.android"

-        public val VARIANT_OPTION: CliOption = CliOption("variant", "<name;path>", "Android build variant", allowMultipleOccurrences = true)
-        public val PACKAGE_OPTION: CliOption = CliOption("package", "<fq name>", "Application package")
+        val VARIANT_OPTION: CliOption = CliOption("variant", "<name;path>", "Android build variant", allowMultipleOccurrences = true)
+        val PACKAGE_OPTION: CliOption = CliOption("package", "<fq name>", "Application package")
    }

    override val pluginId: String = ANDROID_COMPILER_PLUGIN_ID
@@ -69,9 +69,9 @@ public class AndroidCommandLineProcessor : CommandLineProcessor {
    }
 }

-public class AndroidComponentRegistrar : ComponentRegistrar {
+class AndroidComponentRegistrar : ComponentRegistrar {

-    public override fun registerProjectComponents(project: MockProject, configuration: CompilerConfiguration) {
+    override fun registerProjectComponents(project: MockProject, configuration: CompilerConfiguration) {
        val applicationPackage = configuration.get(AndroidConfigurationKeys.PACKAGE)
        val variants = configuration.get(AndroidConfigurationKeys.VARIANT)?.map { parseVariant(it) }?.filterNotNull() ?: emptyList()

@@ -94,7 +94,7 @@ public class AndroidComponentRegistrar : ComponentRegistrar {
    }
 }

-public class AndroidExtensionPropertiesComponentContainerContributor : StorageComponentContainerContributor {
+class AndroidExtensionPropertiesComponentContainerContributor : StorageComponentContainerContributor {
    override fun addDeclarations(container: StorageComponentContainer, platform: TargetPlatform) {
        if (platform is JvmPlatform) {
            container.useInstance(AndroidExtensionPropertiesCallChecker())
@@ -17,7 +17,7 @@
 package org.jetbrains.kotlin.android.synthetic


-public object AndroidConst {
+object AndroidConst {
    val SYNTHETIC_PACKAGE: String = "kotlinx.android.synthetic"
    val SYNTHETIC_PACKAGE_PATH_LENGTH = SYNTHETIC_PACKAGE.count { it == '.' } + 1

@@ -55,7 +55,7 @@ public object AndroidConst {
    val FQNAME_RESOLVE_PACKAGES = listOf("android.widget", "android.webkit", "android.view")
 }

-public fun androidIdToName(id: String): String? {
+fun androidIdToName(id: String): String? {
    for (prefix in AndroidConst.XML_ID_PREFIXES) {
        if (id.startsWith(prefix)) {
            return id.substring(prefix.length)
@@ -64,7 +64,7 @@ public fun androidIdToName(id: String): String? {
    return null
 }

-public fun isWidgetTypeIgnored(xmlType: String): Boolean {
+fun isWidgetTypeIgnored(xmlType: String): Boolean {
    return (xmlType.isEmpty() || xmlType in AndroidConst.IGNORED_XML_WIDGET_TYPES)
 }

@@ -45,7 +45,7 @@ class AndroidXmlHandler(private val elementCallback: (String, String) -> Unit) :

 }

-public fun Attributes.toMap(): HashMap<String, String> {
+fun Attributes.toMap(): HashMap<String, String> {
    val res = HashMap<String, String>()
    for (index in 0..length - 1) {
        val attrName = getLocalName(index)!!
@@ -43,7 +43,7 @@ import org.jetbrains.org.objectweb.asm.Opcodes.ACC_PUBLIC
 import org.jetbrains.org.objectweb.asm.Type
 import org.jetbrains.org.objectweb.asm.commons.InstructionAdapter

-public enum class AndroidClassType(className: String, val supportsCache: Boolean = false, val fragment: Boolean = false) {
+enum class AndroidClassType(className: String, val supportsCache: Boolean = false, val fragment: Boolean = false) {
    ACTIVITY(AndroidConst.ACTIVITY_FQNAME, supportsCache = true),
    FRAGMENT(AndroidConst.FRAGMENT_FQNAME, supportsCache = true, fragment = true),
    SUPPORT_FRAGMENT_ACTIVITY(AndroidConst.SUPPORT_FRAGMENT_ACTIVITY_FQNAME, supportsCache = true),
@@ -51,10 +51,10 @@ public enum class AndroidClassType(className: String, val supportsCache: Boolean
    VIEW(AndroidConst.VIEW_FQNAME),
    UNKNOWN("");

-    public val internalClassName: String = className.replace('.', '/')
+    val internalClassName: String = className.replace('.', '/')

-    public companion object {
-        public fun getClassType(descriptor: ClassifierDescriptor): AndroidClassType {
+    companion object {
+        fun getClassType(descriptor: ClassifierDescriptor): AndroidClassType {
            fun getClassTypeInternal(name: String): AndroidClassType? = when (name) {
                AndroidConst.ACTIVITY_FQNAME -> AndroidClassType.ACTIVITY
                AndroidConst.FRAGMENT_FQNAME -> AndroidClassType.FRAGMENT
@@ -86,7 +86,7 @@ public enum class AndroidClassType(className: String, val supportsCache: Boolean
    }
 }

-public class AndroidExpressionCodegenExtension : ExpressionCodegenExtension {
+class AndroidExpressionCodegenExtension : ExpressionCodegenExtension {
    companion object {
        private val PROPERTY_NAME = "_\$_findViewCache"
        private val CACHED_FIND_VIEW_BY_ID_METHOD_NAME = "_\$_findCachedViewById"
@@ -29,7 +29,7 @@ import org.jetbrains.kotlin.resolve.jvm.diagnostics.JvmDeclarationOrigin
 import org.jetbrains.org.objectweb.asm.*
 import org.jetbrains.org.objectweb.asm.commons.InstructionAdapter

-public class AndroidOnDestroyClassBuilderInterceptorExtension : ClassBuilderInterceptorExtension {
+class AndroidOnDestroyClassBuilderInterceptorExtension : ClassBuilderInterceptorExtension {

    override fun interceptClassBuilderFactory(
            interceptedFactory: ClassBuilderFactory,
@@ -26,7 +26,7 @@ import org.jetbrains.kotlin.android.synthetic.res.AndroidSyntheticProperty
 import org.jetbrains.kotlin.diagnostics.DiagnosticSink
 import org.jetbrains.kotlin.psi.KtExpression

-public class AndroidExtensionPropertiesCallChecker : CallChecker {
+class AndroidExtensionPropertiesCallChecker : CallChecker {
    override fun <F : CallableDescriptor> check(resolvedCall: ResolvedCall<F>, context: BasicCallResolutionContext) {
        val expression = context.call.calleeExpression ?: return

@@ -20,7 +20,7 @@ import org.jetbrains.kotlin.diagnostics.rendering.DefaultErrorMessages
 import org.jetbrains.kotlin.diagnostics.rendering.DiagnosticFactoryToRendererMap
 import org.jetbrains.kotlin.diagnostics.rendering.Renderers

-public class DefaultErrorMessagesAndroid : DefaultErrorMessages.Extension {
+class DefaultErrorMessagesAndroid : DefaultErrorMessages.Extension {

    private companion object {
        val MAP = DiagnosticFactoryToRendererMap("Android")
@@ -39,16 +39,16 @@ class AndroidModuleData(val module: AndroidModule, private val variants: List<An

 abstract class AndroidLayoutXmlFileManager(val project: Project) {

-    public abstract val androidModule: AndroidModule?
+    abstract val androidModule: AndroidModule?

-    public open fun propertyToXmlAttributes(propertyDescriptor: PropertyDescriptor): List<PsiElement> = listOf()
+    open fun propertyToXmlAttributes(propertyDescriptor: PropertyDescriptor): List<PsiElement> = listOf()

    open fun getModuleData(): AndroidModuleData {
        val androidModule = androidModule ?: return AndroidModuleData.EMPTY
        return AndroidModuleData(androidModule, androidModule.variants.map { getVariantData(it) })
    }

-    public fun getVariantData(variant: AndroidVariant): AndroidVariantData {
+    fun getVariantData(variant: AndroidVariant): AndroidVariantData {
        val psiManager = PsiManager.getInstance(project)
        val fileManager = VirtualFileManager.getInstance()

@@ -125,7 +125,7 @@ abstract class AndroidLayoutXmlFileManager(val project: Project) {


    companion object {
-        public fun getInstance(module: Module): AndroidLayoutXmlFileManager? {
+        fun getInstance(module: Module): AndroidLayoutXmlFileManager? {
            val service = ModuleServiceManager.getService(module, AndroidLayoutXmlFileManager::class.java)
            return service ?: module.getComponent(AndroidLayoutXmlFileManager::class.java)
        }
@@ -25,7 +25,7 @@ import java.io.ByteArrayInputStream
 import javax.xml.parsers.SAXParser
 import javax.xml.parsers.SAXParserFactory

-public class CliAndroidLayoutXmlFileManager(
+class CliAndroidLayoutXmlFileManager(
        project: Project,
        private val applicationPackage: String,
        private val variants: List<AndroidVariant>