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

[FIR] Unify diagnostic message in FIR dump for syntax error between PSI and LT

Browse Source
This commit is contained in:
Dmitriy Novozhilov
2023-02-13 18:08:00 +02:00
committed by Space Team
parent aef9b129d2
commit 8e3022452e
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
analysis/analysis-api/testData/symbols/symbolByPsi/valueParameters/parameterNotFunctionalType.pretty.txt
Vendored
+1 -1
View File
@@ -1,3 +1,3 @@
fun f(p: (kotlin.Int, ERROR_TYPE(Symbol not found for p2)) -> ERROR(Unwrapped type is null), `<no name provided>`: ERROR(No type for parameter)) fun f(p: (kotlin.Int, ERROR_TYPE(Symbol not found for p2)) -> ERROR(Incomplete code), `<no name provided>`: ERROR(No type for parameter))
fun `<no name provided>`() fun `<no name provided>`()
analysis/analysis-api/testData/symbols/symbolByPsi/valueParameters/parameterNotFunctionalType.txt
Vendored
+3 -3
View File
@@ -50,9 +50,9 @@ KtFunctionSymbol:
type: ERROR_TYPE type: ERROR_TYPE
KtTypeErrorType: KtTypeErrorType:
annotationsList: [] annotationsList: []
type: ERROR CLASS: Unwrapped type is null type: ERROR CLASS: Incomplete code
] ]
type: kotlin/Function2<kotlin/Int, ERROR CLASS: Symbol not found for p2, ERROR CLASS: Unwrapped type is null> type: kotlin/Function2<kotlin/Int, ERROR CLASS: Symbol not found for p2, ERROR CLASS: Incomplete code>
symbolKind: LOCAL symbolKind: LOCAL
typeParameters: [] typeParameters: []
getContainingModule: KtSourceModule "Sources of main" getContainingModule: KtSourceModule "Sources of main"
@@ -81,4 +81,4 @@ KtFunctionSymbol:
] ]
visibility: Public visibility: Public
getContainingModule: KtSourceModule "Sources of main" getContainingModule: KtSourceModule "Sources of main"
deprecationStatus: null deprecationStatus: null
compiler/fir/analysis-tests/testData/resolve/problems/invalidCode.fir.txt
Vendored
+2 -2
View File
@@ -63,9 +63,9 @@ FILE: e.kt
public get(): <ERROR TYPE REF: Expression 'bar' of type 'ERROR CLASS: cycle' cannot be invoked as a function> public get(): <ERROR TYPE REF: Expression 'bar' of type 'ERROR CLASS: cycle' cannot be invoked as a function>
public set(value: <ERROR TYPE REF: Expression 'bar' of type 'ERROR CLASS: cycle' cannot be invoked as a function>): R|kotlin/Unit| public set(value: <ERROR TYPE REF: Expression 'bar' of type 'ERROR CLASS: cycle' cannot be invoked as a function>): R|kotlin/Unit|
public final class EmptyContinuation : R|e/A<ERROR CLASS: Unwrapped type is null>| { public final class EmptyContinuation : R|e/A<ERROR CLASS: Incomplete code>| {
public constructor(): R|e/A.EmptyContinuation| { public constructor(): R|e/A.EmptyContinuation| {
super<R|e/A<ERROR CLASS: Unwrapped type is null>|>() super<R|e/A<ERROR CLASS: Incomplete code>|>()
} }
} }
compiler/fir/raw-fir/psi2fir/src/org/jetbrains/kotlin/fir/builder/RawFirBuilder.kt
+1 -1
View File
@@ -1969,7 +1969,7 @@ open class RawFirBuilder(
} }
null -> FirErrorTypeRefBuilder().apply { null -> FirErrorTypeRefBuilder().apply {
this.source = source this.source = source
diagnostic = ConeSimpleDiagnostic("Unwrapped type is null", DiagnosticKind.Syntax) diagnostic = ConeSimpleDiagnostic("Incomplete code", DiagnosticKind.Syntax)
} }
else -> throw AssertionError("Unexpected type element: ${unwrappedElement.text}") else -> throw AssertionError("Unexpected type element: ${unwrappedElement.text}")
} }