Skip to content
This repository was archived by the owner on Nov 18, 2022. It is now read-only.

Commit 260a464

Browse files
committed
Replace some RLS occurences with agnostic Rust server
1 parent 4aade08 commit 260a464

File tree

4 files changed

+14
-12
lines changed

4 files changed

+14
-12
lines changed

package.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -89,26 +89,26 @@
8989
"commands": [
9090
{
9191
"command": "rls.update",
92-
"title": "Update the RLS",
93-
"description": "Use Rustup to update Rust, the RLS, and required data",
92+
"title": "Update the current Rust toolchain",
93+
"description": "Use Rustup to the current Rust toolchain, along with its components",
9494
"category": "Rust"
9595
},
9696
{
9797
"command": "rls.restart",
98-
"title": "Restart the RLS",
98+
"title": "Restart the Rust server",
9999
"description": "Sometimes, it's just best to try turning it off and on again",
100100
"category": "Rust"
101101
},
102102
{
103103
"command": "rls.start",
104-
"title": "Start the RLS",
105-
"description": "Start the RLS (when rust-client.autoStartRls is false or when manually stopped)",
104+
"title": "Start the Rust server",
105+
"description": "Start the Rust server (when rust-client.autoStartRls is false or when manually stopped)",
106106
"category": "Rust"
107107
},
108108
{
109109
"command": "rls.stop",
110-
"title": "Stop the RLS",
111-
"description": "Stop the RLS for a workspace until manually started again",
110+
"title": "Stop the Rust server",
111+
"description": "Stop the Rust server for a workspace until manually started again",
112112
"category": "Rust"
113113
}
114114
],

src/configuration.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,8 @@ export class RLSConfiguration {
119119
}
120120

121121
/**
122-
* Whether RLS should be automaticallystarted when opening a relevant Rust project.
122+
* Whether a language server should be automatically started when opening
123+
* a relevant Rust project.
123124
*/
124125
public get autoStartRls(): boolean {
125126
return this.configuration.get<boolean>('rust-client.autoStartRls', true);

src/rustup.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
/**
2-
* @file This module handles running the RLS via rustup, including checking that
3-
* rustup is installed and installing any required components/toolchains.
2+
* @file This module wraps the most commonly used rustup interface, e.g.
3+
* seeing if rustup is installed or probing for/installing the Rust toolchain
4+
* components.
45
*/
56
import * as child_process from 'child_process';
67
import * as util from 'util';

src/spinner.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import { window } from 'vscode';
22

33
export function startSpinner(message: string) {
4-
window.setStatusBarMessage(`RLS $(settings-gear~spin) ${message}`);
4+
window.setStatusBarMessage(`Rust: $(settings-gear~spin) ${message}`);
55
}
66

77
export function stopSpinner(message?: string) {
8-
window.setStatusBarMessage(`RLS ${message || ''}`);
8+
window.setStatusBarMessage(message ? `Rust: ${message}` : 'Rust');
99
}

0 commit comments

Comments
 (0)