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

Scratch: associate inlay with preceding text

Browse Source 
This allow to avoid some unintentional movements of caret after inserting scratch output
This commit is contained in:
Natalia Selezneva
2019-01-17 10:42:41 +03:00
parent 290ae16235
commit 76b06cd747
3 changed files with 7 additions and 3 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
+5 -1
View File
@@ -74,7 +74,11 @@ object InlayScratchOutputHandler : ScratchOutputHandler {
if (shortText != text) { if (shortText != text) {
printToToolWindow(file, expression, output) printToToolWindow(file, expression, output)
} }
editor.inlayModel.addInlineElement(lineEndOffset, InlayScratchFileRenderer(" ".repeat(spaceCount) + shortText, output.type)) editor.inlayModel.addInlineElement(
lineEndOffset,
true,
InlayScratchFileRenderer(" ".repeat(spaceCount) + shortText, output.type)
)
} }
val existing = editor.inlayModel val existing = editor.inlayModel
idea/testData/scratch/unresolved.kts
Vendored
+1 -1
View File
@@ -1 +1 @@
foo() foo()
idea/testData/scratch/veryLongOutput.kts
Vendored
+1 -1
View File
@@ -2,4 +2,4 @@ val a = "a".repeat(100)
a a
val b = "0123456789\n".repeat(10) val b = "0123456789\n".repeat(10)
b b
println("0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789") println("0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789")