Add a language pragma style "vertical_compact". (#280)

Add a language pragma style "vertical_compact". Closes #278.

Author: Javran

data/stylish-haskell.yaml

@@ -212,7 +212,9 @@ steps:
       # - compact: A more compact style.
       #
       # - compact_line: Similar to compact, but wrap each line with
-      #   `{-#LANGUAGE #-}'.
+      #   `{-# LANGUAGE #-}'.
+      #
+      # - vertical_compact: Similar to vertical, but use only one language pragma.
       #
       # Default: vertical.
       style: vertical

lib/Language/Haskell/Stylish/Config.hs

@@ -267,9 +267,10 @@ parseLanguagePragmas config o = LanguagePragmas.step
     <*> mkLanguage o
   where
     styles =
-        [ ("vertical",     LanguagePragmas.Vertical)
-        , ("compact",      LanguagePragmas.Compact)
-        , ("compact_line", LanguagePragmas.CompactLine)
+        [ ("vertical",         LanguagePragmas.Vertical)
+        , ("compact",          LanguagePragmas.Compact)
+        , ("compact_line",     LanguagePragmas.CompactLine)
+        , ("vertical_compact", LanguagePragmas.VerticalCompact)
         ]
 
 

lib/Language/Haskell/Stylish/Step/LanguagePragmas.hs

@@ -24,6 +24,7 @@ data Style
     = Vertical
     | Compact
     | CompactLine
+    | VerticalCompact
     deriving (Eq, Show)
 
 
@@ -73,6 +74,16 @@ compactLinePragmas lg columns align pragmas' = map (wrapLanguage . pad) prags
       map (++ ",") (init pragmas') ++ [last pragmas']
 
 
+--------------------------------------------------------------------------------
+verticalCompactPragmas :: String -> [String] -> Lines
+verticalCompactPragmas lg pragmas' =
+  [ "{-# " <> lg
+  , "    " <> head pragmas'
+  ]
+  <> [ "  , "  <> pragma | pragma <- tail pragmas']
+  <> [ "  #-}"]
+
+
 --------------------------------------------------------------------------------
 truncateComma :: String -> String
 truncateComma ""     = ""
@@ -83,9 +94,10 @@ truncateComma xs
 
 --------------------------------------------------------------------------------
 prettyPragmas :: String -> Maybe Int -> Int -> Bool -> Style -> [String] -> Lines
-prettyPragmas lp _    longest align Vertical    = verticalPragmas lp longest align
-prettyPragmas lp cols _       _     Compact     = compactPragmas lp cols
-prettyPragmas lp cols _       align CompactLine = compactLinePragmas lp cols align
+prettyPragmas lp _    longest align Vertical        = verticalPragmas lp longest align
+prettyPragmas lp cols _       _     Compact         = compactPragmas lp cols
+prettyPragmas lp cols _       align CompactLine     = compactLinePragmas lp cols align
+prettyPragmas lp _    _       _     VerticalCompact = verticalCompactPragmas lp
 
 
 --------------------------------------------------------------------------------

tests/Language/Haskell/Stylish/Step/LanguagePragmas/Tests.hs

@@ -30,6 +30,7 @@ tests = testGroup "Language.Haskell.Stylish.Step.LanguagePragmas.Tests"
     , testCase "case 10" case10
     , testCase "case 11" case11
     , testCase "case 12" case12
+    , testCase "case 13" case13
     ]
 
 lANG :: String
@@ -236,3 +237,25 @@ case12 = expected @=? testStep (step Nothing Compact False False "language") inp
         [ "{-# language NoImplicitPrelude, OverloadedStrings, ScopedTypeVariables, TemplateHaskell, ViewPatterns #-}"
         , "module Main where"
         ]
+
+--------------------------------------------------------------------------------
+case13 :: Assertion
+case13 = expected @=? testStep (step Nothing VerticalCompact False False "language") input
+  where
+    input = unlines
+        [ "{-# LANGUAGE ViewPatterns, OverloadedStrings #-}"
+        , "{-# LANGUAGE TemplateHaskell, ViewPatterns #-}"
+        , "{-# LANGUAGE ScopedTypeVariables, NoImplicitPrelude #-}"
+        , "module Main where"
+        ]
+
+    expected = unlines
+        [ "{-# language"
+        , "    NoImplicitPrelude"
+        , "  , OverloadedStrings"
+        , "  , ScopedTypeVariables"
+        , "  , TemplateHaskell"
+        , "  , ViewPatterns"
+        , "  #-}"
+        , "module Main where"
+        ]