Add unmerged changes as extra dependencies

haskell · Aug 3, 2021 · 35c2b60 · 35c2b60
1 parent dc24e6e
commit 35c2b60
Show file tree

Hide file tree

Showing 12 changed files with 101 additions and 9 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -169,6 +169,10 @@ jobs:
         name: Test hls-brittany-plugin
         run: cabal test hls-brittany-plugin --test-options="-j1 --rerun-update" || cabal test hls-brittany-plugin --test-options="-j1 --rerun" || LSP_TEST_LOG_COLOR=0 LSP_TEST_LOG_MESSAGES=true LSP_TEST_LOG_STDERR=true cabal test hls-brittany-plugin --test-options="-j1 --rerun"
 
+      - if: ${{ needs.pre_job.outputs.should_skip != 'true' && matrix.test && matrix.ghc != '9.0.1' }}
+        name: Test hls-cabal-fmt-plugin
+        run: cabal test hls-cabal-fmt-plugin --test-options="-j1 --rerun-update" || cabal test hls-cabal-fmt-plugin --test-options="-j1 --rerun" || LSP_TEST_LOG_COLOR=0 LSP_TEST_LOG_MESSAGES=true LSP_TEST_LOG_STDERR=true cabal test hls-cabal-fmt-plugin --test-options="-j1 --rerun"
+
       - if: ${{ needs.pre_job.outputs.should_skip != 'true' && matrix.test && matrix.ghc != '9.0.1' }}
         name: Test hls-class-plugin
         run: cabal test hls-class-plugin --test-options="-j1 --rerun-update" || cabal test hls-class-plugin --test-options="-j1 --rerun" || LSP_TEST_LOG_COLOR=0 LSP_TEST_LOG_MESSAGES=true LSP_TEST_LOG_STDERR=true cabal test hls-class-plugin --test-options="-j1 --rerun"

diff --git a/cabal.project b/cabal.project
@@ -24,6 +24,7 @@ packages:
          ./plugins/hls-ormolu-plugin
          ./plugins/hls-call-hierarchy-plugin
          ./plugins/hls-cabal-fmt-plugin
+
 tests: true
 
 package *
@@ -36,6 +37,19 @@ source-repository-package
   location: https://github.com/hsyl20/ghc-api-compat
   tag: 8fee87eac97a538dbe81ff1ab18cff10f2f9fa15
 
+-- stylish haskell
+source-repository-package
+  type: git
+  location: https://github.com/VeryMilkyJoe/stylish-haskell
+  tag: 9279aad535de624fca990ed50f010a1743c0043a
+
+-- cabal-fmt
+source-repository-package
+  type: git
+  location: https://github.com/VeryMilkyJoe/cabal-fmt
+  tag: 440a6ad7683b81b8479d79a74a1fa8d79ca5c706
+
+
 write-ghc-environment-files: never
 
 index-state: 2021-08-01T00:00:00Z

diff --git a/stack-8.10.2.yaml b/stack-8.10.2.yaml
@@ -20,6 +20,8 @@ packages:
   - ./plugins/hls-tactics-plugin
   - ./plugins/hls-brittany-plugin
   - ./plugins/hls-stylish-haskell-plugin
+  - ./plugins/hls-cabal-fmt-plugin
+
   - ./plugins/hls-floskell-plugin
   - ./plugins/hls-fourmolu-plugin
   - ./plugins/hls-pragmas-plugin
@@ -40,6 +42,9 @@ extra-deps:
   - # ghc-api-compat-8.6
     github: hsyl20/ghc-api-compat
     commit: 8fee87eac97a538dbe81ff1ab18cff10f2f9fa15
+  - # cabal-fmt
+    github: VeryMilkyJoe/cabal-fmt
+    commit: 440a6ad7683b81b8479d79a74a1fa8d79ca5c706
   - ghc-check-0.5.0.4
   - ghc-exactprint-0.6.4
   - ghc-lib-8.10.4.20210206
@@ -53,7 +58,10 @@ extra-deps:
   - refinery-0.4.0.0
   - retrie-0.1.1.1
   - shake-0.19.4
-  - stylish-haskell-0.12.2.0
+  - # stylish haskell
+    github: VeryMilkyJoe/stylish-haskell
+    commit: 9279aad535de624fca990ed50f010a1743c0043a
+  #- stylish-haskell-0.12.2.0
   - semigroups-0.18.5
   - temporary-1.2.1.1
   - th-compat-0.1.2@sha256:3d55de1adc542c1a870c9ada90da2fbbe5f4e8bcd3eed545a55c3df9311b32a8,2854

diff --git a/stack-8.10.3.yaml b/stack-8.10.3.yaml
@@ -20,6 +20,7 @@ packages:
   - ./plugins/hls-tactics-plugin
   - ./plugins/hls-brittany-plugin
   - ./plugins/hls-stylish-haskell-plugin
+  - ./plugins/hls-cabal-fmt-plugin
   - ./plugins/hls-floskell-plugin
   - ./plugins/hls-fourmolu-plugin
   - ./plugins/hls-pragmas-plugin
@@ -40,6 +41,9 @@ extra-deps:
   - # ghc-api-compat-8.6
     github: hsyl20/ghc-api-compat
     commit: 8fee87eac97a538dbe81ff1ab18cff10f2f9fa15
+  - # cabal-fmt
+    github: VeryMilkyJoe/cabal-fmt
+    commit: 440a6ad7683b81b8479d79a74a1fa8d79ca5c706
   - ghc-check-0.5.0.4
   - ghc-exactprint-0.6.4
   - ghc-lib-8.10.4.20210206
@@ -53,7 +57,10 @@ extra-deps:
   - refinery-0.4.0.0
   - retrie-0.1.1.1
   - shake-0.19.4
-  - stylish-haskell-0.12.2.0
+  - # stylish haskell
+    github: VeryMilkyJoe/stylish-haskell
+    commit: 9279aad535de624fca990ed50f010a1743c0043a
+  #- stylish-haskell-0.12.2.0
   - semigroups-0.18.5
   - temporary-1.2.1.1
   - th-compat-0.1.2@sha256:3d55de1adc542c1a870c9ada90da2fbbe5f4e8bcd3eed545a55c3df9311b32a8,2854

diff --git a/stack-8.10.4.yaml b/stack-8.10.4.yaml
@@ -20,6 +20,7 @@ packages:
   - ./plugins/hls-tactics-plugin
   - ./plugins/hls-brittany-plugin
   - ./plugins/hls-stylish-haskell-plugin
+  - ./plugins/hls-cabal-fmt-plugin
   - ./plugins/hls-floskell-plugin
   - ./plugins/hls-fourmolu-plugin
   - ./plugins/hls-pragmas-plugin
@@ -40,6 +41,9 @@ extra-deps:
   - # ghc-api-compat-8.6
     github: hsyl20/ghc-api-compat
     commit: 8fee87eac97a538dbe81ff1ab18cff10f2f9fa15
+  - # cabal-fmt
+    github: VeryMilkyJoe/cabal-fmt
+    commit: 440a6ad7683b81b8479d79a74a1fa8d79ca5c706
   - ghc-check-0.5.0.4
   - ghc-exactprint-0.6.4
   - ghc-source-gen-0.4.1.0
@@ -49,7 +53,10 @@ extra-deps:
   - monad-dijkstra-0.1.1.2
   - refinery-0.4.0.0
   - retrie-0.1.1.1
-  - stylish-haskell-0.12.2.0
+  - # stylish haskell
+    github: VeryMilkyJoe/stylish-haskell
+    commit: 9279aad535de624fca990ed50f010a1743c0043a
+  #- stylish-haskell-0.12.2.0
   - semigroups-0.18.5
   - temporary-1.2.1.1
   - th-compat-0.1.2@sha256:3d55de1adc542c1a870c9ada90da2fbbe5f4e8bcd3eed545a55c3df9311b32a8,2854

diff --git a/stack-8.10.5.yaml b/stack-8.10.5.yaml
@@ -22,6 +22,7 @@ packages:
   - ./plugins/hls-tactics-plugin
   - ./plugins/hls-brittany-plugin
   - ./plugins/hls-stylish-haskell-plugin
+  - ./plugins/hls-cabal-fmt-plugin
   - ./plugins/hls-floskell-plugin
   - ./plugins/hls-fourmolu-plugin
   - ./plugins/hls-pragmas-plugin
@@ -42,6 +43,9 @@ extra-deps:
   - # ghc-api-compat-8.6
     github: hsyl20/ghc-api-compat
     commit: 8fee87eac97a538dbe81ff1ab18cff10f2f9fa15
+  - # cabal-fmt
+    github: VeryMilkyJoe/cabal-fmt
+    commit: 440a6ad7683b81b8479d79a74a1fa8d79ca5c706
   - ghc-check-0.5.0.4
   - ghc-exactprint-0.6.4
   - ghc-source-gen-0.4.1.0
@@ -51,7 +55,10 @@ extra-deps:
   - monad-dijkstra-0.1.1.2
   - refinery-0.4.0.0
   - retrie-1.0.0.0
-  - stylish-haskell-0.12.2.0
+  - # stylish haskell
+    github: VeryMilkyJoe/stylish-haskell
+    commit: 9279aad535de624fca990ed50f010a1743c0043a
+  #- stylish-haskell-0.12.2.0
   - semigroups-0.18.5
   - temporary-1.2.1.1
   - th-compat-0.1.2@sha256:3d55de1adc542c1a870c9ada90da2fbbe5f4e8bcd3eed545a55c3df9311b32a8,2854

diff --git a/stack-8.6.4.yaml b/stack-8.6.4.yaml
@@ -21,6 +21,7 @@ packages:
   - ./plugins/hls-tactics-plugin
   - ./plugins/hls-brittany-plugin
   - ./plugins/hls-stylish-haskell-plugin
+  - ./plugins/hls-cabal-fmt-plugin
   - ./plugins/hls-floskell-plugin
   - ./plugins/hls-fourmolu-plugin
   - ./plugins/hls-pragmas-plugin
@@ -47,6 +48,9 @@ extra-deps:
   - # ghc-api-compat-8.6
     github: hsyl20/ghc-api-compat
     commit: 8fee87eac97a538dbe81ff1ab18cff10f2f9fa15
+  - # cabal-fmt
+    github: VeryMilkyJoe/cabal-fmt
+    commit: 440a6ad7683b81b8479d79a74a1fa8d79ca5c706
   - ghc-check-0.5.0.4
   - ghc-events-0.13.0
   - ghc-exactprint-0.6.4
@@ -83,7 +87,10 @@ extra-deps:
   - retrie-0.1.1.1
   - semialign-1.1
   - shake-0.19.4
-  - stylish-haskell-0.12.2.0
+  - # stylish haskell
+    github: VeryMilkyJoe/stylish-haskell
+    commit: 9279aad535de624fca990ed50f010a1743c0043a
+  #- stylish-haskell-0.12.2.0
   - tasty-rerun-1.1.17
   - temporary-1.2.1.1
   - these-1.1.1.1

diff --git a/stack-8.6.5.yaml b/stack-8.6.5.yaml
@@ -20,6 +20,7 @@ packages:
   - ./plugins/hls-tactics-plugin
   - ./plugins/hls-brittany-plugin
   - ./plugins/hls-stylish-haskell-plugin
+  - ./plugins/hls-cabal-fmt-plugin
   - ./plugins/hls-floskell-plugin
   - ./plugins/hls-fourmolu-plugin
   - ./plugins/hls-pragmas-plugin
@@ -48,6 +49,9 @@ extra-deps:
   - # ghc-api-compat-8.6
     github: hsyl20/ghc-api-compat
     commit: 8fee87eac97a538dbe81ff1ab18cff10f2f9fa15
+  - # cabal-fmt
+    github: VeryMilkyJoe/cabal-fmt
+    commit: 440a6ad7683b81b8479d79a74a1fa8d79ca5c706
   - ghc-check-0.5.0.4
   - ghc-events-0.13.0
   - ghc-exactprint-0.6.4
@@ -84,7 +88,10 @@ extra-deps:
   - retrie-0.1.1.1
   - semialign-1.1
   - shake-0.19.4
-  - stylish-haskell-0.12.2.0
+  - # stylish haskell
+    github: VeryMilkyJoe/stylish-haskell
+    commit: 9279aad535de624fca990ed50f010a1743c0043a
+  #- stylish-haskell-0.12.2.0
   - tasty-rerun-1.1.17
   - temporary-1.2.1.1
   - these-1.1.1.1

diff --git a/stack-8.8.3.yaml b/stack-8.8.3.yaml
@@ -20,6 +20,7 @@ packages:
   - ./plugins/hls-tactics-plugin
   - ./plugins/hls-brittany-plugin
   - ./plugins/hls-stylish-haskell-plugin
+  - ./plugins/hls-cabal-fmt-plugin
   - ./plugins/hls-floskell-plugin
   - ./plugins/hls-fourmolu-plugin
   - ./plugins/hls-pragmas-plugin
@@ -42,6 +43,9 @@ extra-deps:
   - # ghc-api-compat-8.6
     github: hsyl20/ghc-api-compat
     commit: 8fee87eac97a538dbe81ff1ab18cff10f2f9fa15
+  - # cabal-fmt
+    github: VeryMilkyJoe/cabal-fmt
+    commit: 440a6ad7683b81b8479d79a74a1fa8d79ca5c706
   - ghc-check-0.5.0.4
   - ghc-exactprint-0.6.4
   - ghc-lib-8.10.4.20210206
@@ -67,7 +71,10 @@ extra-deps:
   - retrie-0.1.1.1
   - semigroups-0.18.5
   - shake-0.19.4
-  - stylish-haskell-0.12.2.0
+  - # stylish haskell
+    github: VeryMilkyJoe/stylish-haskell
+    commit: 9279aad535de624fca990ed50f010a1743c0043a
+  #- stylish-haskell-0.12.2.0
   - temporary-1.2.1.1
   - uniplate-1.6.13
   - th-compat-0.1.2@sha256:3d55de1adc542c1a870c9ada90da2fbbe5f4e8bcd3eed545a55c3df9311b32a8,2854

diff --git a/stack-8.8.4.yaml b/stack-8.8.4.yaml
@@ -20,6 +20,7 @@ packages:
   - ./plugins/hls-tactics-plugin
   - ./plugins/hls-brittany-plugin
   - ./plugins/hls-stylish-haskell-plugin
+  - ./plugins/hls-cabal-fmt-plugin
   - ./plugins/hls-floskell-plugin
   - ./plugins/hls-fourmolu-plugin
   - ./plugins/hls-pragmas-plugin
@@ -42,6 +43,9 @@ extra-deps:
   - # ghc-api-compat-8.6
     github: hsyl20/ghc-api-compat
     commit: 8fee87eac97a538dbe81ff1ab18cff10f2f9fa15
+  - # cabal-fmt
+    github: VeryMilkyJoe/cabal-fmt
+    commit: 440a6ad7683b81b8479d79a74a1fa8d79ca5c706
   - ghc-check-0.5.0.4
   - ghc-exactprint-0.6.4
   - ghc-lib-8.10.4.20210206
@@ -66,7 +70,10 @@ extra-deps:
   - retrie-0.1.1.1
   - semigroups-0.18.5
   - shake-0.19.4
-  - stylish-haskell-0.12.2.0
+  - # stylish haskell
+    github: VeryMilkyJoe/stylish-haskell
+    commit: 9279aad535de624fca990ed50f010a1743c0043a
+  #- stylish-haskell-0.12.2.0
   - temporary-1.2.1.1
   - th-compat-0.1.2@sha256:3d55de1adc542c1a870c9ada90da2fbbe5f4e8bcd3eed545a55c3df9311b32a8,2854
   - bytestring-encoding-0.1.0.0@sha256:460b49779fbf0112e8e2f1753c1ed9131eb18827600c298f4d6bb51c4e8c1c0d,1727

diff --git a/stack-9.0.1.yaml b/stack-9.0.1.yaml
@@ -21,6 +21,7 @@ packages:
   # - ./plugins/hls-tactics-plugin
   # - ./plugins/hls-brittany-plugin
   # - ./plugins/hls-stylish-haskell-plugin
+  # - ./plugins/hls-cabal-fmt-plugin
   # - ./plugins/hls-floskell-plugin
   # - ./plugins/hls-fourmolu-plugin
   - ./plugins/hls-pragmas-plugin
@@ -91,6 +92,15 @@ extra-deps:
   commit: ca23431a8dfa013992f9164ccc882a3277361f17
 # https://github.com/diagrams/active/pull/36
 
+# - # stylish haskell
+#  github: VeryMilkyJoe/stylish-haskell
+#  commit: 9279aad535de624fca990ed50f010a1743c0043a
+# https://github.com/haskell/stylish-haskell/pull/375
+
+- # cabal-fmt
+  github: VeryMilkyJoe/cabal-fmt
+  commit: 440a6ad7683b81b8479d79a74a1fa8d79ca5c706
+# https://github.com/phadej/cabal-fmt/pull/33
 
 # benchmark dependency
 - github: HeinrichApfelmus/operational

diff --git a/stack.yaml b/stack.yaml
@@ -20,6 +20,7 @@ packages:
   - ./plugins/hls-tactics-plugin
   - ./plugins/hls-brittany-plugin
   - ./plugins/hls-stylish-haskell-plugin
+  - ./plugins/hls-cabal-fmt-plugin
   - ./plugins/hls-floskell-plugin
   - ./plugins/hls-fourmolu-plugin
   - ./plugins/hls-pragmas-plugin
@@ -46,7 +47,10 @@ extra-deps:
   - monad-dijkstra-0.1.1.2
   - refinery-0.4.0.0
   - retrie-0.1.1.1
-  - stylish-haskell-0.12.2.0
+  - # stylish haskell
+    github: VeryMilkyJoe/stylish-haskell
+    commit: 9279aad535de624fca990ed50f010a1743c0043a
+  #- stylish-haskell-0.12.2.0
   - semigroups-0.18.5
   - temporary-1.2.1.1
   - th-compat-0.1.2@sha256:3d55de1adc542c1a870c9ada90da2fbbe5f4e8bcd3eed545a55c3df9311b32a8,2854
@@ -61,6 +65,9 @@ extra-deps:
   - lsp-1.2.0.1
   - lsp-types-1.3.0.0
   - lsp-test-0.14.0.1
+  - # cabal-fmt
+    github: VeryMilkyJoe/cabal-fmt
+    commit: 440a6ad7683b81b8479d79a74a1fa8d79ca5c706
 
 configure-options:
   $targets: