Skip to content

Commit 129e584

Browse files
georgefstgeorgefst
authored
Merge branch 'master' into fourmolu-cli
2 parents 236d244 + 7e361f0 commit 129e584

File tree

110 files changed

+1691
-559
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

110 files changed

+1691
-559
lines changed

‎.github/workflows/bench.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ jobs:
5454
# change of the strategy may require changing the bootstrapping/run code
5555

5656
steps:
57-
- uses: actions/checkout@v2
57+
- uses: actions/checkout@v3
5858

5959
- run: git fetch origin master # check the master branch for benchmarking
6060

‎.github/workflows/build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
runs-on: ubuntu-18.04
2626

2727
steps:
28-
- uses: actions/checkout@v2
28+
- uses: actions/checkout@v3
2929

3030
- name: Set hls release version
3131
run: |
@@ -117,7 +117,7 @@ jobs:
117117
# from https://github.com/actions/upload-release-asset/issues/47#issuecomment-659071145
118118
- name: Upload binaries tarball to the release
119119
if: ${{ github.event.release.upload_url != '' }}
120-
uses: actions/github-script@v2
120+
uses: actions/github-script@v6
121121
with:
122122
github-token: ${{secrets.GITHUB_TOKEN}}
123123
script: |

‎.github/workflows/caching.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ jobs:
9595
]
9696

9797
steps:
98-
- uses: actions/checkout@v2
98+
- uses: actions/checkout@v3
9999

100100
- uses: ./.github/actions/setup-build
101101
with:

‎.github/workflows/flags.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ jobs:
5555
]
5656

5757
steps:
58-
- uses: actions/checkout@v2
58+
- uses: actions/checkout@v3
5959

6060
- uses: ./.github/actions/setup-build
6161
with:

‎.github/workflows/hackage.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ jobs:
4949

5050
steps:
5151

52-
- uses: actions/checkout@v2
52+
- uses: actions/checkout@v3
5353

5454
- uses: ./.github/actions/setup-build
5555
with:

‎.github/workflows/hlint.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
name: "Hlint check run"
1111
runs-on: ubuntu-latest
1212
steps:
13-
- uses: actions/checkout@v2
13+
- uses: actions/checkout@v3
1414

1515
- name: 'Installing'
1616
uses: rwe/actions-hlint-setup@v1

‎.github/workflows/nix.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ jobs:
5454
os: [ubuntu-latest, macOS-latest]
5555

5656
steps:
57-
- uses: actions/checkout@v2
57+
- uses: actions/checkout@v3
5858

5959
- uses: cachix/install-nix-action@v16
6060
with:
@@ -88,7 +88,7 @@ jobs:
8888
os: [ubuntu-latest, macOS-latest]
8989

9090
steps:
91-
- uses: actions/checkout@v2
91+
- uses: actions/checkout@v3
9292

9393
- uses: cachix/install-nix-action@v16
9494
with:

‎.github/workflows/test.yml

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ jobs:
107107
ghc: '8.8.4'
108108

109109
steps:
110-
- uses: actions/checkout@v2
110+
- uses: actions/checkout@v3
111111

112112
- uses: ./.github/actions/setup-build
113113
with:
@@ -133,6 +133,10 @@ jobs:
133133
path: "**/.tasty-rerun-log*"
134134
key: v1-${{ runner.os }}-${{ matrix.ghc }}-test-log-${{ github.sha }}
135135

136+
- if: matrix.test
137+
name: Test hls-graph
138+
run: cabal test hls-graph --test-options="$TEST_OPTS"
139+
136140
- if: needs.pre_job.outputs.should_skip_ghcide != 'true' && matrix.test
137141
name: Test ghcide
138142
# run the tests without parallelism to avoid running out of memory
@@ -164,7 +168,7 @@ jobs:
164168
name: Test hls-floskell-plugin
165169
run: cabal test hls-floskell-plugin --test-options="$TEST_OPTS" || cabal test hls-floskell-plugin --test-options="$TEST_OPTS" || LSP_TEST_LOG_COLOR=0 LSP_TEST_LOG_MESSAGES=true LSP_TEST_LOG_STDERR=true cabal test hls-floskell-plugin --test-options="$TEST_OPTS"
166170

167-
- if: matrix.test && matrix.ghc != '9.2.1'
171+
- if: matrix.test
168172
name: Test hls-class-plugin
169173
run: cabal test hls-class-plugin --test-options="$TEST_OPTS" || cabal test hls-class-plugin --test-options="$TEST_OPTS" || LSP_TEST_LOG_COLOR=0 LSP_TEST_LOG_MESSAGES=true LSP_TEST_LOG_STDERR=true cabal test hls-class-plugin --test-options="$TEST_OPTS"
170174

@@ -224,7 +228,7 @@ jobs:
224228
name: Test hls-module-name-plugin test suite
225229
run: cabal test hls-module-name-plugin --test-options="$TEST_OPTS" || cabal test hls-module-name-plugin --test-options="$TEST_OPTS" || LSP_TEST_LOG_COLOR=0 LSP_TEST_LOG_MESSAGES=true LSP_TEST_LOG_STDERR=true cabal test hls-module-name-plugin --test-options="$TEST_OPTS"
226230

227-
- if: matrix.test && matrix.ghc != '9.2.1'
231+
- if: matrix.test
228232
name: Test hls-alternate-number-format-plugin test suite
229233
run: cabal test hls-alternate-number-format-plugin --test-options="$TEST_OPTS" || cabal test hls-alternate-number-format-plugin --test-options="$TEST_OPTS" || LSP_TEST_LOG_COLOR=0 LSP_TEST_LOG_MESSAGES=true LSP_TEST_LOG_STDERR=true cabal test hls-alternate-number-format-plugin --test-options="$TEST_OPTS"
230234

@@ -236,6 +240,10 @@ jobs:
236240
name: Test hls-selection-range-plugin test suite
237241
run: cabal test hls-selection-range-plugin --test-options="$TEST_OPTS" || cabal test hls-selection-range-plugin --test-options="$TEST_OPTS" || LSP_TEST_LOG_COLOR=0 LSP_TEST_LOG_MESSAGES=true LSP_TEST_LOG_STDERR=true cabal test hls-selection-range-plugin --test-options="$TEST_OPTS"
238242

243+
- if: matrix.test
244+
name: Test hls-change-type-signature test suite
245+
run: cabal test hls-change-type-signature-plugin --test-options="$TEST_OPTS" || cabal test hls-change-type-signature-plugin --test-options="$TEST_OPTS" || LSP_TEST_LOG_COLOR=0 LSP_TEST_LOG_MESSAGES=true LSP_TEST_LOG_STDERR=true cabal test hls-change-type-signature-plugin --test-options="$TEST_OPTS"
246+
239247
test_post_job:
240248
if: always()
241249
runs-on: ubuntu-latest

‎bindist/GNUmakefile.in

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ BINDIR ?= $(PREFIX)/bin
55

66
HLS_VERSION := @@HLS_VERSION@@
77

8+
FIND := find
89
INSTALL := install
910
INSTALL_D := $(INSTALL) -d
1011
INSTALL_X := $(INSTALL) -vm 755
@@ -18,10 +19,7 @@ install:
1819
$(INSTALL_D) "$(DESTDIR)$(BINDIR)"
1920
$(INSTALL_D) "$(DESTDIR)$(LIBDIR)/haskell-language-server-$(HLS_VERSION)/lib"
2021
$(INSTALL_D) "$(DESTDIR)$(LIBDIR)/haskell-language-server-$(HLS_VERSION)/bin"
21-
for f in $(wildcard lib/*/*) ; do \
22-
$(INSTALL_D) "$(DESTDIR)$(LIBDIR)/haskell-language-server-$(HLS_VERSION)/`dirname $$f`" && \
23-
$(INSTALL_X) "$$f" "$(DESTDIR)$(LIBDIR)/haskell-language-server-$(HLS_VERSION)/$$f" ; \
24-
done
22+
$(FIND) lib -mindepth 2 -type f -exec sh -c '$(INSTALL_D) "$(DESTDIR)$(LIBDIR)/haskell-language-server-$(HLS_VERSION)/`dirname $$1`" && $(INSTALL_X) "$$1" "$(DESTDIR)$(LIBDIR)/haskell-language-server-$(HLS_VERSION)/$$1"' sh '{}' \;
2523
for b in $(wildcard bin/*) ; do \
2624
$(INSTALL_D) "$(DESTDIR)$(LIBDIR)/haskell-language-server-$(HLS_VERSION)/" && \
2725
$(INSTALL_X) "$$b" "$(DESTDIR)$(LIBDIR)/haskell-language-server-$(HLS_VERSION)/$$b" ; \
@@ -31,7 +29,7 @@ install:
3129
"$$h" > "$(DESTDIR)$(BINDIR)/$${h%.in}" && \
3230
$(CHMOD_X) "$(DESTDIR)$(BINDIR)/$${h%.in}" ; \
3331
done
34-
$(LN_S) "`scripts/relpath.sh "$(BINDIR)" "$(LIBDIR)/haskell-language-server-$(HLS_VERSION)/bin/haskell-language-server-wrapper"`" \
32+
$(LN_S) "`scripts/relpath.sh "$(DESTDIR)$(BINDIR)" "$(DESTDIR)$(LIBDIR)/haskell-language-server-$(HLS_VERSION)/bin/haskell-language-server-wrapper"`" \
3533
"$(DESTDIR)$(BINDIR)/haskell-language-server-wrapper"
3634

3735
version:

‎cabal-ghc90.project

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ packages:
2727
./plugins/hls-call-hierarchy-plugin
2828
./plugins/hls-alternate-number-format-plugin
2929
./plugins/hls-selection-range-plugin
30+
./plugins/hls-change-type-signature-plugin
3031

3132
tests: true
3233

@@ -36,7 +37,7 @@ package *
3637

3738
write-ghc-environment-files: never
3839

39-
index-state: 2022-02-25T21:47:10Z
40+
index-state: 2022-03-08T10:53:01Z
4041

4142
constraints:
4243
-- These plugins don't work on GHC9 yet

0 commit comments

Comments
 (0)