fix: Add ancestor fields to field set

Desdaemon · Aug 28, 2024 · 54f57bb · 54f57bb
1 parent e2a0fcc
commit 54f57bb
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/main.rs b/src/main.rs
@@ -399,8 +399,8 @@ impl LanguageServer for Backend {
 		{
 			let mut document = self
 				.document_map
-				.get_mut(params.text_document.uri.path())
-				// .expect(format_loc!("deadlock"))
+				.try_get_mut(params.text_document.uri.path())
+				.expect(format_loc!("deadlock"))
 				.expect("Did not build a document");
 			old_rope = document.rope.clone();
 			// Update the rope

diff --git a/src/model.rs b/src/model.rs
@@ -344,6 +344,7 @@ impl ModelIndex {
 			if let Some(entry) = self.populate_field_names(ancestor, locations_filter) {
 				if let Some(fields) = entry.fields.as_ref() {
 					for (name, field) in fields {
+						fields_set.insert(interner().resolve(&name).as_bytes(), ());
 						match out.entry(*name) {
 							Entry::Occupied(mut old_field) => {
 								old_field.get_mut().merge(field);