Skip to content

Commit 816cd63

Browse files
wz1000wz1000
committed
Prepare 1.8.0.0
Use hiedb from hackage gitlab-ci: remove workaround for windows 9.2.2 gitlab-ci: remove workaround for windows 9.2.2 hie-bios update hie bios update hie bios bounds hie-bios fixes hie-bios fixes lsp 1.6 cabal.project fixes hie-bios fixes lsp and hie-bios from hackage Mark hie-bios error as expectFail hie-bios fixes hie-bios fixes Stack Stack stack fixes
1 parent 3fb4082 commit 816cd63

File tree

45 files changed

+435
-221
lines changed

Some content is hidden

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

45 files changed

+435
-221
lines changed

‎.gitlab-ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ stages:
77
# https://gitlab.haskell.org/haskell/haskell-language-server/-/pipelines
88
variables:
99
# Commit of ghc/ci-images repository from which to pull Docker images
10-
DOCKER_REV: "4ed1a4f27828ba96a34662dc954335e29b470cd2"
10+
DOCKER_REV: "9e4c540d9e4972a36291dfdf81f079f37d748890"
1111

1212
CABAL_INSTALL_VERSION: 3.8.1.0
1313

‎.gitlab/ci.sh

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ source "$CI_PROJECT_DIR/.gitlab/common.sh"
66

77
export GHCUP_INSTALL_BASE_PREFIX="$CI_PROJECT_DIR/toolchain"
88
export CABAL_DIR="$CI_PROJECT_DIR/cabal"
9-
EXE_EXTENSION = ""
9+
EXE_EXTENSION=""
1010

1111
case "$(uname)" in
1212
MSYS_*|MINGW*)
@@ -50,10 +50,10 @@ esac
5050
case "$(uname)" in
5151
MSYS_*|MINGW*)
5252
# workaround for https://gitlab.haskell.org/ghc/ghc/-/issues/21196
53-
export PATH="${GHCUP_INSTALL_BASE_PREFIX}/ghcup/ghc/${GHC_VERSION}/mingw/bin:${GHCUP_INSTALL_BASE_PREFIX}/ghcup/ghc/${GHC_VERSION}/mingw/usr/bin:$PATH"
54-
ls ${GHCUP_INSTALL_BASE_PREFIX}/ghcup/ghc/${GHC_VERSION}/mingw/bin
55-
cp ${GHCUP_INSTALL_BASE_PREFIX}/ghcup/ghc/${GHC_VERSION}/mingw/bin/libgcc_s_seh-1.dll ${GHCUP_INSTALL_BASE_PREFIX}/ghcup/ghc/${GHC_VERSION}/bin
56-
cp ${GHCUP_INSTALL_BASE_PREFIX}/ghcup/ghc/${GHC_VERSION}/mingw/bin/libwinpthread-1.dll ${GHCUP_INSTALL_BASE_PREFIX}/ghcup/ghc/${GHC_VERSION}/bin
53+
# export PATH="${GHCUP_INSTALL_BASE_PREFIX}/ghcup/ghc/${GHC_VERSION}/mingw/bin:${GHCUP_INSTALL_BASE_PREFIX}/ghcup/ghc/${GHC_VERSION}/mingw/usr/bin:$PATH"
54+
# ls ${GHCUP_INSTALL_BASE_PREFIX}/ghcup/ghc/${GHC_VERSION}/mingw/bin
55+
# cp ${GHCUP_INSTALL_BASE_PREFIX}/ghcup/ghc/${GHC_VERSION}/mingw/bin/libgcc_s_seh-1.dll ${GHCUP_INSTALL_BASE_PREFIX}/ghcup/ghc/${GHC_VERSION}/bin
56+
# cp ${GHCUP_INSTALL_BASE_PREFIX}/ghcup/ghc/${GHC_VERSION}/mingw/bin/libwinpthread-1.dll ${GHCUP_INSTALL_BASE_PREFIX}/ghcup/ghc/${GHC_VERSION}/bin
5757
ghc --info
5858
# Shorten binary names
5959
sed -i.bak -e 's/haskell-language-server/hls/g' \
@@ -76,8 +76,8 @@ case "$(uname)" in
7676

7777
mkdir "$CI_PROJECT_DIR/out"
7878

79-
cp "$(cabal list-bin ${args[@]} exe:hls)" "$CI_PROJECT_DIR/out/haskell-language-server-${GHC_VERSION}"$EXE_EXTENSION
80-
cp "$(cabal list-bin ${args[@]} exe:hls-wrapper)" "$CI_PROJECT_DIR/out/haskell-language-server-wrapper"$EXE_EXTENSION
79+
cp "$(cabal list-bin -v0 ${args[@]} exe:hls)" "$CI_PROJECT_DIR/out/haskell-language-server-${GHC_VERSION}"$EXE_EXTENSION
80+
cp "$(cabal list-bin -v0 ${args[@]} exe:hls-wrapper)" "$CI_PROJECT_DIR/out/haskell-language-server-wrapper"$EXE_EXTENSION
8181
;;
8282
*)
8383
emake --version

‎.gitlab/test.sh

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -45,17 +45,17 @@ case "$(uname -s)" in
4545
;;
4646
esac
4747

48-
case "$(uname)" in
49-
MSYS_*|MINGW*)
50-
# workaround for https://gitlab.haskell.org/ghc/ghc/-/issues/21196
51-
export PATH="${GHCUP_INSTALL_BASE_PREFIX}/ghcup/ghc/${GHC_VERSION}/mingw/bin:${GHCUP_INSTALL_BASE_PREFIX}/ghcup/ghc/${GHC_VERSION}/mingw/usr/bin:$PATH"
52-
ls ${GHCUP_INSTALL_BASE_PREFIX}/ghcup/ghc/${GHC_VERSION}/mingw/bin
53-
cp ${GHCUP_INSTALL_BASE_PREFIX}/ghcup/ghc/${GHC_VERSION}/mingw/bin/libgcc_s_seh-1.dll ${GHCUP_INSTALL_BASE_PREFIX}/ghcup/ghc/${GHC_VERSION}/bin
54-
cp ${GHCUP_INSTALL_BASE_PREFIX}/ghcup/ghc/${GHC_VERSION}/mingw/bin/libwinpthread-1.dll ${GHCUP_INSTALL_BASE_PREFIX}/ghcup/ghc/${GHC_VERSION}/bin
55-
ghc --info
56-
;;
57-
*) ;;
58-
esac
48+
# case "$(uname)" in
49+
# MSYS_*|MINGW*)
50+
# # workaround for https://gitlab.haskell.org/ghc/ghc/-/issues/21196
51+
# export PATH="${GHCUP_INSTALL_BASE_PREFIX}/ghcup/ghc/${GHC_VERSION}/mingw/bin:${GHCUP_INSTALL_BASE_PREFIX}/ghcup/ghc/${GHC_VERSION}/mingw/usr/bin:$PATH"
52+
# ls ${GHCUP_INSTALL_BASE_PREFIX}/ghcup/ghc/${GHC_VERSION}/mingw/bin
53+
# cp ${GHCUP_INSTALL_BASE_PREFIX}/ghcup/ghc/${GHC_VERSION}/mingw/bin/libgcc_s_seh-1.dll ${GHCUP_INSTALL_BASE_PREFIX}/ghcup/ghc/${GHC_VERSION}/bin
54+
# cp ${GHCUP_INSTALL_BASE_PREFIX}/ghcup/ghc/${GHC_VERSION}/mingw/bin/libwinpthread-1.dll ${GHCUP_INSTALL_BASE_PREFIX}/ghcup/ghc/${GHC_VERSION}/bin
55+
# ghc --info
56+
# ;;
57+
# *) ;;
58+
# esac
5959

6060
# make sure out/ dir is gone, so build host rpaths don't
6161
# kick in (TODO: we should probably remove those)

‎ChangeLog.md

Lines changed: 262 additions & 0 deletions
Large diffs are not rendered by default.

‎cabal.project

Lines changed: 2 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ package *
4848

4949
write-ghc-environment-files: never
5050

51-
index-state: 2022-08-29T06:53:13Z
51+
index-state: 2022-09-14T16:53:13Z
5252

5353
constraints:
5454
-- For GHC 9.4, older versions of entropy fail to build on Windows
@@ -71,35 +71,6 @@ source-repository-package
7171
tag: 7a0af7a8fd38045fd15fb13445bdcc7085325460
7272
-- https://github.com/tibbe/ekg-json/pull/12
7373

74-
source-repository-package
75-
type:git
76-
location: https://github.com/wz1000/hiedb
77-
tag: 67b92df2359558091df9102db5b701327308b930
78-
79-
source-repository-package
80-
type:git
81-
location: https://github.com/wz1000/hie-bios
82-
tag: aa73d3d2eb89df0003d2468a105e326d71b62cc7
83-
84-
-- Remove me when a new version of lsp is released
85-
source-repository-package
86-
type:git
87-
location: https://github.com/haskell/lsp
88-
subdir: lsp
89-
tag: b0f8596887088b8ab65fc1015c773f45b47234ae
90-
91-
source-repository-package
92-
type:git
93-
location: https://github.com/haskell/lsp
94-
subdir: lsp-types
95-
tag: b0f8596887088b8ab65fc1015c773f45b47234ae
96-
97-
source-repository-package
98-
type:git
99-
location: https://github.com/haskell/lsp
100-
subdir: lsp-test
101-
tag: b0f8596887088b8ab65fc1015c773f45b47234ae
102-
10374
allow-newer:
10475
-- ghc-9.4
10576
Chart-diagrams:lens,
@@ -117,16 +88,9 @@ allow-newer:
11788
ekg-json:base,
11889
ghc-paths:Cabal,
11990
haddock-library:base,
120-
hie-bios:aeson,
121-
hie-bios:ghc,
12291
monoid-extras:base,
12392
monoid-subclasses:vector,
12493
svg-builder:base,
12594
uuid:time,
12695
vector-space:base,
127-
128-
-- ghc-9.2
129-
----------
130-
hiedb:base,
131-
132-
ekg-wai:time
96+
ekg-wai:time,

‎exe/Wrapper.hs

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -47,13 +47,12 @@ import Development.IDE.LSP.LanguageServer (runLanguageServer)
4747
import qualified Development.IDE.Main as Main
4848
import Development.IDE.Types.Logger (Logger (Logger),
4949
Pretty (pretty),
50-
Priority (Debug, Error, Info, Warning),
50+
Priority (Info),
5151
Recorder (logger_),
5252
WithPriority (WithPriority),
5353
cmapWithPrio,
5454
makeDefaultStderrRecorder)
5555
import GHC.Stack.Types (emptyCallStack)
56-
import HIE.Bios.Internal.Log
5756
import Ide.Plugin.Config (Config)
5857
import Language.LSP.Server (LspM)
5958
import qualified Language.LSP.Server as LSP
@@ -316,11 +315,3 @@ launchErrorLSP errorMsg = do
316315

317316
exitHandler :: IO () -> LSP.Handlers (ErrorLSPM c)
318317
exitHandler exit = LSP.notificationHandler SExit $ const $ liftIO exit
319-
320-
hlsWrapperLogger :: Logger
321-
hlsWrapperLogger = Logger $ \pri txt ->
322-
case pri of
323-
Debug -> debugm (T.unpack txt)
324-
Info -> logm (T.unpack txt)
325-
Warning -> warningm (T.unpack txt)
326-
Error -> errorm (T.unpack txt)

‎ghcide/ghcide.cabal

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ cabal-version: 3.0
22
build-type: Simple
33
category: Development
44
name: ghcide
5-
version: 1.7.0.1
5+
version: 1.8.0.0
66
license: Apache-2.0
77
license-file: LICENSE
88
author: Digital Asset and Ghcide contributors
@@ -64,13 +64,13 @@ library
6464
Glob,
6565
haddock-library >= 1.8 && < 1.11,
6666
hashable,
67-
hie-compat ^>= 0.2.0.0,
68-
hls-plugin-api ^>= 1.4,
67+
hie-compat ^>= 0.3.0.0,
68+
hls-plugin-api ^>= 1.5,
6969
lens,
7070
list-t,
71-
hiedb == 0.4.1.*,
72-
lsp-types ^>= 1.5.0.0,
73-
lsp ^>= 1.5.0.0 ,
71+
hiedb == 0.4.2.*,
72+
lsp-types ^>= 1.6.0.0,
73+
lsp ^>= 1.6.0.0 ,
7474
monoid-subclasses,
7575
mtl,
7676
optparse-applicative,
@@ -81,7 +81,7 @@ library
8181
regex-tdfa >= 1.3.1.0,
8282
text-rope,
8383
safe-exceptions,
84-
hls-graph ^>= 1.7,
84+
hls-graph ^>= 1.8,
8585
sorted-list,
8686
sqlite-simple,
8787
stm,
@@ -105,7 +105,7 @@ library
105105
ghc-check >=0.5.0.8,
106106
ghc-paths,
107107
cryptohash-sha1 >=0.11.100 && <0.12,
108-
hie-bios ^>= 0.9.1,
108+
hie-bios ^>= 0.11.0,
109109
implicit-hie-cradle ^>= 0.3.0.5 || ^>= 0.5,
110110
base16-bytestring >=0.1.1 && <1.1
111111
if os(windows)

‎ghcide/session-loader/Development/IDE/Session.hs

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,12 +68,14 @@ import Development.IDE.Types.Logger (Pretty (pretty),
6868
Priority (Debug, Error, Info, Warning),
6969
Recorder, WithPriority,
7070
logWith, nest, vcat,
71-
viaShow, (<+>))
71+
viaShow, (<+>),
72+
toCologActionWithPrio, cmapWithPrio)
7273
import Development.IDE.Types.Options
7374
import GHC.Check
7475
import qualified HIE.Bios as HieBios
76+
import qualified HIE.Bios.Types as HieBios
7577
import HIE.Bios.Environment hiding (getCacheDir)
76-
import HIE.Bios.Types
78+
import HIE.Bios.Types hiding (Log)
7779
import Hie.Implicit.Cradle (loadImplicitHieCradle)
7880
import Language.LSP.Server
7981
import Language.LSP.Types
@@ -123,6 +125,7 @@ data Log
123125
| LogCradle !(Cradle Void)
124126
| LogNoneCradleFound FilePath
125127
| LogNewComponentCache !(([FileDiagnostic], Maybe HscEnvEq), DependencyInfo)
128+
| LogHieBios HieBios.Log
126129
deriving instance Show Log
127130

128131
instance Pretty Log where
@@ -192,6 +195,7 @@ instance Pretty Log where
192195
"Cradle:" <+> viaShow cradle
193196
LogNewComponentCache componentCache ->
194197
"New component cache HscEnvEq:" <+> viaShow componentCache
198+
LogHieBios log -> pretty log
195199

196200
-- | Bump this version number when making changes to the format of the data stored in hiedb
197201
hiedbDataVersion :: String
@@ -716,7 +720,8 @@ cradleToOptsAndLibDir recorder cradle file = do
716720
-- noneCradleFoundMessage f = T.pack $ "none cradle found for " <> f <> ", ignoring the file"
717721
-- Start off by getting the session options
718722
logWith recorder Debug $ LogCradle cradle
719-
cradleRes <- HieBios.getCompilerOptions file cradle
723+
let logger = toCologActionWithPrio $ cmapWithPrio LogHieBios recorder
724+
cradleRes <- HieBios.getCompilerOptions logger file cradle
720725
case cradleRes of
721726
CradleSuccess r -> do
722727
-- Now get the GHC lib dir

‎ghcide/test/ghcide-test-utils.cabal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ cabal-version: 3.0
33
build-type: Simple
44
category: Development
55
name: ghcide-test-utils
6-
version: 1.7.0.1
6+
version: 1.8.0.0
77
license: Apache-2.0
88
license-file: LICENSE
99
author: Digital Asset and Ghcide contributors

‎haskell-language-server.cabal

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
cabal-version: 3.0
22
category: Development
33
name: haskell-language-server
4-
version: 1.7.0.0
4+
version: 1.8.0.0
55
synopsis: LSP server for GHC
66
description:
77
Please see the README on GitHub at <https://github.com/haskell/haskell-language-server#readme>
@@ -71,12 +71,12 @@ library
7171
, cryptohash-sha1
7272
, data-default
7373
, ghc
74-
, ghcide ^>=1.7
74+
, ghcide ^>=1.8
7575
, githash >=0.1.6.1
7676
, lsp
7777
, hie-bios
7878
, hiedb
79-
, hls-plugin-api ^>=1.4
79+
, hls-plugin-api ^>=1.5
8080
, optparse-applicative
8181
, optparse-simple
8282
, process
@@ -240,22 +240,22 @@ flag dynamic
240240

241241
common class
242242
if flag(class) && (impl(ghc < 9.4.1) || flag(ignore-plugins-ghc-bounds))
243-
build-depends: hls-class-plugin ^>= 1.0
243+
build-depends: hls-class-plugin ^>= 1.1
244244
cpp-options: -Dhls_class
245245

246246
common callHierarchy
247247
if flag(callHierarchy)
248-
build-depends: hls-call-hierarchy-plugin ^>= 1.0
248+
build-depends: hls-call-hierarchy-plugin ^>= 1.1
249249
cpp-options: -Dhls_callHierarchy
250250

251251
common haddockComments
252252
if flag(haddockComments) && (impl(ghc < 9.2.1) || flag(ignore-plugins-ghc-bounds))
253-
build-depends: hls-haddock-comments-plugin ^>= 1.0
253+
build-depends: hls-haddock-comments-plugin ^>= 1.1
254254
cpp-options: -Dhls_haddockComments
255255

256256
common eval
257257
if flag(eval) && (impl(ghc < 9.4.1) || flag(ignore-plugins-ghc-bounds))
258-
build-depends: hls-eval-plugin ^>= 1.2
258+
build-depends: hls-eval-plugin ^>= 1.3
259259
cpp-options: -Dhls_eval
260260

261261
common importLens
@@ -280,12 +280,12 @@ common retrie
280280

281281
common tactic
282282
if flag(tactic) && (impl(ghc < 9.2.1) || flag(ignore-plugins-ghc-bounds))
283-
build-depends: hls-tactics-plugin >=1.2.0.0 && <1.7
283+
build-depends: hls-tactics-plugin ^>= 1.7
284284
cpp-options: -Dhls_tactic
285285

286286
common hlint
287287
if flag(hlint) && (impl(ghc < 9.4.1) || flag(ignore-plugins-ghc-bounds))
288-
build-depends: hls-hlint-plugin ^>= 1.0
288+
build-depends: hls-hlint-plugin ^>= 1.1
289289
cpp-options: -Dhls_hlint
290290

291291
common stan
@@ -295,7 +295,7 @@ common stan
295295

296296
common moduleName
297297
if flag(moduleName)
298-
build-depends: hls-module-name-plugin ^>= 1.0
298+
build-depends: hls-module-name-plugin ^>= 1.1
299299
cpp-options: -Dhls_moduleName
300300

301301
common pragmas
@@ -310,7 +310,7 @@ common splice
310310

311311
common alternateNumberFormat
312312
if flag(alternateNumberFormat)
313-
build-depends: hls-alternate-number-format-plugin ^>= 1.1
313+
build-depends: hls-alternate-number-format-plugin ^>= 1.2
314314
cpp-options: -Dhls_alternateNumberFormat
315315

316316
common qualifyImportedNames
@@ -347,7 +347,7 @@ common floskell
347347

348348
common fourmolu
349349
if flag(fourmolu) && (impl(ghc < 9.4.1) || flag(ignore-plugins-ghc-bounds))
350-
build-depends: hls-fourmolu-plugin ^>= 1.0
350+
build-depends: hls-fourmolu-plugin ^>= 1.1
351351
cpp-options: -Dhls_fourmolu
352352

353353
common ormolu
@@ -534,7 +534,7 @@ test-suite func-test
534534
, lens
535535
, lens-aeson
536536
, ghcide
537-
, hls-test-utils ^>=1.3
537+
, hls-test-utils ^>=1.4
538538
, lsp-types
539539
, aeson
540540
, hls-plugin-api

‎hie-compat/hie-compat.cabal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
cabal-version: 1.22
22
name: hie-compat
3-
version: 0.2.1.1
3+
version: 0.3.0.0
44
synopsis: HIE files for GHC 8.6 and other HIE file backports
55
license: Apache-2.0
66
description:

‎hls-graph/hls-graph.cabal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
cabal-version: 2.4
22
name: hls-graph
3-
version: 1.7.0.0
3+
version: 1.8.0.0
44
synopsis: Haskell Language Server internal graph API
55
description:
66
Please see the README on GitHub at <https://github.com/haskell/haskell-language-server/tree/master/hls-graph#readme>

‎hls-plugin-api/hls-plugin-api.cabal

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
cabal-version: 2.4
22
name: hls-plugin-api
3-
version: 1.4.0.0
3+
version: 1.5.0.0
44
synopsis: Haskell Language Server API for plugin communication
55
description:
66
Please see the README on GitHub at <https://github.com/haskell/haskell-language-server#readme>
@@ -46,10 +46,10 @@ library
4646
, filepath
4747
, ghc
4848
, hashable
49-
, hls-graph ^>= 1.7
49+
, hls-graph ^>= 1.8
5050
, lens
5151
, lens-aeson
52-
, lsp ^>=1.5.0.0
52+
, lsp ^>=1.6.0.0
5353
, opentelemetry >=0.4
5454
, optparse-applicative
5555
, process

0 commit comments

Comments
 (0)