Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix different kinds values used for worktree_id (#17523)

Browse source
This commit is contained in:
Kirill Bulatov 2024-09-07 00:51:09 -04:00 • committed by GitHub
parent 47aec5e64d
commit 8985fd87c2
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
18 changed files with 136 additions and 127 deletions
Download patch file Download diff file Expand all files Collapse all files

6
crates/extension/src/wasm_host/wit/since_v0_1_0.rs
View file

@ -1,6 +1,6 @@
use crate::wasm_host::{wit::ToWasmtimeResult, WasmState};
use ::http_client::AsyncBody;
use ::settings::Settings;
use ::settings::{Settings, WorktreeId};
use anyhow::{anyhow, bail, Context, Result};
use async_compression::futures::bufread::GzipDecoder;
use async_tar::Archive;
@ -76,7 +76,7 @@ impl HostWorktree for WasmState {
delegate: Resource<Arc<dyn LspAdapterDelegate>>,
) -> wasmtime::Result<u64> {
let delegate = self.table.get(&delegate)?;
Ok(delegate.worktree_id())
Ok(delegate.worktree_id().to_proto())
}
async fn root_path(
@ -393,7 +393,7 @@ impl ExtensionImports for WasmState {
let location = location
.as_ref()
.map(|location| ::settings::SettingsLocation {
worktree_id: location.worktree_id as usize,
worktree_id: WorktreeId::from_proto(location.worktree_id),
path: Path::new(&location.path),
});