Skip to content
Draft
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
5 changes: 2 additions & 3 deletions 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
Expand Up @@ -10,4 +10,4 @@ path = "src/dart.rs"
crate-type = ["cdylib"]

[dependencies]
zed_extension_api = "0.7.0"
zed_extension_api = { git = "https://github.com/zed-industries/zed", rev = "103fa371562e86af63204df8cf7bf35559ada0d4" }
21 changes: 16 additions & 5 deletions src/dart.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
use zed::lsp::CompletionKind;
use zed::settings::LspSettings;
use zed::settings::{LanguageSettings, LspSettings};
use zed::{CodeLabel, CodeLabelSpan};
use zed_extension_api::serde_json::json;
use zed_extension_api::{
Expand Down Expand Up @@ -207,14 +207,25 @@ impl zed::Extension for DartExtension {
_language_server_id: &zed::LanguageServerId,
worktree: &zed::Worktree,
) -> Result<Option<serde_json::Value>> {
let settings = LspSettings::for_worktree("dart", worktree)
let mut dart_settings = serde_json::Map::new();

if let Ok(language_settings) = LanguageSettings::for_worktree(Some("Dart"), worktree) {
dart_settings.insert(
"lineLength".into(),
language_settings.preferred_line_length.into(),
);
}

let user_settings = LspSettings::for_worktree("dart", worktree)
.ok()
.and_then(|lsp_settings| lsp_settings.settings.clone())
.unwrap_or_default();

Ok(Some(serde_json::json!({
"dart": settings
})))
if let serde_json::Value::Object(user_map) = user_settings {
dart_settings.extend(user_map);
}

Ok(Some(serde_json::json!({ "dart": dart_settings })))
}

fn label_for_completion(
Expand Down
Loading