Skip to content

Fix diagnostic rendering for compiler plugins checkers #432

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 7, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
package kotlinx.rpc.codegen

import kotlinx.rpc.codegen.checkers.FirSerializablePropertiesProvider
import kotlinx.rpc.codegen.checkers.diagnostics.registerDiagnosticRendererFactories
import org.jetbrains.kotlin.cli.common.CLIConfigurationKeys
import org.jetbrains.kotlin.cli.common.messages.MessageCollector
import org.jetbrains.kotlin.config.CompilerConfiguration
Expand All @@ -20,5 +21,7 @@ class FirRpcExtensionRegistrar(private val configuration: CompilerConfiguration)
+GFactory { FirRpcServiceGenerator(it, logger) }
+CFactory { FirRpcAdditionalCheckers(it, configuration) }
+SCFactory { FirSerializablePropertiesProvider(it) }

registerDiagnosticRendererFactories()
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,7 @@ import org.jetbrains.kotlin.diagnostics.rendering.BaseDiagnosticRendererFactory
import org.jetbrains.kotlin.fir.symbols.FirBasedSymbol
import org.jetbrains.kotlin.fir.types.ConeKotlinType
import org.jetbrains.kotlin.name.Name
import org.jetbrains.kotlin.psi.KtAnnotated
import org.jetbrains.kotlin.psi.KtElement
import org.jetbrains.kotlin.psi.KtNameReferenceExpression

// ###########################################################################
// ### BIG WARNING, LISTEN CLOSELY! ###
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,6 @@ object RpcStrictModeDiagnosticRendererFactory : BaseDiagnosticRendererFactory()
}

private fun message(entityName: String): String {
return "$entityName is prohibited in @Rpc services in strict mode. " +
"Support will be removed completely in the 0.8.0 release."
return "$entityName is prohibited in @Rpc services. "
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,12 @@

package kotlinx.rpc.codegen.checkers.diagnostics

//##csm RpcKtDiagnosticsContainer.kt-imports
//##csm specific=[2.0.0...2.2.10]
import org.jetbrains.kotlin.diagnostics.rendering.RootDiagnosticRendererFactory
//##csm /specific
//##csm /RpcKtDiagnosticsContainer.kt-imports

//##csm RpcKtDiagnosticsContainer
//##csm specific=[2.0.0...2.2.10]
abstract class RpcKtDiagnosticsContainer : RpcKtDiagnosticsContainerCore
Expand All @@ -19,3 +25,13 @@ abstract class RpcKtDiagnosticsContainer : KtDiagnosticsContainer(), RpcKtDiagno
}
//##csm /default
//##csm /RpcKtDiagnosticsContainer

// Automatically done for later versions
fun registerDiagnosticRendererFactories() {
//##csm registerDiagnosticRendererFactories
//##csm specific=[2.0.0...2.2.10]
RootDiagnosticRendererFactory.registerFactory(FirRpcDiagnostics.getRendererFactoryVs())
RootDiagnosticRendererFactory.registerFactory(FirRpcStrictModeDiagnostics.getRendererFactoryVs())
//##csm /specific
//##csm /registerDiagnosticRendererFactories
}