mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Throw error if no folder is opened

Browse Source
This commit is contained in:
Tim 2020-03-31 09:05:22 +01:00 committed by Tim Hutt
parent 6e535915bd
commit a781a58fe2
3 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
editors/code/src/client.ts
View File

@ -30,14 +30,14 @@ export function configToServerOptions(config: Config) {
};
}
export async function createClient(config: Config, serverPath: string, workspaceFolder: vscode.WorkspaceFolder | null): Promise<lc.LanguageClient> {
export async function createClient(config: Config, serverPath: string, workspaceFolder: vscode.WorkspaceFolder): Promise<lc.LanguageClient> {
// '.' Is the fallback if no folder is open
// TODO?: Workspace folders support Uri's (eg: file://test.txt).
// It might be a good idea to test if the uri points to a file.
const run: lc.Executable = {
command: serverPath,
options: { cwd: workspaceFolder?.uri.fsPath ?? '.' },
options: { cwd: workspaceFolder.uri.fsPath },
};
const serverOptions: lc.ServerOptions = {
run,

2
editors/code/src/ctx.ts
View File

@ -19,7 +19,7 @@ export class Ctx {
config: Config,
extCtx: vscode.ExtensionContext,
serverPath: string,
workspaceFolder: vscode.WorkspaceFolder | null,
workspaceFolder: vscode.WorkspaceFolder,
): Promise<Ctx> {
const client = await createClient(config, serverPath, workspaceFolder);
const res = new Ctx(config, extCtx, client, serverPath);

7
editors/code/src/main.ts
View File

@ -42,7 +42,12 @@ export async function activate(context: vscode.ExtensionContext) {
const state = new PersistentState(context.globalState);
const serverPath = await bootstrap(config, state);
const workspaceFolder = vscode.workspace.workspaceFolders?.[0] ?? null;
const workspaceFolder = vscode.workspace.workspaceFolders?.[0];
if (workspaceFolder === undefined) {
const err = "Cannot activate rust-analyzer when no folder is opened";
void vscode.window.showErrorMessage(err);
throw new Error(err);
}
// Note: we try to start the server before we activate type hints so that it
// registers its `onDidChangeDocument` handler before us.