diff --git a/LICENSE b/LICENSE deleted file mode 100644 --- a/LICENSE +++ /dev/null @@ -1,339 +0,0 @@ - GNU GENERAL PUBLIC LICENSE - Version 2, June 1991 - - Copyright (C) 1989, 1991 Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -License is intended to guarantee your freedom to share and change free -software--to make sure the software is free for all its users. This -General Public License applies to most of the Free Software -Foundation's software and to any other program whose authors commit to -using it. (Some other Free Software Foundation software is covered by -the GNU Lesser General Public License instead.) You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -this service if you wish), that you receive source code or can get it -if you want it, that you can change the software or use pieces of it -in new free programs; and that you know you can do these things. - - To protect your rights, we need to make restrictions that forbid -anyone to deny you these rights or to ask you to surrender the rights. -These restrictions translate to certain responsibilities for you if you -distribute copies of the software, or if you modify it. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must give the recipients all the rights that -you have. You must make sure that they, too, receive or can get the -source code. And you must show them these terms so they know their -rights. - - We protect your rights with two steps: (1) copyright the software, and -(2) offer you this license which gives you legal permission to copy, -distribute and/or modify the software. - - Also, for each author's protection and ours, we want to make certain -that everyone understands that there is no warranty for this free -software. If the software is modified by someone else and passed on, we -want its recipients to know that what they have is not the original, so -that any problems introduced by others will not reflect on the original -authors' reputations. - - Finally, any free program is threatened constantly by software -patents. We wish to avoid the danger that redistributors of a free -program will individually obtain patent licenses, in effect making the -program proprietary. To prevent this, we have made it clear that any -patent must be licensed for everyone's free use or not licensed at all. - - The precise terms and conditions for copying, distribution and -modification follow. - - GNU GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License applies to any program or other work which contains -a notice placed by the copyright holder saying it may be distributed -under the terms of this General Public License. The "Program", below, -refers to any such program or work, and a "work based on the Program" -means either the Program or any derivative work under copyright law: -that is to say, a work containing the Program or a portion of it, -either verbatim or with modifications and/or translated into another -language. (Hereinafter, translation is included without limitation in -the term "modification".) Each licensee is addressed as "you". - -Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running the Program is not restricted, and the output from the Program -is covered only if its contents constitute a work based on the -Program (independent of having been made by running the Program). -Whether that is true depends on what the Program does. - - 1. You may copy and distribute verbatim copies of the Program's -source code as you receive it, in any medium, provided that you -conspicuously and appropriately publish on each copy an appropriate -copyright notice and disclaimer of warranty; keep intact all the -notices that refer to this License and to the absence of any warranty; -and give any other recipients of the Program a copy of this License -along with the Program. - -You may charge a fee for the physical act of transferring a copy, and -you may at your option offer warranty protection in exchange for a fee. - - 2. You may modify your copy or copies of the Program or any portion -of it, thus forming a work based on the Program, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) You must cause the modified files to carry prominent notices - stating that you changed the files and the date of any change. - - b) You must cause any work that you distribute or publish, that in - whole or in part contains or is derived from the Program or any - part thereof, to be licensed as a whole at no charge to all third - parties under the terms of this License. - - c) If the modified program normally reads commands interactively - when run, you must cause it, when started running for such - interactive use in the most ordinary way, to print or display an - announcement including an appropriate copyright notice and a - notice that there is no warranty (or else, saying that you provide - a warranty) and that users may redistribute the program under - these conditions, and telling the user how to view a copy of this - License. (Exception: if the Program itself is interactive but - does not normally print such an announcement, your work based on - the Program is not required to print an announcement.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Program, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Program, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Program. - -In addition, mere aggregation of another work not based on the Program -with the Program (or with a work based on the Program) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may copy and distribute the Program (or a work based on it, -under Section 2) in object code or executable form under the terms of -Sections 1 and 2 above provided that you also do one of the following: - - a) Accompany it with the complete corresponding machine-readable - source code, which must be distributed under the terms of Sections - 1 and 2 above on a medium customarily used for software interchange; or, - - b) Accompany it with a written offer, valid for at least three - years, to give any third party, for a charge no more than your - cost of physically performing source distribution, a complete - machine-readable copy of the corresponding source code, to be - distributed under the terms of Sections 1 and 2 above on a medium - customarily used for software interchange; or, - - c) Accompany it with the information you received as to the offer - to distribute corresponding source code. (This alternative is - allowed only for noncommercial distribution and only if you - received the program in object code or executable form with such - an offer, in accord with Subsection b above.) - -The source code for a work means the preferred form of the work for -making modifications to it. For an executable work, complete source -code means all the source code for all modules it contains, plus any -associated interface definition files, plus the scripts used to -control compilation and installation of the executable. However, as a -special exception, the source code distributed need not include -anything that is normally distributed (in either source or binary -form) with the major components (compiler, kernel, and so on) of the -operating system on which the executable runs, unless that component -itself accompanies the executable. - -If distribution of executable or object code is made by offering -access to copy from a designated place, then offering equivalent -access to copy the source code from the same place counts as -distribution of the source code, even though third parties are not -compelled to copy the source along with the object code. - - 4. You may not copy, modify, sublicense, or distribute the Program -except as expressly provided under this License. Any attempt -otherwise to copy, modify, sublicense or distribute the Program is -void, and will automatically terminate your rights under this License. -However, parties who have received copies, or rights, from you under -this License will not have their licenses terminated so long as such -parties remain in full compliance. - - 5. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Program or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Program (or any work based on the -Program), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Program or works based on it. - - 6. Each time you redistribute the Program (or any work based on the -Program), the recipient automatically receives a license from the -original licensor to copy, distribute or modify the Program subject to -these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties to -this License. - - 7. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Program at all. For example, if a patent -license would not permit royalty-free redistribution of the Program by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Program. - -If any portion of this section is held invalid or unenforceable under -any particular circumstance, the balance of the section is intended to -apply and the section as a whole is intended to apply in other -circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system, which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 8. If the distribution and/or use of the Program is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Program under this License -may add an explicit geographical distribution limitation excluding -those countries, so that distribution is permitted only in or among -countries not thus excluded. In such case, this License incorporates -the limitation as if written in the body of this License. - - 9. The Free Software Foundation may publish revised and/or new versions -of the General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - -Each version is given a distinguishing version number. If the Program -specifies a version number of this License which applies to it and "any -later version", you have the option of following the terms and conditions -either of that version or of any later version published by the Free -Software Foundation. If the Program does not specify a version number of -this License, you may choose any version ever published by the Free Software -Foundation. - - 10. If you wish to incorporate parts of the Program into other free -programs whose distribution conditions are different, write to the author -to ask for permission. For software which is copyrighted by the Free -Software Foundation, write to the Free Software Foundation; we sometimes -make exceptions for this. Our decision will be guided by the two goals -of preserving the free status of all derivatives of our free software and -of promoting the sharing and reuse of software generally. - - NO WARRANTY - - 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY -FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN -OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES -PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED -OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS -TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE -PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, -REPAIR OR CORRECTION. - - 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR -REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, -INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING -OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED -TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY -YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER -PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE -POSSIBILITY OF SUCH DAMAGES. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -convey the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License along - with this program; if not, write to the Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - -Also add information on how to contact you by electronic and paper mail. - -If the program is interactive, make it output a short notice like this -when it starts in an interactive mode: - - Gnomovision version 69, Copyright (C) year name of author - Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, the commands you use may -be called something other than `show w' and `show c'; they could even be -mouse-clicks or menu items--whatever suits your program. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the program, if -necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the program - `Gnomovision' (which makes passes at compilers) written by James Hacker. - - , 1 April 1989 - Ty Coon, President of Vice - -This General Public License does not permit incorporating your program into -proprietary programs. If your program is a subroutine library, you may -consider it more useful to permit linking proprietary applications with the -library. If this is what you want to do, use the GNU Lesser General -Public License instead of this License. diff --git a/src/Yi/Snippet.hs b/src/Yi/Snippet.hs new file mode 100644 --- /dev/null +++ b/src/Yi/Snippet.hs @@ -0,0 +1,17 @@ + +module Yi.Snippet + ( Snippet (Snippet) + , Var + , SnippetBody + , lit + , line + , nl + , place + , refer + , finish + , mirror + , filename + , expandSnippetE + ) where + +import Yi.Snippet.Internal diff --git a/src/Yi/Snippet/Internal.hs b/src/Yi/Snippet/Internal.hs new file mode 100644 --- /dev/null +++ b/src/Yi/Snippet/Internal.hs @@ -0,0 +1,267 @@ +{-# LANGUAGE DeriveDataTypeable #-} +{-# LANGUAGE DeriveFunctor #-} +{-# LANGUAGE DeriveGeneric #-} +{-# LANGUAGE FlexibleContexts #-} +{-# LANGUAGE OverloadedStrings #-} +{-# LANGUAGE GADTs #-} + +module Yi.Snippet.Internal + ( Snippet (..) + , Var (..) + , VarValue (..) + , SnippetBody + , EditState (..) + , EditAction (..) + , initialEditState + , lit + , line + , nl + , place + , refer + , finish + , mirror + , renderSnippet + , collectVars + , advanceEditState + , expandSnippetE + , filename + ) where + +import Control.Lens +import Control.Monad.Free +import Control.Monad.State hiding (state) +import Control.Monad.Writer +import Data.Binary (Binary) +import Data.Default +import qualified Data.Map.Strict as M +import Data.Maybe +import Data.Typeable +import GHC.Generics + +import Yi.Buffer +import Yi.Editor (withCurrentBuffer) +import Yi.Keymap +import Yi.Keymap.Keys +import qualified Yi.Rope as R +import Yi.Types (YiVariable, EditorM) + +data Snippet = Snippet + { snipTrigger :: R.YiString + , snipBody :: SnippetBody () + } + +data Var + = FilenameVar + | UserVar {fromVar :: Int} + deriving (Show, Eq, Ord, Generic) + +data VarValue + = DefaultValue R.YiString + | CustomValue R.YiString + deriving (Show, Eq, Generic) + +instance Binary Var +instance Binary VarValue +instance Default VarValue where + def = DefaultValue def + +type Vars = M.Map Var VarValue + +data SnippetBodyF a + = Lit R.YiString a + | Finish a + | MakeVar R.YiString (Var -> a) + | Mirror Var a + | Refer Var (R.YiString -> a) + deriving Functor + +type SnippetBody = Free SnippetBodyF + +filename :: Var +filename = FilenameVar + +lit :: R.YiString -> SnippetBody () +lit s = liftF (Lit s ()) + +line :: R.YiString -> SnippetBody () +line s = lit (s <> "\n") + +nl :: SnippetBody () +nl = liftF (Lit "\n" ()) + +finish :: SnippetBody () +finish = liftF (Finish ()) + +place :: R.YiString -> SnippetBody Var +place s = do + var <- liftF (MakeVar s id) + mirror var + return var + +refer :: Var -> SnippetBody R.YiString +refer var = liftF (Refer var id) + +mirror :: Var -> SnippetBody () +mirror var = liftF (Mirror var ()) + +data EditState = EditState + { sesCursorPosition :: (Maybe Var, Int) + , sesVars :: Vars + } deriving (Show, Eq, Generic, Typeable) + +instance Binary EditState +instance Default EditState where + def = EditState (Nothing, 0) def +instance YiVariable EditState + +initialEditState :: Snippet -> EditState +initialEditState (Snippet _ body) = + EditState + (listToMaybe (M.keys vars), 0) + vars + where + vars = collectVars body + +collectVars :: SnippetBody a -> Vars +collectVars body = + snd (runState (iterM run body) mempty) + where + run :: SnippetBodyF (State Vars a) -> State Vars a + run (Lit _ rest) = rest + run (Finish rest) = rest + run (MakeVar s f) = do + vars <- get + let newVar = if M.null vars + then (UserVar 0) + else UserVar (maximum (map fromVar (M.keys vars)) + 1) + newVars = M.insert newVar (DefaultValue s) vars + put newVars + f newVar + run (Mirror _ rest) = rest + run (Refer var f) = do + vars <- get + f (toYiString (vars M.! var)) + +data EditAction + = SENext + | SEInsertChar Char + | SEBackSpace + | SEEscape + +renderSnippet :: Snippet -> EditState -> (Int, R.YiString) +renderSnippet (Snippet _ body) (EditState (maybeActiveVar, offset) vars) = + (either id id epos, string) + where + (((), (_var, epos)), string) = runWriter (runStateT (iterM run body) (UserVar (-1), Right 0)) + advance :: MonadState (Var, Either Int Int) m => Int -> m () + advance n = modify (fmap (fmap (+ n))) + run :: SnippetBodyF ((StateT (Var, Either Int Int) (Writer R.YiString)) a) + -> StateT (Var, Either Int Int) (Writer R.YiString) a + run (Lit s rest) = do + tell s + advance (R.length s) + rest + run (Finish rest) = rest + run (Mirror var rest) = do + let s = toYiString (vars M.! var) + tell s + + if Just var == maybeActiveVar + then do + (v, curPos) <- get + case curPos of + Right pos -> + put (v, (Left (pos + offset))) + _ -> return () + else advance (R.length s) + + rest + run (MakeVar _ f) = do + (varName, pos) <- get + let newVar = UserVar (fromVar varName + 1) + put (newVar, pos) + f (newVar) + run (Refer var f) = f (toYiString (vars M.! var)) + +toYiString :: VarValue -> R.YiString +toYiString (DefaultValue s) = s +toYiString (CustomValue s) = s + +advanceEditState :: EditState -> EditAction -> EditState +advanceEditState state@(EditState (Nothing, _) _) SENext = state +advanceEditState (EditState (Just i, pos) vars) (SEInsertChar c) = + let newVars = M.adjust (insertChar c pos) i vars + in EditState (Just i, pos + 1) newVars +advanceEditState (EditState (Just i, pos) vars) SEBackSpace = + let newVars = M.adjust (backspace pos) i vars + in EditState (Just i, pos - 1) newVars +advanceEditState (EditState (Just i, _) vars) SENext = + let nextPlace = listToMaybe (dropWhile (<= i) (M.keys vars)) + in EditState (nextPlace, 0) vars +advanceEditState state _ = state + +insertChar :: Char -> Int -> VarValue -> VarValue +insertChar c _ (DefaultValue _) = CustomValue (R.singleton c) +insertChar c pos (CustomValue s) = CustomValue (lhs <> R.singleton c <> rhs) + where (lhs, rhs) = R.splitAt pos s + +backspace :: Int -> VarValue -> VarValue +backspace _ (DefaultValue _) = CustomValue mempty +backspace 0 v = v +backspace pos (CustomValue s) = CustomValue (lhs <> R.drop 1 rhs) + where (lhs, rhs) = R.splitAt (pos - 1) s + +expandSnippetE :: EditorM () -> [Snippet] -> EditorM Bool +expandSnippetE escapeAction snippets = do + trigger <- withCurrentBuffer readPrevWordB + let match = listToMaybe (filter ((== trigger) . snipTrigger) snippets) + case match of + Just snip -> do + beginEditingSnippetE escapeAction snip + return True + _ -> return False + +beginEditingSnippetE :: EditorM () -> Snippet -> EditorM () +beginEditingSnippetE escapeAction snip = do + withCurrentBuffer (deleteB unitWord Backward) + Point origin <- withCurrentBuffer pointB + filenameValue <- withCurrentBuffer (gets identString) + let editState0 = + (\(EditState x vars) -> + EditState x (M.insert filename (DefaultValue (R.fromText filenameValue)) vars)) + (initialEditState snip) + withCurrentBuffer (putBufferDyn editState0) + oldKeymap <- withCurrentBuffer (gets (withMode0 modeKeymap)) + + withCurrentBuffer $ do + let (offset, s) = renderSnippet snip editState0 + insertN s + moveTo (Point (origin + offset)) + + let go SEEscape = do + withCurrentBuffer (modifyMode $ modeKeymapA .~ oldKeymap) + escapeAction + go action = withCurrentBuffer $ do + editState <- getBufferDyn + + let nextEditState = advanceEditState editState action + (_, prevS) = renderSnippet snip editState + moveTo (Point origin) + deleteN (R.length prevS) + + let (offset, s) = renderSnippet snip nextEditState + insertN s + moveTo (Point (origin + offset)) + + case nextEditState of + EditState (Just _, _) _ -> putBufferDyn nextEditState + _ -> modifyMode $ modeKeymapA .~ oldKeymap + withCurrentBuffer $ modifyMode $ modeKeymapA .~ topKeymapA .~ choice + [ printableChar >>=! go . SEInsertChar + , Event KEsc [] ?>>! go SEEscape + , Event KTab [] ?>>! go SENext + , Event KBS [] ?>>! go SEBackSpace + , Event (KASCII 'h') [MCtrl] ?>>! go SEBackSpace + , Event (KASCII '[') [MCtrl] ?>>! go SEEscape + , Event (KASCII 'i') [MCtrl] ?>>! go SENext + ] diff --git a/src/Yi/Templates.hs b/src/Yi/Templates.hs deleted file mode 100644 --- a/src/Yi/Templates.hs +++ /dev/null @@ -1,202 +0,0 @@ -{-# LANGUAGE OverloadedStrings #-} -{-# OPTIONS_HADDOCK show-extensions #-} - --- | --- Module : Yi.Templates --- License : GPL-2 --- Maintainer : yi-devel@googlegroups.com --- Stability : experimental --- Portability : portable --- --- Templates for inserting into documents - -module Yi.Templates ( templates - , templateNames - , lookupTemplate - , addTemplate - ) where - -import qualified Data.Map as Map -import Yi.Buffer (BufferM, insertN) -import Yi.Editor (EditorM, withCurrentBuffer, printMsg) -import qualified Yi.Rope as R - -type Template = String -type TemplateName = String -type TemplateLookup = Map.Map TemplateName Template - -addTemplate :: String -> EditorM () -addTemplate tName = - case lookupTemplate tName of - Nothing -> printMsg "template-name not found" - Just t -> withCurrentBuffer $ addTemplateBuffer t - where - addTemplateBuffer :: Template -> BufferM () - addTemplateBuffer = insertN . R.fromString - -templates :: TemplateLookup -templates = - Map.fromList $ concat [ haskellTemplates ] - -templateNames :: [ TemplateName ] -templateNames = Map.keys templates - - -lookupTemplate :: TemplateName -> Maybe Template -lookupTemplate name = Map.lookup name templates - - -haskellTemplates :: [ (TemplateName, Template) ] -haskellTemplates = - [ ( "haskell-module" - , unlines [ "module " - , " ()" - , "where" - , "" - , "{- Standard Library Modules Imported -}" - , "{- External Library Modules Imported -}" - , "{- Local Modules Imported -}" - , "{- End of Module Imports -}" - ] - ) - , ( "cabal-file" - , unlines [ "Name:" - , "Version:" - , "License:" - , "Author:" - , "Homepage:" - , "Build-depends: base" - , "Synopsis:" - , "" - , "" - , "Executable:" - , "Main-is:" - , "Other-modules:" - , "Include-dirs:" - , "C-sources:" - , "Extra-libraries:" - , "Extensions:" - , "Ghc-options: -Wall" - , "" - ] - ) - , ( "GPL-2" - , unlines - [ "--" - , "-- This program is free software; you can redistribute it and/or" - , "-- modify it under the terms of the GNU General Public License as" - , "-- published by the Free Software Foundation; either version 2 of" - , "-- the License, or (at your option) any later version." - , "--" - , "-- This program is distributed in the hope that it will be useful," - , "-- but WITHOUT ANY WARRANTY; without even the implied warranty of" - , "-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU" - , "-- General Public License for more details." - , "--" - , "-- You should have received a copy of the GNU General Public License" - , "-- along with this program; if not, write to the Free Software" - , "-- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA" - , "-- 02111-1307, USA." - , "--" - ] - ) - , ( "cabal-setup" - , unlines - [ "import Distribution.Simple" - , "import System.Cmd" - , " ( system )" - , "import System.Exit" - , " ( exitWith )" - , "import System" - , " ( getArgs )" - , "" - , "myHooks :: UserHooks" - , "myHooks = defaultUserHooks" - , "" - , "main :: IO ()" - , "main = do args <- getArgs" - , " processArgs args" - , "" - , "processArgs :: [ String ] -> IO ()" - , "processArgs _ = defaultMainWithHooks myHooks" - ] - ) - , ( "haskell-script" - , unlines - [ "{-" - , "-}" - , "module Main" - , " ( main )" - , "where" - , "" - , "{- Standard Library Modules Imported -}" - , "import System.Console.GetOpt" - , " ( getOpt" - , " , usageInfo" - , " , ArgOrder ( .. )" - , " , OptDescr ( .. )" - , " , ArgDescr ( .. )" - , " )" - , "import System.Environment" - , " ( getArgs" - , " , getProgName" - , " )" - , "{- External Library Modules Imported -}" - , "{- Local Modules Imported -}" - , "{- End of Imports -}" - , "" - , "data CliFlag =" - , " CliHelp" - , " | CliVersion" - , " deriving Eq" - , "" - , "" - , "options :: [ OptDescr CliFlag ]" - , "options =" - , " [ Option \"h\" [ \"help\" ]" - , " (NoArg CliHelp)" - , " \"Print the help message to standard out and then exit\"" - , "" - , " , Option \"v\" [ \"version\" ]" - , " (NoArg CliVersion)" - , " \"Print out the version of this program\"" - , " ]" - , "" - , "helpMessage :: String -> String" - , "helpMessage progName =" - , " usageInfo progName options" - , "" - , "versionMessage :: String -> String" - , "versionMessage progName = " - , " progName ++ \": This is version 0.001\"" - , "" - , "-- | The main exported function" - , "main :: IO ()" - , "main = getArgs >>= processOptions" - , "" - , "processOptions :: [ String ] -> IO ()" - , "processOptions cliArgs =" - , " case getOpt Permute options cliArgs of" - , " (flags, args, []) -> " - , " processArgs flags args" - , " (_flags, _args, errors) -> " - , " do progName <- getProgName" - , " ioError $ userError (concat errors ++ helpMessage progName)" - , "" - , "-- We assume all of the arguments are files to process" - , "processArgs :: [ CliFlag ] -> [ String ] -> IO ()" - , "processArgs flags files" - , " | elem CliHelp flags = getProgName >>= (putStrLn . helpMessage)" - , " | elem CliVersion flags = getProgName >>= (putStrLn . versionMessage)" - , " | otherwise = mapM_ processFile files" - , "" - , "-- Our processing of a file is to simply count the words" - , "-- in the file and output the number as a line." - , "processFile :: FilePath -> IO ()" - , "processFile file =" - , " do contents <- readFile file" - , " putStrLn (show $ length $ words contents)" - , "" - ] - ) - ] diff --git a/test/TestMain.hs b/test/TestMain.hs new file mode 100644 --- /dev/null +++ b/test/TestMain.hs @@ -0,0 +1,62 @@ +#!/usr/bin/env runhaskell +{-# LANGUAGE TemplateHaskell #-} +{-# LANGUAGE OverloadedStrings #-} + +import qualified Data.Map.Strict as M +import Data.Monoid +import Test.Tasty.TH +import Test.Tasty.HUnit + +import qualified Yi.Rope as R + +import Yi.Snippet.Internal + +main :: IO () +main = $defaultMainGenerator + +lp :: Snippet +lp = Snippet "lp" $ do + lit "{-# LANGUAGE " + _ <- place "OverloadedStrings" + line " #-}" + +useSnippet :: Snippet -> [EditAction] -> (Int, R.YiString) +useSnippet snip actions = + renderSnippet snip (foldl advanceEditState (initialEditState snip) actions) + +case_lp_default :: Assertion +case_lp_default = + useSnippet lp [] @?= (13, "{-# LANGUAGE OverloadedStrings #-}\n") + +case_lp_default_escape :: Assertion +case_lp_default_escape = + useSnippet lp [SEEscape] @?= (13, "{-# LANGUAGE OverloadedStrings #-}\n") + +case_lp_default_complete :: Assertion +case_lp_default_complete = + useSnippet lp [SENext] @?= (35, "{-# LANGUAGE OverloadedStrings #-}\n") + +case_lp_lambdacase_incomplete :: Assertion +case_lp_lambdacase_incomplete = + useSnippet lp (map SEInsertChar "LambdaCase") + @?= (23, "{-# LANGUAGE LambdaCase #-}\n") + +case_lp_lambdacase_complete :: Assertion +case_lp_lambdacase_complete = + useSnippet lp (map SEInsertChar "LambdaCase" <> [SENext]) + @?= (28, "{-# LANGUAGE LambdaCase #-}\n") + +case_lp_backspace :: Assertion +case_lp_backspace = + useSnippet lp (map SEInsertChar "LambdaCasx" <> [SEBackSpace] <> [SEInsertChar 'e']) + @?= (23, "{-# LANGUAGE LambdaCase #-}\n") + +case_collect_vars :: Assertion +case_collect_vars = + let Snippet _ body = lp + in collectVars body @?= M.fromList [(UserVar 0, DefaultValue "OverloadedStrings")] + +case_complete_edit_state :: Assertion +case_complete_edit_state = + advanceEditState (initialEditState lp) SENext + @?= EditState (Nothing, 0) (M.fromList [(UserVar 0, DefaultValue "OverloadedStrings")]) diff --git a/yi-snippet.cabal b/yi-snippet.cabal --- a/yi-snippet.cabal +++ b/yi-snippet.cabal @@ -1,25 +1,64 @@ -name: yi-snippet -version: 0.1.0.0 -synopsis: Snippet support for Yi -description: Snippet support for Yi -homepage: https://github.com/yi-editor/yi-snippet -license: GPL-2 -license-file: LICENSE -author: Mateusz Kowalczyk -maintainer: fuuzetsu@fuuzetsu.co.uk -category: Yi -build-type: Simple -cabal-version: >=1.10 +-- This file has been generated from package.yaml by hpack version 0.14.0. +-- +-- see: https://github.com/sol/hpack +name: yi-snippet +version: 0.13.2 +synopsis: Snippet support for yi +category: Yi +homepage: https://github.com/yi-editor/yi#readme +bug-reports: https://github.com/yi-editor/yi/issues +maintainer: Yi developers +license: GPL-2 +build-type: Simple +cabal-version: >= 1.10 + +source-repository head + type: git + location: https://github.com/yi-editor/yi + library + hs-source-dirs: + src + ghc-options: -Wall -ferror-spans + build-depends: + base >= 4.8 && < 5 + , binary >= 0.7.5 + , containers >= 0.5.6 + , data-default >= 0.5 + , free >= 4.12 + , lens >= 4.13 + , mtl >= 2.2 + , text >= 1.2 + , vector >= 0.11 + , yi-core >= 0.13.1 + , yi-rope >= 0.7 exposed-modules: - Yi.Templates + Yi.Snippet + Yi.Snippet.Internal + other-modules: + Paths_yi_snippet + default-language: Haskell2010 +test-suite spec + type: exitcode-stdio-1.0 + main-is: TestMain.hs + hs-source-dirs: + test + ghc-options: -Wall -ferror-spans build-depends: - base >=4 && <5 - , containers - , yi - , yi-rope - - hs-source-dirs: src - default-language: Haskell2010 + base >= 4.8 && < 5 + , binary >= 0.7.5 + , containers >= 0.5.6 + , data-default >= 0.5 + , free >= 4.12 + , lens >= 4.13 + , mtl >= 2.2 + , text >= 1.2 + , vector >= 0.11 + , yi-core >= 0.13.1 + , yi-rope >= 0.7 + , tasty-th + , tasty-hunit + , yi-snippet + default-language: Haskell2010