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

[Gradle] Do not store suppressed diagnostics

Browse Source
This commit is contained in:
Dmitry Savvinov
2023-07-20 11:33:52 +02:00
committed by Space Team
parent 71c1abde5c
commit c544d68a64
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/plugin/diagnostics/KotlinToolingDiagnosticsCollector.kt
+7 -7
View File
@@ -29,13 +29,11 @@ internal abstract class KotlinToolingDiagnosticsCollector : BuildService<BuildSe
private val reportedIds: MutableSet<ToolingDiagnosticId> = Collections.newSetFromMap(ConcurrentHashMap())
fun getDiagnosticsForProject(project: Project): Collection<ToolingDiagnostic> {
val rawDiagnostics = rawDiagnosticsFromProject[project.path] ?: return emptyList()
val options = ToolingDiagnosticRenderingOptions.forProject(project)
return rawDiagnostics.withoutSuppressed(options)
return rawDiagnosticsFromProject[project.path] ?: return emptyList()
}
fun report(project: Project, diagnostic: ToolingDiagnostic) {
saveDiagnostic(project, diagnostic)
handleDiagnostic(project, diagnostic)
}
fun report(task: UsesKotlinToolingDiagnostics, diagnostic: ToolingDiagnostic) {
@@ -47,13 +45,13 @@ internal abstract class KotlinToolingDiagnosticsCollector : BuildService<BuildSe
fun reportOncePerGradleProject(fromProject: Project, diagnostic: ToolingDiagnostic, key: ToolingDiagnosticId = diagnostic.id) {
if (reportedIds.add("${fromProject.path}#$key")) {
saveDiagnostic(fromProject, diagnostic)
handleDiagnostic(fromProject, diagnostic)
}
}
fun reportOncePerGradleBuild(fromProject: Project, diagnostic: ToolingDiagnostic, key: ToolingDiagnosticId = diagnostic.id) {
if (reportedIds.add(":#$key")) {
saveDiagnostic(fromProject, diagnostic)
handleDiagnostic(fromProject, diagnostic)
}
}
@@ -61,7 +59,9 @@ internal abstract class KotlinToolingDiagnosticsCollector : BuildService<BuildSe
isTransparent = true
}
private fun saveDiagnostic(project: Project, diagnostic: ToolingDiagnostic) {
private fun handleDiagnostic(project: Project, diagnostic: ToolingDiagnostic) {
if (diagnostic.isSuppressed(ToolingDiagnosticRenderingOptions.forProject(project))) return
val isVerbose = project.kotlinPropertiesProvider.internalVerboseDiagnostics
if (isTransparent) {