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
40 changes: 40 additions & 0 deletions crates/squawk_wasm/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ use salsa::Setter;
use serde::{Deserialize, Serialize};
use squawk_ide::builtins::builtins_line_index;
use squawk_ide::db::{self, Database, File};
use squawk_ide::folding_ranges::{FoldKind, folding_ranges};
use squawk_ide::goto_definition::FileId;
use squawk_syntax::ast::AstNode;
use wasm_bindgen::prelude::*;
Expand Down Expand Up @@ -350,6 +351,38 @@ impl SquawkDatabase {
serde_wasm_bindgen::to_value(&converted).map_err(into_error)
}

pub fn folding_ranges(&self) -> Result<JsValue, Error> {
let file = self.file()?;
let line_index = db::line_index(&self.db, file);
let folds = folding_ranges(&self.db, file);

let converted: Vec<WasmFoldingRange> = folds
.into_iter()
.map(|fold| {
let start = line_index.line_col(fold.range.start());
let end = line_index.line_col(fold.range.end());
let start_wide = line_index
.to_wide(line_index::WideEncoding::Utf16, start)
.unwrap();
let end_wide = line_index
.to_wide(line_index::WideEncoding::Utf16, end)
.unwrap();

WasmFoldingRange {
start_line: start_wide.line,
end_line: end_wide.line,
kind: match fold.kind {
FoldKind::Comment => "comment",
_ => "region",
}
.to_string(),
}
})
.collect();

serde_wasm_bindgen::to_value(&converted).map_err(into_error)
}

pub fn selection_ranges(&self, positions: Vec<JsValue>) -> Result<JsValue, Error> {
let file = self.file()?;
let parse = db::parse(&self.db, file);
Expand Down Expand Up @@ -609,6 +642,13 @@ struct WasmInlayHint {
kind: String,
}

#[derive(Serialize)]
struct WasmFoldingRange {
start_line: u32,
end_line: u32,
kind: String,
}

#[derive(Serialize)]
struct WasmSelectionRange {
start_line: u32,
Expand Down
13 changes: 11 additions & 2 deletions playground/src/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ import {
provideDefinition,
provideReferences,
provideDocumentSymbols,
provideFoldingRanges,
provideSelectionRanges,
provideCompletionItems,
} from "./providers"
Expand Down Expand Up @@ -51,8 +52,8 @@ const SETTINGS = {
minimap: { enabled: false },
automaticLayout: true,
scrollBeyondLastLine: false,
folding: false,
showFoldingControls: "never",
folding: true,
showFoldingControls: "mouseover",
occurrencesHighlight: "off",
stickyScroll: { enabled: false },
fontSize: 16,
Expand Down Expand Up @@ -452,6 +453,13 @@ function registerMonacoProvidersOnce() {
},
)

const foldingRangeProvider = monaco.languages.registerFoldingRangeProvider(
"pgsql",
{
provideFoldingRanges,
},
)

const selectionRangeProvider =
monaco.languages.registerSelectionRangeProvider("pgsql", {
provideSelectionRanges,
Expand All @@ -472,6 +480,7 @@ function registerMonacoProvidersOnce() {
definitionProvider.dispose()
referencesProvider.dispose()
documentSymbolProvider.dispose()
foldingRangeProvider.dispose()
inlayHintsProvider.dispose()
selectionRangeProvider.dispose()
completionProvider.dispose()
Expand Down
25 changes: 25 additions & 0 deletions playground/src/providers.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import {
completion,
document_symbols,
find_references,
folding_ranges,
goto_definition,
hover,
inlay_hints,
Expand Down Expand Up @@ -267,6 +268,30 @@ export async function provideSelectionRanges(
}
}

export async function provideFoldingRanges(
model: monaco.editor.ITextModel,
): Promise<monaco.languages.FoldingRange[]> {
const content = model.getValue()
const version = model.getVersionId()
if (!content) return []

try {
const wasmRanges = folding_ranges(content, version)

return wasmRanges.map((range) => ({
start: range.start_line + 1,
end: range.end_line + 1,
kind:
range.kind === "comment"
? monaco.languages.FoldingRangeKind.Comment
: monaco.languages.FoldingRangeKind.Region,
}))
} catch (e) {
console.error("Error in provideFoldingRanges:", e)
return []
}
}

function convertCompletionKind(
kind: string,
): monaco.languages.CompletionItemKind {
Expand Down
13 changes: 13 additions & 0 deletions playground/src/squawk.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,13 @@ export function selection_ranges(
return getDb(content, version).selection_ranges(positions)
}

export function folding_ranges(
content: string,
version: number,
): FoldingRange[] {
return getDb(content, version).folding_ranges()
}

export function completion(
content: string,
version: number,
Expand Down Expand Up @@ -206,6 +213,12 @@ interface InlayHint {
kind: string
}

export interface FoldingRange {
start_line: number
end_line: number
kind: string
}

export interface SelectionRange {
start_line: number
start_column: number
Expand Down
Loading