-
Notifications
You must be signed in to change notification settings - Fork 30
Fix kotlin master builds #345
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
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
11 changes: 11 additions & 0 deletions
11
...2/src/main/core/kotlinx/rpc/codegen/checkers/diagnostics/RpcKtDiagnosticsContainerCore.kt
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| /* | ||
| * Copyright 2023-2025 JetBrains s.r.o and contributors. Use of this source code is governed by the Apache 2.0 license. | ||
| */ | ||
|
|
||
| package kotlinx.rpc.codegen.checkers.diagnostics | ||
|
|
||
| import org.jetbrains.kotlin.diagnostics.rendering.BaseDiagnosticRendererFactory | ||
|
|
||
| interface RpcKtDiagnosticsContainerCore { | ||
| fun getRendererFactoryVs() : BaseDiagnosticRendererFactory | ||
| } |
2 changes: 1 addition & 1 deletion
2
...eckers/diagnostics/DiagnosticFactories.kt → ...eckers/diagnostics/DiagnosticFactories.kt
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
16 changes: 16 additions & 0 deletions
16
...in/latest/kotlinx/rpc/codegen/checkers/diagnostics/RpcKtDiagnosticFactoryToRendererMap.kt
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| /* | ||
| * Copyright 2023-2025 JetBrains s.r.o and contributors. Use of this source code is governed by the Apache 2.0 license. | ||
| */ | ||
|
|
||
| package kotlinx.rpc.codegen.checkers.diagnostics | ||
|
|
||
| import org.jetbrains.kotlin.diagnostics.KtDiagnosticFactoryToRendererMap | ||
|
|
||
| fun RpcKtDiagnosticFactoryToRendererMap( | ||
| name: String, | ||
| init: (KtDiagnosticFactoryToRendererMap) -> Unit, | ||
| ): Lazy<KtDiagnosticFactoryToRendererMap> { | ||
| return lazy(LazyThreadSafetyMode.SYNCHRONIZED) { | ||
| KtDiagnosticFactoryToRendererMap(name).also(init) | ||
| } | ||
| } |
7 changes: 7 additions & 0 deletions
7
...-k2/src/main/latest/kotlinx/rpc/codegen/checkers/diagnostics/RpcKtDiagnosticsContainer.kt
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| /* | ||
| * Copyright 2023-2025 JetBrains s.r.o and contributors. Use of this source code is governed by the Apache 2.0 license. | ||
| */ | ||
|
|
||
| package kotlinx.rpc.codegen.checkers.diagnostics | ||
|
|
||
| abstract class RpcKtDiagnosticsContainer : RpcKtDiagnosticsContainerCore |
46 changes: 46 additions & 0 deletions
46
...in-k2/src/main/pre_2_0_10/kotlinx/rpc/codegen/checkers/diagnostics/DiagnosticFactories.kt
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,46 @@ | ||
| /* | ||
| * Copyright 2023-2025 JetBrains s.r.o and contributors. Use of this source code is governed by the Apache 2.0 license. | ||
| */ | ||
|
|
||
| @file:Suppress("unused") | ||
|
|
||
| package kotlinx.rpc.codegen.checkers.diagnostics | ||
|
|
||
| import kotlinx.rpc.codegen.StrictMode | ||
| import org.jetbrains.kotlin.diagnostics.KtDiagnosticFactory0 | ||
| import org.jetbrains.kotlin.diagnostics.Severity | ||
| import org.jetbrains.kotlin.diagnostics.SourceElementPositioningStrategies | ||
| import org.jetbrains.kotlin.utils.DummyDelegate | ||
| import kotlin.properties.ReadOnlyProperty | ||
| import kotlin.reflect.KClass | ||
| import kotlin.reflect.KProperty | ||
|
|
||
| inline fun <reified T> modded0(mode: StrictMode): DiagnosticFactory0DelegateProviderOnNull { | ||
| return DiagnosticFactory0DelegateProviderOnNull(mode, T::class) | ||
| } | ||
|
|
||
| class DiagnosticFactory0DelegateProviderOnNull( | ||
| private val mode: StrictMode, | ||
| private val psiType: KClass<*>, | ||
| ) { | ||
| operator fun provideDelegate( | ||
| @Suppress("unused") | ||
| thisRef: Any?, | ||
| prop: KProperty<*>, | ||
| ): ReadOnlyProperty<Any?, KtDiagnosticFactory0?> { | ||
| val severity = when (mode) { | ||
| StrictMode.ERROR -> Severity.ERROR | ||
| StrictMode.WARNING -> Severity.WARNING | ||
| StrictMode.NONE -> null | ||
| } ?: return DummyDelegate(null) | ||
|
|
||
| return DummyDelegate( | ||
| KtDiagnosticFactory0( | ||
| name = prop.name, | ||
| severity = severity, | ||
| defaultPositioningStrategy = SourceElementPositioningStrategies.DEFAULT, | ||
| psiType = psiType, | ||
| ), | ||
| ) | ||
| } | ||
| } |
16 changes: 16 additions & 0 deletions
16
...re_2_0_10/kotlinx/rpc/codegen/checkers/diagnostics/RpcKtDiagnosticFactoryToRendererMap.kt
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| /* | ||
| * Copyright 2023-2025 JetBrains s.r.o and contributors. Use of this source code is governed by the Apache 2.0 license. | ||
| */ | ||
|
|
||
| package kotlinx.rpc.codegen.checkers.diagnostics | ||
|
|
||
| import org.jetbrains.kotlin.diagnostics.KtDiagnosticFactoryToRendererMap | ||
|
|
||
| fun RpcKtDiagnosticFactoryToRendererMap( | ||
| name: String, | ||
| init: (KtDiagnosticFactoryToRendererMap) -> Unit, | ||
| ): Lazy<KtDiagnosticFactoryToRendererMap> { | ||
| return lazy(LazyThreadSafetyMode.SYNCHRONIZED) { | ||
| KtDiagnosticFactoryToRendererMap(name).also(init) | ||
| } | ||
| } |
7 changes: 7 additions & 0 deletions
7
...src/main/pre_2_0_10/kotlinx/rpc/codegen/checkers/diagnostics/RpcKtDiagnosticsContainer.kt
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| /* | ||
| * Copyright 2023-2025 JetBrains s.r.o and contributors. Use of this source code is governed by the Apache 2.0 license. | ||
| */ | ||
|
|
||
| package kotlinx.rpc.codegen.checkers.diagnostics | ||
|
|
||
| abstract class RpcKtDiagnosticsContainer : RpcKtDiagnosticsContainerCore |
46 changes: 46 additions & 0 deletions
46
...in-k2/src/main/pre_2_0_21/kotlinx/rpc/codegen/checkers/diagnostics/DiagnosticFactories.kt
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,46 @@ | ||
| /* | ||
| * Copyright 2023-2025 JetBrains s.r.o and contributors. Use of this source code is governed by the Apache 2.0 license. | ||
| */ | ||
|
|
||
| @file:Suppress("unused") | ||
|
|
||
| package kotlinx.rpc.codegen.checkers.diagnostics | ||
|
|
||
| import kotlinx.rpc.codegen.StrictMode | ||
| import org.jetbrains.kotlin.diagnostics.KtDiagnosticFactory0 | ||
| import org.jetbrains.kotlin.diagnostics.Severity | ||
| import org.jetbrains.kotlin.diagnostics.SourceElementPositioningStrategies | ||
| import org.jetbrains.kotlin.utils.DummyDelegate | ||
| import kotlin.properties.ReadOnlyProperty | ||
| import kotlin.reflect.KClass | ||
| import kotlin.reflect.KProperty | ||
|
|
||
| inline fun <reified T> modded0(mode: StrictMode): DiagnosticFactory0DelegateProviderOnNull { | ||
| return DiagnosticFactory0DelegateProviderOnNull(mode, T::class) | ||
| } | ||
|
|
||
| class DiagnosticFactory0DelegateProviderOnNull( | ||
| private val mode: StrictMode, | ||
| private val psiType: KClass<*>, | ||
| ) { | ||
| operator fun provideDelegate( | ||
| @Suppress("unused") | ||
| thisRef: Any?, | ||
| prop: KProperty<*>, | ||
| ): ReadOnlyProperty<Any?, KtDiagnosticFactory0?> { | ||
| val severity = when (mode) { | ||
| StrictMode.ERROR -> Severity.ERROR | ||
| StrictMode.WARNING -> Severity.WARNING | ||
| StrictMode.NONE -> null | ||
| } ?: return DummyDelegate(null) | ||
|
|
||
| return DummyDelegate( | ||
| KtDiagnosticFactory0( | ||
| name = prop.name, | ||
| severity = severity, | ||
| defaultPositioningStrategy = SourceElementPositioningStrategies.DEFAULT, | ||
| psiType = psiType, | ||
| ), | ||
| ) | ||
| } | ||
| } |
16 changes: 16 additions & 0 deletions
16
...re_2_0_21/kotlinx/rpc/codegen/checkers/diagnostics/RpcKtDiagnosticFactoryToRendererMap.kt
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| /* | ||
| * Copyright 2023-2025 JetBrains s.r.o and contributors. Use of this source code is governed by the Apache 2.0 license. | ||
| */ | ||
|
|
||
| package kotlinx.rpc.codegen.checkers.diagnostics | ||
|
|
||
| import org.jetbrains.kotlin.diagnostics.KtDiagnosticFactoryToRendererMap | ||
|
|
||
| fun RpcKtDiagnosticFactoryToRendererMap( | ||
| name: String, | ||
| init: (KtDiagnosticFactoryToRendererMap) -> Unit, | ||
| ): Lazy<KtDiagnosticFactoryToRendererMap> { | ||
| return lazy(LazyThreadSafetyMode.SYNCHRONIZED) { | ||
| KtDiagnosticFactoryToRendererMap(name).also(init) | ||
| } | ||
| } |
7 changes: 7 additions & 0 deletions
7
...src/main/pre_2_0_21/kotlinx/rpc/codegen/checkers/diagnostics/RpcKtDiagnosticsContainer.kt
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| /* | ||
| * Copyright 2023-2025 JetBrains s.r.o and contributors. Use of this source code is governed by the Apache 2.0 license. | ||
| */ | ||
|
|
||
| package kotlinx.rpc.codegen.checkers.diagnostics | ||
|
|
||
| abstract class RpcKtDiagnosticsContainer : RpcKtDiagnosticsContainerCore |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
[nitpick] Consider adding a comment to explain the transition from using an init block for factory registration to the overridden getRendererFactoryVs() approach to aid future maintainers.
Copilot uses AI. Check for mistakes.