Main: main': m layout

Author: Anton-Latukha

main/Main.hs

@@ -152,15 +152,15 @@ main' opts@Options{..} = runWithBasicEffectsIO opts execContentsFilesOrRepl
     | isEvaluate =
       if
         | isTrace                       -> evaluateExprWith nixTracingEvalExprLoc expr
-        | Just path <- getReduce           -> evaluateExprWith (reduction path . coerce) expr
-        | null getArg || null getArgstr       -> evaluateExprWith nixEvalExprLoc expr
+        | Just path <- getReduce        -> evaluateExprWith (reduction path . coerce) expr
+        | null getArg || null getArgstr -> evaluateExprWith nixEvalExprLoc expr
         | otherwise                     -> processResult printer <=< nixEvalExprLoc (coerce mpath) $ expr
     | isXml                        = fail "Rendering expression trees to XML is not yet implemented"
     | isJson                       = fail "Rendering expression trees to JSON is not implemented"
-    | getVerbosity >= DebugInfo       =  liftIO . putStr . ppShow . stripAnnotation $ expr
-    | isCache , Just path <- mpath =  liftIO . writeCache (replaceExtension path "nixc") $ expr
-    | isParseOnly                  =  void . liftIO . Exception.evaluate . force $ expr
-    | otherwise                  =
+    | getVerbosity >= DebugInfo    = liftIO . putStr . ppShow . stripAnnotation $ expr
+    | isCache , Just path <- mpath = liftIO . writeCache (replaceExtension path "nixc") $ expr
+    | isParseOnly                  = void . liftIO . Exception.evaluate . force $ expr
+    | otherwise                    =
       liftIO .
         renderIO
           stdout
@@ -179,16 +179,16 @@ main' opts@Options{..} = runWithBasicEffectsIO opts execContentsFilesOrRepl
       | otherwise = printer'
      where
       printer'
-        | isXml       = fun (ignoreContext . toXML)                     normalForm
+        | isXml     = fun (ignoreContext . toXML)                    normalForm
         -- 2021-05-27: NOTE: With naive fix of the #941
         -- This is overall a naive printer implementation, as options should interact/respect one another.
         -- A nice question: "Should respect one another to what degree?": Go full combinator way, for which
         -- old Nix CLI is nototrious for (and that would mean to reimplement the old Nix CLI),
         -- OR: https://github.com/haskell-nix/hnix/issues/172 and have some sane standart/default behaviour for (most) keys.
-        | isJson      = fun (ignoreContext . mempty . toJSONNixString) normalForm
-        | isStrict    = fun (show . prettyNValue)                       normalForm
-        | isValues    = fun (show . prettyNValueProv)                   removeEffects
-        | otherwise = fun (show . prettyNValue)                       removeEffects
+        | isJson    = fun (ignoreContext . mempty . toJSONNixString) normalForm
+        | isStrict  = fun (show . prettyNValue)                      normalForm
+        | isValues  = fun (show . prettyNValueProv)                  removeEffects
+        | otherwise = fun (show . prettyNValue)                      removeEffects
        where
         fun
           :: (b -> Text)
@@ -238,9 +238,9 @@ main' opts@Options{..} = runWithBasicEffectsIO opts execContentsFilesOrRepl
                           (forceEntry path nv)
                           (descend &&
                             deferred
-                            (const False)
-                            (const True)
-                            val
+                              (const False)
+                              (const True)
+                              val
                           )
                     )
                     (pure . pure . Free)

src/Nix/Pretty.hs

@@ -89,7 +89,8 @@ hasAttrOp = getSpecialOperator NHasAttrOp
 -- | Determine if to return doc wraped into parens,
 -- according the given operator.
 precedenceWrap :: OperatorInfo -> NixDoc ann -> Doc ann
-precedenceWrap op sub = maybeWrap (getDoc sub)
+precedenceWrap op sub =
+  maybeWrap (getDoc sub)
  where
   maybeWrap :: Doc ann -> Doc ann
   maybeWrap =