Skip to content
This repository was archived by the owner on Mar 19, 2024. It is now read-only.

Update to atom-languageclient 0.8 #37

Merged
merged 1 commit into from
Jan 15, 2018
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
26 changes: 4 additions & 22 deletions lib/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -197,24 +197,6 @@ function serverEnv(toolchain) {
return env
}

/**
* Logs stderr if `core.debugLSP` is enabled
* TODO should be handled upstream, see https://github.com/atom/atom-languageclient/issues/157
* @param {process} process
* @return {process}
*/
function logStdErr(process) {
if (atom.config.get('core.debugLSP')) {
process.stderr.on('data', chunk => {
chunk.toString()
.split('\n')
.filter(l => l)
.forEach(line => console.warn('Rls-stderr', line))
})
}
return process
}

/**
* Check for and install Rls
* @param [busySignalService]
Expand Down Expand Up @@ -420,18 +402,18 @@ class RustLanguageClient extends AutoLanguageClient {
atom.notifications.addInfo(`Using rls command \`${cmdOverride}\``)
this._warnedAboutRlsCommandOverride = true
}
return logStdErr(cp.spawn(cmdOverride, {
return cp.spawn(cmdOverride, {
env: serverEnv(),
shell: true
}))
})
}

return checkToolchain(this.busySignalService)
.then(toolchain => checkRls(this.busySignalService).then(() => toolchain))
.then(toolchain => {
return logStdErr(cp.spawn("rustup", ["run", configToolchain(), "rls"], {
return cp.spawn("rustup", ["run", configToolchain(), "rls"], {
env: serverEnv(toolchain)
}))
})
})
}
}
Expand Down
12 changes: 9 additions & 3 deletions package-lock.json

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

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"atom": ">=1.21.0"
},
"dependencies": {
"atom-languageclient": "^0.7.3",
"atom-languageclient": "^0.8.0",
"atom-package-deps": "^4.6.1",
"toml": "^2.3.3",
"underscore-plus": "^1.6.6"
Expand Down