remove some redundancies between cabal and cabal-project plugin

Author: rm41339

haskell-language-server.cabal

@@ -369,6 +369,8 @@ library hls-cabal-project-plugin
     , pretty
     , cabal-install
     , cabal-install-solver
+    , haskell-language-server:hls-cabal-plugin
+
 
   hs-source-dirs:   plugins/hls-cabal-project-plugin/src
 

plugins/hls-cabal-plugin/src/Ide/Plugin/Cabal/Diagnostics.hs

@@ -5,6 +5,8 @@ module Ide.Plugin.Cabal.Diagnostics
 , warningDiagnostic
 , positionFromCabalPosition
 , fatalParseErrorDiagnostic
+, toBeginningOfNextLine
+, mkDiag
   -- * Re-exports
 , FileDiagnostic
 , Diagnostic(..)

plugins/hls-cabal-project-plugin/src/Ide/Plugin/CabalProject/Diagnostics.hs

@@ -3,7 +3,7 @@
 module Ide.Plugin.CabalProject.Diagnostics
 ( errorDiagnostic
 , warningDiagnostic
-, positionFromCabalProjectPosition
+, positionFromCabalPosition
 , fatalParseErrorDiagnostic
   -- * Re-exports
 , FileDiagnostic
@@ -18,6 +18,9 @@ import           Development.IDE.Types.Diagnostics (fdLspDiagnosticL,
                                                     ideErrorWithSource)
 import           Distribution.Fields               (showPError, showPWarning)
 import qualified Distribution.Parsec               as Syntax
+import           Ide.Plugin.Cabal.Diagnostics      (mkDiag,
+                                                    positionFromCabalPosition,
+                                                    toBeginningOfNextLine)
 import           Ide.PluginUtils                   (extendNextLine)
 import           Language.LSP.Protocol.Lens        (range)
 import           Language.LSP.Protocol.Types       (Diagnostic (..),
@@ -30,64 +33,18 @@ import           Language.LSP.Protocol.Types       (Diagnostic (..),
 -- | Produce a diagnostic for a fatal Cabal parser error.
 fatalParseErrorDiagnostic :: NormalizedFilePath -> T.Text -> FileDiagnostic
 fatalParseErrorDiagnostic fp msg =
-  mkDiag fp "cabal" DiagnosticSeverity_Error (toBeginningOfNextLine Syntax.zeroPos) msg
+  mkDiag fp "cabal-project" DiagnosticSeverity_Error (toBeginningOfNextLine Syntax.zeroPos) msg
 
 -- | Produce a diagnostic from a Cabal parser error
 errorDiagnostic :: NormalizedFilePath -> Syntax.PError -> FileDiagnostic
 errorDiagnostic fp err@(Syntax.PError pos _) =
-  mkDiag fp "cabal" DiagnosticSeverity_Error (toBeginningOfNextLine pos) msg
+  mkDiag fp "cabal-project" DiagnosticSeverity_Error (toBeginningOfNextLine pos) msg
   where
     msg = T.pack $ showPError (fromNormalizedFilePath fp) err
 
 -- | Produce a diagnostic from a Cabal parser warning
 warningDiagnostic :: NormalizedFilePath -> Syntax.PWarning -> FileDiagnostic
 warningDiagnostic fp warning@(Syntax.PWarning _ pos _) =
-  mkDiag fp "cabal" DiagnosticSeverity_Warning (toBeginningOfNextLine pos) msg
+  mkDiag fp "cabal-project" DiagnosticSeverity_Warning (toBeginningOfNextLine pos) msg
   where
     msg = T.pack $ showPWarning (fromNormalizedFilePath fp) warning
-
--- | The Cabal parser does not output a _range_ for a warning/error,
--- only a single source code 'Lib.Position'.
--- We define the range to be _from_ this position
--- _to_ the first column of the next line.
-toBeginningOfNextLine :: Syntax.Position -> Range
-toBeginningOfNextLine cabalPos = extendNextLine $ Range pos pos
-   where
-    pos = positionFromCabalProjectPosition cabalPos
-
--- | Convert a 'Lib.Position' from Cabal to a 'Range' that LSP understands.
---
--- Prefer this function over hand-rolled unpacking/packing, since LSP is zero-based,
--- while Cabal is one-based.
---
--- >>> positionFromCabalPosition $ Lib.Position 1 1
--- Position 0 0
-positionFromCabalProjectPosition :: Syntax.Position -> Position
-positionFromCabalProjectPosition (Syntax.Position line column) = Position (fromIntegral line') (fromIntegral col')
-  where
-    -- LSP is zero-based, Cabal is one-based
-    -- Cabal can return line 0 for errors in the first line
-    line' = if line <= 0 then 0 else line-1
-    col' = if column <= 0 then 0 else column-1
-
--- | Create a 'FileDiagnostic'
-mkDiag
-  :: NormalizedFilePath
-  -- ^ Cabal file path
-  -> T.Text
-  -- ^ Where does the diagnostic come from?
-  -> DiagnosticSeverity
-  -- ^ Severity
-  -> Range
-  -- ^ Which source code range should the editor highlight?
-  -> T.Text
-  -- ^ The message displayed by the editor
-  -> FileDiagnostic
-mkDiag file diagSource sev loc msg =
-  ideErrorWithSource
-    (Just diagSource)
-    (Just sev)
-    file
-    msg
-    Nothing
-    & fdLspDiagnosticL . range .~ loc

plugins/hls-cabal-project-plugin/src/Ide/Plugin/CabalProject/Orphans.hs

@@ -13,25 +13,7 @@ import qualified Distribution.Solver.Types.ProjectConfigPath as PCPath
 import           GHC.Generics                                (Generic)
 
 import qualified Distribution.Client.ProjectConfig.Types     as PC
-
--- ----------------------------------------------------------------
--- Cabal-syntax orphan instances we need sometimes
--- ----------------------------------------------------------------
-
-instance NFData (Field Position) where
-    rnf (Field name fieldLines) = rnf name `seq` rnf fieldLines
-    rnf (Section name sectionArgs fields) =  rnf name `seq` rnf sectionArgs `seq` rnf fields
-
-instance NFData (Name Position) where
-    rnf (Name ann fName) = rnf ann `seq` rnf fName
-
-instance NFData (FieldLine Position) where
-    rnf (FieldLine ann bs) = rnf ann `seq` rnf bs
-
-instance NFData (SectionArg Position) where
-    rnf (SecArgName ann bs)  = rnf ann `seq` rnf bs
-    rnf (SecArgStr ann bs)   = rnf ann `seq` rnf bs
-    rnf (SecArgOther ann bs) = rnf ann `seq` rnf bs
+import           Ide.Plugin.Cabal.Orphans                    ()
 
 -- Project Config Orphans