dan/oxc
1
0
Fork 0
mirror of https://github.com/danbulant/oxc synced 2026-05-19 12:19:15 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

feat(editor/vscode): Replace existing output channel and trace output channel with a single LogOutputChannel (#7196)

Browse source 
I don't think we need two separate channels for output. This replaces
the 2 existing channels with a single channel that allows configuring
the log level.

Ref #7136
This commit is contained in:
Nicholas Rayburn 2024-11-07 19:23:16 -06:00 committed by GitHub
parent 9b8973f425
commit 4dd9b60f5a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 7 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
editors/vscode/client/extension.ts
View file

@ -11,14 +11,12 @@ import { ConfigService } from './config';
const languageClientName = 'oxc';
const outputChannelName = 'Oxc';
const traceOutputChannelName = 'Oxc (Trace)';
const commandPrefix = 'oxc';
const enum OxcCommands {
RestartServer = `${commandPrefix}.restartServer`,
ApplyAllFixes = `${commandPrefix}.applyAllFixes`,
ShowOutputChannel = `${commandPrefix}.showOutputChannel`,
ShowTraceOutputChannel = `${commandPrefix}.showTraceOutputChannel`,
ToggleEnable = `${commandPrefix}.toggleEnable`,
}
@ -57,13 +55,6 @@ export async function activate(context: ExtensionContext) {
},
);
const showTraceOutputCommand = commands.registerCommand(
OxcCommands.ShowTraceOutputChannel,
() => {
client?.traceOutputChannel?.show();
},
);
const toggleEnable = commands.registerCommand(
OxcCommands.ToggleEnable,
() => {
@ -74,13 +65,11 @@ export async function activate(context: ExtensionContext) {
context.subscriptions.push(
restartCommand,
showOutputCommand,
showTraceOutputCommand,
toggleEnable,
config,
);
const outputChannel = window.createOutputChannel(outputChannelName);
const traceOutputChannel = window.createOutputChannel(traceOutputChannelName);
const outputChannel = window.createOutputChannel(outputChannelName, { log: true });
async function findBinary(): Promise<string> {
let bin = config.binPath;
@ -162,7 +151,7 @@ export async function activate(context: ExtensionContext) {
settings: config.toLanguageServerConfig(),
},
outputChannel,
traceOutputChannel,
traceOutputChannel: outputChannel,
};
// Create the language client and start the client.
@ -173,9 +162,11 @@ export async function activate(context: ExtensionContext) {
);
client.onNotification(ShowMessageNotification.type, (params) => {
switch (params.type) {
case MessageType.Log:
case MessageType.Debug:
outputChannel.appendLine(params.message);
outputChannel.debug(params.message);
break;
case MessageType.Log:
outputChannel.info(params.message);
break;
case MessageType.Info:
window.showInformationMessage(params.message);
@ -187,7 +178,7 @@ export async function activate(context: ExtensionContext) {
window.showErrorMessage(params.message);
break;
default:
outputChannel.appendLine(params.message);
outputChannel.info(params.message);
}
});

5
editors/vscode/package.json
View file

@ -52,11 +52,6 @@
"command": "oxc.showOutputChannel",
"title": "Show Output Channel",
"category": "Oxc"
},
{
"command": "oxc.showTraceOutputChannel",
"title": "Show Trace Output Channel",
"category": "Oxc"
}
],
"configuration": {