Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions crates/squawk_wasm/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ squawk-syntax.workspace = true
squawk-linter.workspace = true
squawk-lexer.workspace = true
squawk-ide.workspace = true
squawk-fmt.workspace = true
rowan.workspace = true
salsa.workspace = true

Expand Down
10 changes: 10 additions & 0 deletions crates/squawk_wasm/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -172,6 +172,16 @@ impl SquawkDatabase {
Ok(out)
}

pub fn format(&self) -> Result<String, Error> {
let file = self.file()?;
let content = file.content(&self.db);
let line_ending = find_newline(content)
.map(|(_, ending)| ending)
.unwrap_or_default();
let parse = db::parse(&self.db, file);
squawk_fmt::fmt(&parse.tree(), line_ending).map_err(into_error)
}

pub fn lint(&self) -> Result<JsValue, Error> {
let file = self.file()?;
let content = file.content(&self.db);
Expand Down
43 changes: 41 additions & 2 deletions playground/src/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,14 @@ import {
useEffectEvent,
} from "react"
import * as monaco from "monaco-editor"
import { LintError, Fix, useDumpCst, useDumpTokens, useErrors } from "./squawk"
import {
LintError,
Fix,
useDumpCst,
useDumpTokens,
useErrors,
useFormat,
} from "./squawk"
import {
compress,
compressToEncodedURIComponent,
Expand All @@ -28,7 +35,7 @@ import {
import { language as pgsqlMonarchLanguage } from "./pgsql"
import BUILTINS_SQL from "./builtins.sql?raw"

const modes = ["Lint", "Syntax Tree", "Tokens"] as const
const modes = ["Lint", "Format", "Syntax Tree", "Tokens"] as const
const STORAGE_KEY = "playground-history-v3"

type Mode = (typeof modes)[number]
Expand Down Expand Up @@ -210,6 +217,8 @@ export function App() {
<TokenPanel text={text} version={version} />
) : mode === "Lint" ? (
<ErrorPanel errors={markers} />
) : mode === "Format" ? (
<FormatPanel text={text} version={version} />
) : mode == null ? null : (
assertNever(mode)
)}
Expand Down Expand Up @@ -251,6 +260,29 @@ function TokenPanel({ text, version }: { text: string; version: number }) {
)
}

function FormatPanel({ text, version }: { text: string; version: number }) {
const result = useFormat(text, version)
const value = result.ok ? result.text : result.error
return (
<div className="flex flex-col flex-1">
{result.ok ? null : (
<div className="bg-amber-800 text-slate-100 px-3 py-2 text-sm">
can't format this file
</div>
)}
<Editor
value={value}
settings={{
...SETTINGS,
value,
language: "pgsql-formatted",
readOnly: true,
}}
/>
</div>
)
}

function Controls({
activeMode,
onModeChange,
Expand Down Expand Up @@ -383,6 +415,12 @@ function registerMonacoProvidersOnce() {
pgsqlMonarchLanguage,
)

monaco.languages.register({ id: "pgsql-formatted" })
const pgsqlFormattedTokenProvider = monaco.languages.setMonarchTokensProvider(
"pgsql-formatted",
pgsqlMonarchLanguage,
)

monaco.languages.register({ id: "rast" })
const tokenProvider = monaco.languages.setMonarchTokensProvider("rast", {
tokenizer: {
Expand Down Expand Up @@ -510,6 +548,7 @@ function registerMonacoProvidersOnce() {
return () => {
languageConfig.dispose()
pgsqlTokenProvider.dispose()
pgsqlFormattedTokenProvider.dispose()
codeActionProvider.dispose()
hoverProvider.dispose()
definitionProvider.dispose()
Expand Down
19 changes: 17 additions & 2 deletions playground/src/squawk.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -139,11 +139,21 @@ export function semantic_tokens_legend(): SemanticTokensLegend {
return SquawkDatabase.semantic_tokens_legend()
}

export function dump_cst(content: string, version: number): string {
type FormatResult = { ok: true; text: string } | { ok: false; error: string }

function format(content: string, version: number): FormatResult {
try {
return { ok: true, text: getDb(content, version).format() }
} catch (e) {
return { ok: false, error: e instanceof Error ? e.message : String(e) }
}
}

function dump_cst(content: string, version: number): string {
return getDb(content, version).dump_cst()
}

export function dump_tokens(content: string, version: number): string {
function dump_tokens(content: string, version: number): string {
return getDb(content, version).dump_tokens()
}

Expand All @@ -162,6 +172,11 @@ export function useDumpTokens(text: string, version: number): string {
return isReady ? dump_tokens(text, version) : ""
}

export function useFormat(text: string, version: number): FormatResult {
const isReady = useWasmStatus()
return isReady ? format(text, version) : { ok: true, text: "" }
}

let isStartingAlready: { promise: Promise<unknown>; start: number } | null =
null

Expand Down
Loading