Skip to content

Offline, privacy-first grammar checker. Fast, open-source, Rust-powered

feat: add dialect indicator to vscode status bar

hippietraild1e243ca1e5b
diff --git a/packages/vscode-plugin/src/extension.ts b/packages/vscode-plugin/src/extension.ts
index a63ddff19..1cb448870 100644
--- a/packages/vscode-plugin/src/extension.ts
+++ b/packages/vscode-plugin/src/extension.ts
@@ -2,7 +2,7 @@ import type { ExtensionContext } from 'vscode';
import type { Executable, LanguageClientOptions } from 'vscode-languageclient/node';
import { Uri, commands, window, workspace } from 'vscode';
-// import { StatusBarAlignment, type StatusBarItem } from 'vscode';
+import { StatusBarAlignment, type StatusBarItem } from 'vscode';
import { LanguageClient, ResponseError, TransportKind } from 'vscode-languageclient/node';
// There's no publicly available extension manifest type except for the internal one from VS Code's
@@ -52,7 +52,7 @@ const clientOptions: LanguageClientOptions = {
},
};
-// let dialectStatusBarItem: StatusBarItem | undefined;
+let dialectStatusBarItem: StatusBarItem | undefined;
export async function activate(context: ExtensionContext): Promise<void> {
serverOptions.command = getExecutablePath(context);
@@ -103,36 +103,21 @@ export async function activate(context: ExtensionContext): Promise<void> {
await startLanguageServer();
- // Add status bar item for dialect
- // dialectStatusBarItem = window.createStatusBarItem(StatusBarAlignment.Left, 1000);
- // dialectStatusBarItem.command = 'harper.setDialect';
- // context.subscriptions.push(dialectStatusBarItem);
-
- // // Add command to change dialect
- // context.subscriptions.push(
- // commands.registerCommand('harper.setDialect', async () => {
- // const selected = await window.showQuickPick(['American', 'British'], {
- // placeHolder: 'Select dialect',
- // });
- // if (selected) {
- // await workspace.getConfiguration('harper').update('dialect', selected, true);
- // updateDialectStatusBar();
- // }
- // }),
- // );
-
- // // Update status bar when dialect changes
- // context.subscriptions.push(
- // workspace.onDidChangeConfiguration(async (event) => {
- // if (event.affectsConfiguration('harper.dialect')) {
- // updateDialectStatusBar();
- // }
- // // ... existing code ...
- // }),
- // );
-
- // // Initialize status bar
- // updateDialectStatusBar();
+ // <= 100 is between Copilot and Notifications.
+ // 101..102 is between the magnifying glass and encoding
+ // >= 103 is left of the magnifying glass
+ dialectStatusBarItem = window.createStatusBarItem(StatusBarAlignment.Right, 101);
+ context.subscriptions.push(dialectStatusBarItem);
+
+ context.subscriptions.push(
+ workspace.onDidChangeConfiguration(async (event) => {
+ if (event.affectsConfiguration('harper.dialect')) {
+ updateDialectStatusBar();
+ }
+ }),
+ );
+
+ updateDialectStatusBar();
}
function getExecutablePath(context: ExtensionContext): string {
@@ -192,24 +177,33 @@ function showError(message: string, error: Error | unknown): void {
});
}
-// function updateDialectStatusBar(): void {
-// if (!dialectStatusBarItem) return;
+function updateDialectStatusBar(): void {
+ if (!dialectStatusBarItem) return;
-// const dialect = workspace.getConfiguration('harper').get<string>('dialect', 'American');
-// dialectStatusBarItem.text = `$(globe) ${dialect}`;
-// dialectStatusBarItem.tooltip = `Click to change dialect (currently: ${dialect})`;
-// dialectStatusBarItem.show();
-// console.log(`** Dialect set to ${dialect} **`, dialect);
-// }
+ const dialect = workspace.getConfiguration('harper').get<string>('dialect', '');
+ if (dialect === '') return;
+
+ const flagAndCode = getFlagAndCode(dialect);
+ if (!flagAndCode) return;
+
+ dialectStatusBarItem.text = flagAndCode.join(' ');
+ dialectStatusBarItem.show();
+ console.log(`** dialect set to ${dialect} **`, dialect);
+}
export function deactivate(): Thenable<void> | undefined {
if (!client) {
return undefined;
}
- // if (dialectStatusBarItem) {
- // dialectStatusBarItem.dispose();
- // }
-
return client.stop();
}
+
+function getFlagAndCode(dialect: string): string[] | undefined {
+ return {
+ American: ['πŸ‡ΊπŸ‡Έ', 'US'],
+ Australian: ['πŸ‡¦πŸ‡Ί', 'AU'],
+ British: ['πŸ‡¬πŸ‡§', 'GB'],
+ Canadian: ['πŸ‡¨πŸ‡¦', 'CA'],
+ }[dialect];
+}