Fix formatting issues

- Make verify_formatting.py skip Types.hs and Common.hs
- Fix formatting issues in rest of the files

ihaskell-display/ihaskell-widgets/src/IHaskell/Display/Widgets/Bool/CheckBox.hs

@@ -4,11 +4,10 @@
 {-# LANGUAGE TypeSynonymInstances #-}
 
 module IHaskell.Display.Widgets.Bool.CheckBox (
-    -- * The CheckBox Widget
-    CheckBoxWidget,
-    -- * Constructor
-    mkCheckBoxWidget,
-    ) where
+-- * The CheckBox Widget
+CheckBoxWidget, 
+                -- * Constructor
+                mkCheckBoxWidget) where
 
 -- To keep `cabal repl` happy when running from the ihaskell repo
 import           Prelude
@@ -18,7 +17,7 @@ import           Data.Aeson
 import           Data.HashMap.Strict as HM
 import           Data.IORef (newIORef)
 import           Data.Text (Text)
-import           Data.Vinyl (Rec (..), (<+>))
+import           Data.Vinyl (Rec(..), (<+>))
 
 import           IHaskell.Display
 import           IHaskell.Eval.Widgets
@@ -41,7 +40,8 @@ mkCheckBoxWidget = do
   stateIO <- newIORef widgetState
 
   let widget = IPythonWidget uuid stateIO
-      initData = object ["model_name" .= str "WidgetModel", "widget_class" .= str "IPython.Checkbox"]
+      initData = object
+                   ["model_name" .= str "WidgetModel", "widget_class" .= str "IPython.Checkbox"]
 
   -- Open a comm for this widget, and store it in the kernel state
   widgetSendOpen widget initData $ toJSON widgetState

ihaskell-display/ihaskell-widgets/src/IHaskell/Display/Widgets/Bool/ToggleButton.hs

@@ -4,11 +4,10 @@
 {-# LANGUAGE TypeSynonymInstances #-}
 
 module IHaskell.Display.Widgets.Bool.ToggleButton (
-    -- * The ToggleButton Widget
-    ToggleButton,
-    -- * Constructor
-    mkToggleButton,
-    ) where
+-- * The ToggleButton Widget
+ToggleButton, 
+              -- * Constructor
+              mkToggleButton) where
 
 -- To keep `cabal repl` happy when running from the ihaskell repo
 import           Prelude
@@ -18,7 +17,7 @@ import           Data.Aeson
 import           Data.HashMap.Strict as HM
 import           Data.IORef (newIORef)
 import           Data.Text (Text)
-import           Data.Vinyl (Rec (..), (<+>))
+import           Data.Vinyl (Rec(..), (<+>))
 
 import           IHaskell.Display
 import           IHaskell.Eval.Widgets
@@ -38,15 +37,16 @@ mkToggleButton = do
 
   let boolState = defaultBoolWidget "ToggleButtonView"
       toggleState = (STooltip =:: "")
-                 :& (SIcon =:: "")
-                 :& (SButtonStyle =:: DefaultButton)
-                 :& RNil
+                    :& (SIcon =:: "")
+                    :& (SButtonStyle =:: DefaultButton)
+                    :& RNil
       widgetState = WidgetState (boolState <+> toggleState)
 
   stateIO <- newIORef widgetState
 
   let widget = IPythonWidget uuid stateIO
-      initData = object ["model_name" .= str "WidgetModel", "widget_class" .= str "IPython.ToggleButton"]
+      initData = object
+                   ["model_name" .= str "WidgetModel", "widget_class" .= str "IPython.ToggleButton"]
 
   -- Open a comm for this widget, and store it in the kernel state
   widgetSendOpen widget initData $ toJSON widgetState

ihaskell-display/ihaskell-widgets/src/IHaskell/Display/Widgets/Button.hs

@@ -4,13 +4,12 @@
 {-# LANGUAGE TypeSynonymInstances #-}
 
 module IHaskell.Display.Widgets.Button (
-    -- * The Button Widget
-    Button,
-    -- * Create a new button
-    mkButton,
-    -- * Click manipulation
-    triggerClick,
-    ) where
+-- * The Button Widget
+Button, 
+        -- * Create a new button
+        mkButton, 
+                  -- * Click manipulation
+                  triggerClick) where
 
 -- To keep `cabal repl` happy when running from the ihaskell repo
 import           Prelude
@@ -20,7 +19,7 @@ import           Data.Aeson
 import           Data.HashMap.Strict as HM
 import           Data.IORef (newIORef)
 import           Data.Text (Text)
-import           Data.Vinyl (Rec (..), (<+>))
+import           Data.Vinyl (Rec(..), (<+>))
 
 import           IHaskell.Display
 import           IHaskell.Eval.Widgets
@@ -40,22 +39,19 @@ mkButton = do
 
   let dom = defaultDOMWidget "ButtonView"
       but = (SDescription =:: "")
-         :& (STooltip =:: "")
-         :& (SDisabled =:: False)
-         :& (SIcon =:: "")
-         :& (SButtonStyle =:: DefaultButton)
-         :& (SClickHandler =:: return ())
-         :& RNil
+            :& (STooltip =:: "")
+            :& (SDisabled =:: False)
+            :& (SIcon =:: "")
+            :& (SButtonStyle =:: DefaultButton)
+            :& (SClickHandler =:: return ())
+            :& RNil
       buttonState = WidgetState (dom <+> but)
 
   stateIO <- newIORef buttonState
 
   let button = IPythonWidget uuid stateIO
 
-  let initData = object
-                   [ "model_name" .= str "WidgetModel"
-                   , "widget_class" .= str "IPython.Button"
-                   ]
+  let initData = object ["model_name" .= str "WidgetModel", "widget_class" .= str "IPython.Button"]
 
   -- Open a comm for this widget, and store it in the kernel state
   widgetSendOpen button initData $ toJSON buttonState

ihaskell-display/ihaskell-widgets/src/IHaskell/Display/Widgets/Common.hs

@@ -158,3 +158,6 @@ instance ToJSON ImageFormatValue where
 
 -- | Options for selection widgets.
 data SelectionOptions = OptionLabels [Text] | OptionDict [(Text, Text)]
+
+
+

ihaskell-display/ihaskell-widgets/src/IHaskell/Display/Widgets/Image.hs

@@ -4,11 +4,10 @@
 {-# LANGUAGE TypeSynonymInstances #-}
 
 module IHaskell.Display.Widgets.Image (
-    -- * The Image Widget
-    ImageWidget,
-    -- * Constructor
-    mkImageWidget,
-    ) where
+-- * The Image Widget
+ImageWidget, 
+             -- * Constructor
+             mkImageWidget) where
 
 -- To keep `cabal repl` happy when running from the ihaskell repo
 import           Prelude
@@ -19,7 +18,7 @@ import           Data.HashMap.Strict as HM
 import           Data.IORef (newIORef)
 import           Data.Monoid (mempty)
 import           Data.Text (Text)
-import           Data.Vinyl (Rec (..), (<+>))
+import           Data.Vinyl (Rec(..), (<+>))
 
 import           IHaskell.Display
 import           IHaskell.Eval.Widgets
@@ -39,18 +38,15 @@ mkImageWidget = do
 
   let dom = defaultDOMWidget "ImageView"
       img = (SImageFormat =:: PNG)
-         :& (SB64Value =:: mempty)
-         :& RNil
+            :& (SB64Value =:: mempty)
+            :& RNil
       widgetState = WidgetState (dom <+> img)
 
   stateIO <- newIORef widgetState
 
   let widget = IPythonWidget uuid stateIO
 
-  let initData = object
-                   [ "model_name" .= str "WidgetModel"
-                   , "widget_class" .= str "IPython.Image"
-                   ]
+  let initData = object ["model_name" .= str "WidgetModel", "widget_class" .= str "IPython.Image"]
 
   -- Open a comm for this widget, and store it in the kernel state
   widgetSendOpen widget initData $ toJSON widgetState

ihaskell-display/ihaskell-widgets/src/IHaskell/Display/Widgets/Output.hs

@@ -23,7 +23,7 @@ import           Data.Aeson
 import           Data.HashMap.Strict as HM
 import           Data.IORef (newIORef)
 import           Data.Text (Text)
-import           Data.Vinyl (Rec (..), (<+>))
+import           Data.Vinyl (Rec(..), (<+>))
 
 import           IHaskell.Display
 import           IHaskell.Eval.Widgets

ihaskell-display/ihaskell-widgets/src/IHaskell/Display/Widgets/Selection/Dropdown.hs

@@ -4,11 +4,10 @@
 {-# LANGUAGE TypeSynonymInstances #-}
 
 module IHaskell.Display.Widgets.Selection.Dropdown (
-    -- * The Dropdown Widget
-    Dropdown,
-    -- * Constructor
-    mkDropdown,
-    ) where
+-- * The Dropdown Widget
+Dropdown, 
+          -- * Constructor
+          mkDropdown) where
 
 -- To keep `cabal repl` happy when running from the ihaskell repo
 import           Prelude
@@ -18,7 +17,7 @@ import           Data.Aeson
 import qualified Data.HashMap.Strict as HM
 import           Data.IORef (newIORef)
 import           Data.Text (Text)
-import           Data.Vinyl (Rec (..), (<+>))
+import           Data.Vinyl (Rec(..), (<+>))
 
 import           IHaskell.Display
 import           IHaskell.Eval.Widgets
@@ -42,7 +41,8 @@ mkDropdown = do
   stateIO <- newIORef widgetState
 
   let widget = IPythonWidget uuid stateIO
-      initData = object ["model_name" .= str "WidgetModel", "widget_class" .= str "IPython.Dropdown"]
+      initData = object
+                   ["model_name" .= str "WidgetModel", "widget_class" .= str "IPython.Dropdown"]
 
   -- Open a comm for this widget, and store it in the kernel state
   widgetSendOpen widget initData $ toJSON widgetState
@@ -71,9 +71,10 @@ instance IHaskellWidget Dropdown where
       OptionLabels _ -> do
         setField' widget SSelectedLabel label
         setField' widget SSelectedValue label
-      OptionDict ps -> case lookup label ps of
-        Nothing -> return ()
-        Just value -> do
-          setField' widget SSelectedLabel label
-          setField' widget SSelectedValue value
+      OptionDict ps ->
+        case lookup label ps of
+          Nothing -> return ()
+          Just value -> do
+            setField' widget SSelectedLabel label
+            setField' widget SSelectedValue value
     triggerSelection widget

ihaskell-display/ihaskell-widgets/src/IHaskell/Display/Widgets/Selection/RadioButtons.hs

@@ -4,11 +4,10 @@
 {-# LANGUAGE TypeSynonymInstances #-}
 
 module IHaskell.Display.Widgets.Selection.RadioButtons (
-    -- * The RadioButtons Widget
-    RadioButtons,
-    -- * Constructor
-    mkRadioButtons,
-    ) where
+-- * The RadioButtons Widget
+RadioButtons, 
+              -- * Constructor
+              mkRadioButtons) where
 
 -- To keep `cabal repl` happy when running from the ihaskell repo
 import           Prelude
@@ -18,7 +17,7 @@ import           Data.Aeson
 import qualified Data.HashMap.Strict as HM
 import           Data.IORef (newIORef)
 import           Data.Text (Text)
-import           Data.Vinyl (Rec (..), (<+>))
+import           Data.Vinyl (Rec(..), (<+>))
 
 import           IHaskell.Display
 import           IHaskell.Eval.Widgets
@@ -40,7 +39,8 @@ mkRadioButtons = do
   stateIO <- newIORef widgetState
 
   let widget = IPythonWidget uuid stateIO
-      initData = object ["model_name" .= str "WidgetModel", "widget_class" .= str "IPython.RadioButtons"]
+      initData = object
+                   ["model_name" .= str "WidgetModel", "widget_class" .= str "IPython.RadioButtons"]
 
   -- Open a comm for this widget, and store it in the kernel state
   widgetSendOpen widget initData $ toJSON widgetState
@@ -69,9 +69,10 @@ instance IHaskellWidget RadioButtons where
       OptionLabels _ -> do
         setField' widget SSelectedLabel label
         setField' widget SSelectedValue label
-      OptionDict ps -> case lookup label ps of
-        Nothing -> return ()
-        Just value -> do
-          setField' widget SSelectedLabel label
-          setField' widget SSelectedValue value
+      OptionDict ps ->
+        case lookup label ps of
+          Nothing -> return ()
+          Just value -> do
+            setField' widget SSelectedLabel label
+            setField' widget SSelectedValue value
     triggerSelection widget

ihaskell-display/ihaskell-widgets/src/IHaskell/Display/Widgets/Selection/Select.hs

@@ -4,11 +4,10 @@
 {-# LANGUAGE TypeSynonymInstances #-}
 
 module IHaskell.Display.Widgets.Selection.Select (
-    -- * The Select Widget
-    SelectWidget,
-    -- * Constructor
-    mkSelectWidget,
-    ) where
+-- * The Select Widget
+SelectWidget, 
+              -- * Constructor
+              mkSelectWidget) where
 
 -- To keep `cabal repl` happy when running from the ihaskell repo
 import           Prelude
@@ -18,7 +17,7 @@ import           Data.Aeson
 import qualified Data.HashMap.Strict as HM
 import           Data.IORef (newIORef)
 import           Data.Text (Text)
-import           Data.Vinyl (Rec (..), (<+>))
+import           Data.Vinyl (Rec(..), (<+>))
 
 import           IHaskell.Display
 import           IHaskell.Eval.Widgets
@@ -69,9 +68,10 @@ instance IHaskellWidget SelectWidget where
       OptionLabels _ -> do
         setField' widget SSelectedLabel label
         setField' widget SSelectedValue label
-      OptionDict ps -> case lookup label ps of
-        Nothing -> return ()
-        Just value -> do
-          setField' widget SSelectedLabel label
-          setField' widget SSelectedValue value
+      OptionDict ps ->
+        case lookup label ps of
+          Nothing -> return ()
+          Just value -> do
+            setField' widget SSelectedLabel label
+            setField' widget SSelectedValue value
     triggerSelection widget

ihaskell-display/ihaskell-widgets/src/IHaskell/Display/Widgets/Selection/SelectMultiple.hs

@@ -4,11 +4,10 @@
 {-# LANGUAGE TypeSynonymInstances #-}
 
 module IHaskell.Display.Widgets.Selection.SelectMultiple (
-    -- * The SelectMultiple Widget
-    SelectMultipleWidget,
-    -- * Constructor
-    mkSelectMultipleWidget,
-    ) where
+-- * The SelectMultiple Widget
+SelectMultipleWidget, 
+                      -- * Constructor
+                      mkSelectMultipleWidget) where
 
 -- To keep `cabal repl` happy when running from the ihaskell repo
 import           Prelude
@@ -19,7 +18,7 @@ import qualified Data.HashMap.Strict as HM
 import           Data.IORef (newIORef)
 import           Data.Text (Text)
 import qualified Data.Vector as V
-import           Data.Vinyl (Rec (..), (<+>))
+import           Data.Vinyl (Rec(..), (<+>))
 
 import           IHaskell.Display
 import           IHaskell.Eval.Widgets
@@ -41,7 +40,10 @@ mkSelectMultipleWidget = do
   stateIO <- newIORef widgetState
 
   let widget = IPythonWidget uuid stateIO
-      initData = object ["model_name" .= str "WidgetModel", "widget_class" .= str "IPython.SelectMultiple"]
+      initData = object
+                   [ "model_name" .= str "WidgetModel"
+                   , "widget_class" .= str "IPython.SelectMultiple"
+                   ]
 
   -- Open a comm for this widget, and store it in the kernel state
   widgetSendOpen widget initData $ toJSON widgetState
@@ -71,9 +73,10 @@ instance IHaskellWidget SelectMultipleWidget where
       OptionLabels _ -> do
         setField' widget SSelectedLabels labelList
         setField' widget SSelectedValues labelList
-      OptionDict ps -> case sequence $ map (`lookup` ps) labelList of
-        Nothing -> return ()
-        Just valueList -> do
-          setField' widget SSelectedLabels labelList
-          setField' widget SSelectedValues valueList
+      OptionDict ps ->
+        case sequence $ map (`lookup` ps) labelList of
+          Nothing -> return ()
+          Just valueList -> do
+            setField' widget SSelectedLabels labelList
+            setField' widget SSelectedValues valueList
     triggerSelection widget

ihaskell-display/ihaskell-widgets/src/IHaskell/Display/Widgets/Selection/ToggleButtons.hs

@@ -4,11 +4,10 @@
 {-# LANGUAGE TypeSynonymInstances #-}
 
 module IHaskell.Display.Widgets.Selection.ToggleButtons (
-    -- * The ToggleButtons Widget
-    ToggleButtons,
-    -- * Constructor
-    mkToggleButtons,
-    ) where
+-- * The ToggleButtons Widget
+ToggleButtons, 
+               -- * Constructor
+               mkToggleButtons) where
 
 -- To keep `cabal repl` happy when running from the ihaskell repo
 import           Prelude
@@ -18,7 +17,7 @@ import           Data.Aeson
 import qualified Data.HashMap.Strict as HM
 import           Data.IORef (newIORef)
 import           Data.Text (Text)
-import           Data.Vinyl (Rec (..), (<+>))
+import           Data.Vinyl (Rec(..), (<+>))
 
 import           IHaskell.Display
 import           IHaskell.Eval.Widgets
@@ -37,15 +36,18 @@ mkToggleButtons = do
   uuid <- U.random
   let selectionAttrs = defaultSelectionWidget "ToggleButtonsView"
       toggleButtonsAttrs = (STooltips =:: [])
-                        :& (SIcons =:: [])
-                        :& (SButtonStyle =:: DefaultButton)
-                        :& RNil
+                           :& (SIcons =:: [])
+                           :& (SButtonStyle =:: DefaultButton)
+                           :& RNil
       widgetState = WidgetState $ selectionAttrs <+> toggleButtonsAttrs
 
   stateIO <- newIORef widgetState
 
   let widget = IPythonWidget uuid stateIO
-      initData = object ["model_name" .= str "WidgetModel", "widget_class" .= str "IPython.ToggleButtons"]
+      initData = object
+                   [ "model_name" .= str "WidgetModel"
+                   , "widget_class" .= str "IPython.ToggleButtons"
+                   ]
 
   -- Open a comm for this widget, and store it in the kernel state
   widgetSendOpen widget initData $ toJSON widgetState
@@ -74,9 +76,10 @@ instance IHaskellWidget ToggleButtons where
       OptionLabels _ -> do
         setField' widget SSelectedLabel label
         setField' widget SSelectedValue label
-      OptionDict ps -> case lookup label ps of
-        Nothing -> return ()
-        Just value -> do
-          setField' widget SSelectedLabel label
-          setField' widget SSelectedValue value
+      OptionDict ps ->
+        case lookup label ps of
+          Nothing -> return ()
+          Just value -> do
+            setField' widget SSelectedLabel label
+            setField' widget SSelectedValue value
     triggerSelection widget

ihaskell-display/ihaskell-widgets/src/IHaskell/Display/Widgets/String/HTML.hs

@@ -4,11 +4,10 @@
 {-# LANGUAGE TypeSynonymInstances #-}
 
 module IHaskell.Display.Widgets.String.HTML (
-    -- * The HTML Widget
-    HTMLWidget,
-    -- * Constructor
-    mkHTMLWidget,
-    ) where
+-- * The HTML Widget
+HTMLWidget, 
+            -- * Constructor
+            mkHTMLWidget) where
 
 -- To keep `cabal repl` happy when running from the ihaskell repo
 import           Prelude
@@ -17,7 +16,7 @@ import           Control.Monad (when, join)
 import           Data.Aeson
 import           Data.IORef (newIORef)
 import           Data.Text (Text)
-import           Data.Vinyl (Rec (..), (<+>))
+import           Data.Vinyl (Rec(..), (<+>))
 
 import           IHaskell.Display
 import           IHaskell.Eval.Widgets

ihaskell-display/ihaskell-widgets/src/IHaskell/Display/Widgets/String/Latex.hs

@@ -4,11 +4,10 @@
 {-# LANGUAGE TypeSynonymInstances #-}
 
 module IHaskell.Display.Widgets.String.Latex (
-    -- * The Latex Widget
-    LatexWidget,
-    -- * Constructor
-    mkLatexWidget,
-    ) where
+-- * The Latex Widget
+LatexWidget, 
+             -- * Constructor
+             mkLatexWidget) where
 
 -- To keep `cabal repl` happy when running from the ihaskell repo
 import           Prelude
@@ -17,7 +16,7 @@ import           Control.Monad (when, join)
 import           Data.Aeson
 import           Data.IORef (newIORef)
 import           Data.Text (Text)
-import           Data.Vinyl (Rec (..), (<+>))
+import           Data.Vinyl (Rec(..), (<+>))
 
 import           IHaskell.Display
 import           IHaskell.Eval.Widgets

ihaskell-display/ihaskell-widgets/src/IHaskell/Display/Widgets/String/Text.hs

@@ -4,13 +4,12 @@
 {-# LANGUAGE TypeSynonymInstances #-}
 
 module IHaskell.Display.Widgets.String.Text (
-    -- * The Text Widget
-    TextWidget,
-    -- * Constructor
-    mkTextWidget,
-    -- * Submit handling
-    triggerSubmit,
-    ) where
+-- * The Text Widget
+TextWidget, 
+            -- * Constructor
+            mkTextWidget, 
+                          -- * Submit handling
+                          triggerSubmit) where
 
 -- To keep `cabal repl` happy when running from the ihaskell repo
 import           Prelude
@@ -20,7 +19,7 @@ import           Data.Aeson
 import qualified Data.HashMap.Strict as Map
 import           Data.IORef (newIORef)
 import           Data.Text (Text)
-import           Data.Vinyl (Rec (..), (<+>))
+import           Data.Vinyl (Rec(..), (<+>))
 
 import           IHaskell.Display
 import           IHaskell.Eval.Widgets

ihaskell-display/ihaskell-widgets/src/IHaskell/Display/Widgets/String/TextArea.hs

@@ -4,11 +4,10 @@
 {-# LANGUAGE TypeSynonymInstances #-}
 
 module IHaskell.Display.Widgets.String.TextArea (
-    -- * The TextArea Widget
-    TextAreaWidget,
-    -- * Constructor
-    mkTextAreaWidget,
-    ) where
+-- * The TextArea Widget
+TextAreaWidget, 
+                -- * Constructor
+                mkTextAreaWidget) where
 
 -- To keep `cabal repl` happy when running from the ihaskell repo
 import           Prelude
@@ -17,7 +16,7 @@ import           Control.Monad (when, join)
 import           Data.Aeson
 import           Data.IORef (newIORef)
 import           Data.Text (Text)
-import           Data.Vinyl (Rec (..), (<+>))
+import           Data.Vinyl (Rec(..), (<+>))
 
 import           IHaskell.Display
 import           IHaskell.Eval.Widgets
@@ -38,7 +37,8 @@ mkTextAreaWidget = do
   stateIO <- newIORef widgetState
 
   let widget = IPythonWidget uuid stateIO
-      initData = object ["model_name" .= str "WidgetModel", "widget_class" .= str "IPython.Textarea"]
+      initData = object
+                   ["model_name" .= str "WidgetModel", "widget_class" .= str "IPython.Textarea"]
 
   -- Open a comm for this widget, and store it in the kernel state
   widgetSendOpen widget initData $ toJSON widgetState

ihaskell-display/ihaskell-widgets/src/IHaskell/Display/Widgets/Types.hs

@@ -329,3 +329,6 @@ str = id
 instance ToJSON Natural where
   toJSON 0 = String ""
   toJSON n = String . pack $ show n
+
+
+

verify_formatting.py

@@ -51,9 +51,14 @@ for source_dir in ["src", "ipython-kernel", "ihaskell-display"]:
             continue
 
         for filename in filenames:
-            # Take Haskell files, but ignore the Cabal Setup.hs
-            # Also ignore IHaskellPrelude.hs, it uses CPP in weird places
-            ignored_files = ["Setup.hs", "IHaskellPrelude.hs"]
+            if "ihaskell-display/ihaskell-widgets/src/IHaskell/Display/Widgets" in root:
+                # Ignore Types.hs and Common.hs from ihaskell-widgets
+                # They cause issues with hindent, due to promoted types
+                ignored_files = ["Types.hs", "Common.hs"]
+            else:
+                # Take Haskell files, but ignore the Cabal Setup.hs
+                # Also ignore IHaskellPrelude.hs, it uses CPP in weird places
+                ignored_files = ["Setup.hs", "IHaskellPrelude.hs"]
             if filename.endswith(".hs") and filename not in ignored_files:
                 sources.append(os.path.join(root, filename))