Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Boshen merged 1 commit into from
Nov 8, 2024
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 7 additions & 16 deletions editors/vscode/client/extension.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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`,
}

Expand Down Expand Up @@ -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,
() => {
Expand All @@ -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;
Expand Down Expand Up @@ -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.
Expand All @@ -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);
Expand All @@ -187,7 +178,7 @@ export async function activate(context: ExtensionContext) {
window.showErrorMessage(params.message);
break;
default:
outputChannel.appendLine(params.message);
outputChannel.info(params.message);
}
});

Expand Down
5 changes: 0 additions & 5 deletions editors/vscode/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,11 +52,6 @@
"command": "oxc.showOutputChannel",
"title": "Show Output Channel",
"category": "Oxc"
},
{
"command": "oxc.showTraceOutputChannel",
"title": "Show Trace Output Channel",
"category": "Oxc"
}
],
"configuration": {
Expand Down