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

REPL UI: fix history pane not showing latest command after command execution

Browse Source
This commit is contained in:
Pavel V. Talanov
2016-05-24 17:31:55 +03:00
parent 181a11a1d7
commit 85200e1f8a
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-repl/src/org/jetbrains/kotlin/console/HistoryUpdater.kt
+4 -3
View File
@@ -1,5 +1,5 @@
/* /*
* Copyright 2010-2015 JetBrains s.r.o. * Copyright 2010-2016 JetBrains s.r.o.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -18,7 +18,6 @@ package org.jetbrains.kotlin.console
import com.intellij.execution.console.LanguageConsoleImpl import com.intellij.execution.console.LanguageConsoleImpl
import com.intellij.openapi.editor.ex.EditorEx import com.intellij.openapi.editor.ex.EditorEx
import com.intellij.openapi.editor.ex.util.EditorUtil
import com.intellij.openapi.editor.markup.HighlighterLayer import com.intellij.openapi.editor.markup.HighlighterLayer
import com.intellij.openapi.editor.markup.HighlighterTargetArea import com.intellij.openapi.editor.markup.HighlighterTargetArea
import com.intellij.openapi.util.TextRange import com.intellij.openapi.util.TextRange
@@ -35,7 +34,6 @@ class HistoryUpdater(private val runner: KotlinConsoleRunner) {
val endOffset = startOffset + trimmedCommandText.length val endOffset = startOffset + trimmedCommandText.length
addCommandTextToHistoryEditor(trimmedCommandText) addCommandTextToHistoryEditor(trimmedCommandText)
EditorUtil.scrollToTheEnd(historyEditor)
addFoldingRegion(historyEditor, startOffset, endOffset, trimmedCommandText) addFoldingRegion(historyEditor, startOffset, endOffset, trimmedCommandText)
historyEditor.markupModel.addRangeHighlighter( historyEditor.markupModel.addRangeHighlighter(
@@ -44,6 +42,9 @@ class HistoryUpdater(private val runner: KotlinConsoleRunner) {
val historyMarker = if (runner.isReadLineMode) ReplIcons.READLINE_MARKER else ReplIcons.COMMAND_MARKER val historyMarker = if (runner.isReadLineMode) ReplIcons.READLINE_MARKER else ReplIcons.COMMAND_MARKER
gutterIconRenderer = ConsoleIndicatorRenderer(historyMarker) gutterIconRenderer = ConsoleIndicatorRenderer(historyMarker)
} }
historyEditor.scrollingModel.scrollVertically(endOffset)
return TextRange(startOffset, endOffset) return TextRange(startOffset, endOffset)
} }