Skip to content

Attempting to add default odin collections is causing issues #40

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

Merged
rxptr merged 1 commit into from
Dec 30, 2025
+3 −59
Merged

Attempting to add default odin collections is causing issues #40

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
62 changes: 3 additions & 59 deletions src/odin.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,23 +71,6 @@ impl OdinExtension {
None
}

fn get_default_collections(&self, worktree: &Worktree) -> Option<Vec<(&str, String)>> {
use std::path::Path;
let odin_path = worktree.which("odin")?;
let path = Path::new(&odin_path);
let root = path.parent()?;

let core_str = root.join("core").to_str()?.to_string();
let shared_str = root.join("shared").to_str()?.to_string();
let vendor_str = root.join("vendor").to_str()?.to_string();

Some(vec![
("core", core_str),
("shared", shared_str),
("vendor", vendor_str),
])
}

fn language_server_binary_path(
&mut self,
language_server_id: &LanguageServerId,
Expand Down Expand Up @@ -258,49 +241,10 @@ impl zed::Extension for OdinExtension {
language_server_id: &LanguageServerId,
worktree: &Worktree,
) -> Result<Option<serde_json::Value>> {
// Get user-configured settings (these take precedence)
let mut settings = LspSettings::for_worktree(language_server_id.as_ref(), worktree)
let settings = LspSettings::for_worktree(language_server_id.as_ref(), worktree)
.ok()
.and_then(|lsp_settings| lsp_settings.initialization_options.clone())
.unwrap_or_else(|| serde_json::json!({}));

// Auto-configure collections, merging with user overrides
if let serde_json::Value::Object(ref mut map) = settings {
if let Some(defaults) = self.get_default_collections(worktree) {
let user_collections = map.get("collections").and_then(|v| v.as_array());
let final_collections = if let Some(user_cols) = user_collections {
let user_names: std::collections::HashSet<_> = user_cols
.iter()
.filter_map(|c| c.get("name").and_then(|n| n.as_str()))
.collect();

let mut merged = Vec::new();

for user_col in user_cols {
merged.push(user_col.clone());
}

// Add defaults that weren't overridden by user
for (name, path) in defaults {
if !user_names.contains(name) {
merged.push(serde_json::json!({ "name": name, "path": path }));
}
}

serde_json::Value::Array(merged)
} else {
// No user collections, just use defaults
serde_json::json!(defaults
.iter()
.map(|(name, path)| serde_json::json!({ "name": name, "path": path }))
.collect::<Vec<_>>())
};

map.insert("collections".to_string(), final_collections);
}
}

Ok(Some(settings))
.and_then(|lsp_settings| lsp_settings.initialization_options.clone());
Ok(settings)
}

fn language_server_workspace_configuration(
Expand Down