From 829227255dd06407d16e56ea3c1790ec60aaf712 Mon Sep 17 00:00:00 2001
From: Dmitriy Novozhilov <dmitriy.novozhilov@jetbrains.com>
Date: Fri, 1 Nov 2019 12:41:30 +0300
Subject: [PATCH] [FIR] Add rendering of error numbers per file/package/module
 in HTML dump

---
 .../jetbrains/kotlin/fir/dump/colors.dark.css |  4 +++
 .../kotlin/fir/dump/colors.white.css          |  4 +++
 .../org/jetbrains/kotlin/fir/dump/style.css   |  4 +++
 .../jetbrains/kotlin/fir/dump/HtmlFirDump.kt  | 25 ++++++++++++++++---
 4 files changed, 34 insertions(+), 3 deletions(-)

diff --git a/compiler/fir/dump/resources/org/jetbrains/kotlin/fir/dump/colors.dark.css b/compiler/fir/dump/resources/org/jetbrains/kotlin/fir/dump/colors.dark.css
index 4dd1fd7bc98..9105fcf9294 100644
--- a/compiler/fir/dump/resources/org/jetbrains/kotlin/fir/dump/colors.dark.css
+++ b/compiler/fir/dump/resources/org/jetbrains/kotlin/fir/dump/colors.dark.css
@@ -78,4 +78,8 @@ body.dark {
 .dark .line {
     background-color: #313335;
     border-right: thin solid darkgray;
+}
+
+.dark .error-counter {
+    color: #ff1010;
 }
\ No newline at end of file
diff --git a/compiler/fir/dump/resources/org/jetbrains/kotlin/fir/dump/colors.white.css b/compiler/fir/dump/resources/org/jetbrains/kotlin/fir/dump/colors.white.css
index 54f01bd82e1..9ce8fcdb204 100644
--- a/compiler/fir/dump/resources/org/jetbrains/kotlin/fir/dump/colors.white.css
+++ b/compiler/fir/dump/resources/org/jetbrains/kotlin/fir/dump/colors.white.css
@@ -67,4 +67,8 @@
 .white .line {
     background-color: lightgray;
     border-right: thin solid darkgray;
+}
+
+.white .error-counter {
+    color: #f00;
 }
\ No newline at end of file
diff --git a/compiler/fir/dump/resources/org/jetbrains/kotlin/fir/dump/style.css b/compiler/fir/dump/resources/org/jetbrains/kotlin/fir/dump/style.css
index b60ebff552f..b16547c6b93 100644
--- a/compiler/fir/dump/resources/org/jetbrains/kotlin/fir/dump/style.css
+++ b/compiler/fir/dump/resources/org/jetbrains/kotlin/fir/dump/style.css
@@ -58,4 +58,8 @@ a.ref {
 
 .line {
     margin-right: 5px;
+}
+
+.error-counter {
+    margin-left: 10px;
 }
\ No newline at end of file
diff --git a/compiler/fir/dump/src/org/jetbrains/kotlin/fir/dump/HtmlFirDump.kt b/compiler/fir/dump/src/org/jetbrains/kotlin/fir/dump/HtmlFirDump.kt
index 32f50c83d90..a2c5a0bd41c 100644
--- a/compiler/fir/dump/src/org/jetbrains/kotlin/fir/dump/HtmlFirDump.kt
+++ b/compiler/fir/dump/src/org/jetbrains/kotlin/fir/dump/HtmlFirDump.kt
@@ -69,7 +69,7 @@ private class PackageInfo(val fqName: FqName, val moduleInfo: ModuleInfo) {
     val packageRoot = fqName.pathSegments().fold(moduleInfo.moduleRoot) { dir, segment -> dir.resolve(segment.asString()) }.also {
         it.mkdirs()
     }
-
+    val errors = mutableMapOf<String, Int>().withDefault { 0 }
 }
 
 private class ModuleInfo(val name: String, outputRoot: File) {
@@ -77,6 +77,9 @@ private class ModuleInfo(val name: String, outputRoot: File) {
     val moduleRoot = outputRoot.resolve(name).also {
         it.mkdirs()
     }
+    val errors: Map<FqName, Int> by lazy {
+        packages.mapValues { (_, packageInfo) -> packageInfo.errors.values.sum() }.withDefault { 0 }
+    }
 }
 
 private class SupplementaryGenerator(val outputRoot: File) {
@@ -106,6 +109,7 @@ private class SupplementaryGenerator(val outputRoot: File) {
                             ) {
                                 +packageInfo.fqName.asString()
                             }
+                            addErrors(moduleInfo.errors.getValue(packageInfo.fqName))
                         }
                     }
                 }
@@ -113,6 +117,12 @@ private class SupplementaryGenerator(val outputRoot: File) {
         }
     }
 
+    fun LI.addErrors(errors: Int) {
+        if (errors > 0) {
+            span(classes = "error-counter") { +(errors.toString()) }
+        }
+    }
+
     fun linkToIndex(moduleInfo: ModuleInfo, from: File): String {
         return moduleInfo.moduleRoot.resolve(MODULE_INDEX).relativeTo(from).path
     }
@@ -148,6 +158,7 @@ private class SupplementaryGenerator(val outputRoot: File) {
                     for (file in packageInfo.contents) {
                         li {
                             a(href = "./$file.fir.html", classes = "container-ref") { +file }
+                            addErrors(packageInfo.errors.getValue(file))
                         }
                     }
                 }
@@ -170,6 +181,7 @@ private class SupplementaryGenerator(val outputRoot: File) {
                     for (module in modules) {
                         li {
                             a(href = linkToIndex(module, outputRoot), classes = "container-ref") { +module.name }
+                            addErrors(module.errors.values.sum())
                         }
                     }
                 }
@@ -273,6 +285,9 @@ class MultiModuleHtmlFirDump(private val outputRoot: File) {
         dumper.generate(file, builder)
 
         dumpOutput.writeText(builder.toString())
+        packageForFile(file).apply {
+            errors[file.name] = dumper.errors
+        }
     }
 
 
@@ -368,12 +383,15 @@ class MultiModuleHtmlFirDump(private val outputRoot: File) {
 }
 
 class HtmlFirDump internal constructor(private var linkResolver: FirLinkResolver, private val session: FirSession) {
+    var errors: Int = 0
+        private set
 
-
-    fun generate(element: FirFile, builder: StringBuilder) {
+    fun generate(element: FirFile, builder: StringBuilder): Int {
+        errors = 0
         builder.appendHTML().html {
             generate(element)
         }
+        return errors
     }
 
     private fun FlowContent.keyword(text: String) {
@@ -414,6 +432,7 @@ class HtmlFirDump internal constructor(private var linkResolver: FirLinkResolver
     }
 
     private fun FlowContent.error(block: SPAN.() -> Unit) {
+        errors++
         span(classes = "error") {
             block()
         }