Skip to content

Commit 53a178d

Browse files
pepeiborrapepeiborra
authored
Merge branch 'master' into hindent-support
2 parents 67914d7 + e20b026 commit 53a178d

File tree

56 files changed

+932
-322
lines changed

Some content is hidden

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

56 files changed

+932
-322
lines changed

‎.circleci/config.yml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -77,22 +77,16 @@ version: 2
7777
jobs:
7878
stackage-lts16:
7979
environment:
80-
# https://github.com/digital-asset/ghc-lib/issues/352
81-
- CPATH: "/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/include/ffi:$CPATH"
8280
- STACK_FILE: "stack-lts16.yaml"
8381
<<: *defaults
8482

8583
stackage-lts19:
8684
environment:
87-
# https://github.com/digital-asset/ghc-lib/issues/352
88-
- CPATH: "/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/include/ffi:$CPATH"
8985
- STACK_FILE: "stack-lts19.yaml"
9086
<<: *defaults
9187

9288
stackage-nightly:
9389
environment:
94-
# https://github.com/digital-asset/ghc-lib/issues/352
95-
- CPATH: "/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/include/ffi:$CPATH"
9690
- STACK_FILE: "stack.yaml"
9791
<<: *defaults
9892

‎.github/actions/setup-build/action.yml

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -42,27 +42,6 @@ runs:
4242
echo "CABAL_PKGS_DIR=~/.cabal/packages" >> $GITHUB_ENV
4343
shell: bash
4444

45-
# This copy an alternative cabal-ghc${GHCVER}.project (for example cabal-ghc92.project)
46-
# as main cabal-project, for not fully supported ghc versions
47-
# Needs to be before the caching step so that the cache can detect changes to the modified cabal.project file
48-
- name: Use possible modified `cabal.project`
49-
env:
50-
GHCVER: ${{ inputs.ghc }}
51-
run: |
52-
# File has some protections preventing regular `rm`.
53-
# (most probably sticky bit is set on $HOME)
54-
# `&&` insures `rm -f` return is positive.
55-
# Many platforms also have `alias cp='cp -i'`.
56-
GHCVER2=${GHCVER//./}
57-
ALT_PROJECT_FILE_MINOR=cabal-ghc${GHCVER2}.project
58-
ALT_PROJECT_FILE_MAJOR=cabal-ghc${GHCVER2:0:2}.project
59-
if [[ -f "$ALT_PROJECT_FILE_MINOR" ]]; then
60-
rm -f -v cabal.project && cp -v "$ALT_PROJECT_FILE_MINOR" cabal.project
61-
elif [[ -f "$ALT_PROJECT_FILE_MAJOR" ]]; then
62-
rm -f -v cabal.project && cp -v "$ALT_PROJECT_FILE_MAJOR" cabal.project
63-
fi
64-
shell: bash
65-
6645
- if: inputs.os == 'Windows' && inputs.ghc == '8.8.4'
6746
name: (Windows,GHC 8.8) Modify `cabal.project` to workaround segfaults
6847
run: |

‎.github/workflows/bench.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ jobs:
4646
strategy:
4747
fail-fast: false
4848
matrix:
49-
ghc: ['8.10.7']
49+
ghc: ['8.10.7', '9.2.4']
5050
os: [ubuntu-latest]
5151

5252
# This code is fitted to the strategy: assumes Linux is used ... etc,
@@ -103,7 +103,7 @@ jobs:
103103
strategy:
104104
fail-fast: false
105105
matrix:
106-
ghc: ['8.10.7']
106+
ghc: ['8.10.7', '9.2.4']
107107
os: [ubuntu-latest]
108108
cabal: ['3.6']
109109
example: ['cabal', 'lsp-types']

‎.github/workflows/caching.yml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,8 @@ jobs:
8080
strategy:
8181
fail-fast: false
8282
matrix:
83-
ghc: [ "9.2.3"
84-
, "9.2.2"
83+
ghc: [ "9.2.4"
84+
, "9.2.3"
8585
, "9.0.2"
8686
, "8.10.7"
8787
, "8.8.4"
@@ -115,9 +115,6 @@ jobs:
115115
run: |
116116
# repeating builds to workaround segfaults in windows and ghc-8.8.4
117117
cabal $cabalBuild || cabal $cabalBuild || cabal $cabalBuild
118-
env:
119-
# needed for GHC 9.2.2 https://github.com/digital-asset/ghc-lib/issues/352
120-
CPATH: "/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/include/ffi:$CPATH"
121118
122119
# We build ghcide with benchs and test enabled to include its dependencies in the cache
123120
# (including shake-bench)

‎.github/workflows/flags.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444
strategy:
4545
fail-fast: true
4646
matrix:
47-
ghc: [ "9.2.3"
47+
ghc: [ "9.2.4"
4848
, "9.0.2"
4949
, "8.10.7"
5050
, "8.8.4"
@@ -68,7 +68,7 @@ jobs:
6868
run: cabal v2-build ghcide --flags="ghc-patched-unboxed-bytecode test-exe executable bench-exe ekg"
6969

7070
# we have to clean up warnings for 9.0 and 9.2 before enable -WAll
71-
- if: matrix.ghc != '9.0.2' && matrix.ghc != '9.2.3'
71+
- if: matrix.ghc != '9.0.2' && matrix.ghc != '9.2.4'
7272
name: Build with pedantic (-WError)
7373
run: cabal v2-build --flags="pedantic"
7474

‎.github/workflows/pre-commit.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ jobs:
1313

1414
- uses: ./.github/actions/setup-build
1515
with:
16-
ghc: "9.2.3"
1716
os: ${{ runner.os }}
1817
shorten-hls: false
1918

@@ -28,7 +27,7 @@ jobs:
2827
2928
- name: Compiled deps cache
3029
id: stylish-haskell-compiled-cache
31-
uses: actions/cache@v2
30+
uses: actions/cache@v3
3231
env:
3332
cache-name: stylish-haskell-compiled-cache
3433
with:
@@ -39,5 +38,5 @@ jobs:
3938
${{ inputs.cache-prefix }}${{ env.cache-name }}-${{ inputs.os }}-${{ inputs.ghc }}-
4039
${{ inputs.cache-prefix }}${{ env.cache-name }}-${{ inputs.os }}-
4140
42-
- uses: actions/setup-python@v3
41+
- uses: actions/setup-python@v4
4342
- uses: pre-commit/action@v3.0.0

‎.github/workflows/test.yml

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,8 @@ jobs:
5757
strategy:
5858
fail-fast: true
5959
matrix:
60-
ghc: [ "9.2.3"
61-
, "9.2.2"
60+
ghc: [ "9.2.4"
61+
, "9.2.3"
6262
, "9.0.2"
6363
, "8.10.7"
6464
, "8.8.4"
@@ -70,7 +70,7 @@ jobs:
7070
include:
7171
# only test supported ghc major versions
7272
- os: ubuntu-latest
73-
ghc: '9.2.3'
73+
ghc: '9.2.4'
7474
test: true
7575
- os: ubuntu-latest
7676
ghc: '9.0.2'
@@ -85,7 +85,7 @@ jobs:
8585
ghc: '8.6.5'
8686
test: true
8787
- os: windows-latest
88-
ghc: '9.2.3'
88+
ghc: '9.2.4'
8989
test: true
9090
- os: windows-latest
9191
ghc: '9.0.2'
@@ -100,7 +100,7 @@ jobs:
100100
- os: windows-latest
101101
ghc: '8.8.4'
102102
- os: windows-latest
103-
ghc: '9.2.2'
103+
ghc: '9.2.3'
104104

105105
steps:
106106
- uses: actions/checkout@v3
@@ -112,9 +112,6 @@ jobs:
112112

113113
# repeating builds to workaround segfaults in windows and ghc-8.8.4
114114
- name: Build
115-
# needed for GHC 9.2.2 https://github.com/digital-asset/ghc-lib/issues/352
116-
env:
117-
CPATH: "/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/include/ffi:$CPATH"
118115
run: cabal build || cabal build || cabal build
119116

120117
- name: Set test options
@@ -159,7 +156,7 @@ jobs:
159156
HLS_WRAPPER_TEST_EXE: hls-wrapper
160157
run: cabal test wrapper-test --test-options="$TEST_OPTS --rerun-log-file .tasty-rerun-log-wrapper" || cabal test wrapper-test --test-options="$TEST_OPTS --rerun-log-file .tasty-rerun-log-wrapper" || cabal test wrapper-test --test-options="$TEST_OPTS --rerun-log-file .tasty-rerun-log-wrapper"
161158

162-
- if: matrix.test && matrix.ghc != '9.2.3'
159+
- if: matrix.test && matrix.ghc != '9.2.4'
163160
name: Test hls-brittany-plugin
164161
run: cabal test hls-brittany-plugin --test-options="$TEST_OPTS" || cabal test hls-brittany-plugin --test-options="$TEST_OPTS" || LSP_TEST_LOG_COLOR=0 LSP_TEST_LOG_MESSAGES=true LSP_TEST_LOG_STDERR=true cabal test hls-brittany-plugin --test-options="$TEST_OPTS"
165162

@@ -179,11 +176,11 @@ jobs:
179176
name: Test hls-eval-plugin
180177
run: cabal test hls-eval-plugin --test-options="$TEST_OPTS" || cabal test hls-eval-plugin --test-options="$TEST_OPTS" || LSP_TEST_LOG_COLOR=0 LSP_TEST_LOG_MESSAGES=true LSP_TEST_LOG_STDERR=true cabal test hls-eval-plugin --test-options="$TEST_OPTS"
181178

182-
- if: matrix.test && matrix.ghc != '9.2.3'
179+
- if: matrix.test && matrix.ghc != '9.2.4'
183180
name: Test hls-haddock-comments-plugin
184181
run: cabal test hls-haddock-comments-plugin --test-options="$TEST_OPTS" || cabal test hls-haddock-comments-plugin --test-options="$TEST_OPTS" || LSP_TEST_LOG_COLOR=0 LSP_TEST_LOG_MESSAGES=true LSP_TEST_LOG_STDERR=true cabal test hls-haddock-comments-plugin --test-options="$TEST_OPTS"
185182

186-
- if: matrix.test && matrix.ghc != '9.2.3'
183+
- if: matrix.test && matrix.ghc != '9.2.4'
187184
name: Test hls-splice-plugin
188185
run: cabal test hls-splice-plugin --test-options="$TEST_OPTS" || cabal test hls-splice-plugin --test-options="$TEST_OPTS" || LSP_TEST_LOG_COLOR=0 LSP_TEST_LOG_MESSAGES=true LSP_TEST_LOG_STDERR=true cabal test hls-splice-plugin --test-options="$TEST_OPTS"
189186

@@ -199,7 +196,7 @@ jobs:
199196
name: Test hls-fourmolu-plugin
200197
run: cabal test hls-fourmolu-plugin --test-options="$TEST_OPTS" || cabal test hls-fourmolu-plugin --test-options="$TEST_OPTS" || LSP_TEST_LOG_COLOR=0 LSP_TEST_LOG_MESSAGES=true LSP_TEST_LOG_STDERR=true cabal test hls-fourmolu-plugin --test-options="$TEST_OPTS"
201198

202-
- if: matrix.test && matrix.ghc != '9.2.3'
199+
- if: matrix.test && matrix.ghc != '9.2.4'
203200
name: Test hls-tactics-plugin test suite
204201
run: cabal test hls-tactics-plugin --test-options="$TEST_OPTS" || cabal test hls-tactics-plugin --test-options="$TEST_OPTS" || LSP_TEST_LOG_COLOR=0 LSP_TEST_LOG_MESSAGES=true LSP_TEST_LOG_STDERR=true cabal test hls-tactics-plugin --test-options="$TEST_OPTS"
205202

@@ -223,7 +220,7 @@ jobs:
223220
name: Test hls-hlint-plugin test suite
224221
run: cabal test hls-hlint-plugin --test-options="$TEST_OPTS" || cabal test hls-hlint-plugin --test-options="$TEST_OPTS" || LSP_TEST_LOG_COLOR=0 LSP_TEST_LOG_MESSAGES=true LSP_TEST_LOG_STDERR=true cabal test hls-hlint-plugin --test-options="$TEST_OPTS"
225222

226-
- if: matrix.test && matrix.ghc != '9.0.1' && matrix.ghc != '9.0.2' && matrix.ghc != '9.2.2'
223+
- if: matrix.test && matrix.ghc != '9.0.1' && matrix.ghc != '9.0.2' && matrix.ghc != '9.2.4'
227224
name: Test hls-stan-plugin test suite
228225
run: cabal test hls-stan-plugin --test-options="$TEST_OPTS" || cabal test hls-hlint-plugin --test-options="$TEST_OPTS" || LSP_TEST_LOG_COLOR=0 LSP_TEST_LOG_MESSAGES=true LSP_TEST_LOG_STDERR=true cabal test hls-stan-plugin --test-options="$TEST_OPTS"
229226

@@ -251,6 +248,10 @@ jobs:
251248
name: Test hls-gadt-plugin test suit
252249
run: cabal test hls-gadt-plugin --test-options="$TEST_OPTS" || cabal test hls-gadt-plugin --test-options="$TEST_OPTS" || LSP_TEST_LOG_COLOR=0 LSP_TEST_LOG_MESSAGES=true LSP_TEST_LOG_STDERR=true cabal test hls-gadt-plugin --test-options="$TEST_OPTS"
253250

251+
- if: matrix.test
252+
name: Test hls-explicit-fixity-plugin test suite
253+
run: cabal test hls-explicit-fixity-plugin --test-options="$TEST_OPTS" || cabal test hls-explicit-fixity-plugin --test-options="$TEST_OPTS" || LSP_TEST_LOG_COLOR=0 LSP_TEST_LOG_MESSAGES=true LSP_TEST_LOG_STDERR=true cabal test hls-explicit-fixity-plugin --test-options="$TEST_OPTS"
254+
254255
test_post_job:
255256
if: always()
256257
runs-on: ubuntu-latest

‎.gitlab-ci.yml

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ variables:
1717
CABAL_PROJECT: cabal.project
1818
- GHC_VERSION: 9.0.2
1919
CABAL_PROJECT: cabal.project
20-
- GHC_VERSION: 9.2.2
21-
CABAL_PROJECT: cabal.project
2220
- GHC_VERSION: 9.2.3
2321
CABAL_PROJECT: cabal.project
22+
- GHC_VERSION: 9.2.4
23+
CABAL_PROJECT: cabal.project
2424

2525
workflow:
2626
rules:
@@ -419,10 +419,8 @@ build-x86_64-darwin:
419419
ADD_CABAL_ARGS: ""
420420
before_script:
421421
- /bin/bash ./.gitlab/brew.sh autoconf automake coreutils make tree
422-
# CPATH https://github.com/digital-asset/ghc-lib/issues/352
423422
script: |
424423
export PATH="$CI_PROJECT_DIR/.brew/bin:$CI_PROJECT_DIR/.brew/sbin:$PATH"
425-
export CPATH="/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/include/ffi:$CPATH"
426424
/bin/bash ./.gitlab/ci.sh
427425
after_script:
428426
- rm -Rf /private/tmp/.brew_tmp
@@ -470,17 +468,13 @@ build-aarch64-darwin:
470468
before_script:
471469
- export HOMEBREW_CHANGE_ARCH_TO_ARM=1
472470
- arch -arm64 /bin/bash ./.gitlab/brew.sh llvm autoconf automake coreutils make tree
473-
# C_INCLUDE_PATH: https://gitlab.haskell.org/ghc/ghc/-/issues/20592
474-
# CPATH https://github.com/digital-asset/ghc-lib/issues/352
475471
script: |
476472
export PATH="$CI_PROJECT_DIR/.brew/opt/llvm/bin:$CI_PROJECT_DIR/.brew/bin:$CI_PROJECT_DIR/.brew/sbin:$PATH"
477473
export CC=$CI_PROJECT_DIR/.brew/opt/llvm/bin/clang
478474
export CXX=$CI_PROJECT_DIR/.brew/opt/llvm/bin/clang++
479475
export LD=ld
480476
export AR=$CI_PROJECT_DIR/.brew/opt/llvm/bin/llvm-ar
481477
export RANLIB=$CI_PROJECT_DIR/.brew/opt/llvm/bin/llvm-ranlib
482-
export C_INCLUDE_PATH="`xcrun --show-sdk-path`/usr/include/ffi"
483-
export CPATH="/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/include/ffi:$CPATH"
484478
arch -arm64 /bin/bash ./.gitlab/ci.sh
485479
after_script:
486480
- rm -Rf /private/tmp/.brew_tmp
@@ -508,12 +502,8 @@ test-aarch64-darwin:
508502
before_script:
509503
- export HOMEBREW_CHANGE_ARCH_TO_ARM=1
510504
- arch -arm64 /bin/bash ./.gitlab/brew.sh make tree
511-
# C_INCLUDE_PATH: https://gitlab.haskell.org/ghc/ghc/-/issues/20592
512-
# CPATH https://github.com/digital-asset/ghc-lib/issues/352
513505
script: |
514506
export PATH="$CI_PROJECT_DIR/.brew/opt/llvm/bin:$CI_PROJECT_DIR/.brew/bin:$CI_PROJECT_DIR/.brew/sbin:$PATH"
515-
export C_INCLUDE_PATH="`xcrun --show-sdk-path`/usr/include/ffi"
516-
export CPATH="/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/include/ffi:$CPATH"
517507
arch -arm64 /bin/bash ./.gitlab/test.sh
518508
after_script:
519509
- rm -Rf /private/tmp/.brew_tmp

‎.gitpod.Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ RUN sudo install-packages build-essential curl libffi-dev libffi7 libgmp-dev lib
1111
ghcup install ghc 8.8.4 && \
1212
ghcup install ghc 8.10.7 && \
1313
ghcup install ghc 9.0.2 && \
14-
ghcup install ghc 9.2.2 && \
15-
ghcup install ghc 9.2.3 --set && \
14+
ghcup install ghc 9.2.3 && \
15+
ghcup install ghc 9.2.4 --set && \
1616
ghcup install hls --set && \
1717
ghcup install cabal --set && \
1818
ghcup install stack --set && \

‎bindist/ghcs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
8.8.4,cabal.project
33
8.10.7,cabal.project
44
9.0.2,cabal.project
5-
9.2.2,cabal.project
65
9.2.3,cabal.project
6+
9.2.4,cabal.project

‎bindist/ghcs-Msys

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
8.10.7,cabal.project
22
9.0.2,cabal.project
3-
9.2.2,cabal.project
43
9.2.3,cabal.project
4+
9.2.4,cabal.project

‎cabal.project

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ packages:
3131
./plugins/hls-stan-plugin
3232
./plugins/hls-gadt-plugin
3333
./plugins/hls-hindent-plugin
34+
./plugins/hls-explicit-fixity-plugin
3435

3536
-- Standard location for temporary packages needed for particular environments
3637
-- For example it is used in the project gitlab mirror to help in the MAcOS M1 build script
@@ -45,7 +46,7 @@ package *
4546

4647
write-ghc-environment-files: never
4748

48-
index-state: 2022-07-08T03:47:21Z
49+
index-state: 2022-08-09T13:13:41Z
4950

5051
constraints:
5152
hyphenation +embed,
@@ -69,5 +70,4 @@ allow-newer:
6970
----------
7071
hiedb:base,
7172

72-
ekg-core,
7373
ekg-wai:time

‎configuration-ghc-90.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ let
1919
ptr-poker = hself.callCabal2nix "ptr-poker" inputs.ptr-poker { };
2020

2121
ghc-lib = hself.ghc-lib_9_2_2_20220307;
22-
ghc-lib-parser = hself.ghc-lib-parser_9_2_3_20220709;
22+
ghc-lib-parser = hself.ghc-lib-parser_9_2_4_20220729;
2323
ghc-lib-parser-ex = hself.ghc-lib-parser-ex_9_2_0_4;
2424

2525
Cabal = hself.Cabal_3_6_3_0;

‎docs/features.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,12 @@ Provided by: `ghcide`
5050

5151
Type information and documentation on hover, [including from local definitions](./configuration.md#how-to-show-local-documentation-on-hover).
5252

53+
### Show fixity
54+
55+
Provided by: `hls-explicit-fixity-plugin`
56+
57+
Provides fixity information.
58+
5359
## Jump to definition
5460

5561
Provided by: `ghcide`

‎docs/supported-versions.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,16 @@ Last supporting HLS version:
1010
- specific version number: this GHC version is no longer one of the actively supported versions, and the last version of HLS which supports it is listed.
1111

1212
Support status (see the support policy below for more details):
13-
- "supported": this version of GHC is currently actively supported
13+
- "supported": this version of GHC is currently actively supported
1414
- "deprecated": this version of GHC was supported in the past, but is now deprecated
1515
- "will be deprecated ...": this version of GHC has special deprecation conditions that deviate from the support policy
1616
- "partial": not all features and plugins work, see the plugin support table and any linked issues for more details
1717

1818
| GHC version | Last supporting HLS version | Support status |
1919
| ----------- | -------------------------------------------------------------------------------------------------------------------------------------------------------- | -------------------------------------------------------------------------------------- |
20-
| 9.2.3 | next | supported, ([partial](https://github.com/haskell/haskell-language-server/issues/2982)) |
21-
| 9.2.2 | [latest](https://github.com/haskell/haskell-language-server/releases/latest) | supported, ([partial](https://github.com/haskell/haskell-language-server/issues/2982)) |
20+
| 9.2.4 | next | supported([partial](https://github.com/haskell/haskell-language-server/issues/2982)) |
21+
| 9.2.3 | next | supported([partial](https://github.com/haskell/haskell-language-server/issues/2982)) |
22+
| 9.2.2 | [1.7.0.0](https://github.com/haskell/haskell-language-server/releases/tag/1.7.0.0) | supported, ([partial](https://github.com/haskell/haskell-language-server/issues/2982)) |
2223
| 9.2.1 | [1.7.0.0](https://github.com/haskell/haskell-language-server/releases/tag/1.7.0.0) | deprecated |
2324
| 9.0.2 | [latest](https://github.com/haskell/haskell-language-server/releases/latest) | supported |
2425
| 9.0.1 | [1.6.1.0](https://github.com/haskell/haskell-language-server/releases/tag/1.6.1.0) | deprecated |

0 commit comments

Comments
 (0)