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

[FIR] Make rendering of properties for diagnostics more user-friendly

Browse Source 
#KT-60137 Fixed
This commit is contained in:
Kirill Rakhman
2023-07-26 17:27:19 +02:00
committed by Space Team
parent b5ea059861
commit ed6948959c
16 changed files with 79 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/DiagnosticCompilerTestFE10TestdataTestGenerated.java
Generated
+6
View File
@@ -23974,6 +23974,12 @@ public class DiagnosticCompilerTestFE10TestdataTestGenerated extends AbstractDia
runTest("compiler/testData/diagnostics/tests/overload/overloadsFromCurrentAndSuperClassWithReturnType.kt");
}
@Test
@TestMetadata("RedeclarationThroughDestructuring.kt")
public void testRedeclarationThroughDestructuring() throws Exception {
runTest("compiler/testData/diagnostics/tests/overload/RedeclarationThroughDestructuring.kt");
}
@Test
@TestMetadata("SyntheticAndNotSynthetic.kt")
public void testSyntheticAndNotSynthetic() throws Exception {
analysis/low-level-api-fir/tests/org/jetbrains/kotlin/analysis/low/level/api/fir/diagnostic/compiler/based/LLFirPreresolvedReversedDiagnosticCompilerFE10TestDataTestGenerated.java
Generated
+6
View File
@@ -23974,6 +23974,12 @@ public class LLFirPreresolvedReversedDiagnosticCompilerFE10TestDataTestGenerated
runTest("compiler/testData/diagnostics/tests/overload/overloadsFromCurrentAndSuperClassWithReturnType.kt");
}
@Test
@TestMetadata("RedeclarationThroughDestructuring.kt")
public void testRedeclarationThroughDestructuring() throws Exception {
runTest("compiler/testData/diagnostics/tests/overload/RedeclarationThroughDestructuring.kt");
}
@Test
@TestMetadata("SyntheticAndNotSynthetic.kt")
public void testSyntheticAndNotSynthetic() throws Exception {
compiler/fir/analysis-tests/testData/resolve/scopes/publicJavaAndPrivateKotlinVar.overrides.txt
Vendored
+3 -3
View File
@@ -4,7 +4,7 @@ C:
[Source]: public open override fun setName(newName: R|kotlin/String|): R|kotlin/Any?| from Use site scope of /C [id: 0]
[SubstitutionOverride(DeclarationSite)]: public abstract fun setName(newName: R|kotlin/String!|): R|kotlin/Any!| from Substitution scope for [Java enhancement scope for /B] for type C [id: 1]
[Enhancement]: public abstract fun setName(newName: R|kotlin/String!|): R|ft<T & Any, T?>| from Java enhancement scope for /B [id: 2]
[Source]: private final var name: R|kotlin/String| = R|<local>/name| from Use site scope of /C [id: 0]
[Source]: private final var name: R|kotlin/String| from Use site scope of /C [id: 0]
D:
[Source]: public open override fun getName(): R|kotlin/String| from Java enhancement scope for /D [id: 0]
@@ -12,6 +12,6 @@ D:
[Source]: public open override fun setName(newName: R|kotlin/String|): R|kotlin/Any?| from Java enhancement scope for /D [id: 0]
[SubstitutionOverride(DeclarationSite)]: public abstract fun setName(newName: R|kotlin/String!|): R|kotlin/Any!| from Substitution scope for [Java enhancement scope for /B] for type C [id: 1]
[Enhancement]: public abstract fun setName(newName: R|kotlin/String!|): R|ft<T & Any, T?>| from Java enhancement scope for /B [id: 2]
[Source]: private final var name: R|kotlin/String| = R|<local>/name| from Java enhancement scope for /D [id: 0]
[Source]: private final var name: R|kotlin/String| = R|<local>/name| from Use site scope of /C [id: 0]
[Source]: private final var name: R|kotlin/String| from Java enhancement scope for /D [id: 0]
[Source]: private final var name: R|kotlin/String| from Use site scope of /C [id: 0]
compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirLightTreeOldFrontendDiagnosticsTestGenerated.java
Generated
+6
View File
@@ -23974,6 +23974,12 @@ public class FirLightTreeOldFrontendDiagnosticsTestGenerated extends AbstractFir
runTest("compiler/testData/diagnostics/tests/overload/overloadsFromCurrentAndSuperClassWithReturnType.kt");
}
@Test
@TestMetadata("RedeclarationThroughDestructuring.kt")
public void testRedeclarationThroughDestructuring() throws Exception {
runTest("compiler/testData/diagnostics/tests/overload/RedeclarationThroughDestructuring.kt");
}
@Test
@TestMetadata("SyntheticAndNotSynthetic.kt")
public void testSyntheticAndNotSynthetic() throws Exception {
compiler/fir/analysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirPsiOldFrontendDiagnosticsTestGenerated.java
Generated
+6
View File
@@ -23980,6 +23980,12 @@ public class FirPsiOldFrontendDiagnosticsTestGenerated extends AbstractFirPsiDia
runTest("compiler/testData/diagnostics/tests/overload/overloadsFromCurrentAndSuperClassWithReturnType.kt");
}
@Test
@TestMetadata("RedeclarationThroughDestructuring.kt")
public void testRedeclarationThroughDestructuring() throws Exception {
runTest("compiler/testData/diagnostics/tests/overload/RedeclarationThroughDestructuring.kt");
}
@Test
@TestMetadata("SyntheticAndNotSynthetic.kt")
public void testSyntheticAndNotSynthetic() throws Exception {
compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/FirDiagnosticRenderers.kt
+1
View File
@@ -42,6 +42,7 @@ object FirDiagnosticRenderers {
callArgumentsRenderer = FirCallNoArgumentsRenderer(),
modifierRenderer = FirPartialModifierRenderer(),
valueParameterRenderer = FirValueParameterRendererNoDefaultValue(),
declarationRenderer = FirDeclarationRenderer("local ")
).renderElementAsString(symbol.fir, trim = true)
is FirTypeParameterSymbol -> symbol.name.asString()
else -> "???"
compiler/fir/tree/src/org/jetbrains/kotlin/fir/renderer/FirBodyRenderer.kt
+12
View File
@@ -6,6 +6,7 @@
package org.jetbrains.kotlin.fir.renderer
import org.jetbrains.kotlin.fir.declarations.FirFunction
import org.jetbrains.kotlin.fir.declarations.FirVariable
import org.jetbrains.kotlin.fir.expressions.FirBlock
import org.jetbrains.kotlin.fir.expressions.FirDelegatedConstructorCall
import org.jetbrains.kotlin.fir.expressions.FirLazyBlock
@@ -23,6 +24,17 @@ class FirBodyRenderer {
renderBody(function.body)
}
fun render(variable: FirVariable) {
variable.initializer?.let {
printer.print(" = ")
it.accept(visitor)
}
variable.delegate?.let {
printer.print("by ")
it.accept(visitor)
}
}
fun renderBody(block: FirBlock?, additionalStatements: List<FirStatement> = emptyList()) {
if (block == null) return
when (block) {
compiler/fir/tree/src/org/jetbrains/kotlin/fir/renderer/FirDeclarationRenderer.kt
+5 -3
View File
@@ -10,7 +10,9 @@ import org.jetbrains.kotlin.fir.declarations.impl.FirErrorConstructor
import org.jetbrains.kotlin.fir.isCatchParameter
import org.jetbrains.kotlin.util.capitalizeDecapitalize.toLowerCaseAsciiOnly
open class FirDeclarationRenderer {
open class FirDeclarationRenderer(
private val localVariablePrefix: String = "l",
) {
internal lateinit var components: FirRendererComponents
protected val printer get() = components.printer
@@ -40,7 +42,7 @@ open class FirDeclarationRenderer {
if (declaration.isCatchParameter == true) {
""
} else {
val prefix = if (declaration.isLocal) "l" else ""
val prefix = if (declaration.isLocal) localVariablePrefix else ""
prefix + if (declaration.isVal) "val" else "var"
}
}
@@ -61,4 +63,4 @@ open class FirDeclarationRenderer {
protected open fun FirDeclaration.renderDeclarationAttributes() {
}
}
}
compiler/fir/tree/src/org/jetbrains/kotlin/fir/renderer/FirRenderer.kt
+1 -8
View File
@@ -305,14 +305,7 @@ class FirRenderer(
override fun visitVariable(variable: FirVariable) {
visitCallableDeclaration(variable)
variable.initializer?.let {
print(" = ")
it.accept(this)
}
variable.delegate?.let {
print("by ")
it.accept(this)
}
bodyRenderer?.render(variable)
}
override fun visitField(field: FirField) {
compiler/testData/diagnostics/tests/imports/EnumEntryVsStaticAmbiguity.fir.diag.txt
Vendored
+1 -1
View File
@@ -1 +1 @@
/test.kt:(154,158): error: Overload resolution ambiguity between candidates: [static field SOME: String = String(Some), static enum entry SOME: SomeEnum]
/test.kt:(154,158): error: Overload resolution ambiguity between candidates: [static field SOME: String, static enum entry SOME: SomeEnum]
compiler/testData/diagnostics/tests/imports/EnumEntryVsStaticAmbiguity3.fir.diag.txt
Vendored
+1 -1
View File
@@ -1 +1 @@
/test.kt:(160,164): error: Overload resolution ambiguity between candidates: [static field SOME: String = String(Some), static enum entry SOME: SomeEnum]
/test.kt:(160,164): error: Overload resolution ambiguity between candidates: [static field SOME: String, static enum entry SOME: SomeEnum]
compiler/testData/diagnostics/tests/overload/RedeclarationThroughDestructuring.diag.txt
Vendored
+6
View File
@@ -0,0 +1,6 @@
/RedeclarationThroughDestructuring.kt:5:14: error: conflicting declarations: val b: String, val b: Int
val (b, b) = e
^
/RedeclarationThroughDestructuring.kt:5:17: error: conflicting declarations: val b: String, val b: Int
val (b, b) = e
^
compiler/testData/diagnostics/tests/overload/RedeclarationThroughDestructuring.fir.diag.txt
Vendored
+3
View File
@@ -0,0 +1,3 @@
/RedeclarationThroughDestructuring.fir.kt:(133,134): error: Conflicting declarations: [local val b: String, local val b: Int]
/RedeclarationThroughDestructuring.fir.kt:(136,137): error: Conflicting declarations: [local val b: String, local val b: Int]
compiler/testData/diagnostics/tests/overload/RedeclarationThroughDestructuring.fir.kt
Vendored
+8
View File
@@ -0,0 +1,8 @@
// RENDER_DIAGNOSTICS_FULL_TEXT
data class Example(val a: String, val b: Int) {
fun testRedeclaration(e: Example){
val (<!REDECLARATION!>b<!>, <!REDECLARATION!>b<!>) = e
}
}
compiler/testData/diagnostics/tests/overload/RedeclarationThroughDestructuring.kt
Vendored
+8
View File
@@ -0,0 +1,8 @@
// RENDER_DIAGNOSTICS_FULL_TEXT
data class Example(val a: String, val b: Int) {
fun testRedeclaration(e: Example){
val (<!REDECLARATION!>b<!>, <!NAME_SHADOWING, REDECLARATION!>b<!>) = e
}
}
compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/DiagnosticTestGenerated.java
Generated
+6
View File
@@ -25006,6 +25006,12 @@ public class DiagnosticTestGenerated extends AbstractDiagnosticTest {
runTest("compiler/testData/diagnostics/tests/overload/overloadsFromCurrentAndSuperClassWithReturnType.kt");
}
@Test
@TestMetadata("RedeclarationThroughDestructuring.kt")
public void testRedeclarationThroughDestructuring() throws Exception {
runTest("compiler/testData/diagnostics/tests/overload/RedeclarationThroughDestructuring.kt");
}
@Test
@TestMetadata("SyntheticAndNotSynthetic.kt")
public void testSyntheticAndNotSynthetic() throws Exception {