Compare commits
11 Commits
opencollec
...
hls-1.4.0
| Author | SHA1 | Date | |
|---|---|---|---|
|
0f14dee72a
|
|||
|
ae2031174e
|
|||
|
c163278c64
|
|||
|
d10133f06f
|
|||
|
4377fc663e
|
|||
|
|
737f72f90f | ||
|
|
c3aab65521 | ||
|
|
972474f79a | ||
| bc64d2ade0 | |||
|
|
eddda55fe6 | ||
|
|
13aca91231 |
@@ -72,7 +72,6 @@ toolRequirements:
|
|||||||
'( >= 7 && < 8 )':
|
'( >= 7 && < 8 )':
|
||||||
distroPKGs:
|
distroPKGs:
|
||||||
- gcc
|
- gcc
|
||||||
- gcc-c++
|
|
||||||
- gmp
|
- gmp
|
||||||
- gmp-devel
|
- gmp-devel
|
||||||
- make
|
- make
|
||||||
@@ -83,7 +82,6 @@ toolRequirements:
|
|||||||
unknown_versioning:
|
unknown_versioning:
|
||||||
distroPKGs:
|
distroPKGs:
|
||||||
- gcc
|
- gcc
|
||||||
- gcc-c++
|
|
||||||
- gmp
|
- gmp
|
||||||
- gmp-devel
|
- gmp-devel
|
||||||
- make
|
- make
|
||||||
@@ -96,7 +94,6 @@ toolRequirements:
|
|||||||
unknown_versioning:
|
unknown_versioning:
|
||||||
distroPKGs:
|
distroPKGs:
|
||||||
- gcc
|
- gcc
|
||||||
- gcc-c++
|
|
||||||
- gmp
|
- gmp
|
||||||
- gmp-devel
|
- gmp-devel
|
||||||
- make
|
- make
|
||||||
@@ -111,14 +108,15 @@ toolRequirements:
|
|||||||
- binutils-gold
|
- binutils-gold
|
||||||
- curl
|
- curl
|
||||||
- gcc
|
- gcc
|
||||||
- g++
|
|
||||||
- gmp-dev
|
- gmp-dev
|
||||||
- ncurses-dev
|
- libc-dev
|
||||||
- libffi-dev
|
- libffi-dev
|
||||||
- make
|
- make
|
||||||
- xz
|
- musl-dev
|
||||||
- tar
|
- ncurses-dev
|
||||||
- perl
|
- perl
|
||||||
|
- tar
|
||||||
|
- xz
|
||||||
notes: ''
|
notes: ''
|
||||||
Linux_UnknownLinux:
|
Linux_UnknownLinux:
|
||||||
unknown_versioning:
|
unknown_versioning:
|
||||||
@@ -2357,9 +2355,7 @@ ghcupDownloads:
|
|||||||
Linux_Alpine:
|
Linux_Alpine:
|
||||||
unknown_versioning: *hls-120-64
|
unknown_versioning: *hls-120-64
|
||||||
1.3.0:
|
1.3.0:
|
||||||
viTags:
|
viTags: []
|
||||||
- Recommended
|
|
||||||
- Latest
|
|
||||||
viChangeLog: https://github.com/haskell/haskell-language-server/blob/master/ChangeLog.md#130
|
viChangeLog: https://github.com/haskell/haskell-language-server/blob/master/ChangeLog.md#130
|
||||||
viPostInstall: *hls-post-install
|
viPostInstall: *hls-post-install
|
||||||
viArch:
|
viArch:
|
||||||
@@ -2378,6 +2374,28 @@ ghcupDownloads:
|
|||||||
dlHash: 46aac7be888e29a9907cf56698c1ce1475c148b5e6cc099513e9ef74a0520dcf
|
dlHash: 46aac7be888e29a9907cf56698c1ce1475c148b5e6cc099513e9ef74a0520dcf
|
||||||
Linux_Alpine:
|
Linux_Alpine:
|
||||||
unknown_versioning: *hls-130-64
|
unknown_versioning: *hls-130-64
|
||||||
|
1.4.0:
|
||||||
|
viTags:
|
||||||
|
- Recommended
|
||||||
|
- Latest
|
||||||
|
viChangeLog: https://github.com/haskell/haskell-language-server/blob/master/ChangeLog.md#140
|
||||||
|
viPostInstall: *hls-post-install
|
||||||
|
viArch:
|
||||||
|
A_64:
|
||||||
|
Linux_UnknownLinux:
|
||||||
|
unknown_versioning: &hls-140-64
|
||||||
|
dlUri: https://github.com/haskell/haskell-language-server/releases/download/1.4.0/haskell-language-server-Linux-1.4.0.tar.gz
|
||||||
|
dlHash: f93c114441911ccce55649702adc9553cb4c9f953c37878321d2806a3525fee8
|
||||||
|
Darwin:
|
||||||
|
unknown_versioning:
|
||||||
|
dlUri: https://github.com/haskell/haskell-language-server/releases/download/1.4.0/haskell-language-server-macOS-1.4.0.tar.gz
|
||||||
|
dlHash: a7f0ac6be93ffb08cc239e5f5fead99b061061825f99566c1be33ee60cab62a4
|
||||||
|
Windows:
|
||||||
|
unknown_versioning:
|
||||||
|
dlUri: https://github.com/haskell/haskell-language-server/releases/download/1.4.0/haskell-language-server-Windows-1.4.0.tar.gz
|
||||||
|
dlHash: 0ec77cee750037b7a0ede817b46a913a702821f4098c6a858bcb686cb30f7efd
|
||||||
|
Linux_Alpine:
|
||||||
|
unknown_versioning: *hls-140-64
|
||||||
Stack:
|
Stack:
|
||||||
2.5.1:
|
2.5.1:
|
||||||
viTags:
|
viTags:
|
||||||
|
|||||||
@@ -72,7 +72,6 @@ toolRequirements:
|
|||||||
'( >= 7 && < 8 )':
|
'( >= 7 && < 8 )':
|
||||||
distroPKGs:
|
distroPKGs:
|
||||||
- gcc
|
- gcc
|
||||||
- gcc-c++
|
|
||||||
- gmp
|
- gmp
|
||||||
- gmp-devel
|
- gmp-devel
|
||||||
- make
|
- make
|
||||||
@@ -83,7 +82,6 @@ toolRequirements:
|
|||||||
unknown_versioning:
|
unknown_versioning:
|
||||||
distroPKGs:
|
distroPKGs:
|
||||||
- gcc
|
- gcc
|
||||||
- gcc-c++
|
|
||||||
- gmp
|
- gmp
|
||||||
- gmp-devel
|
- gmp-devel
|
||||||
- make
|
- make
|
||||||
@@ -96,7 +94,6 @@ toolRequirements:
|
|||||||
unknown_versioning:
|
unknown_versioning:
|
||||||
distroPKGs:
|
distroPKGs:
|
||||||
- gcc
|
- gcc
|
||||||
- gcc-c++
|
|
||||||
- gmp
|
- gmp
|
||||||
- gmp-devel
|
- gmp-devel
|
||||||
- make
|
- make
|
||||||
@@ -109,7 +106,6 @@ toolRequirements:
|
|||||||
unknown_versioning:
|
unknown_versioning:
|
||||||
distroPKGs:
|
distroPKGs:
|
||||||
- gcc
|
- gcc
|
||||||
- g++
|
|
||||||
- gmp
|
- gmp
|
||||||
- gmp-devel
|
- gmp-devel
|
||||||
- make
|
- make
|
||||||
@@ -125,14 +121,15 @@ toolRequirements:
|
|||||||
- binutils-gold
|
- binutils-gold
|
||||||
- curl
|
- curl
|
||||||
- gcc
|
- gcc
|
||||||
- g++
|
|
||||||
- gmp-dev
|
- gmp-dev
|
||||||
- ncurses-dev
|
- libc-dev
|
||||||
- libffi-dev
|
- libffi-dev
|
||||||
- make
|
- make
|
||||||
- xz
|
- musl-dev
|
||||||
- tar
|
- ncurses-dev
|
||||||
- perl
|
- perl
|
||||||
|
- tar
|
||||||
|
- xz
|
||||||
notes: ''
|
notes: ''
|
||||||
Linux_UnknownLinux:
|
Linux_UnknownLinux:
|
||||||
unknown_versioning:
|
unknown_versioning:
|
||||||
@@ -2419,9 +2416,7 @@ ghcupDownloads:
|
|||||||
Linux_Alpine:
|
Linux_Alpine:
|
||||||
unknown_versioning: *hls-120-64
|
unknown_versioning: *hls-120-64
|
||||||
1.3.0:
|
1.3.0:
|
||||||
viTags:
|
viTags: []
|
||||||
- Recommended
|
|
||||||
- Latest
|
|
||||||
viChangeLog: https://github.com/haskell/haskell-language-server/blob/master/ChangeLog.md#130
|
viChangeLog: https://github.com/haskell/haskell-language-server/blob/master/ChangeLog.md#130
|
||||||
viPostInstall: *hls-post-install
|
viPostInstall: *hls-post-install
|
||||||
viArch:
|
viArch:
|
||||||
@@ -2440,6 +2435,28 @@ ghcupDownloads:
|
|||||||
dlHash: 46aac7be888e29a9907cf56698c1ce1475c148b5e6cc099513e9ef74a0520dcf
|
dlHash: 46aac7be888e29a9907cf56698c1ce1475c148b5e6cc099513e9ef74a0520dcf
|
||||||
Linux_Alpine:
|
Linux_Alpine:
|
||||||
unknown_versioning: *hls-130-64
|
unknown_versioning: *hls-130-64
|
||||||
|
1.4.0:
|
||||||
|
viTags:
|
||||||
|
- Recommended
|
||||||
|
- Latest
|
||||||
|
viChangeLog: https://github.com/haskell/haskell-language-server/blob/master/ChangeLog.md#140
|
||||||
|
viPostInstall: *hls-post-install
|
||||||
|
viArch:
|
||||||
|
A_64:
|
||||||
|
Linux_UnknownLinux:
|
||||||
|
unknown_versioning: &hls-140-64
|
||||||
|
dlUri: https://github.com/haskell/haskell-language-server/releases/download/1.4.0/haskell-language-server-Linux-1.4.0.tar.gz
|
||||||
|
dlHash: f93c114441911ccce55649702adc9553cb4c9f953c37878321d2806a3525fee8
|
||||||
|
Darwin:
|
||||||
|
unknown_versioning:
|
||||||
|
dlUri: https://github.com/haskell/haskell-language-server/releases/download/1.4.0/haskell-language-server-macOS-1.4.0.tar.gz
|
||||||
|
dlHash: a7f0ac6be93ffb08cc239e5f5fead99b061061825f99566c1be33ee60cab62a4
|
||||||
|
Windows:
|
||||||
|
unknown_versioning:
|
||||||
|
dlUri: https://github.com/haskell/haskell-language-server/releases/download/1.4.0/haskell-language-server-Windows-1.4.0.tar.gz
|
||||||
|
dlHash: 0ec77cee750037b7a0ede817b46a913a702821f4098c6a858bcb686cb30f7efd
|
||||||
|
Linux_Alpine:
|
||||||
|
unknown_versioning: *hls-140-64
|
||||||
Stack:
|
Stack:
|
||||||
2.5.1:
|
2.5.1:
|
||||||
viTags:
|
viTags:
|
||||||
|
|||||||
29
lib/GHCup.hs
29
lib/GHCup.hs
@@ -868,6 +868,8 @@ setGHC ver sghc = do
|
|||||||
-- create symlink for share dir
|
-- create symlink for share dir
|
||||||
when (isNothing . _tvTarget $ ver) $ lift $ symlinkShareDir ghcdir verS
|
when (isNothing . _tvTarget $ ver) $ lift $ symlinkShareDir ghcdir verS
|
||||||
|
|
||||||
|
when (sghc == SetGHCOnly) $ lift warnAboutHlsCompatibility
|
||||||
|
|
||||||
pure ver
|
pure ver
|
||||||
|
|
||||||
where
|
where
|
||||||
@@ -978,6 +980,8 @@ setHLS ver = do
|
|||||||
|
|
||||||
lift $ createLink destL wrapper
|
lift $ createLink destL wrapper
|
||||||
|
|
||||||
|
lift warnAboutHlsCompatibility
|
||||||
|
|
||||||
pure ()
|
pure ()
|
||||||
|
|
||||||
|
|
||||||
@@ -1010,6 +1014,31 @@ setStack ver = do
|
|||||||
pure ()
|
pure ()
|
||||||
|
|
||||||
|
|
||||||
|
-- | Warn if the installed and set HLS is not compatible with the installed and
|
||||||
|
-- set GHC version.
|
||||||
|
warnAboutHlsCompatibility :: ( MonadReader env m
|
||||||
|
, HasDirs env
|
||||||
|
, HasLog env
|
||||||
|
, MonadThrow m
|
||||||
|
, MonadCatch m
|
||||||
|
, MonadIO m
|
||||||
|
)
|
||||||
|
=> m ()
|
||||||
|
warnAboutHlsCompatibility = do
|
||||||
|
supportedGHC <- hlsGHCVersions
|
||||||
|
currentGHC <- fmap _tvVersion <$> ghcSet Nothing
|
||||||
|
currentHLS <- hlsSet
|
||||||
|
|
||||||
|
case (currentGHC, currentHLS) of
|
||||||
|
(Just gv, Just hv) | gv `notElem` supportedGHC -> do
|
||||||
|
logWarn $
|
||||||
|
"GHC " <> T.pack (prettyShow gv) <> " is not compatible with " <>
|
||||||
|
"Haskell Language Server " <> T.pack (prettyShow hv) <> "." <> "\n" <>
|
||||||
|
"Haskell IDE support may not work until this is fixed." <> "\n" <>
|
||||||
|
"Install a different HLS version, or install and set one of the following GHCs:" <> "\n" <>
|
||||||
|
T.pack (prettyShow supportedGHC)
|
||||||
|
|
||||||
|
_ -> return ()
|
||||||
|
|
||||||
------------------
|
------------------
|
||||||
--[ List tools ]--
|
--[ List tools ]--
|
||||||
|
|||||||
@@ -475,7 +475,7 @@ hlsGHCVersions = do
|
|||||||
. splitOn "~"
|
. splitOn "~"
|
||||||
)
|
)
|
||||||
bins
|
bins
|
||||||
pure . rights . concat . maybeToList $ vers
|
pure . sortBy (flip compare) . rights . concat . maybeToList $ vers
|
||||||
|
|
||||||
|
|
||||||
-- | Get all server binaries for an hls version, if any.
|
-- | Get all server binaries for an hls version, if any.
|
||||||
|
|||||||
Reference in New Issue
Block a user