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

Remove usages of Delegates.lazy

Browse Source
This commit is contained in:
Ilya Gorbunov
2015-10-14 00:01:37 +03:00
parent c4ef4758d2
commit 2fba80168d
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-annotation-processing/src/main/kotlin/org/jetbrains/kotlin/annotation/AnnotationProcessorWrapper.kt
+1 -1
View File
@@ -48,7 +48,7 @@ public abstract class AnnotationProcessorWrapper(
val KAPT_ANNOTATION_OPTION = "kapt.annotations" val KAPT_ANNOTATION_OPTION = "kapt.annotations"
} }
private val processor: Processor by Delegates.lazy { private val processor: Processor by lazy {
try { try {
val instance = Class.forName(processorFqName).newInstance() as? Processor val instance = Class.forName(processorFqName).newInstance() as? Processor
instance ?: throw IllegalArgumentException("Instance has a wrong type: $processorFqName") instance ?: throw IllegalArgumentException("Instance has a wrong type: $processorFqName")
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/KotlinPlugin.kt
+4 -4
View File
@@ -53,10 +53,10 @@ abstract class KotlinSourceSetProcessor<T : AbstractCompile>(
protected val sourceSetName: String = sourceSet.getName() protected val sourceSetName: String = sourceSet.getName()
protected val sourceRootDir: String = "src/${sourceSetName}/kotlin" protected val sourceRootDir: String = "src/${sourceSetName}/kotlin"
protected val absoluteSourceRootDir: String = project.getProjectDir().getPath() + "/" + sourceRootDir protected val absoluteSourceRootDir: String = project.getProjectDir().getPath() + "/" + sourceRootDir
protected val kotlinSourceSet: KotlinSourceSet? by Delegates.lazy { createKotlinSourceSet() } protected val kotlinSourceSet: KotlinSourceSet? by lazy { createKotlinSourceSet() }
protected val kotlinDirSet: SourceDirectorySet? by Delegates.lazy { createKotlinDirSet() } protected val kotlinDirSet: SourceDirectorySet? by lazy { createKotlinDirSet() }
protected val kotlinTask: T by Delegates.lazy { createKotlinCompileTask() } protected val kotlinTask: T by lazy { createKotlinCompileTask() }
protected val kotlinTaskName: String by Delegates.lazy { kotlinTask.getName() } protected val kotlinTaskName: String by lazy { kotlinTask.getName() }
public fun run() { public fun run() {
if (kotlinSourceSet == null || kotlinDirSet == null) { if (kotlinSourceSet == null || kotlinDirSet == null) {
plugins/annotation-collector/src/org/jetbrains/kotlin/annotation/AnnotationCollectorExtension.kt
+1 -1
View File
@@ -93,7 +93,7 @@ public abstract class AnnotationCollectorExtensionBase(val supportInheritedAnnot
annotationFilters = nullableAnnotations.filterNotNull() annotationFilters = nullableAnnotations.filterNotNull()
} }
private val classVisitor: ClassVisitor by Delegates.lazy { private val classVisitor: ClassVisitor by lazy {
object : ClassVisitor(Opcodes.ASM5, super.getVisitor()) { object : ClassVisitor(Opcodes.ASM5, super.getVisitor()) {
override fun visitAnnotation(desc: String, visible: Boolean): AnnotationVisitor? { override fun visitAnnotation(desc: String, visible: Boolean): AnnotationVisitor? {
recordAnnotation(null, RecordTypes.ANNOTATED_CLASS, desc) recordAnnotation(null, RecordTypes.ANNOTATED_CLASS, desc)