Merge pull request #159 from jhrcek/fixHlintWarnings

Fix some hlint warnings

Author: Patrick Thomson

.hlint.yaml

@@ -67,7 +67,7 @@
 # Conveniences
 - warning: {lhs: maybe a pure, rhs: maybeM a, name: Use maybeM}
 - warning: {lhs: either (const a) id, rhs: fromRight a, name: use fromRight}
-- warning: {lhs: either id (const a), rhs: fromLeft a, name: use fromRight}
+- warning: {lhs: either id (const a), rhs: fromLeft a, name: use fromLeft}
 
 # Applicative style
 - warning: {lhs: f <$> pure a <*> b, rhs: f a <$> b, name: Avoid redundant pure}

semantic-core/src/Analysis/Concrete.hs

@@ -1,4 +1,4 @@
-{-# LANGUAGE FlexibleContexts, FlexibleInstances, GeneralizedNewtypeDeriving, LambdaCase, MultiParamTypeClasses, NamedFieldPuns, RecordWildCards, TypeApplications, TypeOperators, UndecidableInstances #-}
+{-# LANGUAGE FlexibleContexts, FlexibleInstances, LambdaCase, MultiParamTypeClasses, NamedFieldPuns, RecordWildCards, TypeOperators, UndecidableInstances #-}
 module Analysis.Concrete
 ( Concrete(..)
 , concrete

semantic-core/src/Analysis/Eval.hs

@@ -1,4 +1,4 @@
-{-# LANGUAGE FlexibleContexts, GeneralizedNewtypeDeriving, LambdaCase, RankNTypes, RecordWildCards #-}
+{-# LANGUAGE FlexibleContexts, LambdaCase, RankNTypes, RecordWildCards #-}
 module Analysis.Eval
 ( eval
 , prog1

semantic-core/src/Analysis/Typecheck.hs

@@ -160,7 +160,7 @@ typecheckingAnalysis = Analysis{..}
         bool _ = pure MBool
         asBool b = unify MBool b >> pure True <|> pure False
         string _ = pure MString
-        asString s = unify MString s *> pure ""
+        asString s = unify MString s $> ""
         frame = fail "unimplemented"
         edge _ _ = pure ()
         _ ... m = m

semantic-core/src/Control/Effect/Readline.hs

@@ -81,7 +81,7 @@ instance (Carrier sig m, Effect sig, MonadException m, MonadIO m) => Carrier (Re
 
 runReadlineWithHistory :: MonadException m => ReadlineC m a -> m a
 runReadlineWithHistory block = do
-  homeDir <- liftIO $ getHomeDirectory
+  homeDir <- liftIO getHomeDirectory
   prefs <- liftIO $ readPrefs (homeDir </> ".haskeline")
   let settingsDir = homeDir </> ".local/semantic-core"
       settings = Settings

semantic-core/test/Spec.hs

@@ -1,4 +1,4 @@
-{-# LANGUAGE OverloadedStrings, TypeApplications #-}
+{-# LANGUAGE OverloadedStrings #-}
 {-# OPTIONS_GHC -fno-warn-orphans #-}
 
 module Main (main) where

src/Data/Language.hs

@@ -1,4 +1,4 @@
-{-# LANGUAGE DeriveAnyClass, DeriveGeneric, KindSignatures, LambdaCase #-}
+{-# LANGUAGE DeriveAnyClass, DeriveGeneric, KindSignatures #-}
 module Data.Language
   ( Language (..)
   , SLanguage (..)

src/Data/Project.hs

@@ -1,4 +1,4 @@
-{-# LANGUAGE DeriveAnyClass, KindSignatures, MultiWayIf #-}
+{-# LANGUAGE DeriveAnyClass, MultiWayIf #-}
 
 module Data.Project
   ( Project (..)

src/Semantic/Git.hs

@@ -19,6 +19,7 @@ import Control.Monad.IO.Class
 import Data.Attoparsec.Text   (Parser)
 import Data.Attoparsec.Text   as AP
 import Data.Char
+import Data.Either            (fromRight)
 import Data.Text              as Text
 import Shelly                 hiding (FilePath)
 import System.IO              (hSetBinaryMode)
@@ -42,7 +43,7 @@ sh = shelly . silently . onCommandHandles (initOutputHandles (`hSetBinaryMode` T
 
 -- | Parses an list of entries separated by \NUL, and on failure return []
 parseEntries :: Text -> [TreeEntry]
-parseEntries = either (const []) id . AP.parseOnly everything
+parseEntries = fromRight [] . AP.parseOnly everything
   where
     everything = AP.sepBy entryParser "\NUL" <* "\NUL\n" <* AP.endOfInput
 
@@ -87,4 +88,3 @@ data TreeEntry
   , treeEntryOid  :: OID
   , treeEntryPath :: FilePath
   } deriving (Eq, Show)
-

src/Tags/Taggable.hs

@@ -189,7 +189,7 @@ instance Taggable Expression.Call where
 instance Taggable Ruby.Send where
   snippet ann (Ruby.Send _ _ _ (Just (Term (In body _)))) = Just $ subtractLocation ann body
   snippet ann _                                           = Just $ locationByteRange ann
-  symbolName Ruby.Send{..} = maybe Nothing declaredName sendSelector
+  symbolName Ruby.Send{..} = declaredName =<< sendSelector
 
 instance Taggable []
 instance Taggable Comment.Comment