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
18 changes: 9 additions & 9 deletions .github/workflows/rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ jobs:
- name: Conflict label formatting (Phase 1C)
run: cargo test -p gitcomet-core --test conflict_label_formatting --verbose
- name: Meld algorithm parity (Phase 5)
run: cargo test -p gitcomet-core --test meld_algorithm_tests --verbose
run: cargo test -p gitcomet-core --lib meld_tests --verbose
- name: Core library unit tests
run: cargo test -p gitcomet-core --lib --verbose
- name: State management (conflict session, reducers, effects)
Expand Down Expand Up @@ -213,13 +213,13 @@ jobs:
uses: Swatinem/rust-cache@v2
- name: Benchmark conflict and markdown preview hot paths
run: |
cargo bench -p gitcomet-ui-gpui --bench performance -- conflict_three_way_scroll/style_window
cargo bench -p gitcomet-ui-gpui --bench performance -- conflict_two_way_split_scroll/window_200
cargo bench -p gitcomet-ui-gpui --bench performance -- conflict_search_query_update/window/200
cargo bench -p gitcomet-ui-gpui --bench performance -- conflict_split_resize_step/window/200
cargo bench -p gitcomet-ui-gpui --bench performance -- markdown_preview_parse_build/single_document/medium
cargo bench -p gitcomet-ui-gpui --bench performance -- markdown_preview_parse_build/two_sided_diff/medium
cargo bench -p gitcomet-ui-gpui --bench performance -- markdown_preview_render_single/window_rows/200
cargo bench -p gitcomet-ui-gpui --bench performance -- markdown_preview_render_diff/window_rows/200
cargo bench -p gitcomet-ui-gpui --features benchmarks --bench performance -- conflict_three_way_scroll/style_window
cargo bench -p gitcomet-ui-gpui --features benchmarks --bench performance -- conflict_two_way_split_scroll/window_200
cargo bench -p gitcomet-ui-gpui --features benchmarks --bench performance -- conflict_search_query_update/window/200
cargo bench -p gitcomet-ui-gpui --features benchmarks --bench performance -- conflict_split_resize_step/window/200
cargo bench -p gitcomet-ui-gpui --features benchmarks --bench performance -- markdown_preview_parse_build/single_document/medium
cargo bench -p gitcomet-ui-gpui --features benchmarks --bench performance -- markdown_preview_parse_build/two_sided_diff/medium
cargo bench -p gitcomet-ui-gpui --features benchmarks --bench performance -- markdown_preview_render_single/window_rows/200
cargo bench -p gitcomet-ui-gpui --features benchmarks --bench performance -- markdown_preview_render_diff/window_rows/200
- name: Emit budget report (alerting mode)
run: cargo run -p gitcomet-ui-gpui --bin perf_budget_report -- --criterion-root target/criterion
37 changes: 36 additions & 1 deletion Cargo.lock

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

15 changes: 14 additions & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -34,13 +34,14 @@ gitcomet-git = { path = "crates/gitcomet-git" }
gitcomet-git-gix = { path = "crates/gitcomet-git-gix" }
gitcomet-state = { path = "crates/gitcomet-state" }
gitcomet-ui = { path = "crates/gitcomet-ui" }
gitcomet-ui-gpui = { path = "crates/gitcomet-ui-gpui" }
gitcomet-ui-gpui = { path = "crates/gitcomet-ui-gpui", default-features = false }

# External crates
clap = { version = "4.6.0", features = ["derive"] }
criterion = "0.8.2"
gix = { version = "0.80.0", default-features = false, features = ["max-performance-safe", "comfort", "basic", "auto-chain-error", "status", "blame"] }
gpui = { version = "0.2.2" }
lru = "0.16"
mimalloc = { version = "0.1.48", features = ["v3"] }
pulldown-cmark = { version = "0.13", default-features = false, features = ["simd"] }
notify = "9.0.0-rc.2"
Expand All @@ -51,23 +52,35 @@ semver = "1.0.27"
serde = { version = "1.0.228", features = ["derive"] }
serde_json = "1.0.149"
smol = "2.0.2"
strsim = "0.11.1"
tempfile = "3.27.0"
thiserror = "2.0"
tree-sitter = "0.26.7"
tree-sitter-bash = "0.25.1"
tree-sitter-css = "0.25.0"
tree-sitter-go = "0.25.0"
tree-sitter-html = "0.23.2"
tree-sitter-javascript = "0.25.0"
tree-sitter-json = "0.24.8"
tree-sitter-python = "0.25.0"
tree-sitter-rust = "0.24.0"
tree-sitter-typescript = "0.23.2"
tree-sitter-xml = "0.7.0"
tree-sitter-yaml = "0.7.2"
unicode-segmentation = "1.12.0"
zed-reqwest = { version = "0.12.15-zed", default-features = false, features = ["blocking", "json", "rustls-tls-native-roots"] }

[workspace.lints.rust]
unsafe_code = "forbid"

[profile.dev]
incremental = true
opt-level = 0

[profile.test]
opt-level = 1
split-debuginfo = "packed"

[profile.release]
lto = "thin"
codegen-units = 1
Expand Down
12 changes: 11 additions & 1 deletion crates/gitcomet-app/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,16 @@ workspace = true
[features]
default = ["ui-gpui", "gix"]
ui = ["dep:gitcomet-ui"]
ui-gpui = ["ui", "dep:gitcomet-ui-gpui"]
ui-gpui-runtime = ["ui", "dep:gitcomet-ui-gpui"]
ui-gpui = ["ui-gpui-runtime", "gitcomet-ui-gpui/syntax-all"]
ui-gpui-syntax-common = [
"ui-gpui-runtime",
"gitcomet-ui-gpui/syntax-common",
]
ui-gpui-syntax-minimal = [
"ui-gpui-runtime",
"gitcomet-ui-gpui/syntax-minimal",
]
gix = ["dep:gitcomet-git-gix"]

[dependencies]
Expand All @@ -24,6 +33,7 @@ gitcomet-git-gix = { workspace = true, optional = true }
gitcomet-ui = { workspace = true, optional = true }
gitcomet-ui-gpui = { workspace = true, optional = true }
mimalloc = { workspace = true }
rustc-hash = { workspace = true }
tempfile = { workspace = true }

[target.'cfg(target_os = "windows")'.build-dependencies]
Expand Down
Loading
Loading