Skip to content
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

Automatically insert matching close brackets at REPL #1953

Merged
merged 3 commits into from
Jun 18, 2024
Merged

Automatically insert matching close brackets at REPL #1953

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c2cce0a
automatically insert matching close brackets at REPL
byorgey Jun 17, 2024
3efc228
Restyled by fourmolu (#1954)
restyled-io[bot] Jun 17, 2024
a3f0832
Merge branch 'main' into push-mrnsmwtpvytk
mergify[bot] Jun 18, 2024
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
17 changes: 15 additions & 2 deletions src/swarm-tui/Swarm/TUI/Controller.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,12 +40,13 @@ module Swarm.TUI.Controller (
import Brick hiding (Direction, Location)
import Brick.Focus
import Brick.Widgets.Dialog
import Brick.Widgets.Edit (applyEdit, handleEditorEvent)
import Brick.Widgets.Edit (Editor, applyEdit, handleEditorEvent)
import Brick.Widgets.List (handleListEvent)
import Brick.Widgets.List qualified as BL
import Control.Applicative (liftA2, pure)
import Control.Carrier.Lift qualified as Fused
import Control.Carrier.State.Lazy qualified as Fused
import Control.Category ((>>>))
import Control.Lens as Lens
import Control.Lens.Extras as Lens (is)
import Control.Monad (forM_, unless, void, when)
Expand All @@ -66,6 +67,7 @@ import Data.String (fromString)
import Data.Text (Text)
import Data.Text qualified as T
import Data.Text.IO qualified as T
import Data.Text.Zipper qualified as TZ
import Data.Text.Zipper.Generic.Words qualified as TZ
import Data.Time (getZonedTime)
import Data.Vector qualified as V
Expand Down Expand Up @@ -1206,12 +1208,23 @@ handleREPLEventTyping = \case
uiState . uiGameplay . uiREPL . replPromptEditor %= applyEdit TZ.deletePrevWord
-- finally if none match pass the event to the editor
ev -> do
Brick.zoom (uiState . uiGameplay . uiREPL . replPromptEditor) (handleEditorEvent ev)
Brick.zoom (uiState . uiGameplay . uiREPL . replPromptEditor) $ case ev of
CharKey c | c `elem` ("([{" :: String) -> insertMatchingPair c
_ -> handleEditorEvent ev
uiState . uiGameplay . uiREPL . replPromptType %= \case
CmdPrompt _ -> CmdPrompt [] -- reset completions on any event passed to editor
SearchPrompt a -> SearchPrompt a
modify validateREPLForm

insertMatchingPair :: Char -> EventM Name (Editor Text Name) ()
insertMatchingPair c = modify . applyEdit $ TZ.insertChar c >>> TZ.insertChar (close c) >>> TZ.moveLeft
where
close = \case
'(' -> ')'
'[' -> ']'
'{' -> '}'
_ -> c

data CompletionType
= FunctionName
| EntityName
Expand Down