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

Scratch: take into account only lines with expressions calculating inlay insert offset

Browse Source
This commit is contained in:
Natalia Selezneva
2018-05-17 13:19:32 +03:00
parent aa7c13e30b
commit db63877690
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-jvm/src/org/jetbrains/kotlin/idea/scratch/output/InlayScratchOutputHandler.kt
+3 -3
View File
@@ -96,10 +96,10 @@ object InlayScratchOutputHandler : ScratchOutputHandler {
private fun maxLineLength(file: ScratchFile): Int {
val doc = file.editor.editor.document
return (0 until doc.lineCount)
return file.getExpressions()
.flatMap { it.lineStart..it.lineEnd }
.map { doc.getLineEndOffset(it) - doc.getLineStartOffset(it) }
.max()
?: -1
.max() ?: 0
}
private fun clearInlays(editor: TextEditor) {
idea/testData/scratch/unresolved.repl.after
Vendored
+1 -1
View File
@@ -1,4 +1,4 @@
foo() // ERROR: error: unresolved reference: foo...
foo() // ERROR: error: unresolved reference: foo...
/** unresolved.kts:1 error: unresolved reference: foo
foo()
idea/testData/scratch/unresolvedMultiline.repl.after
Vendored
+2 -2
View File
@@ -1,8 +1,8 @@
foo.forEach { // ERROR: error: unresolved reference: foo...
foo.forEach { // ERROR: error: unresolved reference: foo...
1 + 1
}
fun goo(a: String) { // ERROR: error: unresolved reference: goo...
fun goo(a: String) { // ERROR: error: unresolved reference: goo...
super.goo(a)
}
/** unresolvedMultiline.kts:1 error: unresolved reference: foo