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 Cargo.lock

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

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

[package]
name = "zed_java"
version = "6.8.0"
version = "6.8.1"
edition = "2024"
publish = false
license = "Apache-2.0"
Expand Down
2 changes: 1 addition & 1 deletion extension.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
id = "java"
name = "Java"
version = "6.8.0"
version = "6.8.1"
schema_version = 1
authors = [
"Valentine Briese <valentinegb@icloud.com>",
Expand Down
8 changes: 2 additions & 6 deletions src/debugger.rs
Original file line number Diff line number Diff line change
Expand Up @@ -156,9 +156,7 @@ impl Debugger {
DownloadedFileType::Uncompressed,
)
.map_err(|err| {
format!(
"Failed to download java-debug fork from {JAVA_DEBUG_PLUGIN_FORK_URL}: {err}"
)
format!("Failed to download java-debug fork from {JAVA_DEBUG_PLUGIN_FORK_URL}: {err}")
})?;

self.plugin_path = Some(jar_path.clone());
Expand Down Expand Up @@ -196,9 +194,7 @@ impl Debugger {
return Err(err.to_owned());
}

println!(
"Could not fetch debugger: {err}\nFalling back to local version."
);
println!("Could not fetch debugger: {err}\nFalling back to local version.");

let exists = fs::read_dir(prefix)
.ok()
Expand Down
11 changes: 8 additions & 3 deletions src/java.rs
Original file line number Diff line number Diff line change
Expand Up @@ -448,9 +448,14 @@ impl Extension for Java {
};
let braces = " {}";
let code = format!("{keyword}{}{braces}", completion.label);
let namespace = completion
.detail
.map(|detail| detail[..detail.len() - completion.label.len() - 1].to_string());
let namespace = completion.detail.and_then(|detail| {
if detail.len() > completion.label.len() {
let prefix_len = detail.len() - completion.label.len() - 1;
Some(detail[..prefix_len].to_string())
} else {
None
}
});
let mut spans = vec![CodeLabelSpan::code_range(
keyword.len()..code.len() - braces.len(),
)];
Expand Down