fix: let LSP autocompletion work in more contexts

compiler/noirc_frontend/src/elaborator/expressions.rs

@@ -369,7 +369,8 @@ impl<'context> Elaborator<'context> {
                     function_args.push((typ, arg, span));
                 }
 
-                let location = Location::new(span, self.file);
+                let call_span = Span::from(object_span.start()..method_name_span.end());
+                let location = Location::new(call_span, self.file);
                 let method = method_call.method_name;
                 let turbofish_generics = generics.clone();
                 let is_macro_call = method_call.is_macro_call;

compiler/noirc_frontend/src/parser/errors.rs

@@ -20,6 +20,8 @@ pub enum ParserErrorReason {
     ExpectedIdentifierAfterDot,
     #[error("expected an identifier after ::")]
     ExpectedIdentifierAfterColons,
+    #[error("expected {{ after if condition")]
+    ExpectedLeftBraceAfterIfCondition,
     #[error("Expected a ; separating these two statements")]
     MissingSeparatingSemi,
     #[error("constrain keyword is deprecated")]

compiler/noirc_frontend/src/parser/parser.rs

@@ -51,7 +51,7 @@
 
 use chumsky::prelude::*;
 use iter_extended::vecmap;
 use lalrpop_util::lalrpop_mod;
 use noirc_errors::{Span, Spanned};
 
 mod assertion;
@@ -65,8 +65,8 @@
 pub(super) mod traits;
 mod types;
 
 // synthesized by LALRPOP
 lalrpop_mod!(pub noir_parser);
 
 #[cfg(test)]
 mod test_helpers;
@@ -91,12 +91,12 @@
 
     if cfg!(feature = "experimental_parser") {
         for parsed_item in &parsed_module.items {
             if lalrpop_parser_supports_kind(&parsed_item.kind) {
                 match &parsed_item.kind {
                     ItemKind::Import(parsed_use_tree) => {
                         prototype_parse_use_tree(Some(parsed_use_tree), source_program);
                     }
                     // other kinds prevented by lalrpop_parser_supports_kind
                     _ => unreachable!(),
                 }
             }
@@ -113,7 +113,7 @@
     }
 
     let mut lexer = Lexer::new(input);
     lexer = lexer.skip_whitespaces(false);
     let mut errors = Vec::new();
 
     // NOTE: this is a hack to get the references working
@@ -944,10 +944,32 @@
 
         keyword(Keyword::If)
             .ignore_then(expr_no_constructors)
-            .then(if_block)
-            .then(keyword(Keyword::Else).ignore_then(else_block).or_not())
-            .map(|((condition, consequence), alternative)| {
-                ExpressionKind::If(Box::new(IfExpression { condition, consequence, alternative }))
+            .then(if_block.then(keyword(Keyword::Else).ignore_then(else_block).or_not()).or_not())
+            .validate(|(condition, consequence_and_alternative), span, emit_error| {
+                if let Some((consequence, alternative)) = consequence_and_alternative {
+                    ExpressionKind::If(Box::new(IfExpression {
+                        condition,
+                        consequence,
+                        alternative,
+                    }))
+                } else {
+                    // We allow `if cond` without a block mainly for LSP, so that it parses right
+                    // and autocompletion works there.
+                    emit_error(ParserError::with_reason(
+                        ParserErrorReason::ExpectedLeftBraceAfterIfCondition,
+                        span,
+                    ));
+
+                    let span_end = condition.span.end();
+                    ExpressionKind::If(Box::new(IfExpression {
+                        condition,
+                        consequence: Expression::new(
+                            ExpressionKind::Error,
+                            Span::from(span_end..span_end),
+                        ),
+                        alternative: None,
+                    }))
+                }
             })
     })
 }
@@ -1420,6 +1442,24 @@
         );
     }
 
+    #[test]
+    fn parse_if_without_block() {
+        let src = "if foo";
+        let parser = if_expr(expression_no_constructors(expression()), fresh_statement());
+        let (expression_kind, errors) = parse_recover(parser, src);
+
+        let expression_kind = expression_kind.unwrap();
+        let ExpressionKind::If(if_expression) = expression_kind else {
+            panic!("Expected an if expression, got {:?}", expression_kind);
+        };
+
+        assert_eq!(if_expression.consequence.kind, ExpressionKind::Error);
+        assert_eq!(if_expression.alternative, None);
+
+        assert_eq!(errors.len(), 1);
+        assert_eq!(errors[0].message, "expected { after if condition");
+    }
+
     #[test]
     fn parse_module_declaration() {
         parse_with(module_declaration(), "mod foo").unwrap();

tooling/lsp/src/requests/completion.rs

@@ -4,7 +4,7 @@
 };
 
 use async_lsp::ResponseError;
 use builtins::{builtin_integer_types, keyword_builtin_function, keyword_builtin_type};
 use fm::{FileId, PathString};
 use lsp_types::{
     CompletionItem, CompletionItemKind, CompletionItemLabelDetails, CompletionParams,
@@ -39,7 +39,7 @@
 
 use super::process_request;
 
 mod builtins;
 
 /// When finding items in a module, whether to show only direct children or all visible items.
 #[derive(Clone, Copy, PartialEq, Eq, Debug)]
@@ -450,7 +450,18 @@
 
     fn find_in_lvalue(&mut self, lvalue: &LValue) {
         match lvalue {
-            LValue::Ident(_) => (),
+            LValue::Ident(ident) => {
+                if self.byte == Some(b'.') && ident.span().end() as usize == self.byte_index - 1 {
+                    let location = Location::new(ident.span(), self.file);
+                    if let Some(ReferenceId::Local(definition_id)) =
+                        self.interner.find_referenced(location)
+                    {
+                        let typ = self.interner.definition_type(definition_id);
+                        let prefix = "";
+                        self.complete_type_fields_and_methods(&typ, prefix);
+                    }
+                }
+            }
             LValue::MemberAccess { object, field_name: _, span: _ } => self.find_in_lvalue(object),
             LValue::Index { array, index, span: _ } => {
                 self.find_in_lvalue(array);
@@ -477,19 +488,6 @@
     }
 
     fn find_in_expression(&mut self, expression: &Expression) {
-        // "foo." (no identifier afterwards) is parsed as the expression on the left hand-side of the dot.
-        // Here we check if there's a dot at the completion position, and if the expression
-        // ends right before the dot. If so, it means we want to complete the expression's type fields and methods.
-        if self.byte == Some(b'.') && expression.span.end() as usize == self.byte_index - 1 {
-            let location = Location::new(expression.span, self.file);
-            if let Some(typ) = self.interner.type_at_location(location) {
-                let typ = typ.follow_bindings();
-                let prefix = "";
-                self.complete_type_fields_and_methods(&typ, prefix);
-                return;
-            }
-        }
-
         match &expression.kind {
             noirc_frontend::ast::ExpressionKind::Literal(literal) => self.find_in_literal(literal),
             noirc_frontend::ast::ExpressionKind::Block(block_expression) => {
@@ -551,6 +549,23 @@
             | noirc_frontend::ast::ExpressionKind::Resolved(_)
             | noirc_frontend::ast::ExpressionKind::Error => (),
         }
+
+        // "foo." (no identifier afterwards) is parsed as the expression on the left hand-side of the dot.
+        // Here we check if there's a dot at the completion position, and if the expression
+        // ends right before the dot. If so, it means we want to complete the expression's type fields and methods.
+        // We only do this after visiting nested expressions, because in an expression like `foo & bar.` we want
+        // to complete for `bar`, not for `foo & bar`.
+        if self.completion_items.is_empty()
+            && self.byte == Some(b'.')
+            && expression.span.end() as usize == self.byte_index - 1
+        {
+            let location = Location::new(expression.span, self.file);
+            if let Some(typ) = self.interner.type_at_location(location) {
+                let typ = typ.follow_bindings();
+                let prefix = "";
+                self.complete_type_fields_and_methods(&typ, prefix);
+            }
+        }
     }
 
     fn find_in_literal(&mut self, literal: &Literal) {
@@ -2877,4 +2892,86 @@
         )
         .await;
     }
+
+    #[test]
+    async fn test_completes_in_broken_if_after_dot() {
+        let src = r#"
+            struct Some {
+                foo: i32,
+            }
+
+            fn foo(s: Some) {
+                if s.>|<
+            }
+        "#;
+        assert_completion(
+            src,
+            vec![simple_completion_item("foo", CompletionItemKind::FIELD, Some("i32".to_string()))],
+        )
+        .await;
+    }
+
+    #[test]
+    async fn test_completes_in_nested_expression() {
+        let src = r#"
+            struct Foo { bar: Bar }
+            struct Bar { baz: i32 }
+
+            fn foo(f: Foo) {
+                f.bar & f.>|<
+            }
+        "#;
+        assert_completion(
+            src,
+            vec![simple_completion_item("bar", CompletionItemKind::FIELD, Some("Bar".to_string()))],
+        )
+        .await;
+    }
+
+    #[test]
+    async fn test_completes_in_call_chain() {
+        let src = r#"
+            struct Foo {}
+
+            impl Foo {
+                fn foo(self) -> Foo { self }
+            }
+
+            fn foo(f: Foo) {
+                f.foo().>|<
+            }
+        "#;
+        assert_completion(
+            src,
+            vec![snippet_completion_item(
+                "foo()",
+                CompletionItemKind::FUNCTION,
+                "foo()",
+                Some("fn(self) -> Foo".to_string()),
+            )],
+        )
+        .await;
+    }
+
+    #[test]
+    async fn test_completes_when_assignment_follows() {
+        let src = r#"
+            struct Foo {
+                bar: i32,
+            }
+
+            fn foo(f: Foo) {
+                let mut x = 1;
+
+                f.>|<
+
+                x = 2;
+            }
+        "#;
+        assert_completion(
+            src,
+            vec![simple_completion_item("bar", CompletionItemKind::FIELD, Some("i32".to_string()))],
+        )
+        .await;
+    }
 }