[FIR] Move Jsr305State from FirSession to separate component
This commit is contained in:
+18
@@ -0,0 +1,18 @@
|
||||
/*
|
||||
* Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
|
||||
* Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
|
||||
*/
|
||||
|
||||
package org.jetbrains.kotlin.fir.java.enhancement
|
||||
|
||||
import org.jetbrains.kotlin.fir.FirSession
|
||||
import org.jetbrains.kotlin.fir.FirSessionComponent
|
||||
import org.jetbrains.kotlin.utils.Jsr305State
|
||||
|
||||
class FirJsr305StateContainer(val jsr305State: Jsr305State) : FirSessionComponent {
|
||||
companion object {
|
||||
val Default: FirJsr305StateContainer = FirJsr305StateContainer(Jsr305State.DEFAULT)
|
||||
}
|
||||
}
|
||||
|
||||
val FirSession.jsr305StateContainer: FirJsr305StateContainer by FirSession.sessionComponentAccessor()
|
||||
+1
-1
@@ -47,7 +47,7 @@ class FirSignatureEnhancement(
|
||||
private val javaTypeParameterStack: JavaTypeParameterStack =
|
||||
if (owner is FirJavaClass) owner.javaTypeParameterStack else JavaTypeParameterStack.EMPTY
|
||||
|
||||
private val jsr305State: Jsr305State = session.jsr305State ?: Jsr305State.DEFAULT
|
||||
private val jsr305State: Jsr305State = session.jsr305StateContainer.jsr305State
|
||||
|
||||
private val typeQualifierResolver = FirAnnotationTypeQualifierResolver(session, jsr305State)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user