Skip to content

Commit d85938f

Browse files
committed
Rename to haskell-language-server
Voting at time of migration was 42 for this name, next closest was 6. Closes #29
1 parent 34e77bd commit d85938f

19 files changed

+94
-78
lines changed

README.md

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,16 @@
1-
# ide
1+
# haskell-language-server
2+
23
[![License Apache 2.0][badge-license]][license]
34
[![CircleCI][badge-circleci]][circleci]
45

56
[badge-license]: https://img.shields.io/badge/license-Apache2-green.svg?dummy
6-
[license]: https://github.com/haskell/ide/blob/master/LICENSE
7-
[badge-circleci]: https://img.shields.io/circleci/project/github/haskell/ide/master.svg
8-
[circleci]: https://circleci.com/gh/haskell/ide/
7+
[license]: https://github.com/haskell/haskell-language-server/blob/master/LICENSE
8+
[badge-circleci]: https://img.shields.io/circleci/project/github/haskell/haskell-language-server/master.svg
9+
[circleci]: https://circleci.com/gh/haskell/haskell-language-server/
910

10-
Integration point for ghcide and haskell-ide-engine. One IDE to rule them all. Read the [project's background](https://neilmitchell.blogspot.com/2020/01/one-haskell-ide-to-rule-them-all.html).
11+
Integration point for ghcide and haskell-ide-engine. One IDE to rule
12+
them all. Read the [project's
13+
background](https://neilmitchell.blogspot.com/2020/01/one-haskell-ide-to-rule-them-all.html).
1114

1215
This is *very* early stage software.
1316

File renamed without changes.
File renamed without changes.

cabal.project

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,14 @@ packages:
44

55
tests: true
66

7-
package ide
7+
package haskell-language-server
88
test-show-details: direct
99
package ghcide
1010
test-show-details: direct
1111

1212
write-ghc-environment-files: never
13+
14+
-- pre-brexit
15+
-- A later version (2020-02-01T08:48:32Z) has a problem with a diamond
16+
-- dependency for cabal-helper and cabal-plan
17+
index-state: 2020-01-31T22:59:59Z

exe/Arguments.hs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import Data.Version
1919
import Development.GitRev
2020
import qualified GHC.Paths
2121
import Options.Applicative
22-
import Paths_ide
22+
import Paths_haskell_language_server
2323
import System.Environment
2424

2525
-- ---------------------------------------------------------------------
@@ -38,7 +38,7 @@ getArguments exeName = execParser opts
3838
where
3939
opts = info (arguments exeName <**> helper)
4040
( fullDesc
41-
<> progDesc "Used as a test bed to check your IDE will work"
41+
<> progDesc "Used as a test bed to check your IDE Client will work"
4242
<> header (exeName ++ " - GHC Haskell LSP server"))
4343

4444
arguments :: String -> Parser Arguments

exe/Main.hs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ main :: IO ()
6565
main = do
6666
-- WARNING: If you write to stdout before runLanguageServer
6767
-- then the language server will not work
68-
Arguments{..} <- getArguments "haskell-ide"
68+
Arguments{..} <- getArguments "haskell-language-server"
6969

7070
if argsVersion then ghcideVersion >>= putStrLn >> exitSuccess
7171
else hPutStrLn stderr {- see WARNING above -} =<< ghcideVersion
@@ -83,7 +83,7 @@ main = do
8383

8484
if argLSP then do
8585
t <- offsetTime
86-
hPutStrLn stderr "Starting (ide)LSP server..."
86+
hPutStrLn stderr "Starting (haskell-language-server)LSP server..."
8787
hPutStrLn stderr "If you are seeing this in a terminal, you probably should have run ghcide WITHOUT the --lsp option!"
8888
runLanguageServer def (pluginHandler plugins) $ \getLspId event vfs caps -> do
8989
t <- t
@@ -96,8 +96,8 @@ main = do
9696
}
9797
initialise caps (mainRule >> pluginRules plugins >> action kick) getLspId event (logger minBound) options vfs
9898
else do
99-
putStrLn $ "Ghcide setup tester in " ++ dir ++ "."
100-
putStrLn "Report bugs at https://github.com/digital-asset/ghcide/issues"
99+
putStrLn $ "(haskell-language-server)Ghcide setup tester in " ++ dir ++ "."
100+
putStrLn "Report bugs at https://github.com/haskell/haskell-language-server/issues"
101101

102102
putStrLn $ "\nStep 1/6: Finding files to test in " ++ dir
103103
files <- nubOrd <$> expandFiles (argFiles ++ ["." | null argFiles])

exe/Wrapper.hs

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ main :: IO ()
3434
main = do
3535
-- WARNING: If you write to stdout before runLanguageServer
3636
-- then the language server will not work
37-
Arguments{..} <- getArguments "haskell-ide"
37+
Arguments{..} <- getArguments "haskell-language-server-wrapper"
3838

3939
if argsVersion then ghcideVersion >>= putStrLn >> exitSuccess
4040
else hPutStrLn stderr {- see WARNING above -} =<< ghcideVersion
@@ -55,7 +55,8 @@ main = do
5555
-- Core.setupLogger mLogFileName ["hie"] logLevel
5656

5757
progName <- getProgName
58-
logm $ "run entered for haskell-ide-wrapper(" ++ progName ++ ") " ++ hieVersion
58+
logm $ "run entered for haskell-language-server-wrapper(" ++ progName ++ ") "
59+
++ hieVersion
5960
d <- getCurrentDirectory
6061
logm $ "Current directory:" ++ d
6162
logm $ "Operating system:" ++ os
@@ -72,22 +73,22 @@ main = do
7273
logm $ "Project GHC version:" ++ ghcVersion
7374

7475
let
75-
hieBin = "haskell-ide-" ++ ghcVersion
76+
hieBin = "haskell-language-server-" ++ ghcVersion
7677
backupHieBin =
7778
case dropWhileEnd (/='.') ghcVersion of
78-
[] -> "haskell-ide"
79-
xs -> "haskell-ide-" ++ init xs
80-
candidates' = [hieBin, backupHieBin, "haskell-ide"]
79+
[] -> "haskell-language-server"
80+
xs -> "haskell-language-server-" ++ init xs
81+
candidates' = [hieBin, backupHieBin, "haskell-language-server"]
8182
candidates = map (++ exeExtension) candidates'
8283

83-
logm $ "haskell-ide exe candidates :" ++ show candidates
84+
logm $ "haskell-language-server exe candidates :" ++ show candidates
8485

8586
mexes <- traverse findExecutable candidates
8687

8788
case asum mexes of
88-
Nothing -> logm $ "cannot find any haskell-ide exe, looked for:" ++ intercalate ", " candidates
89+
Nothing -> logm $ "cannot find any haskell-language-server exe, looked for:" ++ intercalate ", " candidates
8990
Just e -> do
90-
logm $ "found haskell-ide exe at:" ++ e
91+
logm $ "found haskell-language-server exe at:" ++ e
9192
logm $ "args:" ++ show args
9293
logm "launching ....\n\n\n"
9394
callProcess e args

ide.cabal renamed to haskell-language-server.cabal

Lines changed: 16 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
cabal-version: 1.12
22
category: Development
3-
name: ide
3+
name: haskell-language-server
44
version: 0.1.0.0
55
synopsis: LSP server for GHC
6-
description: Please see the README on GitHub at <https://github.com/alanz/ide#readme>
7-
homepage: https://github.com/alanz/ide#readme
8-
bug-reports: https://github.com/alanz/ide/issues
6+
description: Please see the README on GitHub at <https://github.com/haskell/haskell-language-server#readme>
7+
homepage: https://github.com/haskell/haskell-language-server#readme
8+
bug-reports: https://github.com/haskell/haskell-language-server/issues
99
author: Alan Zimmerman
1010
maintainer: [email protected]
1111
copyright: Alan Zimmerman
@@ -16,23 +16,22 @@ extra-source-files:
1616
README.md
1717
ChangeLog.md
1818

19-
2019
flag pedantic
2120
Description: Enable -Werror
2221
Default: False
2322
Manual: True
2423

2524
source-repository head
2625
type: git
27-
location: https://github.com/alanz/ide
26+
location: https://github.com/haskell/haskell-language-server
2827

2928
library
3029
exposed-modules:
3130
Ide.Cradle
3231
Ide.Plugin.Example
3332
Ide.Version
3433
other-modules:
35-
Paths_ide
34+
Paths_haskell_language_server
3635
hs-source-dirs:
3736
src
3837
build-depends:
@@ -87,15 +86,15 @@ library
8786

8887
default-language: Haskell2010
8988

90-
executable haskell-ide
89+
executable haskell-language-server
9190
main-is: Main.hs
9291
hs-source-dirs:
9392
exe
9493
other-modules:
9594
Arguments
96-
Paths_ide
95+
Paths_haskell_language_server
9796
autogen-modules:
98-
Paths_ide
97+
Paths_haskell_language_server
9998
ghc-options:
10099
-threaded
101100
-Wall
@@ -124,21 +123,21 @@ executable haskell-ide
124123
, haskell-lsp
125124
, hie-bios >= 0.3.2 && < 0.4
126125
, hslogger
127-
, ide
126+
, haskell-language-server
128127
, optparse-applicative
129128
, shake >= 0.17.5
130129
, text
131130
default-language: Haskell2010
132131

133-
executable haskell-ide-wrapper
132+
executable haskell-language-server-wrapper
134133
main-is: Wrapper.hs
135134
hs-source-dirs:
136135
exe
137136
other-modules:
138137
Arguments
139-
Paths_ide
138+
Paths_haskell_language_server
140139
autogen-modules:
141-
Paths_ide
140+
Paths_haskell_language_server
142141
ghc-options:
143142
-threaded
144143
-Wall
@@ -163,7 +162,7 @@ executable haskell-ide-wrapper
163162
, ghc-paths
164163
, haskell-lsp
165164
, hie-bios
166-
, ide
165+
, haskell-language-server
167166
, optparse-applicative
168167
, process
169168
, text
@@ -174,7 +173,7 @@ test-suite test
174173
type: exitcode-stdio-1.0
175174
main-is: Spec.hs
176175
other-modules:
177-
Paths_ide
176+
Paths_haskell_language_server
178177
hs-source-dirs:
179178
test
180179
ghc-options:
@@ -186,5 +185,5 @@ test-suite test
186185
ghc-options: -Werror
187186
build-depends:
188187
base >=4.7 && <5
189-
, ide
188+
, haskell-language-server
190189
default-language: Haskell2010

hie.yaml.cbl

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
1-
# This is a sample hie.yaml file for opening haskell-ide-engine in
2-
# hie, using cabal as the build system.
3-
# To use is, copy it to a file called 'hie.yaml'
1+
# This is a sample hie.yaml file for opening haskell-language-server
2+
# in hie, using cabal as the build system. To use is, copy it to a
3+
# file called 'hie.yaml'
44

55
cradle:
66
cabal:
77

88
- path: "./test"
9-
component: "ide:test"
9+
component: "haskell-language-server:test"
1010

1111
- path: "./exe/Main.hs"
12-
component: "ide:exe:haskell-ide"
12+
component: "haskell-language-server:exe:haskell-language-server"
1313

1414
- path: "./exe/Wrapper.hs"
15-
component: "ide:exe:haskell-ide-wrapper"
15+
component: "haskell-language-server:exe:haskell-language-server-wrapper"
1616

1717
- path: "./src"
18-
component: "lib:ide"
18+
component: "lib:haskell-language-server"
1919

2020
- path: "./ghcide/src"
2121
component: "ghcide:lib:ghcide"

hie.yaml.stack

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,23 @@
1-
# This is a sample hie.yaml file for opening haskell-ide-engine in
2-
# hie, using stack as the build system.
3-
# To use is, copy it to a file called 'hie.yaml'
1+
# This is a sample hie.yaml file for opening haskell-language-server
2+
# in hie, using stack as the build system. To use is, copy it to a
3+
# file called 'hie.yaml'
44

55
cradle:
66
stack:
77
- path: "./test"
8-
component: "ide:test"
8+
component: "haskell-language-server:test"
99

10-
- path: "./exe"
11-
component: "ide:exe:ide"
10+
- path: "./exe/Main.hs"
11+
component: "haskell-language-server:exe:haskell-language-server"
12+
13+
- path: "./exe/Wrapper.hs"
14+
component: "haskell-language-server:exe:haskell-language-server-wrapper"
1215

1316
- path: "./src"
14-
component: "ide:lib"
17+
component: "haskell-language-server:lib"
18+
19+
- path: "./ghcide/src"
20+
component: "ghcide:lib:ghcide"
21+
22+
- path: "./ghcide/exe"
23+
component: "ghcide:exe:ghcide"

0 commit comments

Comments
 (0)