Skip to content

Commit fccb9e2

Browse files
authored
Merge branch 'master' into nix-8.10.3
2 parents 8de2ca5 + 2d9fbc8 commit fccb9e2

File tree

4 files changed

+11
-13
lines changed

4 files changed

+11
-13
lines changed

ghcide/ghcide.cabal

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -253,9 +253,8 @@ executable ghcide
253253
-- allow user RTS overrides
254254
-rtsopts
255255
-- disable idle GC
256-
-- disable parallel GC
257256
-- increase nursery size
258-
"-with-rtsopts=-I0 -qg -A128M"
257+
"-with-rtsopts=-I0 -A128M"
259258
main-is: Main.hs
260259
build-depends:
261260
aeson,

ghcide/src/Development/IDE/LSP/Outline.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ moduleOutline
4040
moduleOutline _lsp ideState DocumentSymbolParams { _textDocument = TextDocumentIdentifier uri }
4141
= case uriToFilePath uri of
4242
Just (toNormalizedFilePath' -> fp) -> do
43-
mb_decls <- fmap fst <$> runIdeAction "Outline" (shakeExtras ideState) (useWithStaleFast GetParsedModule fp)
43+
mb_decls <- fmap fst <$> runAction "Outline" ideState (useWithStale GetParsedModule fp)
4444
pure $ Right $ case mb_decls of
4545
Nothing -> DSDocumentSymbols (List [])
4646
Just ParsedModule { pm_parsed_source = L _ltop HsModule { hsmodName, hsmodDecls, hsmodImports } }

haskell-language-server.cabal

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -294,9 +294,8 @@ executable haskell-language-server
294294
-- allow user RTS overrides
295295
-rtsopts
296296
-- disable idle GC
297-
-- disable parallel GC
298297
-- increase nursery size
299-
"-with-rtsopts=-I0 -qg -A128M"
298+
"-with-rtsopts=-I0 -A128M"
300299
if flag(pedantic)
301300
ghc-options: -Werror
302301

@@ -341,9 +340,8 @@ executable haskell-language-server-wrapper
341340
-- allow user RTS overrides
342341
-rtsopts
343342
-- disable idle GC
344-
-- disable parallel GC
345343
-- increase nursery size
346-
"-with-rtsopts=-I0 -qg -A128M"
344+
"-with-rtsopts=-I0 -A128M"
347345
if flag(pedantic)
348346
ghc-options: -Werror
349347

@@ -468,7 +466,3 @@ test-suite wrapper-test
468466
hs-source-dirs: test/wrapper
469467
main-is: Main.hs
470468
ghc-options: -Wall
471-
472-
473-
474-

plugins/hls-class-plugin/hls-class-plugin.cabal

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,16 @@
11
cabal-version: 2.2
22
name: hls-class-plugin
3-
version: 0.1.0.0
4-
synopsis: Explicit imports plugin for Haskell Language Server
3+
version: 0.1.0.1
4+
synopsis: Class/instance management plugin for Haskell Language Server
5+
description:
6+
Class/instance management plugin for Haskell Language Server.
7+
For usage, please see README of HLS on GitHub at <https://github.com/haskell/haskell-language-server#readme>
58
license: Apache-2.0
69
license-file: LICENSE
710
author: Junyoung Clare Jang
811
maintainer: [email protected]
12+
homepage: https://github.com/haskell/haskell-language-server#readme
13+
bug-reports: https://github.com/haskell/haskell-language-server/issues
914
category: Development
1015
build-type: Simple
1116

0 commit comments

Comments
 (0)