Skip to content

Fix editor esc handler #304

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
phodal merged 4 commits into from
Feb 16, 2025
Merged

Fix editor esc handler #304

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3f942c8
refactor(inline): improve caret state handling logic
iptton Feb 16, 2025
6664949
fix: 修复错误 import
iptton Feb 16, 2025
3425621
refactor(inline): simplify caret and selection handling
iptton Feb 16, 2025
8d99e7c
Merge branch 'master' into fix-editor-esc-handler
iptton Feb 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 6 additions & 16 deletions core/src/main/kotlin/cc/unitmesh/devti/inline/AutoDevInlineChatPanel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import cc.unitmesh.devti.llms.cancelHandler
import cc.unitmesh.devti.sketch.SketchProcessListener
import cc.unitmesh.devti.sketch.SketchToolWindow
import cc.unitmesh.devti.util.AutoDevCoroutineScope
import com.intellij.database.util.common.doesntMeet
import com.intellij.icons.AllIcons
import com.intellij.ide.KeyboardAwareFocusOwner
import com.intellij.openapi.Disposable
Expand All @@ -16,12 +15,7 @@ import com.intellij.openapi.actionSystem.impl.ActionButton
import com.intellij.openapi.application.ApplicationManager
import com.intellij.openapi.application.invokeLater
import com.intellij.openapi.application.runInEdt
import com.intellij.openapi.editor.Caret
import com.intellij.openapi.editor.CaretModel
import com.intellij.openapi.editor.Editor
import com.intellij.openapi.editor.EditorCustomElementRenderer
import com.intellij.openapi.editor.Inlay
import com.intellij.openapi.editor.SelectionModel
import com.intellij.openapi.editor.*
import com.intellij.openapi.editor.actionSystem.EditorActionHandler
import com.intellij.openapi.editor.actionSystem.EditorActionManager
import com.intellij.openapi.editor.markup.TextAttributes
Expand Down Expand Up @@ -318,16 +312,12 @@ class EscHandler(private val targetEditor: Editor, private val action: () -> Uni
caret: Caret?,
context: DataContext,
) {
if (editor == targetEditor) {
val caretModel: CaretModel = editor.caretModel
val hasMultiCaret = caretModel.caretCount > 1
val hasSelection = caretModel.allCarets.any { it.hasSelection() }
if (!hasMultiCaret && !hasSelection) {
action()
return
}
val caretModel: CaretModel = editor.caretModel
if (editor == targetEditor || caretModel.caretCount > 1 || caretModel.allCarets.any { it.hasSelection() }) {
action()
} else {
oldHandler?.execute(editor, caret, context)
}
oldHandler?.execute(editor, caret, context)
}

override fun dispose() {
Expand Down
Loading