Support only GHC 9.0

.devcontainer/Dockerfile

@@ -0,0 +1,30 @@
+ARG UBUNTU_TAG=20.04
+FROM ubuntu:"$UBUNTU_TAG"
+
+ENV LANG=C.UTF-8
+RUN \
+    apt-get update && \
+    apt-get install --assume-yes curl gcc git libgmp-dev libtinfo-dev make sudo
+
+ARG GHCUP_VERSION=0.1.17.3
+RUN \
+    curl --output /usr/local/bin/ghcup "https://downloads.haskell.org/~ghcup/$GHCUP_VERSION/x86_64-linux-ghcup-$GHCUP_VERSION" && \
+    chmod +x /usr/local/bin/ghcup && \
+    ghcup --version
+
+ARG USER_NAME=haskell
+RUN \
+    useradd --create-home --shell "$( which bash )" "$USER_NAME" && \
+    echo "$USER_NAME ALL=(ALL) NOPASSWD: ALL" | tee "/etc/sudoers.d/$USER_NAME"
+USER "$USER_NAME"
+ENV PATH="/home/$USER_NAME/.cabal/bin:/home/$USER_NAME/.ghcup/bin:$PATH"
+
+ARG GHC_VERSION=9.0.1
+RUN \
+    ghcup install ghc "$GHC_VERSION" --set && \
+    ghc --version
+
+ARG CABAL_VERSION=3.6.2.0
+RUN \
+    ghcup install cabal "$CABAL_VERSION" --set && \
+    cabal --version

.devcontainer/devcontainer.json

@@ -0,0 +1,6 @@
+{
+    "build": {
+        "dockerfile": "Dockerfile"
+    },
+    "postCreateCommand": "cabal update"
+}

.github/workflows/ci.yaml

@@ -2,38 +2,34 @@ name: CI
 on:
   pull_request:
     branches:
-      - master
+      - main
   push:
     branches:
-      - master
+      - main
 jobs:
   build:
     strategy:
       fail-fast: false
       matrix:
         os:
-          - macos-10.15
-          - ubuntu-18.04
+          - macos-11
+          - ubuntu-20.04
           - windows-2019
         ghc:
-          - 8.10.2
+          - 9.0.1
         cabal:
-          - 3.2.0.0
-        include:
-          - os: ubuntu-18.04
-            ghc: 8.8.4
-            cabal: 3.2.0.0
-          - os: ubuntu-18.04
-            ghc: 8.6.5
-            cabal: 3.2.0.0
+          - 3.6.2.0
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v2
+      - run: mkdir artifact
+      - run: mkdir artifact/${{ matrix.os }}
       - id: setup-haskell
-        uses: actions/setup-haskell@v1
+        uses: haskell/actions/setup@v1
         with:
           ghc-version: ${{ matrix.ghc }}
           cabal-version: ${{ matrix.cabal }}
+      - run: cabal configure --enable-tests
       - run: cabal freeze
       - run: cat cabal.project.freeze
       - uses: actions/cache@v2
@@ -43,24 +39,12 @@ jobs:
           restore-keys: |
             ${{ matrix.os }}-${{ matrix.ghc }}-${{ matrix.cabal }}-
             ${{ matrix.os }}-${{ matrix.ghc }}-
+      - run: cabal build
+      - run: cabal install --installdir artifact/${{ matrix.os }} --install-method copy
       - run: cabal test --test-show-details direct
-      - run: cabal install --installdir output --install-method copy
-      - run: strip output/brittany*
+      - run: cabal check
+      - run: cabal sdist --output-dir artifact/${{ matrix.os }}
       - uses: actions/upload-artifact@v2
         with:
-          path: output/brittany*
-          name: brittany-${{ matrix.os }}-ghc-${{ matrix.ghc }}-${{ github.sha }}
-      - if: matrix.os == 'ubuntu-18.04' && matrix.ghc == '8.10.2'
-        uses: actions/upload-artifact@v2
-        with:
-          path: dist-newstyle/sdist/brittany-*.tar.gz
-          name: brittany-${{ github.sha }}.tar.gz
-      - run: cabal check
-
-
-  nix:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: cachix/install-nix-action@v12
-      - uses: actions/checkout@v2
-      - run: nix-build
+          path: artifact
+          name: brittany-${{ github.sha }}

.gitignore

@@ -10,7 +10,8 @@ local/
 .cabal-sandbox/
 .stack-work/
 cabal.sandbox.config
-cabal.project.local
+cabal.project.local*
+cabal.project.freeze
 .ghc.environment.*
 result
 .stack-work*

.vscode/extensions.json

@@ -0,0 +1,5 @@
+{
+    "recommendations": [
+        "taylorfausak.purple-yolk"
+    ]
+}

.vscode/settings.json

@@ -0,0 +1,6 @@
+{
+    "purple-yolk.brittany.command": "false",
+    "purple-yolk.ghci.command": "cabal repl --repl-options -ddump-json",
+    "purple-yolk.hlint.command": "false",
+    "purple-yolk.hlint.onSave": false
+}

brittany.cabal

@@ -16,7 +16,7 @@ copyright:            Copyright (C) 2016-2019 Lennart Spitzner
                       Copyright (C) 2019 PRODA LTD
 category:             Language
 build-type:           Simple
-cabal-version:        1.18
+cabal-version:        2.0
 homepage:             https://github.com/lspitzner/brittany/
 bug-reports:          https://github.com/lspitzner/brittany/issues
 extra-doc-files: {
@@ -91,36 +91,36 @@ library {
     -fno-warn-redundant-constraints
   }
   build-depends:
-    { base >=4.12 && <4.15
-    , ghc >=8.6.1 && <8.11
-    , ghc-paths >=0.1.0.9 && <0.2
-    , ghc-exactprint >=0.5.8 && <0.6.5
-    , transformers >=0.5.2.0 && <0.6
-    , containers >=0.5.7.1 && <0.7
-    , mtl >=2.2.1 && <2.3
-    , text >=1.2 && <1.3
-    , multistate >=0.7.1.1 && <0.9
-    , syb >=0.6 && <0.8
-    , data-tree-print
-    , pretty >=1.1.3.3 && <1.2
-    , bytestring >=0.10.8.1 && <0.11
-    , directory >=1.2.6.2 && <1.4
-    , butcher >=1.3.1 && <1.4
-    , yaml >=0.8.18 && <0.12
-    , aeson >=1.0.1.0 && <1.6
-    , extra >=1.4.10 && <1.8
-    , uniplate >=1.6.12 && <1.7
-    , strict >=0.3.2 && <0.5
-    , monad-memo >=0.4.1 && <0.6
-    , unsafe >=0.0 && <0.1
-    , safe >=0.3.9 && <0.4
-    , deepseq >=1.4.2.0 && <1.5
-    , semigroups >=0.18.2 && <0.20
-    , cmdargs >=0.10.14 && <0.11
-    , czipwith >=1.0.1.0 && <1.1
-    , ghc-boot-th >=8.6.1 && <8.11
-    , filepath >=1.4.1.0 && <1.5
-    , random >= 1.1 && <1.3
+    { base ^>= 4.15.0
+    , aeson ^>= 2.0.1
+    , butcher ^>= 1.3.3
+    , bytestring ^>= 0.10.12
+    , cmdargs ^>= 0.10.21
+    , containers ^>= 0.6.4
+    , czipwith ^>= 1.0.1
+    , data-tree-print ^>= 0.1.0
+    , deepseq ^>= 1.4.5
+    , directory ^>= 1.3.6
+    , extra ^>= 1.7.10
+    , filepath ^>= 1.4.2
+    , ghc ^>= 9.0.1
+    , ghc-boot-th ^>= 9.0.1
+    , ghc-exactprint ^>= 0.6.4
+    , ghc-paths ^>= 0.1.0
+    , monad-memo ^>= 0.5.3
+    , mtl ^>= 2.2.2
+    , multistate ^>= 0.8.0
+    , pretty ^>= 1.1.3
+    , random ^>= 1.2.1
+    , safe ^>= 0.3.19
+    , semigroups ^>= 0.19.2
+    , strict ^>= 0.4.0
+    , syb ^>= 0.7.2
+    , text ^>= 1.2.5
+    , transformers ^>= 0.5.6
+    , uniplate ^>= 1.6.13
+    , unsafe ^>= 0.0
+    , yaml ^>= 0.11.7
     }
   default-extensions: {
     CPP

cabal.project

@@ -0,0 +1,12 @@
+packages: .
+
+allow-newer:
+    , butcher:base
+    , data-tree-print:base
+    , multistate:base
+
+-- https://github.com/lspitzner/czipwith/pull/2
+source-repository-package
+    type: git
+    location: https://github.com/mithrandi/czipwith
+    tag: b6245884ae83e00dd2b5261762549b37390179f8

src-libinterfacetests/Main.hs

@@ -26,7 +26,7 @@ main = hspec $ do
             , "  ]"
             ]
       output <- liftIO $ parsePrintModule staticDefaultConfig input
-      input `shouldSatisfy` \_ -> case output of
-        Right x | x == expected -> True
-        _                       -> False
+      hush output `shouldBe` Just expected
 
+hush :: Either a b -> Maybe b
+hush = either (const Nothing) Just

src-literatetests/10-tests.blt

@@ -1551,6 +1551,97 @@ instance Foo Int where
     { unBarInt :: Int
     }
 
+###############################################################################
+###############################################################################
+###############################################################################
+#group gh-357
+###############################################################################
+###############################################################################
+###############################################################################
+
+#test type-instance-without-comment
+
+{-# language TypeFamilies #-}
+type family F a
+type instance F Int = IO Int
+
+#test type-instance-with-comment
+
+{-# language TypeFamilies #-}
+type family F a
+type instance F Int = IO Int -- x
+
+#test newtype-instance-without-comment
+
+{-# language TypeFamilies #-}
+data family F a
+newtype instance F Int = N Int
+
+#test newtype-instance-with-comment
+
+{-# language TypeFamilies #-}
+data family F a
+newtype instance F Int = N Int -- x
+
+#test data-instance-without-comment
+
+{-# language TypeFamilies #-}
+data family F a
+data instance F Int = D Int
+
+#test data-instance-with-comment
+
+{-# language TypeFamilies #-}
+data family F a
+data instance F Int = D Int -- x
+
+#test instance-type-without-comment
+
+{-# language TypeFamilies #-}
+class C a where
+  type family F a
+instance C Int where
+  type F Int = IO Int
+
+#test instance-type-with-comment
+
+{-# language TypeFamilies #-}
+class C a where
+  type family F a
+instance C Int where
+  type F Int = IO Int -- x
+
+#test instance-newtype-without-comment
+
+{-# language TypeFamilies #-}
+class C a where
+  data family F a
+instance C Int where
+  newtype F Int = N Int
+
+#test instance-newtype-with-comment
+
+{-# language TypeFamilies #-}
+class C a where
+  data family F a
+instance C Int where
+  newtype F Int = N Int -- x
+
+#test instance-data-without-comment
+
+{-# language TypeFamilies #-}
+class C a where
+  data family F a
+instance C Int where
+  data F Int = D Int
+
+#test instance-data-with-comment
+
+{-# language TypeFamilies #-}
+class C a where
+  data family F a
+instance C Int where
+  data F Int = D Int -- x
 
 ###############################################################################
 ###############################################################################