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
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -32,3 +32,6 @@ extension.wasm
# Added by cargo

/target

# Direnv
.envrc
10 changes: 4 additions & 6 deletions xtask-lsp-install/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,10 @@ fn main() -> Result<(), Box<dyn Error>> {

eprintln!("Done");

let from = Path::new("target/debug").join(LSP_BINARY);
let to = zed_paths::extensions_dir()
.join("work")
.join(EXTENSION_ID)
.join(LSP_BINARY);
let to = fs::canonicalize(to)?;
let target_dir = env::var("CARGO_TARGET_DIR").unwrap_or_else(|_| "target".to_string());
let from = Path::new(&target_dir).join("debug").join(LSP_BINARY);
let to = zed_paths::extensions_dir().join("work").join(EXTENSION_ID);
let to = fs::canonicalize(to)?.join(LSP_BINARY);

eprintln!(
"Copying the LSP binary from {} to the extension working directory {}...",
Expand Down