Skip to content

Rename vscode-hie-server to haskell #253

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 27, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ deploy:
script: vsce publish -p $VS_CODE
skip_cleanup: true
on: # Publish on all builds on master branch.
repo: alanz/vscode-hie-server
repo: haskell/vscode-haskell
branch: master
tags: true
condition: $TRAVIS_OS_NAME = linux
Expand All @@ -54,7 +54,7 @@ deploy:
# file: "*.vsix"
# skip_cleanup: true
# on: # Due to a limitation with releases, we can only deploy them on tags.
# repo: alanz/vscode-hie-server
# repo: haskell/vscode-haskell
# branch: master
# tags: true
# condition: $TRAVIS_OS_NAME = linux
Expand Down
7 changes: 4 additions & 3 deletions Contributing.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,15 @@ Run `npm install` in the project root to install the development dependencies.
You can also package up the extension with

- `npm install -g vsce` to get the Extension Manager,
- `vsce package` which creates an extension package at `vscode-hie-server-<version>.vsix`.
- `npm install` to build the extension
- `vsce package` which creates an extension package at `haskell-<version>.vsix`.

_Note:_ that if you get errors running `vsce package`, it might help running `tsc -p ./` directly, since that gives the actual error output of the TypeScript compilation.

## Developing inside VS Code

- Launch VS Code, press `File` > `Open Folder`, open the `vscode-hie-server` folder;
- press `F5` to open a new window with the `vscode-hie-server` loaded (this will overwrite existing ones, e.g. from the marketplace);
- Launch VS Code, press `File` > `Open Folder`, open the `vscode-haskell` folder;
- press `F5` to open a new window with the `vscode-haskell` loaded (this will overwrite existing ones, e.g. from the marketplace);
- open a Haskell file with the **new** editor to test the LSP client;

You are now ready to make changes and debug. You can,
Expand Down
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -81,9 +81,9 @@ documentation: True
This extension will download `haskell-language-server` binaries to a specific location depending on your system. If you find yourself running out of disk space, you can try deleting old versions of language servers in this directory. The extension will redownload them, no strings attached.
| Platform | Path |
|----------|------|
| macOS | `~/Library/Application\ Support/Code/User/globalStorage/alanz.vscode-hie-server/` |
| Windows | `%APPDATA%\Code\User\globalStorage\alanz.vscode-hie-server` |
| Linux | `$HOME/.config/Code/User/globalStorage/alanz.vscode-hie-server` |
| macOS | `~/Library/Application\ Support/Code/User/globalStorage/haskell.haskell/` |
| Windows | `%APPDATA%\Code\User\globalStorage\haskell.haskell` |
| Linux | `$HOME/.config/Code/User/globalStorage/haskell.haskell` |

Note that if `haskell-language-server-wrapper`/`haskell-language-server` is already on the PATH, then the extension will launch it directly instead of downloading binaries.

Expand Down Expand Up @@ -147,8 +147,8 @@ Please include the output when filing any issues on the relevant language server

## Contributing

If you want to help, get started by reading [Contributing](https://github.com/alanz/vscode-hie-server/blob/master/Contributing.md) for more details.
If you want to help, get started by reading [Contributing](https://github.com/haskell/vscode-haskell/blob/master/Contributing.md) for more details.

## Release Notes

See the [Changelog](https://github.com/alanz/vscode-hie-server/blob/master/Changelog.md) for more details.
See the [Changelog](https://github.com/haskell/vscode-haskell/blob/master/Changelog.md) for more details.
4 changes: 2 additions & 2 deletions default.nix
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{ pkgs ? import <nixpkgs> {} }:
with pkgs;
pkgs.mkYarnPackage {
name = "vscode-hie-server";
name = "vscode-haskell";
src = ./.;
packageJSON = ./package.json;
yarnLock = ./yarn.lock;

installPhase = ''
mkdir -p "$out/dist"
yarn vscode:prepublish --output-path "$out/dist"
mv deps/vscode-hie-server/{package.json,hie-vscode.sh,hie-vscode.bat} "$out"
mv deps/vscode-haskell/{package.json,hie-vscode.sh,hie-vscode.bat} "$out"
'';

distPhase = ''
Expand Down
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 6 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"name": "vscode-hie-server",
"name": "haskell",
"displayName": "Haskell",
"description": "Haskell language support powered by the Haskell Language Server, ghcide or HIE",
"version": "0.1.1",
"version": "1.0.0",
"license": "MIT",
"publisher": "alanz",
"publisher": "haskell",
"engines": {
"vscode": "^1.39.0"
},
Expand All @@ -16,13 +16,13 @@
"lsp",
"multi-root ready"
],
"homepage": "https://github.com/alanz/vscode-hie-server",
"homepage": "https://github.com/haskell/vscode-haskell",
"repository": {
"type": "git",
"url": "https://github.com/alanz/vscode-hie-server.git"
"url": "https://github.com/haskell/vscode-haskell.git"
},
"bugs": {
"url": "https://github.com/alanz/vscode-hie-server/issues"
"url": "https://github.com/haskell/vscode-haskell/issues"
},
"categories": [
"Programming Languages",
Expand Down
2 changes: 1 addition & 1 deletion src/utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import { createGunzip } from 'zlib';
/** When making http requests to github.com, use this header otherwise
* the server will close the request
*/
export const userAgentHeader = { 'User-Agent': 'vscode-hie-server' };
export const userAgentHeader = { 'User-Agent': 'vscode-haskell' };

/** downloadFile may get called twice on the same src and destination:
* When this happens, we should only download the file once but return two
Expand Down