Prettier 3 formatting

Author: ntotten

.github/workflows/stale.yml

@@ -1,7 +1,7 @@
 name: "Close stale issues and PRs"
 on:
   workflow_dispatch:
-  
+
 jobs:
   stale:
     runs-on: ubuntu-latest

scripts/version.js

@@ -11,7 +11,7 @@ fs.readFile(CHANGELOG, (error, data) => {
   const stringData = data.toString("utf8");
   const updated = stringData.replace(
     /## \[Unreleased\](?!\s*## )/, // None empty Unreleased block
-    `## [Unreleased]\n\n## [${v}]`
+    `## [Unreleased]\n\n## [${v}]`,
   );
 
   if (updated !== stringData) {

src/Files.ts

@@ -18,7 +18,7 @@ function isWindows(): boolean {
  * @param tracer the tracer to use
  */
 export function resolveGlobalNodePath(
-  tracer?: (message: string) => void
+  tracer?: (message: string) => void,
 ): string | undefined {
   let npmCommand = "npm";
   const options: SpawnSyncOptionsWithStringEncoding = {
@@ -36,7 +36,7 @@ export function resolveGlobalNodePath(
     const stdout = spawnSync(
       npmCommand,
       ["config", "get", "prefix"],
-      options
+      options,
     ).stdout;
 
     if (!stdout) {
@@ -77,7 +77,7 @@ interface YarnJsonFormat {
  * @param tracer the tracer to use
  */
 export function resolveGlobalYarnPath(
-  tracer?: (message: string) => void
+  tracer?: (message: string) => void,
 ): string | undefined {
   let yarnCommand = "yarn";
   const options: SpawnSyncOptionsWithStringEncoding = {
@@ -96,7 +96,7 @@ export function resolveGlobalYarnPath(
     const results = spawnSync(
       yarnCommand,
       ["global", "dir", "--json"],
-      options
+      options,
     );
 
     const stdout = results.stdout;

src/ModuleLoader.ts

@@ -21,7 +21,7 @@ export function loadNodeModule<T>(moduleName: string): T | undefined {
 
 export function resolveNodeModule(
   moduleName: string,
-  options?: { paths: string[] }
+  options?: { paths: string[] },
 ) {
   try {
     return nodeModuleLoader().resolve(moduleName, options);
@@ -36,7 +36,7 @@ export function resolveNodeModule(
  */
 export function resolveConfigPlugins(
   config: PrettierOptions,
-  fileName: string
+  fileName: string,
 ): PrettierOptions {
   if (config?.plugins?.length) {
     config.plugins = config.plugins.map((plugin) => {

src/PrettierEditProvider.ts

@@ -10,15 +10,13 @@ import {
 import { ExtensionFormattingOptions } from "./types";
 
 export class PrettierEditProvider
-  implements
-    DocumentRangeFormattingEditProvider,
-    DocumentFormattingEditProvider
+  implements DocumentRangeFormattingEditProvider, DocumentFormattingEditProvider
 {
   constructor(
     private provideEdits: (
       document: TextDocument,
-      options: ExtensionFormattingOptions
-    ) => Promise<TextEdit[]>
+      options: ExtensionFormattingOptions,
+    ) => Promise<TextEdit[]>,
   ) {}
 
   public async provideDocumentRangeFormattingEdits(
@@ -27,7 +25,7 @@ export class PrettierEditProvider
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
     options: FormattingOptions,
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    token: CancellationToken
+    token: CancellationToken,
   ): Promise<TextEdit[]> {
     return this.provideEdits(document, {
       rangeEnd: document.offsetAt(range.end),
@@ -41,7 +39,7 @@ export class PrettierEditProvider
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
     options: FormattingOptions,
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    token: CancellationToken
+    token: CancellationToken,
   ): Promise<TextEdit[]> {
     return this.provideEdits(document, {
       force: false,

src/PrettierInstance.ts

@@ -13,7 +13,7 @@ export interface PrettierInstance {
   format(source: string, options?: PrettierOptions): Promise<string>;
   getFileInfo(
     filePath: string,
-    fileInfoOptions?: PrettierFileInfoOptions
+    fileInfoOptions?: PrettierFileInfoOptions,
   ): Promise<PrettierFileInfoResult>;
   getSupportInfo({
     plugins,
@@ -26,7 +26,7 @@ export interface PrettierInstance {
   resolveConfigFile(filePath?: string): Promise<string | null>;
   resolveConfig(
     fileName: string,
-    options?: ResolveConfigOptions
+    options?: ResolveConfigOptions,
   ): Promise<PrettierOptions | null>;
 }
 

src/PrettierWorkerInstance.ts

@@ -17,12 +17,12 @@ import { ResolveConfigOptions, Options } from "prettier";
 let currentCallId = 0;
 
 const worker = new Worker(
-  url.pathToFileURL(path.join(__dirname, "/worker/prettier-instance-worker.js"))
+  url.pathToFileURL(
+    path.join(__dirname, "/worker/prettier-instance-worker.js"),
+  ),
 );
 
-export const PrettierWorkerInstance: PrettierInstanceConstructor = class PrettierWorkerInstance
-  implements PrettierInstance
-{
+export const PrettierWorkerInstance: PrettierInstanceConstructor = class PrettierWorkerInstance implements PrettierInstance {
   private messageResolvers: Map<
     number,
     {
@@ -72,7 +72,7 @@ export const PrettierWorkerInstance: PrettierInstanceConstructor = class Prettie
 
   public async format(
     source: string,
-    options?: PrettierOptions
+    options?: PrettierOptions,
   ): Promise<string> {
     const result = await this.callMethod("format", [source, options]);
     return result;
@@ -95,7 +95,7 @@ export const PrettierWorkerInstance: PrettierInstanceConstructor = class Prettie
 
   public async getFileInfo(
     filePath: string,
-    fileInfoOptions?: PrettierFileInfoOptions
+    fileInfoOptions?: PrettierFileInfoOptions,
   ): Promise<PrettierFileInfoResult> {
     const result = await this.callMethod("getFileInfo", [
       filePath,
@@ -105,15 +105,15 @@ export const PrettierWorkerInstance: PrettierInstanceConstructor = class Prettie
   }
 
   public async resolveConfigFile(
-    filePath?: string | undefined
+    filePath?: string | undefined,
   ): Promise<string | null> {
     const result = await this.callMethod("resolveConfigFile", [filePath]);
     return result;
   }
 
   public async resolveConfig(
     fileName: string,
-    options?: ResolveConfigOptions | undefined
+    options?: ResolveConfigOptions | undefined,
   ): Promise<Options> {
     const result = await this.callMethod("resolveConfig", [fileName, options]);
     return result;

src/StatusBar.ts

@@ -26,11 +26,11 @@ export class StatusBar implements Disposable {
     this.statusBarItem = window.createStatusBarItem(
       "prettier.status",
       StatusBarAlignment.Right,
-      -1
+      -1,
     );
     this.languageStatusItem = languages.createLanguageStatusItem(
       "prettier.status",
-      []
+      [],
     );
 
     this.statusBarItem.name = "Prettier";
@@ -62,19 +62,19 @@ export class StatusBar implements Disposable {
       case FormatterStatus.Ignore:
       case FormatterStatus.Warn:
         this.statusBarItem.backgroundColor = new ThemeColor(
-          "statusBarItem.warningBackground"
+          "statusBarItem.warningBackground",
         );
         this.languageStatusItem.severity = LanguageStatusSeverity.Warning;
         break;
       case FormatterStatus.Error:
         this.statusBarItem.backgroundColor = new ThemeColor(
-          "statusBarItem.errorBackground"
+          "statusBarItem.errorBackground",
         );
         this.languageStatusItem.severity = LanguageStatusSeverity.Error;
         break;
       default:
         this.statusBarItem.backgroundColor = new ThemeColor(
-          "statusBarItem.fourgroundBackground"
+          "statusBarItem.fourgroundBackground",
         );
         this.languageStatusItem.severity = LanguageStatusSeverity.Information;
         break;

src/TemplateService.ts

@@ -6,7 +6,7 @@ import { PrettierModule, PrettierOptions } from "./types";
 export class TemplateService {
   constructor(
     private loggingService: LoggingService,
-    private prettierModule: PrettierModule
+    private prettierModule: PrettierModule,
   ) {}
   public async writeConfigFile(folderPath: Uri) {
     const settings = { tabWidth: 2, useTabs: false };
@@ -22,13 +22,13 @@ export class TemplateService {
 
     const templateSource = await this.prettierModule.format(
       JSON.stringify(settings, null, 2),
-      formatterOptions
+      formatterOptions,
     );
 
     this.loggingService.logInfo(`Writing .prettierrc to ${outputPath}`);
     await workspace.fs.writeFile(
       outputPath,
-      new TextEncoder().encode(templateSource)
+      new TextEncoder().encode(templateSource),
     );
   }
 }

src/extension.ts

@@ -31,7 +31,7 @@ export function activate(context: ExtensionContext) {
         if (event.affectsConfiguration("prettier.enable")) {
           loggingService.logWarning(RESTART_TO_ENABLE);
         }
-      })
+      }),
     );
     return;
   }
@@ -40,33 +40,33 @@ export function activate(context: ExtensionContext) {
 
   const templateService = new TemplateService(
     loggingService,
-    moduleResolver.getGlobalPrettierInstance()
+    moduleResolver.getGlobalPrettierInstance(),
   );
 
   const statusBar = new StatusBar();
 
   const editService = new PrettierEditService(
     moduleResolver,
     loggingService,
-    statusBar
+    statusBar,
   );
   editService
     .registerGlobal()
     .then(() => {
       const createConfigFileFunc = createConfigFile(templateService);
       const createConfigFileCommand = commands.registerCommand(
         "prettier.createConfigFile",
-        createConfigFileFunc
+        createConfigFileFunc,
       );
       const openOutputCommand = commands.registerCommand(
         "prettier.openOutput",
         () => {
           loggingService.show();
-        }
+        },
       );
       const forceFormatDocumentCommand = commands.registerCommand(
         "prettier.forceFormatDocument",
-        editService.forceFormatDocument
+        editService.forceFormatDocument,
       );
 
       context.subscriptions.push(
@@ -75,7 +75,7 @@ export function activate(context: ExtensionContext) {
         createConfigFileCommand,
         openOutputCommand,
         forceFormatDocumentCommand,
-        ...editService.registerDisposables()
+        ...editService.registerDisposables(),
       );
     })
     .catch((err) => {