Skip to content

Commit

Permalink
Merge pull request #244 from wz1000/singleton-methods
Browse files Browse the repository at this point in the history
Type safe API, significantly simplify Core, Remove Capture, Update to 3.15, Split out features into modules, Use TH to generate datatypes, Add proper support for dynamic registration
  • Loading branch information
lukel97 authored Oct 9, 2020
2 parents 9eb60f9 + d591f3d commit 9dc38a3
Show file tree
Hide file tree
Showing 92 changed files with 5,788 additions and 8,410 deletions.
2 changes: 1 addition & 1 deletion .azure/linux-stack.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ jobs:
displayName: Build `haskell-lsp`
- bash: |
source .azure/linux-stack.bashrc
stack build --stack-yaml $(YAML_FILE) :lsp-hello --flag haskell-lsp:demo
stack build --stack-yaml $(YAML_FILE) --flag haskell-lsp:demo
displayName: Build language server example
- bash: |
source .azure/linux-stack.bashrc
Expand Down
2 changes: 1 addition & 1 deletion .azure/macos-stack.yml
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ jobs:
displayName: Build `haskell-lsp`
- bash: |
source .azure/macos-stack.bashrc
stack build --stack-yaml $(YAML_FILE) :lsp-hello --flag haskell-lsp:demo
stack build --stack-yaml $(YAML_FILE) --flag haskell-lsp:demo
displayName: Build language server example
- bash: |
source .azure/macos-stack.bashrc
Expand Down
2 changes: 1 addition & 1 deletion .azure/windows-stack.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ jobs:
displayName: Build `haskell-lsp`
- bash: |
source .azure/windows-stack.bashrc
stack build --stack-yaml $(YAML_FILE) :lsp-hello --flag haskell-lsp:demo
stack build --stack-yaml $(YAML_FILE) --flag haskell-lsp:demo
displayName: Build language server example
- bash: |
source .azure/windows-stack.bashrc
Expand Down
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,12 @@ stack*.yaml.lock
/haskell-lsp-types/cabal.project.local~
*.swp
*.swo
*.orig
*.DS_Store
.hspec-failures
/haskell-lsp-types/dist/
/haskell-lsp-types/dist-newstyle/
/haskell-lsp-types/TAGS
/haskell-lsp-types/tags
/haskell-lsp-types/ctags
.hie
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,14 +36,14 @@ It can also be used with emacs, see https://github.com/emacs-lsp/lsp-haskell

## Using the example server

stack install :lsp-hello --flag haskell-lsp:demo
stack install :lsp-demo-reactor-server --flag haskell-lsp:demo

will generate a `lsp-hello` executable.
will generate a `:lsp-demo-reactor-server` executable.

Changing the server to be called in the [`vscode-hie-server`](https://github.com/alanz/vscode-hie-server/blob/master/hie-vscode.sh#L21) plugin from `hie` to
`lsp-hello` will run the example server instead of hie.
Changing the server executable in the [`vscode-haskell`](https://github.com/haskell/vscode-haskell) plugin to
`lsp-demo-reactor-server` to test it out.

Likewise, changing the executable in `lsp-haskell` for emacs.
Likewise, you can change the executable in `lsp-haskell` for emacs.

## Useful links

Expand Down
12 changes: 12 additions & 0 deletions cabal.project
Original file line number Diff line number Diff line change
@@ -1,3 +1,15 @@
packages:
./
./haskell-lsp-types/
./func-test/

package haskell-lsp
flags: +demo


source-repository-package
type: git
location: https://github.com/wz1000/lsp-test.git
tag: e251176a4b2ff4dead7846fe5d0a4e1dbea69fd4

tests: True
Loading

0 comments on commit 9dc38a3

Please sign in to comment.