Merge pull request IntersectMBO#5410 from input-output-hk/mgalazyn/fix/fix-stylish-hook-for-cpp

Add skipping of files using `CPP` extension in `stylish-haskell`

Author: carbolymer

.github/workflows/stylish-haskell.yml

@@ -65,7 +65,11 @@ jobs:
 
         for x in $(git ls-tree --full-tree --name-only -r HEAD ${{ env.STYLISH_HASKELL_PATHS }}); do
           if [ "${x##*.}" == "hs" ]; then
-            stylish-haskell -i $x
+            if grep -qE '^#' $x; then
+              echo "$x contains CPP.  Skipping."
+            else
+              stylish-haskell -i $x
+            fi
           fi
         done
 
@@ -78,7 +82,11 @@ jobs:
         git fetch origin ${{ github.base_ref }} --unshallow
         for x in $(git diff --name-only origin/${{ github.base_ref }}..HEAD ${{ env.STYLISH_HASKELL_PATHS }}); do
           if [ "${x##*.}" == "hs" ]; then
-            stylish-haskell -i $x
+            if grep -qE '^#' $x; then
+              echo "$x contains CPP.  Skipping."
+            else
+              stylish-haskell -i $x
+            fi
           fi
         done
 

scripts/githooks/haskell-style-lint

@@ -4,12 +4,16 @@
 #
 # To set this script as your pre-commit hook, use the following command:
 #
-# ln -s $(git-root)/scripts/githooks/haskell-style-lint $(git-root)/.git/hooks/pre-commit
+# ln -s $(git-root)/scripts/githooks/haskell-style-lint $(git rev-parse --git-dir)/hooks/pre-commit
 #
 
 for x in $(git diff --staged --name-only --diff-filter=ACM | tr '\n' ' '); do
   if [ "${x##*.}" = "hs" ]; then
-    stylish-haskell -i "$x"
+    if grep -qE '^#' "$x"; then
+      echo "$x contains CPP.  Skipping."
+    else
+      stylish-haskell -i "$x"
+    fi
     # fail on linting issues
     hlint "$x"
   fi