Minor: make variables initialized in defineClass lateinit instead of nullable.

This commit is contained in:
Ilya Gorbunov
2016-03-15 03:08:24 +03:00
parent d9329456b5
commit 1ae0040ca3
5 changed files with 16 additions and 18 deletions
@@ -1,5 +1,5 @@
/*
* Copyright 2010-2015 JetBrains s.r.o.
* Copyright 2010-2016 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -42,7 +42,7 @@ abstract class ClassNameCollectionClassBuilderFactory(
override fun getDelegate() = _delegate
private var classInternalName: String? = null
private lateinit var classInternalName: String
override fun defineClass(origin: PsiElement?, version: Int, access: Int, name: String, signature: String?, superName: String, interfaces: Array<out String>) {
classInternalName = name
@@ -50,9 +50,7 @@ abstract class ClassNameCollectionClassBuilderFactory(
}
override fun done() {
if (classInternalName != null) {
handleClashingNames(classInternalName!!, classCreatedFor)
}
handleClashingNames(classInternalName, classCreatedFor)
super.done()
}
}
@@ -1,5 +1,5 @@
/*
* Copyright 2010-2015 JetBrains s.r.o.
* Copyright 2010-2016 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -32,7 +32,7 @@ abstract class SignatureCollectingClassBuilderFactory(
protected abstract fun handleClashingSignatures(data: ConflictingJvmDeclarationsData)
protected abstract fun onClassDone(classOrigin: JvmDeclarationOrigin,
classInternalName: String?,
classInternalName: String,
signatures: MultiMap<RawSignature, JvmDeclarationOrigin>)
override fun newClassBuilder(origin: JvmDeclarationOrigin): DelegatingClassBuilder {
@@ -46,7 +46,7 @@ abstract class SignatureCollectingClassBuilderFactory(
override fun getDelegate() = _delegate
private var classInternalName: String? = null
private lateinit var classInternalName: String
private val signatures = LinkedMultiMap<RawSignature, JvmDeclarationOrigin>()
@@ -1,5 +1,5 @@
/*
* Copyright 2010-2015 JetBrains s.r.o.
* Copyright 2010-2016 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -91,7 +91,7 @@ class BuilderFactoryForDuplicateSignatureDiagnostics(
override fun onClassDone(
classOrigin: JvmDeclarationOrigin,
classInternalName: String?,
classInternalName: String,
signatures: MultiMap<RawSignature, JvmDeclarationOrigin>
) {
reportDiagnosticsTasks.add { reportClashingSignaturesInHierarchy(classOrigin, classInternalName, signatures) }
@@ -99,7 +99,7 @@ class BuilderFactoryForDuplicateSignatureDiagnostics(
private fun reportClashingSignaturesInHierarchy(
classOrigin: JvmDeclarationOrigin,
classInternalName: String?,
classInternalName: String,
signatures: MultiMap<RawSignature, JvmDeclarationOrigin>
) {
val descriptor = classOrigin.descriptor