Try changing haskell source files with new workflow structure

Author: drsooch

.github/workflows/pre-commit.yml

@@ -9,18 +9,25 @@ jobs:
   file-diff:
     runs-on: ubuntu-latest
     outputs:
-      changed_files: ${{ env.GIT_DIFF }}
+      git-diff: ${{ steps.git-diff.outputs.diff }}
     steps:
-    - uses: actions/checkout@v3
-    - uses: technote-space/[email protected]
-      with:
-        PATTERNS: |
-          +(src|exe|test|ghcide|plugins|hls-plugin-api|hie-compat|hls-graph|hls-test-utils)/**/*.hs
+        - name: Checkout code
+          uses: actions/checkout@v3
+        - name: Find changed files
+          uses: technote-space/[email protected]
+          id: git-diff
+          with:
+            PATTERNS: |
+              +(src|exe|test|ghcide|plugins|hls-plugin-api|hie-compat|hls-graph|hls-test-utils)/**/*.hs
+        - name: "ECHO changed files"
+          run: echo env.GIT_DIFF
   pre-commit:
     runs-on: ubuntu-latest
     needs: file-diff
-    if: needs.file-diff.changed_files
     steps:
+    - name: "ECHO changed files"
+      run: echo ${{ needs.file-diff.outputs.git-diff }}
+    - uses: actions/checkout@v3
     - uses: ./.github/actions/setup-build
       with:
         os: ${{ runner.os }}
@@ -51,4 +58,4 @@ jobs:
     - uses: actions/setup-python@v4
     - uses: pre-commit/[email protected]
       with:
-        extra_args: --files ${{ needs.file-diff.changed_files }}
+        extra_args: --files ${{ needs.file-diff.output.git-diff }}

ghcide/src/Development/IDE/Plugin/HLS.hs

@@ -10,16 +10,16 @@ module Development.IDE.Plugin.HLS
     ) where
 
 import           Control.Exception            (SomeException)
-import           Control.Lens                 ((^.))
+import           Control.Lens         ((^.))
 import           Control.Monad
-import qualified Data.Aeson                   as J
+import qualified Data.Aeson      as J
 import           Data.Dependent.Map           (DMap)
 import qualified Data.Dependent.Map           as DMap
 import           Data.Dependent.Sum
 import           Data.Either
-import qualified Data.List                    as List
+import qualified Data.List      as List
 import           Data.List.NonEmpty           (NonEmpty, nonEmpty, toList)
-import qualified Data.Map                     as Map
+import qualified Data.Map                 as Map
 import           Data.String
 import           Data.Text                    (Text)
 import qualified Data.Text                    as T
@@ -133,15 +133,15 @@ executeCommandHandlers recorder ecs = requestHandler SWorkspaceExecuteCommand ex
     parseCmdId x = case T.splitOn ":" x of
       [plugin, command]    -> Just (PluginId plugin, CommandId command)
       [_, plugin, command] -> Just (PluginId plugin, CommandId command)
-      _                    -> Nothing
+      _          -> Nothing
 
     -- The parameters to the HLS command are always the first element
 
     execCmd ide (ExecuteCommandParams _ cmdId args) = do
       let cmdParams :: J.Value
           cmdParams = case args of
             Just (J.List (x:_)) -> x
-            _                   -> J.Null
+            _  -> J.Null
       case parseCmdId cmdId of
         -- Shortcut for immediately applying a applyWorkspaceEdit as a fallback for v3.8 code actions
         Just ("hls", "fallbackCodeAction") ->
@@ -206,6 +206,7 @@ extensiblePlugins recorder xs = mempty { P.pluginHandlers = handlers }
               Nothing -> pure $ Left $ combineErrors errs
               Just xs -> do
                 caps <- LSP.getClientCapabilities
+
                 pure $ Right $ combineResponses m config caps params xs
 
 -- ---------------------------------------------------------------------

plugins/hls-alternate-number-format-plugin/src/Ide/Plugin/Literals.hs

@@ -8,6 +8,7 @@ module Ide.Plugin.Literals (
     collectLiterals
     , Literal(..)
     , getSrcText
+
     , getSrcSpan
 ) where
 
@@ -16,7 +17,7 @@ import           Data.Text                     (Text)
 import qualified Data.Text                     as T
 import           Development.IDE.GHC.Compat    hiding (getSrcSpan)
 import           Development.IDE.Graph.Classes (NFData (rnf))
-import           Generics.SYB                  (Data, Typeable, everything,
+import           Generics.SYB  (Data, Typeable, everything,
                                                 extQ)
 import qualified GHC.Generics                  as GHC
 
@@ -29,8 +30,12 @@ data Literal = IntLiteral  LiteralSrcSpan Text Integer
              deriving (GHC.Generic, Show, Ord, Eq, Data)
 
 newtype LiteralSrcSpan = LiteralSrcSpan { unLit :: RealSrcSpan }
+
                         deriving (GHC.Generic, Show, Ord, Eq, Data)
 
+
+
+
 instance NFData LiteralSrcSpan where
     rnf x = x `seq` ()
 
@@ -40,14 +45,14 @@ instance NFData Literal
 -- | Return a Literal's Source representation
 getSrcText :: Literal -> Text
 getSrcText = \case
-  IntLiteral _ txt _  -> txt
+  IntLiteral _ txt _     -> txt
   FracLiteral _ txt _ -> txt
 
 -- | Return a Literal's Real Source location
 getSrcSpan :: Literal -> RealSrcSpan
 getSrcSpan = \case
-    IntLiteral ss _ _  -> unLit ss
-    FracLiteral ss _ _ -> unLit ss
+    IntLiteral ss _ _ -> unLit ss
+    FracLiteral ss _ _     -> unLit ss
 
 -- | Find all literals in a Parsed Source File
 collectLiterals :: (Data ast, Typeable ast) => ast -> [Literal]