languages/rust
languages/rust
1
0
Fork 0
mirror of https://github.com/rust-lang/rust synced 2024-10-03 15:26:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

internal: Keep output channels across restarts

Browse source
This commit is contained in:
Lukas Wirth 2022-06-05 13:59:49 +02:00
parent fd298b3994
commit 1127d2508f
3 changed files with 29 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
editors/code/src/client.ts
View file

@ -7,6 +7,7 @@ import { WorkspaceEdit } from "vscode";
import { Workspace } from "./ctx";
import { updateConfig } from "./config";
import { substituteVariablesInEnv } from "./config";
import { outputChannel, traceOutputChannel } from "./main";
import { randomUUID } from "crypto";
export interface Env {
@ -82,9 +83,6 @@ export async function createClient(
run,
debug: run,
};
const traceOutputChannel = vscode.window.createOutputChannel(
"Rust Analyzer Language Server Trace"
);
let initializationOptions = vscode.workspace.getConfiguration("rust-analyzer");
@ -104,7 +102,8 @@ export async function createClient(
documentSelector: [{ scheme: "file", language: "rust" }],
initializationOptions,
diagnosticCollectionName: "rustc",
traceOutputChannel,
traceOutputChannel: traceOutputChannel(),
outputChannel: outputChannel(),
middleware: {
async provideHover(
document: vscode.TextDocument,

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

@ -43,8 +43,6 @@ export class Ctx {
const res = new Ctx(config, extCtx, client, serverPath, statusBar);
res.pushCleanup(client.start());
res.pushCleanup(client.traceOutputChannel);
res.pushCleanup(client.outputChannel);
await client.onReady();
client.onNotification(ra.serverStatus, (params) => res.setServerStatus(params));
return res;

27
editors/code/src/main.ts
View file

@ -15,6 +15,23 @@ let ctx: Ctx | undefined;
const RUST_PROJECT_CONTEXT_NAME = "inRustProject";
let TRACE_OUTPUT_CHANNEL: vscode.OutputChannel | null = null;
export function traceOutputChannel() {
if (!TRACE_OUTPUT_CHANNEL) {
TRACE_OUTPUT_CHANNEL = vscode.window.createOutputChannel(
"Rust Analyzer Language Server Trace"
);
}
return TRACE_OUTPUT_CHANNEL;
}
let OUTPUT_CHANNEL: vscode.OutputChannel | null = null;
export function outputChannel() {
if (!OUTPUT_CHANNEL) {
OUTPUT_CHANNEL = vscode.window.createOutputChannel("Rust Analyzer Language Server");
}
return OUTPUT_CHANNEL;
}
export interface RustAnalyzerExtensionApi {
client: lc.LanguageClient;
}
@ -110,7 +127,7 @@ async function initCommonContext(context: vscode.ExtensionContext, ctx: Ctx) {
// Reloading is inspired by @DanTup maneuver: https://github.com/microsoft/vscode/issues/45774#issuecomment-373423895
ctx.registerCommand("reload", (_) => async () => {
void vscode.window.showInformationMessage("Reloading rust-analyzer...");
await deactivate();
await doDeactivate();
while (context.subscriptions.length > 0) {
try {
context.subscriptions.pop()!.dispose();
@ -165,6 +182,14 @@ async function initCommonContext(context: vscode.ExtensionContext, ctx: Ctx) {
}
export async function deactivate() {
TRACE_OUTPUT_CHANNEL?.dispose();
TRACE_OUTPUT_CHANNEL = null;
OUTPUT_CHANNEL?.dispose();
OUTPUT_CHANNEL = null;
await doDeactivate();
}
async function doDeactivate() {
await setContextValue(RUST_PROJECT_CONTEXT_NAME, undefined);
await ctx?.client.stop();
ctx = undefined;