Skip to content

Update vscode-languageclient and enable proposed features #150

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.

Sign up for GitHub

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 2 commits into from
Jun 16, 2019
Merged

Update vscode-languageclient and enable proposed features #150

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
354120a
Update vscode-languageclient and enable proposed features
lukel97 Apr 22, 2019
c519c81
Merge branch 'master' of https://github.com/alanz/vscode-hie-server i…
lukel97 Jun 8, 2019
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
41 changes: 21 additions & 20 deletions package-lock.json
View file
Open in desktop

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

6 changes: 3 additions & 3 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"license": "MIT",
"publisher": "alanz",
"engines": {
"vscode": "^1.25.0"
"vscode": "^1.33.0"
},
"keywords": ["language", "haskell", "lsp", "multi-root ready"],
"homepage": "https://github.com/alanz/vscode-hie-server",
Expand Down Expand Up @@ -229,7 +229,7 @@
"prettier": "1.11.1",
"pretty-quick": "^1.4.1",
"tslint": "^5.9.1",
"typescript": "^2.8.1",
"typescript": "^3.4.3",
"vscode": "^1.1.33"
},
"extensionDependencies": ["justusadam.language-haskell"],
Expand All @@ -245,7 +245,7 @@
"lru-cache": "^4.1.3",
"request": "^2.86.0",
"request-promise-native": "^1.0.5",
"vscode-languageclient": "^4.4.0",
"vscode-languageclient": "5.3.0-next.5",
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Doesn't the next suffix mean you have to be on the dev channel for vscode?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No, the vscode version is constrained from the engines.vscode field from what I can tell: I tried bumping it to 1.35 today and I got an error when installing it with my older version of vscode. vscode-languageclient is just the library for connecting vscode extension APIs to LSP

"extend": ">=3.0.2"
}
}
3 changes: 3 additions & 0 deletions src/extension.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,6 +190,9 @@ function activateHieNoCheck(context: ExtensionContext, folder: WorkspaceFolder,
// Create the LSP client.
const langClient = new LanguageClient(langName, langName, serverOptions, clientOptions, true);

// Register ClientCapabilities for stuff like window/progress
langClient.registerProposedFeatures();

if (workspace.getConfiguration('languageServerHaskell', uri).showTypeForSelection.onHover) {
context.subscriptions.push(ShowTypeHover.registerTypeHover(clients));
}
Expand Down