Skip to content
Open
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
95 changes: 48 additions & 47 deletions Cargo.lock

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

20 changes: 10 additions & 10 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -38,22 +38,22 @@ tracing = "0.1"
rust-i18n = "3.1.5"
schemars = { version = "1.2", features = ["preserve_order"] }
rquickjs = { version = "0.11", features = ["bindgen", "futures", "macro"] }
rquickjs-serde = "0.4"
oxc_allocator = "0.112.0"
oxc_ast = "0.112.0"
oxc_parser = "0.112.0"
oxc_transformer = "0.112.0"
oxc_codegen = "0.112.0"
oxc_span = "0.112.0"
oxc_semantic = "0.112.0"
oxc_diagnostics = "0.112.0"
rquickjs-serde = "0.5"
oxc_allocator = "0.115.0"
oxc_ast = "0.115.0"
oxc_parser = "0.115.0"
oxc_transformer = "0.115.0"
oxc_codegen = "0.115.0"
oxc_span = "0.115.0"
oxc_semantic = "0.115.0"
oxc_diagnostics = "0.115.0"
tree-sitter = "0.26.5"
tree-sitter-highlight = "0.26.3"
crossterm = "0.29"
winit = "0.30"
wgpu = "28.0"
lsp-types = "0.97"
ts-rs = { version = "11.1", features = ["serde_json"] }
ts-rs = { version = "12.0", features = ["serde_json"] }
# Add more as needed during refactor

[profile.release]
Expand Down
6 changes: 3 additions & 3 deletions crates/fresh-editor/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ nix = { version = "0.31", features = ["signal", "pthread", "resource", "poll", "
# Plugin API proc macros for type-safe bindings
fresh-plugin-api-macros = { workspace = true, optional = true }
# TypeScript type generation from Rust structs
ts-rs = { version = "11.1", optional = true }
ts-rs = { version = "12.0", optional = true }

# anyhow is always needed for model error handling
anyhow = { workspace = true }
Expand Down Expand Up @@ -177,7 +177,7 @@ interprocess = { version = "2.2", features = ["tokio"] }

# Embedded plugins support (optional)
include_dir = { version = "0.7", optional = true }
tempfile = { version = "3.24", optional = true }
tempfile = { version = "3.25", optional = true }
trash = { version = "5.2.5", optional = true }
open = { version = "5.3", optional = true }

Expand All @@ -186,7 +186,7 @@ fresh-gui = { workspace = true, optional = true }

[dev-dependencies]
proptest = "1.9"
tempfile = "3.24.0"
tempfile = "3.25"
insta = { version = "1.46", features = ["yaml"] }
vt100 = "0.16" # Virtual terminal emulator for testing real ANSI output
ctor = "0.6.3"
Expand Down
3 changes: 3 additions & 0 deletions crates/fresh-editor/src/app/async_messages.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1142,6 +1142,9 @@ impl Editor {
}
}

// Flush any deferred grammar rebuilds as a single batch
self.flush_pending_grammars();

has_visual_commands
}

Expand Down
7 changes: 4 additions & 3 deletions crates/fresh-editor/src/app/buffer_management.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2570,9 +2570,10 @@ impl Editor {
None => return Ok(()),
};

let rt = self.tokio_runtime.as_ref().ok_or_else(|| {
std::io::Error::new(std::io::ErrorKind::Other, "async runtime not available")
})?;
let rt = self
.tokio_runtime
.as_ref()
.ok_or_else(|| std::io::Error::other("async runtime not available"))?;

let io_results: Vec<std::io::Result<(usize, usize)>> = rt.block_on(async {
let mut handles = Vec::with_capacity(io_work.len());
Expand Down
2 changes: 1 addition & 1 deletion crates/fresh-editor/src/app/file_explorer.rs
Original file line number Diff line number Diff line change
Expand Up @@ -566,7 +566,7 @@ impl Editor {
let delete_result = if self.filesystem.remote_connection_info().is_some() {
self.move_to_remote_trash(&path)
} else {
trash::delete(&path).map_err(|e| std::io::Error::new(std::io::ErrorKind::Other, e))
trash::delete(&path).map_err(|e| std::io::Error::other(e))
};

match delete_result {
Expand Down
Loading
Loading