Update tools/lsp/preview/drop_location.rs

Co-authored-by: Olivier Goffart <[email protected]>

tools/lsp/common/component_catalog.rs

@@ -177,7 +177,9 @@ pub fn file_local_components(
     url: &lsp_types::Url,
     result: &mut Vec<ComponentInformation>,
 ) {
-    let Some(doc) = document_cache.get_document(url) else { return; };
+    let Some(doc) = document_cache.get_document(url) else {
+        return;
+    };
     let exported_components =
         doc.exports.iter().filter_map(|(_, e)| e.as_ref().left()).cloned().collect::<Vec<_>>();
     for component in &*doc.inner_components {

tools/lsp/common/test.rs

@@ -67,7 +67,7 @@ pub fn test_file_name(name: &str) -> PathBuf {
 pub fn compile_test_with_sources(
     style: &str,
     code: HashMap<lsp_types::Url, String>,
-    allow_warnings: bool
+    allow_warnings: bool,
 ) -> common::DocumentCache {
     i_slint_backend_testing::init_no_event_loop();
     recompile_test_with_sources(style, code, allow_warnings)

tools/lsp/preview.rs

@@ -156,7 +156,9 @@ fn add_new_component() {
         })
     }
 
-    let Some(document_cache) = document_cache() else { return; };
+    let Some(document_cache) = document_cache() else {
+        return;
+    };
 
     let preview_component = {
         let cache = CONTENT_CACHE.get_or_init(Default::default).lock().unwrap();
@@ -175,7 +177,9 @@ fn add_new_component() {
         return;
     };
 
-    let Some(document) = &document.node else { return; };
+    let Some(document) = &document.node else {
+        return;
+    };
 
     if let Some((edit, drop_data)) = drop_location::add_new_component(&component_name, document) {
         element_selection::select_element_at_source_code_position(
@@ -479,11 +483,11 @@ fn finish_parsing(ok: bool) {
             &mut components,
         );
         if let Some(previewed_url) = previewed_url {
-        component_catalog::file_local_components(
-            &document_cache,
-            &previewed_url,
-            &mut components,
-        );
+            component_catalog::file_local_components(
+                &document_cache,
+                &previewed_url,
+                &mut components,
+            );
         }
 
         components.sort_by(|a, b| a.name.cmp(&b.name));

tools/lsp/preview/drop_location.rs

@@ -556,8 +556,12 @@ pub fn add_new_component(
     );
 
     let selection_offset = insert_position.insertion_position.offset()
-        + new_text.chars().take_while(|c| c.is_whitespace()).map(|c| c.len_utf8() as u32).sum::<u32>()
-        + 10 /* component<SPACE> */;
+        + new_text
+            .chars()
+            .take_while(|c| c.is_whitespace())
+            .map(|c| c.len_utf8() as u32)
+            .sum::<u32>()
+        + "component ".len() as u32;
 
     let source_file = document.source_file.clone();
     let path = source_file.path().to_path_buf();