Skip to content

Commit 35c2b60

Browse files
Jana ChadtVeryMilkyJoe
Jana Chadt
authored and
VeryMilkyJoe
committed
Add unmerged changes as extra dependencies
1 parent dc24e6e commit 35c2b60

12 files changed

+101
-9
lines changed

‎.github/workflows/test.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -169,6 +169,10 @@ jobs:
169169
name: Test hls-brittany-plugin
170170
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"
171171

172+
- if: ${{ needs.pre_job.outputs.should_skip != 'true' && matrix.test && matrix.ghc != '9.0.1' }}
173+
name: Test hls-cabal-fmt-plugin
174+
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"
175+
172176
- if: ${{ needs.pre_job.outputs.should_skip != 'true' && matrix.test && matrix.ghc != '9.0.1' }}
173177
name: Test hls-class-plugin
174178
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"

‎cabal.project

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ packages:
2424
./plugins/hls-ormolu-plugin
2525
./plugins/hls-call-hierarchy-plugin
2626
./plugins/hls-cabal-fmt-plugin
27+
2728
tests: true
2829

2930
package *
@@ -36,6 +37,19 @@ source-repository-package
3637
location: https://github.com/hsyl20/ghc-api-compat
3738
tag: 8fee87eac97a538dbe81ff1ab18cff10f2f9fa15
3839

40+
-- stylish haskell
41+
source-repository-package
42+
type: git
43+
location: https://github.com/VeryMilkyJoe/stylish-haskell
44+
tag: 9279aad535de624fca990ed50f010a1743c0043a
45+
46+
-- cabal-fmt
47+
source-repository-package
48+
type: git
49+
location: https://github.com/VeryMilkyJoe/cabal-fmt
50+
tag: 440a6ad7683b81b8479d79a74a1fa8d79ca5c706
51+
52+
3953
write-ghc-environment-files: never
4054

4155
index-state: 2021-08-01T00:00:00Z

‎stack-8.10.2.yaml

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@ packages:
2020
- ./plugins/hls-tactics-plugin
2121
- ./plugins/hls-brittany-plugin
2222
- ./plugins/hls-stylish-haskell-plugin
23+
- ./plugins/hls-cabal-fmt-plugin
24+
2325
- ./plugins/hls-floskell-plugin
2426
- ./plugins/hls-fourmolu-plugin
2527
- ./plugins/hls-pragmas-plugin
@@ -40,6 +42,9 @@ extra-deps:
4042
- # ghc-api-compat-8.6
4143
github: hsyl20/ghc-api-compat
4244
commit: 8fee87eac97a538dbe81ff1ab18cff10f2f9fa15
45+
- # cabal-fmt
46+
github: VeryMilkyJoe/cabal-fmt
47+
commit: 440a6ad7683b81b8479d79a74a1fa8d79ca5c706
4348
- ghc-check-0.5.0.4
4449
- ghc-exactprint-0.6.4
4550
- ghc-lib-8.10.4.20210206
@@ -53,7 +58,10 @@ extra-deps:
5358
- refinery-0.4.0.0
5459
- retrie-0.1.1.1
5560
- shake-0.19.4
56-
- stylish-haskell-0.12.2.0
61+
- # stylish haskell
62+
github: VeryMilkyJoe/stylish-haskell
63+
commit: 9279aad535de624fca990ed50f010a1743c0043a
64+
#- stylish-haskell-0.12.2.0
5765
- semigroups-0.18.5
5866
- temporary-1.2.1.1
5967
- th-compat-0.1.2@sha256:3d55de1adc542c1a870c9ada90da2fbbe5f4e8bcd3eed545a55c3df9311b32a8,2854

‎stack-8.10.3.yaml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ packages:
2020
- ./plugins/hls-tactics-plugin
2121
- ./plugins/hls-brittany-plugin
2222
- ./plugins/hls-stylish-haskell-plugin
23+
- ./plugins/hls-cabal-fmt-plugin
2324
- ./plugins/hls-floskell-plugin
2425
- ./plugins/hls-fourmolu-plugin
2526
- ./plugins/hls-pragmas-plugin
@@ -40,6 +41,9 @@ extra-deps:
4041
- # ghc-api-compat-8.6
4142
github: hsyl20/ghc-api-compat
4243
commit: 8fee87eac97a538dbe81ff1ab18cff10f2f9fa15
44+
- # cabal-fmt
45+
github: VeryMilkyJoe/cabal-fmt
46+
commit: 440a6ad7683b81b8479d79a74a1fa8d79ca5c706
4347
- ghc-check-0.5.0.4
4448
- ghc-exactprint-0.6.4
4549
- ghc-lib-8.10.4.20210206
@@ -53,7 +57,10 @@ extra-deps:
5357
- refinery-0.4.0.0
5458
- retrie-0.1.1.1
5559
- shake-0.19.4
56-
- stylish-haskell-0.12.2.0
60+
- # stylish haskell
61+
github: VeryMilkyJoe/stylish-haskell
62+
commit: 9279aad535de624fca990ed50f010a1743c0043a
63+
#- stylish-haskell-0.12.2.0
5764
- semigroups-0.18.5
5865
- temporary-1.2.1.1
5966
- th-compat-0.1.2@sha256:3d55de1adc542c1a870c9ada90da2fbbe5f4e8bcd3eed545a55c3df9311b32a8,2854

‎stack-8.10.4.yaml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ packages:
2020
- ./plugins/hls-tactics-plugin
2121
- ./plugins/hls-brittany-plugin
2222
- ./plugins/hls-stylish-haskell-plugin
23+
- ./plugins/hls-cabal-fmt-plugin
2324
- ./plugins/hls-floskell-plugin
2425
- ./plugins/hls-fourmolu-plugin
2526
- ./plugins/hls-pragmas-plugin
@@ -40,6 +41,9 @@ extra-deps:
4041
- # ghc-api-compat-8.6
4142
github: hsyl20/ghc-api-compat
4243
commit: 8fee87eac97a538dbe81ff1ab18cff10f2f9fa15
44+
- # cabal-fmt
45+
github: VeryMilkyJoe/cabal-fmt
46+
commit: 440a6ad7683b81b8479d79a74a1fa8d79ca5c706
4347
- ghc-check-0.5.0.4
4448
- ghc-exactprint-0.6.4
4549
- ghc-source-gen-0.4.1.0
@@ -49,7 +53,10 @@ extra-deps:
4953
- monad-dijkstra-0.1.1.2
5054
- refinery-0.4.0.0
5155
- retrie-0.1.1.1
52-
- stylish-haskell-0.12.2.0
56+
- # stylish haskell
57+
github: VeryMilkyJoe/stylish-haskell
58+
commit: 9279aad535de624fca990ed50f010a1743c0043a
59+
#- stylish-haskell-0.12.2.0
5360
- semigroups-0.18.5
5461
- temporary-1.2.1.1
5562
- th-compat-0.1.2@sha256:3d55de1adc542c1a870c9ada90da2fbbe5f4e8bcd3eed545a55c3df9311b32a8,2854

‎stack-8.10.5.yaml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ packages:
2222
- ./plugins/hls-tactics-plugin
2323
- ./plugins/hls-brittany-plugin
2424
- ./plugins/hls-stylish-haskell-plugin
25+
- ./plugins/hls-cabal-fmt-plugin
2526
- ./plugins/hls-floskell-plugin
2627
- ./plugins/hls-fourmolu-plugin
2728
- ./plugins/hls-pragmas-plugin
@@ -42,6 +43,9 @@ extra-deps:
4243
- # ghc-api-compat-8.6
4344
github: hsyl20/ghc-api-compat
4445
commit: 8fee87eac97a538dbe81ff1ab18cff10f2f9fa15
46+
- # cabal-fmt
47+
github: VeryMilkyJoe/cabal-fmt
48+
commit: 440a6ad7683b81b8479d79a74a1fa8d79ca5c706
4549
- ghc-check-0.5.0.4
4650
- ghc-exactprint-0.6.4
4751
- ghc-source-gen-0.4.1.0
@@ -51,7 +55,10 @@ extra-deps:
5155
- monad-dijkstra-0.1.1.2
5256
- refinery-0.4.0.0
5357
- retrie-1.0.0.0
54-
- stylish-haskell-0.12.2.0
58+
- # stylish haskell
59+
github: VeryMilkyJoe/stylish-haskell
60+
commit: 9279aad535de624fca990ed50f010a1743c0043a
61+
#- stylish-haskell-0.12.2.0
5562
- semigroups-0.18.5
5663
- temporary-1.2.1.1
5764
- th-compat-0.1.2@sha256:3d55de1adc542c1a870c9ada90da2fbbe5f4e8bcd3eed545a55c3df9311b32a8,2854

‎stack-8.6.4.yaml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ packages:
2121
- ./plugins/hls-tactics-plugin
2222
- ./plugins/hls-brittany-plugin
2323
- ./plugins/hls-stylish-haskell-plugin
24+
- ./plugins/hls-cabal-fmt-plugin
2425
- ./plugins/hls-floskell-plugin
2526
- ./plugins/hls-fourmolu-plugin
2627
- ./plugins/hls-pragmas-plugin
@@ -47,6 +48,9 @@ extra-deps:
4748
- # ghc-api-compat-8.6
4849
github: hsyl20/ghc-api-compat
4950
commit: 8fee87eac97a538dbe81ff1ab18cff10f2f9fa15
51+
- # cabal-fmt
52+
github: VeryMilkyJoe/cabal-fmt
53+
commit: 440a6ad7683b81b8479d79a74a1fa8d79ca5c706
5054
- ghc-check-0.5.0.4
5155
- ghc-events-0.13.0
5256
- ghc-exactprint-0.6.4
@@ -83,7 +87,10 @@ extra-deps:
8387
- retrie-0.1.1.1
8488
- semialign-1.1
8589
- shake-0.19.4
86-
- stylish-haskell-0.12.2.0
90+
- # stylish haskell
91+
github: VeryMilkyJoe/stylish-haskell
92+
commit: 9279aad535de624fca990ed50f010a1743c0043a
93+
#- stylish-haskell-0.12.2.0
8794
- tasty-rerun-1.1.17
8895
- temporary-1.2.1.1
8996
- these-1.1.1.1

‎stack-8.6.5.yaml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ packages:
2020
- ./plugins/hls-tactics-plugin
2121
- ./plugins/hls-brittany-plugin
2222
- ./plugins/hls-stylish-haskell-plugin
23+
- ./plugins/hls-cabal-fmt-plugin
2324
- ./plugins/hls-floskell-plugin
2425
- ./plugins/hls-fourmolu-plugin
2526
- ./plugins/hls-pragmas-plugin
@@ -48,6 +49,9 @@ extra-deps:
4849
- # ghc-api-compat-8.6
4950
github: hsyl20/ghc-api-compat
5051
commit: 8fee87eac97a538dbe81ff1ab18cff10f2f9fa15
52+
- # cabal-fmt
53+
github: VeryMilkyJoe/cabal-fmt
54+
commit: 440a6ad7683b81b8479d79a74a1fa8d79ca5c706
5155
- ghc-check-0.5.0.4
5256
- ghc-events-0.13.0
5357
- ghc-exactprint-0.6.4
@@ -84,7 +88,10 @@ extra-deps:
8488
- retrie-0.1.1.1
8589
- semialign-1.1
8690
- shake-0.19.4
87-
- stylish-haskell-0.12.2.0
91+
- # stylish haskell
92+
github: VeryMilkyJoe/stylish-haskell
93+
commit: 9279aad535de624fca990ed50f010a1743c0043a
94+
#- stylish-haskell-0.12.2.0
8895
- tasty-rerun-1.1.17
8996
- temporary-1.2.1.1
9097
- these-1.1.1.1

‎stack-8.8.3.yaml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ packages:
2020
- ./plugins/hls-tactics-plugin
2121
- ./plugins/hls-brittany-plugin
2222
- ./plugins/hls-stylish-haskell-plugin
23+
- ./plugins/hls-cabal-fmt-plugin
2324
- ./plugins/hls-floskell-plugin
2425
- ./plugins/hls-fourmolu-plugin
2526
- ./plugins/hls-pragmas-plugin
@@ -42,6 +43,9 @@ extra-deps:
4243
- # ghc-api-compat-8.6
4344
github: hsyl20/ghc-api-compat
4445
commit: 8fee87eac97a538dbe81ff1ab18cff10f2f9fa15
46+
- # cabal-fmt
47+
github: VeryMilkyJoe/cabal-fmt
48+
commit: 440a6ad7683b81b8479d79a74a1fa8d79ca5c706
4549
- ghc-check-0.5.0.4
4650
- ghc-exactprint-0.6.4
4751
- ghc-lib-8.10.4.20210206
@@ -67,7 +71,10 @@ extra-deps:
6771
- retrie-0.1.1.1
6872
- semigroups-0.18.5
6973
- shake-0.19.4
70-
- stylish-haskell-0.12.2.0
74+
- # stylish haskell
75+
github: VeryMilkyJoe/stylish-haskell
76+
commit: 9279aad535de624fca990ed50f010a1743c0043a
77+
#- stylish-haskell-0.12.2.0
7178
- temporary-1.2.1.1
7279
- uniplate-1.6.13
7380
- th-compat-0.1.2@sha256:3d55de1adc542c1a870c9ada90da2fbbe5f4e8bcd3eed545a55c3df9311b32a8,2854

‎stack-8.8.4.yaml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ packages:
2020
- ./plugins/hls-tactics-plugin
2121
- ./plugins/hls-brittany-plugin
2222
- ./plugins/hls-stylish-haskell-plugin
23+
- ./plugins/hls-cabal-fmt-plugin
2324
- ./plugins/hls-floskell-plugin
2425
- ./plugins/hls-fourmolu-plugin
2526
- ./plugins/hls-pragmas-plugin
@@ -42,6 +43,9 @@ extra-deps:
4243
- # ghc-api-compat-8.6
4344
github: hsyl20/ghc-api-compat
4445
commit: 8fee87eac97a538dbe81ff1ab18cff10f2f9fa15
46+
- # cabal-fmt
47+
github: VeryMilkyJoe/cabal-fmt
48+
commit: 440a6ad7683b81b8479d79a74a1fa8d79ca5c706
4549
- ghc-check-0.5.0.4
4650
- ghc-exactprint-0.6.4
4751
- ghc-lib-8.10.4.20210206
@@ -66,7 +70,10 @@ extra-deps:
6670
- retrie-0.1.1.1
6771
- semigroups-0.18.5
6872
- shake-0.19.4
69-
- stylish-haskell-0.12.2.0
73+
- # stylish haskell
74+
github: VeryMilkyJoe/stylish-haskell
75+
commit: 9279aad535de624fca990ed50f010a1743c0043a
76+
#- stylish-haskell-0.12.2.0
7077
- temporary-1.2.1.1
7178
- th-compat-0.1.2@sha256:3d55de1adc542c1a870c9ada90da2fbbe5f4e8bcd3eed545a55c3df9311b32a8,2854
7279
- bytestring-encoding-0.1.0.0@sha256:460b49779fbf0112e8e2f1753c1ed9131eb18827600c298f4d6bb51c4e8c1c0d,1727

‎stack-9.0.1.yaml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ packages:
2121
# - ./plugins/hls-tactics-plugin
2222
# - ./plugins/hls-brittany-plugin
2323
# - ./plugins/hls-stylish-haskell-plugin
24+
# - ./plugins/hls-cabal-fmt-plugin
2425
# - ./plugins/hls-floskell-plugin
2526
# - ./plugins/hls-fourmolu-plugin
2627
- ./plugins/hls-pragmas-plugin
@@ -91,6 +92,15 @@ extra-deps:
9192
commit: ca23431a8dfa013992f9164ccc882a3277361f17
9293
# https://github.com/diagrams/active/pull/36
9394

95+
# - # stylish haskell
96+
# github: VeryMilkyJoe/stylish-haskell
97+
# commit: 9279aad535de624fca990ed50f010a1743c0043a
98+
# https://github.com/haskell/stylish-haskell/pull/375
99+
100+
- # cabal-fmt
101+
github: VeryMilkyJoe/cabal-fmt
102+
commit: 440a6ad7683b81b8479d79a74a1fa8d79ca5c706
103+
# https://github.com/phadej/cabal-fmt/pull/33
94104

95105
# benchmark dependency
96106
- github: HeinrichApfelmus/operational

‎stack.yaml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ packages:
2020
- ./plugins/hls-tactics-plugin
2121
- ./plugins/hls-brittany-plugin
2222
- ./plugins/hls-stylish-haskell-plugin
23+
- ./plugins/hls-cabal-fmt-plugin
2324
- ./plugins/hls-floskell-plugin
2425
- ./plugins/hls-fourmolu-plugin
2526
- ./plugins/hls-pragmas-plugin
@@ -46,7 +47,10 @@ extra-deps:
4647
- monad-dijkstra-0.1.1.2
4748
- refinery-0.4.0.0
4849
- retrie-0.1.1.1
49-
- stylish-haskell-0.12.2.0
50+
- # stylish haskell
51+
github: VeryMilkyJoe/stylish-haskell
52+
commit: 9279aad535de624fca990ed50f010a1743c0043a
53+
#- stylish-haskell-0.12.2.0
5054
- semigroups-0.18.5
5155
- temporary-1.2.1.1
5256
- th-compat-0.1.2@sha256:3d55de1adc542c1a870c9ada90da2fbbe5f4e8bcd3eed545a55c3df9311b32a8,2854
@@ -61,6 +65,9 @@ extra-deps:
6165
- lsp-1.2.0.1
6266
- lsp-types-1.3.0.0
6367
- lsp-test-0.14.0.1
68+
- # cabal-fmt
69+
github: VeryMilkyJoe/cabal-fmt
70+
commit: 440a6ad7683b81b8479d79a74a1fa8d79ca5c706
6471

6572
configure-options:
6673
$targets:

0 commit comments

Comments
 (0)