Skip to content

fix: use suffix matching for formatter file extensions #14537

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kevinWangSheng wants to merge 1 commit into
base: dev
Choose a base branch
from
+6 −7
Open

fix: use suffix matching for formatter file extensions #14537

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 6 additions & 7 deletions packages/opencode/src/format/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { Bus } from "../bus"
import { File } from "../file"
import { Log } from "../util/log"
import path from "path"

import z from "zod"

import * as Formatter from "./formatter"
Expand Down Expand Up @@ -73,14 +73,14 @@ export namespace Format {
return status
}

async function getFormatter(ext: string) {
async function getFormatter(file: string) {
const formatters = await state().then((x) => x.formatters)
const result = []
for (const item of Object.values(formatters)) {
log.info("checking", { name: item.name, ext })
if (!item.extensions.includes(ext)) continue
log.info("checking", { name: item.name, file })
if (!item.extensions.some((ext) => file.endsWith(ext))) continue
if (!(await isEnabled(item))) continue
log.info("enabled", { name: item.name, ext })
log.info("enabled", { name: item.name, file })
result.push(item)
}
return result
Expand All @@ -105,9 +105,8 @@ export namespace Format {
Bus.subscribe(File.Event.Edited, async (payload) => {
const file = payload.properties.file
log.info("formatting", { file })
const ext = path.extname(file)

for (const item of await getFormatter(ext)) {
for (const item of await getFormatter(file)) {
log.info("running", { command: item.command })
try {
const proc = Bun.spawn({
Expand Down
Loading