From 55775ce5cd69a1fff9a8fde2178161b7b2fe5974 Mon Sep 17 00:00:00 2001 From: leaysgur <6259812+leaysgur@users.noreply.github.com> Date: Fri, 19 Sep 2025 01:17:15 +0000 Subject: [PATCH] fix(oxfmt): Fix up the half-finished lines (#13840) Just tidied up first before moving on to another task. --- apps/oxfmt/src/service.rs | 7 ++----- apps/oxfmt/tests/fixtures/extensions/test.cjs | 2 +- apps/oxfmt/tests/fixtures/extensions/test.cts | 2 +- apps/oxfmt/tests/fixtures/extensions/test.es6 | 2 +- apps/oxfmt/tests/fixtures/extensions/test.js | 2 +- apps/oxfmt/tests/fixtures/extensions/test.jsm | 2 +- apps/oxfmt/tests/fixtures/extensions/test.jsx | 2 +- apps/oxfmt/tests/fixtures/extensions/test.mjs | 2 +- apps/oxfmt/tests/fixtures/extensions/test.mts | 2 +- apps/oxfmt/tests/fixtures/extensions/test.pac | 2 +- apps/oxfmt/tests/fixtures/extensions/test.ts | 2 +- apps/oxfmt/tests/fixtures/extensions/test.tsx | 2 +- 12 files changed, 13 insertions(+), 16 deletions(-) diff --git a/apps/oxfmt/src/service.rs b/apps/oxfmt/src/service.rs index 6c339554b5a8e..f546f8c2efb17 100644 --- a/apps/oxfmt/src/service.rs +++ b/apps/oxfmt/src/service.rs @@ -72,11 +72,8 @@ impl FormatService { return; } - let options = FormatOptions { - // semicolons: "always".parse().unwrap(), - semicolons: "as-needed".parse().unwrap(), - ..FormatOptions::default() - }; + // TODO: Read and apply config + let options = FormatOptions::default(); let code = Formatter::new(&allocator, options).build(&ret.program); let elapsed = start_time.elapsed(); diff --git a/apps/oxfmt/tests/fixtures/extensions/test.cjs b/apps/oxfmt/tests/fixtures/extensions/test.cjs index 7676d34e4c4cc..2cd122bdc2a7b 100644 --- a/apps/oxfmt/tests/fixtures/extensions/test.cjs +++ b/apps/oxfmt/tests/fixtures/extensions/test.cjs @@ -1 +1 @@ -module.exports = "cjs" +module.exports = "cjs"; diff --git a/apps/oxfmt/tests/fixtures/extensions/test.cts b/apps/oxfmt/tests/fixtures/extensions/test.cts index 5a4bc81ef11c3..8c54302ee8fb3 100644 --- a/apps/oxfmt/tests/fixtures/extensions/test.cts +++ b/apps/oxfmt/tests/fixtures/extensions/test.cts @@ -1 +1 @@ -module.exports = { typed: "cts" as string } +module.exports = { typed: "cts" as string }; diff --git a/apps/oxfmt/tests/fixtures/extensions/test.es6 b/apps/oxfmt/tests/fixtures/extensions/test.es6 index 5fd2b0182a9a8..3e47e0dce8c62 100644 --- a/apps/oxfmt/tests/fixtures/extensions/test.es6 +++ b/apps/oxfmt/tests/fixtures/extensions/test.es6 @@ -1 +1 @@ -const es6 = "ecmascript6" +const es6 = "ecmascript6"; diff --git a/apps/oxfmt/tests/fixtures/extensions/test.js b/apps/oxfmt/tests/fixtures/extensions/test.js index 7a1cf0f4ec9bb..ecf0170259286 100644 --- a/apps/oxfmt/tests/fixtures/extensions/test.js +++ b/apps/oxfmt/tests/fixtures/extensions/test.js @@ -1 +1 @@ -const standard = "js" +const standard = "js"; diff --git a/apps/oxfmt/tests/fixtures/extensions/test.jsm b/apps/oxfmt/tests/fixtures/extensions/test.jsm index 6e763f9fb017a..38230cae95524 100644 --- a/apps/oxfmt/tests/fixtures/extensions/test.jsm +++ b/apps/oxfmt/tests/fixtures/extensions/test.jsm @@ -1 +1 @@ -const jsModule = "javascript module" +const jsModule = "javascript module"; diff --git a/apps/oxfmt/tests/fixtures/extensions/test.jsx b/apps/oxfmt/tests/fixtures/extensions/test.jsx index 32834469304b6..5e96b63613125 100644 --- a/apps/oxfmt/tests/fixtures/extensions/test.jsx +++ b/apps/oxfmt/tests/fixtures/extensions/test.jsx @@ -1 +1 @@ -const Component = () =>
JSX
+const Component = () =>
JSX
; diff --git a/apps/oxfmt/tests/fixtures/extensions/test.mjs b/apps/oxfmt/tests/fixtures/extensions/test.mjs index 10782bff0b3d2..d2e1a45195e5c 100644 --- a/apps/oxfmt/tests/fixtures/extensions/test.mjs +++ b/apps/oxfmt/tests/fixtures/extensions/test.mjs @@ -1 +1 @@ -export const module = "mjs" +export const module = "mjs"; diff --git a/apps/oxfmt/tests/fixtures/extensions/test.mts b/apps/oxfmt/tests/fixtures/extensions/test.mts index 0137da962b7b5..06a48d46e8cce 100644 --- a/apps/oxfmt/tests/fixtures/extensions/test.mts +++ b/apps/oxfmt/tests/fixtures/extensions/test.mts @@ -1 +1 @@ -export const typedModule: string = "mts" +export const typedModule: string = "mts"; diff --git a/apps/oxfmt/tests/fixtures/extensions/test.pac b/apps/oxfmt/tests/fixtures/extensions/test.pac index 13c01cf87282e..29b1e54266346 100644 --- a/apps/oxfmt/tests/fixtures/extensions/test.pac +++ b/apps/oxfmt/tests/fixtures/extensions/test.pac @@ -1 +1 @@ -const standard = "pac" +const standard = "pac"; diff --git a/apps/oxfmt/tests/fixtures/extensions/test.ts b/apps/oxfmt/tests/fixtures/extensions/test.ts index 33798445d0d6c..abaaeee2d2997 100644 --- a/apps/oxfmt/tests/fixtures/extensions/test.ts +++ b/apps/oxfmt/tests/fixtures/extensions/test.ts @@ -1 +1 @@ -const typed: string = "ts" +const typed: string = "ts"; diff --git a/apps/oxfmt/tests/fixtures/extensions/test.tsx b/apps/oxfmt/tests/fixtures/extensions/test.tsx index 6362be7d87530..dade727f349b0 100644 --- a/apps/oxfmt/tests/fixtures/extensions/test.tsx +++ b/apps/oxfmt/tests/fixtures/extensions/test.tsx @@ -1 +1 @@ -const Component: React.FC = () =>
TSX
+const Component: React.FC = () =>
TSX
;