fix(editor): preserve trailing Dameng dot whitespace

This commit is contained in:
zipg authored and GitHub committed 2026-08-12 20:14:28 +08:00
1 parent 023e082ce5
commit 9a30b95a1a
2 files changed
+75 -16

No files matched your search

+42 -16
View File
@@ -1,7 +1,7 @@
import { DEFAULT_SQL_FORMATTER_SETTINGS, normalizeSqlFormatterSettings, sqlFormatterOptions, type SqlFormatterSettings } from "@/lib/sql/sqlFormatterConfig";
import { looksLikeXml } from "@/lib/sql/autoFormat";
export type SqlFormatDialect = "mysql" | "postgres" | "sqlite" | "sqlserver" | "clickhouse" | "generic";
export type SqlFormatDialect = "mysql" | "postgres" | "sqlite" | "sqlserver" | "clickhouse" | "dameng" | "generic";
export const MAX_SQL_FORMAT_CHARS = 1_000_000;
@@ -53,6 +53,8 @@ export function sqlFormatDialectForDbType(dbType: string | null | undefined): Sq
return "sqlserver";
case "clickhouse":
return "clickhouse";
case "dameng":
return "dameng";
default:
return "generic";
}
@@ -75,6 +77,16 @@ function formatterLanguage(dialect: SqlFormatDialect) {
}
}
function splitTrailingStandaloneDot(sql: string): { body: string; suffix: string } | null {
const match = /\s+\.(\s*)$/.exec(sql);
if (!match || match.index === 0) return null;
return {
body: sql.slice(0, match.index),
suffix: match[0],
};
}
export async function formatSqlText(sql: string, dialect: SqlFormatDialect = "generic", settings: Partial<SqlFormatterSettings> = DEFAULT_SQL_FORMATTER_SETTINGS): Promise<string> {
if (!sql.trim()) return sql;
if (sql.length > MAX_SQL_FORMAT_CHARS) {
@@ -89,23 +101,37 @@ export async function formatSqlText(sql: string, dialect: SqlFormatDialect = "ge
const normalizedSettings = normalizeSqlFormatterSettings(settings);
const options = sqlFormatterOptions(normalizedSettings);
const language = formatterLanguage(dialect);
try {
const formatted = format(sql, { language, ...options });
return applySqlFormatterLayout(formatted, normalizedSettings, dialect);
} catch (err) {
// The generic "sql" dialect can't parse many real-world constructs (PostgreSQL
// `::` casts, GaussDB/openGauss materialized-view DDL, T-SQL specifics, ...).
// Retry once with the more permissive PostgreSQL grammar, which is a superset
// that tolerates most of these, before surfacing the failure.
if (language !== "postgresql") {
try {
const formatted = format(sql, { language: "postgresql", ...options });
return applySqlFormatterLayout(formatted, normalizedSettings, dialect);
} catch {
// fall through to the original error below
const formatWithFallback = (input: string): string => {
try {
return format(input, { language, ...options });
} catch (err) {
// The generic "sql" dialect can't parse many real-world constructs (PostgreSQL
// `::` casts, GaussDB/openGauss materialized-view DDL, T-SQL specifics, ...).
// Retry once with the more permissive PostgreSQL grammar, which is a superset
// that tolerates most of these, before surfacing the failure.
if (language !== "postgresql") {
try {
return format(input, { language: "postgresql", ...options });
} catch {
// fall through to the original error below
}
}
throw err;
}
};
try {
return applySqlFormatterLayout(formatWithFallback(sql), normalizedSettings, dialect);
} catch (err) {
const trailingDot = dialect === "dameng" ? splitTrailingStandaloneDot(sql) : null;
if (!trailingDot) throw err;
try {
const formatted = applySqlFormatterLayout(formatWithFallback(trailingDot.body), normalizedSettings, dialect);
return `${formatted}${trailingDot.suffix}`;
} catch {
throw err;
}
throw err;
}
}