Skip to content
This repository was archived by the owner on Oct 7, 2020. It is now read-only.

Commit 164c038

Browse files
committed
Merge pull request #179 from cocreature/remove-ide-backend
Remove ide-backend
2 parents 6078c36 + 7ccb508 commit 164c038

12 files changed

+14
-377
lines changed

.travis.yml

+1-3
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,8 @@ before_install:
2121
install:
2222
- "./travis_long stack +RTS -N2 -RTS setup"
2323
- "./travis_long stack build --only-snapshot"
24-
- "./travis_long stack install ide-backend-server"
2524
script:
26-
- "STACK_YAML=stack_test.yaml ./travis_long stack +RTS -N1 -RTS build --test --no-run-tests"
27-
- "./travis_long stack +RTS -N1 -RTS build --test"
25+
- "./travis_long ./pedantic.sh +RTS -N1 -RTS"
2826
- "./travis_long stack exec emacs24 -- -q --batch -L elisp -l elisp/tests/hie-tests.el
2927
-f ert-run-tests-batch-and-exit"
3028
- "./travis_long ./deploy-docs.sh"

Makefile

+2-6
Original file line numberDiff line numberDiff line change
@@ -5,22 +5,18 @@ ifeq (,$(shell which $(emacs) 2> /dev/null))
55
endif
66

77
.PHONY: test
8-
test: build-haskell test-haskell test-emacs
8+
test: test-haskell test-emacs
99

1010
.PHONY: test-emacs
1111
test-emacs:
1212
stack exec $(emacs) -- -q --batch -L elisp -l elisp/tests/hie-tests.el -f ert-run-tests-batch-and-exit
1313

14-
.PHONY: build-haskell
15-
build-haskell:
16-
@STACK_YAML=stack_test.yaml stack build --test --no-run-tests
17-
1814
.PHONY: test-haskell
1915
test-haskell:
2016
# stack build --test --pedantic
2117
# stack complains about deprecations in ghc-mod as an extra dep
2218
# build with -Werror enabled but run the tests without it because ide-backend picks it up
23-
stack build --test
19+
./pedantic.sh
2420

2521
.PHONY: ghci-test
2622
ghci-test:

app/MainHie.hs

-2
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@ import Haskell.Ide.ExamplePluginAsync
5151
import Haskell.Ide.GhcModPlugin
5252
import Haskell.Ide.GhcTreePlugin
5353
import Haskell.Ide.HaRePlugin
54-
import Haskell.Ide.IdeBackend
5554

5655
-- ---------------------------------------------------------------------
5756

@@ -65,7 +64,6 @@ taggedPlugins =
6564
:& Plugin (Proxy :: Proxy "ghctree") ghcTreeDescriptor
6665
:& Plugin (Proxy :: Proxy "hare") hareDescriptor
6766
:& Plugin (Proxy :: Proxy "base") baseDescriptor
68-
:& Plugin (Proxy :: Proxy "ide-backend") idebackendDescriptor
6967
:& RNil
7068

7169
recProxy :: Rec f t -> Proxy t

deploy-docs.sh

-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ pip install -U Sphinx
77
set -e # exit with nonzero exit code if anything fails
88

99
# build docs generator and create docs
10-
stack build
1110
stack exec hie-docs-generator -- --prefix docs/source/
1211

1312
# run our compile script, discussed above

haskell-ide-engine.cabal

-3
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,6 @@ executable hie
8888
, hie-ghc-mod
8989
, hie-ghc-tree
9090
, hie-hare
91-
, hie-ide-backend
9291
, hie-plugin-api
9392
, monad-logger
9493
, optparse-applicative
@@ -114,7 +113,6 @@ test-suite haskell-ide-test
114113
GhcModPluginSpec
115114
GhcTreePluginSpec
116115
HaRePluginSpec
117-
IdeBackendPluginSpec
118116
JsonStdioSpec
119117
JsonSpec
120118
UtilsSpec
@@ -130,7 +128,6 @@ test-suite haskell-ide-test
130128
, hie-apply-refact
131129
, hie-base
132130
, hie-eg-plugin-async
133-
, hie-ide-backend
134131
, hie-ghc-mod
135132
, hie-ghc-tree
136133
, hie-hare

hie-ide-backend/Haskell/Ide/IdeBackend.hs

-186
This file was deleted.

hie-ide-backend/Setup.hs

-2
This file was deleted.

hie-ide-backend/hie-ide-backend.cabal

-37
This file was deleted.

pedantic.sh

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
#!/usr/bin/env bash
2+
stack $@ build --test \
3+
--flag hie-apply-refact:pedantic \
4+
--flag hie-base:pedantic \
5+
--flag hie-docs-generator:pedantic \
6+
--flag hie-eg-plugin-async:pedantic \
7+
--flag hie-example-plugin2:pedantic \
8+
--flag hie-ghc-mod:pedantic \
9+
--flag hie-ghc-tree:pedantic \
10+
--flag hie-hare:pedantic \
11+
--flag hie-plugin-api:pedantic \

stack.yaml

-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ packages:
1010
- hie-ghc-tree
1111
- hie-hare
1212
- hie-docs-generator
13-
- hie-ide-backend
1413
- location:
1514
git: https://github.com/mpickering/apply-refact.git
1615
commit: 402458652844c1a0f42b15123e0ceff761919415

stack_test.yaml

-50
This file was deleted.

0 commit comments

Comments
 (0)