haskeline 0.6.3.2 → 0.6.4.0

raw patch · 4 files changed

+36/−6 lines, 4 filesPVP ok

version bump matches the API change (PVP)

API changes (from Hackage documentation)

Files

• CHANGES +3/−0
• System/Console/Haskeline.hs +30/−5
• examples/Test.hs +2/−0
• haskeline.cabal +1/−1

@@ -1,3 +1,6 @@+Changed in version 0.6.4:+   * Added new function getInputLineWithInitial.+ Changed in version 0.6.3.2:    * Allow building with mtl-2.0.* . 

@@ -43,6 +43,7 @@                     -- ** Reading user input                     -- $inputfncs                     getInputLine,+                    getInputLineWithInitial,                     getInputChar,                     getPassword,                     -- ** Outputting text@@ -135,15 +136,39 @@ -} getInputLine :: MonadException m => String -- ^ The input prompt                             -> InputT m (Maybe String)-getInputLine = promptedInput getInputCmdLine $ unMaybeT . getLocaleLine+getInputLine = promptedInput (getInputCmdLine emptyIM) $ unMaybeT . getLocaleLine -getInputCmdLine :: MonadException m => TermOps -> String -> InputT m (Maybe String)-getInputCmdLine tops prefix = do+{- | Reads one line of input and fills the insertion space with initial text. When using+terminal-style interaction, this function provides a rich line-editing user interface with the+added ability to give the user default values.++This function behaves in the exact same manner as 'getInputLine', except that+it pre-populates the input area. The text that resides in the input area is given as a 2-tuple+with two 'String's.   The string on the left of the tuple (obtained by calling 'fst') is+what will appear to the left of the cursor and the string on the right (obtained by+calling 'snd') is what will appear to the right of the cursor.++Some examples of calling of this function are:++> getInputLineWithInitial "prompt> " ("left", "") -- The cursor starts at the end of the line.+> getInputLineWithInitial "prompt> " ("left ", "right") -- The cursor starts before the second word.+ -}+getInputLineWithInitial :: MonadException m+                            => String           -- ^ The input prompt+                            -> (String, String) -- ^ The initial value left and right of the cursor+                            -> InputT m (Maybe String)+getInputLineWithInitial prompt (left,right) = promptedInput (getInputCmdLine initialIM)+                                                (unMaybeT . getLocaleLine) prompt+  where+    initialIM = insertString left $ moveToStart $ insertString right $ emptyIM++getInputCmdLine :: MonadException m => InsertMode -> TermOps -> String -> InputT m (Maybe String)+getInputCmdLine initialIM tops prefix = do     emode <- asks editMode     result <- runInputCmdT tops $ case emode of-                Emacs -> runCommandLoop tops prefix emacsCommands emptyIM+                Emacs -> runCommandLoop tops prefix emacsCommands initialIM                 Vi -> evalStateT' emptyViState $-                        runCommandLoop tops prefix viKeyCommands emptyIM+                        runCommandLoop tops prefix viKeyCommands initialIM     maybeAddHistory result     return result 

@@ -11,6 +11,7 @@ ./Test chars    (character input) ./Test password (no masking characters) ./Test password \*+./Test initial  (use initial text in the prompt) --}  mySettings :: Settings IO@@ -23,6 +24,7 @@                 ["chars"] -> fmap (fmap (\c -> [c])) . getInputChar                 ["password"] -> getPassword Nothing                 ["password", [c]] -> getPassword (Just c)+                ["initial"] -> flip getInputLineWithInitial ("left ", "right")                 _ -> getInputLine         runInputT mySettings $ withInterrupt $ loop inputFunc 0     where

@@ -1,6 +1,6 @@ Name:           haskeline Cabal-Version:  >=1.6-Version:        0.6.3.2+Version:        0.6.4.0 Category:       User Interfaces License:        BSD3 License-File:   LICENSE