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
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,4 +38,4 @@ jobs:
- uses: actions/checkout@v4
- uses: dtolnay/rust-toolchain@stable
- uses: Swatinem/rust-cache@v2
- run: cargo bench --workspace -- --quick
- run: cargo bench -p markdusk-bench --benches -- --quick
15 changes: 10 additions & 5 deletions crates/markdusk-app/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,11 @@ pub struct PendingOpens(pub Mutex<Vec<String>>);

#[tauri::command]
fn drain_pending_opens(state: tauri::State<'_, PendingOpens>) -> Vec<String> {
state.0.lock().map(|mut v| std::mem::take(&mut *v)).unwrap_or_default()
state
.0
.lock()
.map(|mut v| std::mem::take(&mut *v))
.unwrap_or_default()
}

pub fn run() {
Expand All @@ -35,10 +39,11 @@ pub fn run() {
// Capture file paths from launch args (Finder double-click cold-start).
let pending = app.state::<PendingOpens>();
for arg in std::env::args().skip(1) {
if !arg.starts_with('-') && std::path::Path::new(&arg).exists() {
if let Ok(mut v) = pending.0.lock() {
v.push(arg);
}
if !arg.starts_with('-')
&& std::path::Path::new(&arg).exists()
&& let Ok(mut v) = pending.0.lock()
{
v.push(arg);
}
}
Ok(())
Expand Down
16 changes: 8 additions & 8 deletions crates/markdusk-app/src/menu.rs
Original file line number Diff line number Diff line change
Expand Up @@ -60,10 +60,10 @@ pub fn build<R: Runtime>(app: &AppHandle<R>) -> tauri::Result<Menu<R>> {
.accelerator("CmdOrCtrl+Alt+F")
.build(app)?;

let spell_check_item = MenuItemBuilder::with_id("edit:spell-check", "Toggle Spell Check")
.build(app)?;
let smart_punct_item = MenuItemBuilder::with_id("edit:smart-punct", "Toggle Smart Punctuation")
.build(app)?;
let spell_check_item =
MenuItemBuilder::with_id("edit:spell-check", "Toggle Spell Check").build(app)?;
let smart_punct_item =
MenuItemBuilder::with_id("edit:smart-punct", "Toggle Smart Punctuation").build(app)?;

let edit_submenu = SubmenuBuilder::new(app, "Edit")
.undo()
Expand Down Expand Up @@ -104,10 +104,10 @@ pub fn build<R: Runtime>(app: &AppHandle<R>) -> tauri::Result<Menu<R>> {
.item(&mode_vim)
.build()?;

let focus_dim_paragraph = MenuItemBuilder::with_id("view:focus-dim:paragraph", "Paragraph")
.build(app)?;
let focus_dim_sentence = MenuItemBuilder::with_id("view:focus-dim:sentence", "Sentence")
.build(app)?;
let focus_dim_paragraph =
MenuItemBuilder::with_id("view:focus-dim:paragraph", "Paragraph").build(app)?;
let focus_dim_sentence =
MenuItemBuilder::with_id("view:focus-dim:sentence", "Sentence").build(app)?;
let focus_dim_off = MenuItemBuilder::with_id("view:focus-dim:off", "Off").build(app)?;
let focus_dim_submenu = SubmenuBuilder::new(app, "Focus Dim")
.item(&focus_dim_paragraph)
Expand Down
Loading