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

Rewrite Annotator to be able to put several annotations in one position

Browse Source
This commit is contained in:
Ivan Cilcic
2019-08-14 17:05:18 +03:00
committed by Mikhail Glukhikh
parent 1c2ffa65ca
commit 08c9fa5259
1 changed files with 16 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/visualizer/common/src/org/jetbrains/kotlin/compiler/visualizer/Annotator.kt
+16 -17
View File
@@ -14,29 +14,30 @@ object Annotator {
class AnnotationInfo(val text: String, val range: TextRange) class AnnotationInfo(val text: String, val range: TextRange)
private fun putAnnotationToLines(annotations: List<AnnotationInfo>, lineStart: Int, lineSize: Int): Map<Int, StringBuilder> { private fun putAnnotationToLines(annotations: List<AnnotationInfo>, lineStart: Int, lineSize: Int): List<StringBuilder> {
val annotationLines = mutableMapOf(0 to StringBuilder(comment + " ".repeat(lineSize - comment.length))) val annotationLines = mutableListOf(StringBuilder(comment + " ".repeat(lineSize - comment.length)))
val levelToOffset = mutableMapOf(0 to 0)
var prevAnnStart = Int.MAX_VALUE
var lastLevel = 1
for (ann in annotations) { for (ann in annotations) {
if (ann.range.startOffset + ann.text.length >= prevAnnStart) { var lastLevel = 0
lastLevel++ lastLevel = levelToOffset.values.takeWhile { ann.range.startOffset + ann.text.length >= it }.size
} else {
lastLevel = 1 if (annotationLines.size <= lastLevel) {
annotationLines.add(StringBuilder(comment + " ".repeat(lineSize - comment.length)))
} }
if (!annotationLines.containsKey(lastLevel)) {
annotationLines[lastLevel] = StringBuilder(comment + " ".repeat(lineSize - comment.length))
}
val startReplace = max(comment.length, ann.range.startOffset - lineStart) val startReplace = max(comment.length, ann.range.startOffset - lineStart)
annotationLines[lastLevel] = annotationLines[lastLevel]!!.replace(startReplace, startReplace + ann.text.length, ann.text) annotationLines[lastLevel].replace(startReplace, startReplace + ann.text.length, ann.text)
for (i in 0 until lastLevel) { for (i in 0 until lastLevel) {
annotationLines[i] = annotationLines[i]!!.replace(startReplace, startReplace + 1, verticalLine) if (annotationLines[i][startReplace] == ' ') { //to avoid char replacement for a multilevel annotation
annotationLines[i].replace(startReplace, startReplace + 1, verticalLine)
}
} }
prevAnnStart = ann.range.startOffset for (i in 1..lastLevel) {
levelToOffset[i] = ann.range.startOffset
}
} }
return annotationLines return annotationLines
@@ -54,9 +55,7 @@ object Annotator {
if (annotations.isNotEmpty()) { if (annotations.isNotEmpty()) {
val annotationLines = putAnnotationToLines(annotations, lineStartOffset, line.length) val annotationLines = putAnnotationToLines(annotations, lineStartOffset, line.length)
annotationLines.toSortedMap(Comparator.reverseOrder()).mapTo(resultLines) { annotationLines.asReversed().mapTo(resultLines) { it.toString() }
it.value.toString()
}
} }
resultLines.add(line) resultLines.add(line)