feat: (LSP) if in runtime code, always suggest functions that return Quoted as macro calls

tooling/lsp/src/requests/completion.rs

@@ -41,7 +41,7 @@
 use super::process_request;
 
 mod auto_import;
 mod builtins;
 mod completion_items;
 mod kinds;
 mod sort_text;
@@ -113,6 +113,7 @@
     /// The line where an auto_import must be inserted
     auto_import_line: usize,
     self_type: Option<Type>,
+    in_comptime: bool,
 }
 
 impl<'a> NodeFinder<'a> {
@@ -156,6 +157,7 @@
             nesting: 0,
             auto_import_line: 0,
             self_type: None,
+            in_comptime: false,
         }
     }
 
@@ -233,7 +235,7 @@
         let mut idents: Vec<Ident> = Vec::new();
 
         // Find in which ident we are in, and in which part of it
         // (it could be that we are completting in the middle of an ident)
         for segment in &path.segments {
             let ident = &segment.ident;
 
@@ -1056,8 +1058,12 @@
             self.collect_local_variables(&param.pattern);
         }
 
+        let old_in_comptime = self.in_comptime;
+        self.in_comptime = noir_function.def.is_comptime;
+
         noir_function.def.body.accept(Some(span), self);
 
+        self.in_comptime = old_in_comptime;
         self.type_parameters = old_type_parameters;
         self.self_type = None;
 
@@ -1278,8 +1284,12 @@
         let old_local_variables = self.local_variables.clone();
         self.local_variables.clear();
 
+        let old_in_comptime = self.in_comptime;
+        self.in_comptime = true;
+
         statement.accept(self);
 
+        self.in_comptime = old_in_comptime;
         self.local_variables = old_local_variables;
 
         false
@@ -1424,8 +1434,12 @@
         let old_local_variables = self.local_variables.clone();
         self.local_variables.clear();
 
+        let old_in_comptime = self.in_comptime;
+        self.in_comptime = true;
+
         block_expression.accept(Some(span), self);
 
+        self.in_comptime = old_in_comptime;
         self.local_variables = old_local_variables;
 
         false
@@ -1598,8 +1612,8 @@
 ///
 /// For example:
 ///
 /// // "merk" and "ro" match "merkle" and "root" and are in order
 /// name_matches("compute_merkle_root", "merk_ro") == true
 ///
 /// // "ro" matches "root", but "merkle" comes before it, so no match
 /// name_matches("compute_merkle_root", "ro_mer") == false

tooling/lsp/src/requests/completion/completion_items.rs

@@ -232,7 +232,13 @@ impl<'a> NodeFinder<'a> {
         if modifiers.is_comptime
             && matches!(func_meta.return_type(), Type::Quoted(QuotedType::Quoted))
         {
-            vec![make_completion_item(false), make_completion_item(true)]
+            if self.in_comptime {
+                vec![make_completion_item(false), make_completion_item(true)]
+            } else {
+                // If not in a comptime block we can't operate with comptime values so the only thing
+                // we can do is call a macro.
+                vec![make_completion_item(true)]
+            }
         } else {
             vec![make_completion_item(false)]
         }

tooling/lsp/src/requests/completion/tests.rs

@@ -133,14 +133,14 @@
     #[test]
     async fn test_use_first_segment() {
         let src = r#"
             mod foobaz {}
             mod foobar {}
             use foob>|<
         "#;
 
         assert_completion(
             src,
             vec![module_completion_item("foobaz"), module_completion_item("foobar")],
         )
         .await;
     }
@@ -303,7 +303,7 @@
             mod bar {
                 mod something {}
 
                 use super::foob>|<
             }
         "#;
 
@@ -1546,7 +1546,7 @@
     async fn test_auto_import_suggests_modules_too() {
         let src = r#"
             mod foo {
                 mod barbaz {
                     fn hello_world() {}
                 }
             }
@@ -1559,7 +1559,7 @@
         assert_eq!(items.len(), 1);
 
         let item = &items[0];
         assert_eq!(item.label, "barbaz");
         assert_eq!(
             item.label_details,
             Some(CompletionItemLabelDetails {
@@ -2126,7 +2126,9 @@
         comptime fn foobar() -> Quoted {}
 
         fn main() {
-            fooba>|<
+            comptime {
+                fooba>|<
+            }
         }
         "#;
 
@@ -2140,6 +2142,24 @@
         .await;
     }
 
+    #[test]
+    async fn test_suggests_only_macro_call_if_comptime_function_returns_quoted_and_outside_comptime(
+    ) {
+        let src = r#"
+        comptime fn foobar() -> Quoted {}
+
+        fn main() {
+            fooba>|<
+        }
+        "#;
+
+        assert_completion_excluding_auto_import(
+            src,
+            vec![function_completion_item("foobar!()", "foobar!()", "fn() -> Quoted")],
+        )
+        .await;
+    }
+
     #[test]
     async fn test_only_suggests_macro_call_for_unquote() {
         let src = r#"