Merge pull request #480 from lukecotter/chore-switch-prettier-import-sort

lcottercertinia · web-flow · commit 9e2ad8104bbf · 2024-01-24T16:58:33.000Z
chore: switch prettier import sort package
diff --git a/.prettierrc b/.prettierrc
@@ -1,12 +1,7 @@
 {
-  "plugins": ["@trivago/prettier-plugin-sort-imports"],
+  "plugins": ["prettier-plugin-organize-imports"],
   "tabWidth": 2,
   "printWidth": 100,
   "semi": true,
-  "singleQuote": true,
-  "importOrder": ["<THIRD_PARTY_MODULES>", "^[./]"],
-  "importOrderParserPlugins": ["typescript", "decorators"],
-  "importOrderSeparation": true,
-  "importOrderSortSpecifiers": true
-
+  "singleQuote": true
 }
diff --git a/lana/src/Context.ts b/lana/src/Context.ts
@@ -1,7 +1,7 @@
 /*
  * Copyright (c) 2020 Certinia Inc. All rights reserved.
  */
-import { type ExtensionContext, workspace } from 'vscode';
+import { workspace, type ExtensionContext } from 'vscode';
 
 import { ShowAnalysisCodeLens } from './codelenses/ShowAnalysisCodeLens.js';
 import { RetrieveLogFile } from './commands/RetrieveLogFile.js';
diff --git a/lana/src/codelenses/ShowAnalysisCodeLens.ts b/lana/src/codelenses/ShowAnalysisCodeLens.ts
@@ -1,4 +1,4 @@
-import { CodeLens, type CodeLensProvider, Range, type TextDocument, languages } from 'vscode';
+import { CodeLens, Range, languages, type CodeLensProvider, type TextDocument } from 'vscode';
 
 import { Context } from '../Context.js';
 import { ShowLogAnalysis } from '../commands/ShowLogAnalysis.js';
diff --git a/lana/src/commands/LogView.ts b/lana/src/commands/LogView.ts
@@ -5,8 +5,7 @@ import { createReadStream, existsSync } from 'fs';
 import { writeFile } from 'fs/promises';
 import { homedir } from 'os';
 import { basename, dirname, join, parse } from 'path';
-import { type WebviewPanel, window as vscWindow } from 'vscode';
-import { Uri, commands, workspace } from 'vscode';
+import { Uri, commands, window as vscWindow, workspace, type WebviewPanel } from 'vscode';
 
 import { Context } from '../Context.js';
 import { OpenFileInPackage } from '../display/OpenFileInPackage.js';
diff --git a/lana/src/commands/RetrieveLogFile.ts b/lana/src/commands/RetrieveLogFile.ts
@@ -4,7 +4,7 @@
 import { type LogRecord } from '@salesforce/apex-node';
 import { existsSync } from 'fs';
 import { join, parse } from 'path';
-import { type WebviewPanel, window } from 'vscode';
+import { window, type WebviewPanel } from 'vscode';
 
 import { appName } from '../AppSettings.js';
 import { Context } from '../Context.js';
diff --git a/lana/src/display/Display.ts b/lana/src/display/Display.ts
@@ -1,7 +1,7 @@
 /*
  * Copyright (c) 2020 Certinia Inc. All rights reserved.
  */
-import { type MessageOptions, Uri, commands, window } from 'vscode';
+import { Uri, commands, window, type MessageOptions } from 'vscode';
 
 import { appName } from '../AppSettings.js';
 
diff --git a/lana/src/display/OpenFileInPackage.ts b/lana/src/display/OpenFileInPackage.ts
@@ -5,10 +5,10 @@ import { sep } from 'path';
 import {
   Position,
   Selection,
-  type TextDocumentShowOptions,
   Uri,
   ViewColumn,
   commands,
+  type TextDocumentShowOptions,
 } from 'vscode';
 
 import { Context } from '../Context.js';
diff --git a/lana/src/display/QuickPick.ts b/lana/src/display/QuickPick.ts
@@ -1,7 +1,7 @@
 /*
  * Copyright (c) 2020 Certinia Inc. All rights reserved.
  */
-import { type QuickPickItem, type QuickPickOptions, window } from 'vscode';
+import { window, type QuickPickItem, type QuickPickOptions } from 'vscode';
 
 export class Item implements QuickPickItem {
   label: string;
diff --git a/lana/src/display/WebView.ts b/lana/src/display/WebView.ts
@@ -1,7 +1,7 @@
 /*
  * Copyright (c) 2020 Certinia Inc. All rights reserved.
  */
-import { Uri, type WebviewPanel, type WebviewPanelOptions, window } from 'vscode';
+import { Uri, window, type WebviewPanel, type WebviewPanelOptions } from 'vscode';
 
 export class WebView {
   static apply(name: string, title: string, resourceRoots: Uri[]): WebviewPanel {
diff --git a/log-viewer/modules/__tests__/TreeView.test.ts b/log-viewer/modules/__tests__/TreeView.test.ts
@@ -1,8 +1,7 @@
 /*
  * Copyright (c) 2020 Certinia Inc. All rights reserved.
  */
-import parseLog, { logLines } from '../parsers/TreeParserLegacy.js';
-import { LineIterator } from '../parsers/TreeParserLegacy.js';
+import parseLog, { LineIterator, logLines } from '../parsers/TreeParserLegacy.js';
 
 describe('LineIterator tests', () => {
   it('Should return null when there are no more lines', () => {
diff --git a/log-viewer/modules/components/AnalysisView.ts b/log-viewer/modules/components/AnalysisView.ts
@@ -7,9 +7,9 @@ import {
   vsCodeDropdown,
   vsCodeOption,
 } from '@vscode/webview-ui-toolkit';
-import { LitElement, type PropertyValues, css, html, unsafeCSS } from 'lit';
+import { LitElement, css, html, unsafeCSS, type PropertyValues } from 'lit';
 import { customElement, property } from 'lit/decorators.js';
-import { type ColumnComponent, TabulatorFull as Tabulator } from 'tabulator-tables';
+import { TabulatorFull as Tabulator, type ColumnComponent } from 'tabulator-tables';
 
 import NumberAccessor from '../datagrid/dataaccessor/Number.js';
 import { progressFormatter } from '../datagrid/format/Progress.js';
diff --git a/log-viewer/modules/components/SOQLLinterIssues.ts b/log-viewer/modules/components/SOQLLinterIssues.ts
@@ -1,7 +1,7 @@
 /*
  * Copyright (c) 2021 Certinia Inc. All rights reserved.
  */
-import { LitElement, type PropertyValues, type TemplateResult, css, html } from 'lit';
+import { LitElement, css, html, type PropertyValues, type TemplateResult } from 'lit';
 import { customElement, property, state } from 'lit/decorators.js';
 
 import { DatabaseAccess } from '../Database.js';
diff --git a/log-viewer/modules/components/calltree-view/CalltreeView.ts b/log-viewer/modules/components/calltree-view/CalltreeView.ts
@@ -10,17 +10,17 @@
 //todo: add filter on line type
 //todo: add filter on log level (fine, finer etc)
 import { provideVSCodeDesignSystem, vsCodeCheckbox } from '@vscode/webview-ui-toolkit';
-import { LitElement, type PropertyValues, css, html, unsafeCSS } from 'lit';
+import { LitElement, css, html, unsafeCSS, type PropertyValues } from 'lit';
 import { customElement, property } from 'lit/decorators.js';
-import { type RowComponent, TabulatorFull as Tabulator } from 'tabulator-tables';
+import { TabulatorFull as Tabulator, type RowComponent } from 'tabulator-tables';
 
 import MinMaxEditor from '../../datagrid/editors/MinMax.js';
 import MinMaxFilter from '../../datagrid/filters/MinMax.js';
 import { progressFormatter } from '../../datagrid/format/Progress.js';
 import { RowKeyboardNavigation } from '../../datagrid/module/RowKeyboardNavigation.js';
 import { RowNavigation } from '../../datagrid/module/RowNavigation.js';
 import dataGridStyles from '../../datagrid/style/DataGrid.scss';
-import { ApexLog, type LogEventType, LogLine, TimedNode } from '../../parsers/ApexLogParser.js';
+import { ApexLog, LogLine, TimedNode, type LogEventType } from '../../parsers/ApexLogParser.js';
 import { hostService } from '../../services/VSCodeService.js';
 import { globalStyles } from '../../styles/global.styles.js';
 import '../skeleton/GridSkeleton.js';
diff --git a/log-viewer/modules/components/database-view/DatabaseView.ts b/log-viewer/modules/components/database-view/DatabaseView.ts
@@ -7,13 +7,13 @@ import {
   vsCodeDropdown,
   vsCodeOption,
 } from '@vscode/webview-ui-toolkit';
-import { LitElement, type PropertyValues, css, html, render, unsafeCSS } from 'lit';
+import { LitElement, css, html, render, unsafeCSS, type PropertyValues } from 'lit';
 import { customElement, property, state } from 'lit/decorators.js';
 import {
+  TabulatorFull as Tabulator,
   type ColumnComponent,
   type GroupComponent,
   type RowComponent,
-  TabulatorFull as Tabulator,
 } from 'tabulator-tables';
 
 import { DatabaseAccess } from '../../Database.js';
diff --git a/log-viewer/modules/components/notifications/NotificationPanel.ts b/log-viewer/modules/components/notifications/NotificationPanel.ts
@@ -2,7 +2,7 @@
  * Copyright (c) 2023 Certinia Inc. All rights reserved.
  */
 import { provideVSCodeDesignSystem, vsCodeButton, vsCodeDivider } from '@vscode/webview-ui-toolkit';
-import { LitElement, type TemplateResult, css, html } from 'lit';
+import { LitElement, css, html, type TemplateResult } from 'lit';
 import { customElement, property } from 'lit/decorators.js';
 
 import { globalStyles } from '../../styles/global.styles.js';
diff --git a/log-viewer/modules/datagrid/module/RowKeyboardNavigation.ts b/log-viewer/modules/datagrid/module/RowKeyboardNavigation.ts
@@ -1,7 +1,7 @@
 /*
  * Copyright (c) 2022 Certinia Inc. All rights reserved.
  */
-import { KeybindingsModule, Module, type RowComponent, Tabulator } from 'tabulator-tables';
+import { KeybindingsModule, Module, Tabulator, type RowComponent } from 'tabulator-tables';
 
 // todo: make this generic and support opening grouped rows too then use on DB view.
 // todo: remove the '@ts-expect-error' + fix the types file
diff --git a/log-viewer/modules/datagrid/module/RowNavigation.ts b/log-viewer/modules/datagrid/module/RowNavigation.ts
@@ -1,7 +1,7 @@
 /*
  * Copyright (c) 2022 Certinia Inc. All rights reserved.
  */
-import { Module, type RowComponent, Tabulator } from 'tabulator-tables';
+import { Module, Tabulator, type RowComponent } from 'tabulator-tables';
 
 export class RowNavigation extends Module {
   constructor(table: Tabulator) {
diff --git a/log-viewer/modules/parsers/ApexLogParser.ts b/log-viewer/modules/parsers/ApexLogParser.ts
@@ -2982,4 +2982,4 @@ const logEventNames = [
 
 export type LogEventType = (typeof logEventNames)[number];
 
-export { SOQLExecuteExplainLine, SOQLExecuteBeginLine, DMLBeginLine };
+export { DMLBeginLine, SOQLExecuteBeginLine, SOQLExecuteExplainLine };
diff --git a/log-viewer/modules/parsers/TreeParserLegacy.ts b/log-viewer/modules/parsers/TreeParserLegacy.ts
@@ -2875,5 +2875,12 @@ export function getLogSettings(log: string) {
   });
 }
 
-export { logLines, totalDuration, truncated, cpuUsed };
-export { SOQLExecuteExplainLine, SOQLExecuteBeginLine, DMLBeginLine };
+export {
+  DMLBeginLine,
+  SOQLExecuteBeginLine,
+  SOQLExecuteExplainLine,
+  cpuUsed,
+  logLines,
+  totalDuration,
+  truncated,
+};
diff --git a/log-viewer/modules/soql/SOQLParser.ts b/log-viewer/modules/soql/SOQLParser.ts
@@ -8,12 +8,12 @@ import {
   QueryContext,
 } from '@apexdevtools/apex-parser';
 import {
-  type ANTLRErrorListener,
   CharStreams,
   CommonTokenStream,
   RecognitionException,
   Recognizer,
   Token,
+  type ANTLRErrorListener,
 } from 'antlr4ts';
 
 // To understand the parser AST see https://github.com/nawforce/apex-parser/blob/master/antlr/ApexParser.g4
diff --git a/log-viewer/modules/timeline/Timeline.ts b/log-viewer/modules/timeline/Timeline.ts
@@ -7,9 +7,9 @@ import { goToRow } from '../components/calltree-view/CalltreeView.js';
 import {
   ApexLog,
   LogLine,
-  type LogSubCategory,
   Method,
   TimedNode,
+  type LogSubCategory,
 } from '../parsers/ApexLogParser.js';
 
 export { ApexLog };
diff --git a/log-viewer/modules/timeline/TimelineKey.ts b/log-viewer/modules/timeline/TimelineKey.ts
@@ -6,7 +6,7 @@ import { LitElement, css, html } from 'lit';
 import { customElement, state } from 'lit/decorators.js';
 
 import { globalStyles } from '../styles/global.styles.js';
-import { type TimelineGroup, keyMap } from './Timeline.js';
+import { keyMap, type TimelineGroup } from './Timeline.js';
 
 @customElement('timeline-key')
 export class Timelinekey extends LitElement {
diff --git a/log-viewer/modules/timeline/TimelineView.ts b/log-viewer/modules/timeline/TimelineView.ts
@@ -1,7 +1,7 @@
 /*
  * Copyright (c) 2023 Certinia Inc. All rights reserved.
  */
-import { LitElement, type PropertyValues, css, html } from 'lit';
+import { LitElement, css, html, type PropertyValues } from 'lit';
 import { customElement, property } from 'lit/decorators.js';
 
 import { skeletonStyles } from '../components/skeleton/skeleton.styles.js';
diff --git a/package.json b/package.json
@@ -9,7 +9,6 @@
     "@swc/core": "^1.3.100",
     "@swc/helpers": "^0.5.3",
     "@swc/jest": "^0.2.29",
-    "@trivago/prettier-plugin-sort-imports": "^4.3.0",
     "@types/jest": "^29.5.11",
     "@typescript-eslint/eslint-plugin": "^6.14.0",
     "@typescript-eslint/parser": "^6.14.0",
@@ -20,6 +19,7 @@
     "jest-environment-jsdom": "^29.7.0",
     "lint-staged": "^15.2.0",
     "prettier": "^3.1.1",
+    "prettier-plugin-organize-imports": "^3.2.4",
     "rollup": "^4.9.0",
     "rollup-plugin-copy": "^3.5.0",
     "rollup-plugin-minify-html": "^1.0.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { CodeLens, type CodeLensProvider, Range, type TextDocument, languages } from 'vscode';`
	`1`	`+import { CodeLens, Range, languages, type CodeLensProvider, type TextDocument } from 'vscode';`
`2`	`2`
`3`	`3`	`import { Context } from '../Context.js';`
`4`	`4`	`import { ShowLogAnalysis } from '../commands/ShowLogAnalysis.js';`