Skip to content

Replace biome_lsp_converters with home grown SourceFile #353

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

Replace biome_lsp_converters with home grown SourceFile #353

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
973be7a
Implement `source_file` crate
DavisVaughan Jun 3, 2025
4e86dca
Use `SourceFile` in LSP and drop `biome_lsp_converters`
DavisVaughan Jun 3, 2025
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
104 changes: 11 additions & 93 deletions Cargo.lock
View file
Open in desktop

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

4 changes: 1 addition & 3 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ line_ending = { path = "./crates/line_ending" }
lsp = { path = "./crates/lsp" }
lsp_test = { path = "./crates/lsp_test" }
settings = { path = "./crates/settings" }
source_file = { path = "./crates/source_file" }
tests_macros = { path = "./crates/tests_macros" }
workspace = { path = "./crates/workspace" }

Expand All @@ -42,7 +43,6 @@ assert_matches = "1.5.0"
biome_console = { git = "https://github.com/biomejs/biome", rev = "2648fa4201be4afd26f44eca1a4e77aac0a67272" }
biome_diagnostics = { git = "https://github.com/biomejs/biome", rev = "2648fa4201be4afd26f44eca1a4e77aac0a67272" }
biome_formatter = { git = "https://github.com/biomejs/biome", rev = "2648fa4201be4afd26f44eca1a4e77aac0a67272" }
biome_lsp_converters = { git = "https://github.com/biomejs/biome", rev = "2648fa4201be4afd26f44eca1a4e77aac0a67272" }
biome_parser = { git = "https://github.com/biomejs/biome", rev = "2648fa4201be4afd26f44eca1a4e77aac0a67272" }
biome_rowan = { git = "https://github.com/biomejs/biome", rev = "2648fa4201be4afd26f44eca1a4e77aac0a67272" }
biome_string_case = { git = "https://github.com/biomejs/biome", rev = "2648fa4201be4afd26f44eca1a4e77aac0a67272" }
Expand All @@ -52,7 +52,6 @@ bytes = "1.8.0"
cargo_metadata = "0.19.1"
clap = { version = "4.5.20", features = ["derive"] }
colored = "3.0.0"
crossbeam = "0.8.4"
dissimilar = "1.0.9"
futures = "0.3.31"
futures-util = "0.3.31"
Expand Down Expand Up @@ -82,7 +81,6 @@ tracing = { version = "0.1.40", default-features = false, features = ["std"] }
tracing-subscriber = "0.3.19"
tree-sitter = "0.23.0"
tree-sitter-r = { git = "https://github.com/r-lib/tree-sitter-r", rev = "a0d3e3307489c3ca54da8c7b5b4e0c5f5fd6953a" }
triomphe = "0.1.14"
url = "2.5.3"
uuid = { version = "1.11.0", features = ["v4"] }

Expand Down
1 change: 1 addition & 0 deletions crates/crates/src/snapshots/crates__tests__crate_names.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ expression: AIR_CRATE_NAMES
"lsp",
"lsp_test",
"settings",
"source_file",
"tests_macros",
"workspace",
"xtask",
Expand Down
6 changes: 1 addition & 5 deletions crates/lsp/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,20 +18,17 @@ air_r_parser.workspace = true
air_r_syntax.workspace = true
anyhow.workspace = true
biome_formatter.workspace = true
biome_lsp_converters.workspace = true
biome_parser.workspace = true
biome_rowan.workspace = true
biome_text_size.workspace = true
crates.workspace = true
crossbeam.workspace = true
dissimilar.workspace = true
futures.workspace = true
itertools.workspace = true
line_ending.workspace = true
memchr.workspace = true
serde.workspace = true
serde_json.workspace = true
settings.workspace = true
source_file.workspace = true
struct-field-names-as-array.workspace = true
strum = { workspace = true, features = ["derive"] }
time = { workspace = true }
Expand All @@ -41,7 +38,6 @@ tracing.workspace = true
tracing-subscriber = { workspace = true, features = ["ansi", "local-time"] }
tree-sitter.workspace = true
tree-sitter-r.workspace = true
triomphe.workspace = true
url.workspace = true
uuid = { workspace = true, features = ["v4"] }
workspace = { workspace = true }
Expand Down
5 changes: 3 additions & 2 deletions crates/lsp/src/rust_analyzer/diff.rs → crates/lsp/src/diff.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,10 @@
// origin = "https://github.com/rust-lang/rust-analyzer/blob/8d5e91c9/crates/rust-analyzer/src/handlers/request.rs#L2483"
// ---

use biome_text_size::{TextRange, TextSize};
use biome_text_size::TextRange;
use biome_text_size::TextSize;

use super::text_edit::TextEdit;
use crate::text_edit::TextEdit;

pub(crate) fn diff(left: &str, right: &str) -> TextEdit {
use dissimilar::Chunk;
Expand Down
Loading
Loading