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

FIR: fix FQ_NAMES_IN_TYPES renderer

Browse Source
This commit is contained in:
Mikhail Glukhikh
2021-04-02 15:11:02 +03:00
parent 761a0a7d0d
commit e7102cd63f
3 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/FirDiagnosticRenderers.kt
+1 -2
View File
@@ -12,7 +12,6 @@ import org.jetbrains.kotlin.fir.FirElement
import org.jetbrains.kotlin.fir.FirRenderer import org.jetbrains.kotlin.fir.FirRenderer
import org.jetbrains.kotlin.fir.declarations.* import org.jetbrains.kotlin.fir.declarations.*
import org.jetbrains.kotlin.fir.render import org.jetbrains.kotlin.fir.render
import org.jetbrains.kotlin.fir.renderWithType
import org.jetbrains.kotlin.fir.symbols.AbstractFirBasedSymbol import org.jetbrains.kotlin.fir.symbols.AbstractFirBasedSymbol
import org.jetbrains.kotlin.fir.symbols.impl.* import org.jetbrains.kotlin.fir.symbols.impl.*
import org.jetbrains.kotlin.fir.types.ConeKotlinType import org.jetbrains.kotlin.fir.types.ConeKotlinType
@@ -86,7 +85,7 @@ object FirDiagnosticRenderers {
} }
val FQ_NAMES_IN_TYPES = Renderer { element: FirElement -> val FQ_NAMES_IN_TYPES = Renderer { element: FirElement ->
element.renderWithType(mode = FirRenderer.RenderMode.WithFqNamesExceptAnnotation) element.render(mode = FirRenderer.RenderMode.WithFqNamesExceptAnnotationAndBody)
} }
val AMBIGUOUS_CALLS = Renderer { candidates: Collection<AbstractFirBasedSymbol<*>> -> val AMBIGUOUS_CALLS = Renderer { candidates: Collection<AbstractFirBasedSymbol<*>> ->
compiler/fir/tree/src/org/jetbrains/kotlin/fir/FirRenderer.kt
+2 -1
View File
@@ -74,12 +74,13 @@ class FirRenderer(builder: StringBuilder, private val mode: RenderMode = RenderM
renderAnnotation = true, renderAnnotation = true,
) )
object WithFqNamesExceptAnnotation : RenderMode( object WithFqNamesExceptAnnotationAndBody : RenderMode(
renderLambdaBodies = true, renderLambdaBodies = true,
renderCallArguments = true, renderCallArguments = true,
renderCallableFqNames = true, renderCallableFqNames = true,
renderDeclarationResolvePhase = false, renderDeclarationResolvePhase = false,
renderAnnotation = false, renderAnnotation = false,
renderBodies = false,
) )
object WithResolvePhases : RenderMode( object WithResolvePhases : RenderMode(
idea/idea-frontend-fir/testData/analysisSession/resolveCall/simpleCallWithNonMatchingArgs.kt
Vendored
+1 -3
View File
@@ -4,6 +4,4 @@ fun x() {
fun foo(){} fun foo(){}
// CALL: KtFunctionCall: targetFunction = ERR<Too many arguments for org.jetbrains.kotlin.fir.declarations.impl.FirSimpleFunctionImpl@5f1f1786: public final fun /foo(): R|kotlin/Unit| { // CALL: KtFunctionCall: targetFunction = ERR<Too many arguments for public final fun /foo(): R|kotlin/Unit|, [/foo(): kotlin.Unit]>
}
, [/foo(): kotlin.Unit]>