Use .prettierrc for consistent cross editor experiences

posit-dev · Jan 17, 2025 · ef6f3a6 · ef6f3a6
1 parent 5659059
commit ef6f3a6
Show file tree

Hide file tree

Showing 8 changed files with 23 additions and 22 deletions.
diff --git a/editors/code/.editorconfig b/editors/code/.editorconfig
diff --git a/editors/code/.prettierrc b/editors/code/.prettierrc
@@ -0,0 +1,5 @@
+{
+    "useTabs": true,
+    "tabWidth": 4,
+    "trailingComma": "all"
+}
diff --git a/editors/code/.vscodeignore b/editors/code/.vscodeignore
@@ -4,6 +4,7 @@ out/**
 node_modules/**
 src/**
 .gitignore
+.prettierrc
 .yarnrc
 webpack.config.js
 vsc-extension-quickstart.md

diff --git a/editors/code/src/binary.ts b/editors/code/src/binary.ts
@@ -6,19 +6,19 @@ import { AIR_BINARY_NAME, BUNDLED_AIR_EXECUTABLE } from "./constants";
 export type ExecutableLocation = "environment" | "bundled";
 
 export async function resolveAirBinaryPath(
-	executableLocation: ExecutableLocation
+	executableLocation: ExecutableLocation,
 ): Promise<string> {
 	if (!vscode.workspace.isTrusted) {
 		output.log(
-			`Workspace is not trusted, using bundled executable: ${BUNDLED_AIR_EXECUTABLE}`
+			`Workspace is not trusted, using bundled executable: ${BUNDLED_AIR_EXECUTABLE}`,
 		);
 		return BUNDLED_AIR_EXECUTABLE;
 	}
 
 	// User requested the bundled air binary
 	if (executableLocation === "bundled") {
 		output.log(
-			`Using bundled executable as requested by \`air.executableLocation\`: ${BUNDLED_AIR_EXECUTABLE}`
+			`Using bundled executable as requested by \`air.executableLocation\`: ${BUNDLED_AIR_EXECUTABLE}`,
 		);
 		return BUNDLED_AIR_EXECUTABLE;
 	}

diff --git a/editors/code/src/constants.ts b/editors/code/src/constants.ts
@@ -24,5 +24,5 @@ export const BUNDLED_AIR_EXECUTABLE = path.join(
 	EXTENSION_ROOT_DIR,
 	"bundled",
 	"bin",
-	AIR_BINARY_NAME
+	AIR_BINARY_NAME,
 );
diff --git a/editors/code/src/context.ts b/editors/code/src/context.ts
@@ -6,10 +6,7 @@ import { Lsp } from "./lsp";
 // https://github.com/rust-lang/rust-analyzer/blob/master/editors/code/src/ctx.ts
 
 export class Ctx {
-	constructor(
-		readonly extension: vscode.ExtensionContext,
-		public lsp: Lsp,
-	) {}
+	constructor(readonly extension: vscode.ExtensionContext, public lsp: Lsp) {}
 
 	public getClient(): lc.LanguageClient {
 		return this.lsp.getClient();

diff --git a/editors/code/src/lsp.ts b/editors/code/src/lsp.ts
@@ -68,7 +68,7 @@ export class Lsp {
 		const initializationOptions = getInitializationOptions("air");
 
 		const command = await resolveAirBinaryPath(
-			workspaceSettings.executableLocation
+			workspaceSettings.executableLocation,
 		);
 
 		let serverOptions: lc.ServerOptions = {
@@ -104,7 +104,10 @@ export class Lsp {
 
 						const config = vscode.workspace.getConfiguration(
 							undefined,
-							{ uri, languageId }
+							{
+								uri,
+								languageId,
+							},
 						);
 						items[i] = config.get(item.section);
 					}
@@ -131,10 +134,10 @@ export class Lsp {
 			"airLanguageServer",
 			"Air Language Server",
 			serverOptions,
-			clientOptions
+			clientOptions,
 		);
 		client.onNotification(SYNC_FILE_SETTINGS, (settings) =>
-			this.fileSettings.handleSettingsNotification(settings)
+			this.fileSettings.handleSettingsNotification(settings),
 		);
 
 		await client.start();

diff --git a/editors/code/src/settings.ts b/editors/code/src/settings.ts
@@ -17,22 +17,22 @@ export type WorkspaceSettings = {
 };
 
 export function getInitializationOptions(
-	namespace: string
+	namespace: string,
 ): InitializationOptions {
 	const config = getConfiguration(namespace);
 
 	return {
 		logLevel: getOptionalUserValue<LogLevel>(config, "logLevel"),
 		dependencyLogLevels: getOptionalUserValue<string>(
 			config,
-			"dependencyLogLevels"
+			"dependencyLogLevels",
 		),
 	};
 }
 
 export function getWorkspaceSettings(
 	namespace: string,
-	workspace: vscode.WorkspaceFolder
+	workspace: vscode.WorkspaceFolder,
 ): WorkspaceSettings {
 	const config = getConfiguration(namespace, workspace);
 
@@ -45,15 +45,15 @@ export function getWorkspaceSettings(
 
 function getOptionalUserValue<T>(
 	config: vscode.WorkspaceConfiguration,
-	key: string
+	key: string,
 ): T | undefined {
 	const inspect = config.inspect<T>(key);
 	return inspect?.globalValue;
 }
 
 function getConfiguration(
 	config: string,
-	scope?: vscode.ConfigurationScope
+	scope?: vscode.ConfigurationScope,
 ): vscode.WorkspaceConfiguration {
 	return vscode.workspace.getConfiguration(config, scope);
 }