Skip to content

Commit f4aaf9a

Browse files
authored
Fix diagnostic rendering for compiler plugins checkers (#432)
1 parent 0c017be commit f4aaf9a

File tree

4 files changed

+20
-4
lines changed

4 files changed

+20
-4
lines changed

compiler-plugin/compiler-plugin-k2/src/main/kotlin/kotlinx/rpc/codegen/FirRpcExtensionRegistrar.kt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
package kotlinx.rpc.codegen
66

77
import kotlinx.rpc.codegen.checkers.FirSerializablePropertiesProvider
8+
import kotlinx.rpc.codegen.checkers.diagnostics.registerDiagnosticRendererFactories
89
import org.jetbrains.kotlin.cli.common.CLIConfigurationKeys
910
import org.jetbrains.kotlin.cli.common.messages.MessageCollector
1011
import org.jetbrains.kotlin.config.CompilerConfiguration
@@ -20,5 +21,7 @@ class FirRpcExtensionRegistrar(private val configuration: CompilerConfiguration)
2021
+GFactory { FirRpcServiceGenerator(it, logger) }
2122
+CFactory { FirRpcAdditionalCheckers(it, configuration) }
2223
+SCFactory { FirSerializablePropertiesProvider(it) }
24+
25+
registerDiagnosticRendererFactories()
2326
}
2427
}

compiler-plugin/compiler-plugin-k2/src/main/kotlin/kotlinx/rpc/codegen/checkers/diagnostics/FirRpcDiagnostics.kt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,7 @@ import org.jetbrains.kotlin.diagnostics.rendering.BaseDiagnosticRendererFactory
1515
import org.jetbrains.kotlin.fir.symbols.FirBasedSymbol
1616
import org.jetbrains.kotlin.fir.types.ConeKotlinType
1717
import org.jetbrains.kotlin.name.Name
18-
import org.jetbrains.kotlin.psi.KtAnnotated
1918
import org.jetbrains.kotlin.psi.KtElement
20-
import org.jetbrains.kotlin.psi.KtNameReferenceExpression
2119

2220
// ###########################################################################
2321
// ### BIG WARNING, LISTEN CLOSELY! ###

compiler-plugin/compiler-plugin-k2/src/main/kotlin/kotlinx/rpc/codegen/checkers/diagnostics/RpcDiagnosticRendererFactory.kt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,6 @@ object RpcStrictModeDiagnosticRendererFactory : BaseDiagnosticRendererFactory()
9696
}
9797

9898
private fun message(entityName: String): String {
99-
return "$entityName is prohibited in @Rpc services in strict mode. " +
100-
"Support will be removed completely in the 0.8.0 release."
99+
return "$entityName is prohibited in @Rpc services. "
101100
}
102101
}

compiler-plugin/compiler-plugin-k2/src/main/templates/kotlinx/rpc/codegen/checkers/diagnostics/RpcKtDiagnosticsContainer.kt

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,12 @@
44

55
package kotlinx.rpc.codegen.checkers.diagnostics
66

7+
//##csm RpcKtDiagnosticsContainer.kt-imports
8+
//##csm specific=[2.0.0...2.2.10]
9+
import org.jetbrains.kotlin.diagnostics.rendering.RootDiagnosticRendererFactory
10+
//##csm /specific
11+
//##csm /RpcKtDiagnosticsContainer.kt-imports
12+
713
//##csm RpcKtDiagnosticsContainer
814
//##csm specific=[2.0.0...2.2.10]
915
abstract class RpcKtDiagnosticsContainer : RpcKtDiagnosticsContainerCore
@@ -19,3 +25,13 @@ abstract class RpcKtDiagnosticsContainer : KtDiagnosticsContainer(), RpcKtDiagno
1925
}
2026
//##csm /default
2127
//##csm /RpcKtDiagnosticsContainer
28+
29+
// Automatically done for later versions
30+
fun registerDiagnosticRendererFactories() {
31+
//##csm registerDiagnosticRendererFactories
32+
//##csm specific=[2.0.0...2.2.10]
33+
RootDiagnosticRendererFactory.registerFactory(FirRpcDiagnostics.getRendererFactoryVs())
34+
RootDiagnosticRendererFactory.registerFactory(FirRpcStrictModeDiagnostics.getRendererFactoryVs())
35+
//##csm /specific
36+
//##csm /registerDiagnosticRendererFactories
37+
}

0 commit comments

Comments
 (0)