Skip to content
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

Upgrade to latest LS protocol #2144

Closed
wants to merge 13 commits into from
Closed

Upgrade to latest LS protocol #2144

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
997635a
LS symbol providers
Jun 8, 2018
f6c6276
Merge branch 'master' of https://github.com/Microsoft/vscode-python
Jun 13, 2018
0a20fef
Merge branch 'master' of https://github.com/Microsoft/vscode-python
Jun 19, 2018
660a627
Merge branch 'master' of https://github.com/Microsoft/vscode-python
Jun 29, 2018
3813395
Merge branch 'master' of https://github.com/Microsoft/vscode-python
Jul 3, 2018
d4fd3ab
Different ready wait
Jul 4, 2018
3a0bea4
Merge branch 'master' of https://github.com/Microsoft/vscode-python
Jul 12, 2018
56bf688
Upgrade dependencies to latest LS
Jul 12, 2018
37f1154
Make open files only default
Jul 12, 2018
4092bcc
Turn off hash checks
Jul 12, 2018
49ec38a
Fix double progress display
Jul 12, 2018
f7e245b
Update packages
Jul 13, 2018
bdce0ff
Anchor dependencies
brettcannon Jul 13, 2018
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
47 changes: 27 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.

11 changes: 6 additions & 5 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
"theme": "dark"
},
"engines": {
"vscode": "^1.23.0"
"vscode": "^1.25.0"
},
"recommendations": [
"donjayamanne.jupyter"
Expand Down Expand Up @@ -1277,7 +1277,7 @@
},
"python.analysis.openFilesOnly": {
"type": "boolean",
"default": false,
"default": true,
"description": "Only show errors and warnings for open files rather than for the entire workspace.",
"scope": "resource"
},
Expand Down Expand Up @@ -1964,7 +1964,7 @@
"fs-extra": "4.0.3",
"fuzzy": "0.1.3",
"get-port": "3.2.0",
"glob": "^7.1.2",
"glob": "7.1.2",
"iconv-lite": "0.4.21",
"inversify": "4.11.1",
"line-by-line": "0.1.6",
Expand All @@ -1990,8 +1990,9 @@
"vscode-debugadapter": "1.28.0",
"vscode-debugprotocol": "1.28.0",
"vscode-extension-telemetry": "0.0.15",
"vscode-languageclient": "3.5.1",
"vscode-languageserver": "3.5.1",
"vscode-languageclient": "4.3.0",
"vscode-languageserver": "4.3.0",
"vscode-languageserver-protocol": "3.9.0",
"winreg": "1.2.4",
"xml2js": "0.4.19"
},
Expand Down
5 changes: 2 additions & 3 deletions src/client/activation/downloader.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ export class LanguageServerDownloader {
let localTempFilePath = '';
try {
localTempFilePath = await this.downloadFile(downloadUriPrefix, enginePackageFileName, 'Downloading Microsoft Python Language Server... ');
await this.verifyDownload(localTempFilePath, platformString);
// await this.verifyDownload(localTempFilePath, platformString);
await this.unpackArchive(context.extensionPath, localTempFilePath);
} catch (err) {
this.output.appendLine('failed.');
Expand Down Expand Up @@ -70,8 +70,7 @@ export class LanguageServerDownloader {
});

await window.withProgress({
location: ProgressLocation.Window,
title
location: ProgressLocation.Window
}, (progress) => {

requestProgress(request(uri))
Expand Down
2 changes: 1 addition & 1 deletion src/client/activation/languageServer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,7 @@ export class LanguageServerExtensionActivator implements IExtensionActivator {
properties
},
displayOptions: {
preferredFormat: 1, // Markdown
preferredFormat: 'markdown',
trimDocumentationLines: false,
maxDocumentationLineLength: 0,
trimDocumentationText: false,
Expand Down