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

Commit 30492ea

Browse files
authored
Merge branch 'master' into remove-src-path-env-var
2 parents a5dd315 + a11b70b commit 30492ea

File tree

4 files changed

+1995
-94
lines changed

4 files changed

+1995
-94
lines changed

README.md

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,5 +41,23 @@ This will spit out language server message logging into the atom console. Check
4141
## RLS
4242
RLS is no longer supported. To use RLS install a previous version of ide-rust, `apm install [email protected]`.
4343

44+
## Screenshots
45+
**Autocomplete**:
46+
47+
![Autocomplete image](https://user-images.githubusercontent.com/16418197/121962919-01114c80-cd2f-11eb-8136-11ba82ebe543.png)
48+
49+
**Datatips**:
50+
51+
![Datatips image](https://user-images.githubusercontent.com/16418197/121962751-c7404600-cd2e-11eb-84dd-eff95743a0d3.png)
52+
53+
**Linter**:
54+
55+
![Linter image](https://user-images.githubusercontent.com/16418197/121962803-d7582580-cd2e-11eb-9742-040b78ca75d2.png)
56+
57+
**Outline**:
58+
59+
![Outline image](https://user-images.githubusercontent.com/16418197/121962765-cd362700-cd2e-11eb-92b2-74516cd734db.png)
60+
61+
4462
## License
4563
MIT License. See the [license](LICENSE) for more details.

lib/index.js

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -393,11 +393,11 @@ class RustLanguageClient extends AutoLanguageClient {
393393
}
394394
}
395395

396-
activate() {
396+
async activate() {
397397
super.activate()
398398

399399
// Get required dependencies
400-
require("atom-package-deps").install("ide-rust")
400+
await (require("atom-package-deps").install("ide-rust"))
401401

402402
// // Watch rls.toml file changes -> update rls
403403
// this.disposables.add(atom.project.onDidChangeFiles(events => {
@@ -480,14 +480,7 @@ class RustLanguageClient extends AutoLanguageClient {
480480
}
481481

482482
// Killing servers is faster and less likely to get stuck, but let's see if rust-analyzer deserves grace...
483-
shutdownServersGracefully() {
484-
return true
485-
}
486-
487-
// Can click through to out-of-project files.
488-
serversSupportDefinitionDestinations() {
489-
return true
490-
}
483+
shutdownGracefully = true
491484

492485
async startServerProcess(projectPath) {
493486
if (shouldIgnoreProjectPath(projectPath)) {

0 commit comments

Comments
 (0)