Get rid of 'class object' usages in code and builtins
Replace some comments and library usages as well
This commit is contained in:
@@ -41,7 +41,7 @@ public object AndroidConfigurationKeys {
|
||||
}
|
||||
|
||||
public class AndroidCommandLineProcessor : CommandLineProcessor {
|
||||
class object {
|
||||
companion object {
|
||||
public val ANDROID_COMPILER_PLUGIN_ID: String = "org.jetbrains.kotlin.android"
|
||||
|
||||
public val RESOURCE_PATH_OPTION: CliOption = CliOption("androidRes", "<path>", "Android resources path")
|
||||
|
||||
@@ -51,7 +51,7 @@ private enum class AndroidClassType(val internalClassName: String, val supportsC
|
||||
}
|
||||
|
||||
public class AndroidExpressionCodegenExtension : ExpressionCodegenExtension {
|
||||
class object {
|
||||
companion object {
|
||||
private val PROPERTY_NAME = "_\$_findViewCache"
|
||||
private val CACHED_FIND_VIEW_BY_ID_METHOD_NAME = "_\$_findCachedViewById"
|
||||
private val CLEAR_CACHE_METHOD_NAME = "_\$_clearFindViewByIdCache"
|
||||
|
||||
+1
-1
@@ -70,7 +70,7 @@ public abstract class AndroidResourceManager(val project: Project) {
|
||||
return VirtualFileManager.getInstance().findFileByUrl("file://" + info.mainResDirectory)
|
||||
}
|
||||
|
||||
class object {
|
||||
companion object {
|
||||
public fun getInstance(module: Module): AndroidResourceManager {
|
||||
val service = ModuleServiceManager.getService<AndroidResourceManager>(module, javaClass<AndroidResourceManager>())
|
||||
return service ?: module.getComponent<AndroidResourceManager>(javaClass<AndroidResourceManager>())
|
||||
|
||||
+1
-1
@@ -149,7 +149,7 @@ public abstract class AndroidUIXmlProcessor(protected val project: Project) {
|
||||
return CachedValuesManager.getManager(project).createCachedValue(result, false)
|
||||
}
|
||||
|
||||
class object {
|
||||
companion object {
|
||||
private val EXPLICIT_FLEXIBLE_PACKAGE = Flexibility.FLEXIBLE_TYPE_CLASSIFIER.getPackageFqName().asString()
|
||||
private val EXPLICIT_FLEXIBLE_CLASS_NAME = Flexibility.FLEXIBLE_TYPE_CLASSIFIER.getRelativeClassName().asString()
|
||||
|
||||
|
||||
@@ -10,7 +10,7 @@ import kotlinx.android.synthetic.layout.*
|
||||
|
||||
class R {
|
||||
class id {
|
||||
class object {
|
||||
companion object {
|
||||
val login = 5
|
||||
}
|
||||
}
|
||||
|
||||
@@ -10,7 +10,7 @@ import kotlinx.android.synthetic.layout.*
|
||||
|
||||
class R {
|
||||
class id {
|
||||
class object {
|
||||
companion object {
|
||||
val login = 5
|
||||
}
|
||||
}
|
||||
|
||||
@@ -8,7 +8,7 @@ import kotlinx.android.synthetic.layout.view.*
|
||||
|
||||
class R {
|
||||
class id {
|
||||
class object {
|
||||
companion object {
|
||||
val container = 0
|
||||
val login = 1
|
||||
}
|
||||
|
||||
@@ -8,7 +8,7 @@ import kotlinx.android.synthetic.layout.view.*
|
||||
|
||||
class R {
|
||||
class id {
|
||||
class object {
|
||||
companion object {
|
||||
val container = 0
|
||||
val login = 1
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user