[ide] Fix autocomplete issues (#1092)

Release the fixes as 0.9.1

Author: SamChou19815

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "samlang-cli"
-version = "0.9.0"
+version = "0.9.1"
 edition = "2021"
 
 [dependencies]

crates/samlang-cli/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "samlang-collections"
-version = "0.9.0"
+version = "0.9.1"
 edition = "2021"
 
 [dependencies]

crates/samlang-collections/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "samlang-core"
-version = "0.9.0"
+version = "0.9.1"
 edition = "2021"
 
 [dependencies]

crates/samlang-core/Cargo.toml

@@ -98,6 +98,8 @@ mod tests {
   #[test]
   fn location_contains_position_tests() {
     assert!(Location::from_pos(1, 3, 3, 1).contains_position(Position(2, 2)));
+    assert!(Location::from_pos(1, 3, 3, 1).contains_position(Position(1, 3)));
+    assert!(Location::from_pos(1, 3, 3, 1).contains_position(Position(3, 1)));
     assert!(!Location::from_pos(1, 3, 3, 1).contains_position(Position(1, 2)));
     assert!(!Location::from_pos(1, 3, 3, 1).contains_position(Position(3, 2)));
   }

crates/samlang-core/src/ast/loc.rs

@@ -950,7 +950,7 @@ impl<'a> SourceParser<'a> {
     let mut function_expression = self.parse_base_expression();
     loop {
       match self.peek() {
-        Token(_, TokenContent::Operator(TokenOp::DOT)) => {
+        Token(dot_loc, TokenContent::Operator(TokenOp::DOT)) => {
           let mut field_preceding_comments = self.collect_preceding_comments();
           self.consume();
           field_preceding_comments.append(&mut self.collect_preceding_comments());
@@ -960,10 +960,7 @@ impl<'a> SourceParser<'a> {
             }
             Token(l, t) => {
               self.report(l, format!("Expected identifier, but get {}", t.pretty_print(self.heap)));
-              (
-                Location { module_reference: self.module_reference, start: l.start, end: l.start },
-                PStr::MISSING,
-              )
+              (Location { end: l.start, ..dot_loc }, PStr::MISSING)
             }
           };
           let mut loc = function_expression.loc().union(&field_loc);

crates/samlang-core/src/parser/source_parser.rs

@@ -702,7 +702,9 @@ pub mod completion {
               } else {
                 (CompletionItemKind::Interface, format!("interface {}", name))
               };
-              let additional_edits = if available_names.contains(n) {
+              let additional_edits = if available_names.contains(n)
+                || ModuleReference::ROOT.eq(import_mod_ref)
+              {
                 vec![]
               } else {
                 rewrite::generate_auto_import_edits(
@@ -736,9 +738,9 @@ pub mod completion {
           fn_name: _,
           is_method: true,
           type_: _,
-        } => (module_ref, class_name),
-        LocationCoverSearchResult::Expression(expr::E::FieldAccess(e)) => {
-          e.object.type_().as_nominal().map(|t| (t.module_reference, t.id))?
+        }
+        | LocationCoverSearchResult::PropertyName(_, module_ref, class_name, _) => {
+          (module_ref, class_name)
         }
         _ => return None,
       };

crates/samlang-core/src/services/api.rs

@@ -7,7 +7,7 @@ mod tests {
   };
   use itertools::Itertools;
   use pretty_assertions::assert_eq;
-  use samlang_heap::{Heap, ModuleReference};
+  use samlang_heap::{Heap, ModuleReference, PStr};
   use std::collections::HashMap;
 
   #[test]
@@ -992,27 +992,65 @@ class Main {
 
   #[test]
   fn autocomplete_test_6() {
-    let mod_ref = ModuleReference::DUMMY;
+    let heap = &mut Heap::new();
+    let mod_ref = heap.alloc_module_reference(vec![PStr::UPPER_A]);
     let state = ServerState::new(
       Heap::new(),
       false,
-      HashMap::from([(
-        mod_ref,
-        r#"
+      HashMap::from([
+        (
+          mod_ref,
+          r#"
 class Main {
-  function main(a: Developer): Developer = a.
+  function main1(a: Developer): Developer = a.
+  function main2(): Developer = Developer.
+  function main3(): Developer = Process.
 }
 class Developer {
   private method f(): unit = {}
   method b(): unit = {}
 }
 "#
-        .to_string(),
-      )]),
+          .to_string(),
+        ),
+        (ModuleReference::DUMMY, "class Other {}".to_string()),
+      ]),
     );
     assert_eq!(
       "b [kind=Method, detail=b(): unit]",
-      completion::auto_complete(&state, &mod_ref, Position(2, 45))
+      completion::auto_complete(&state, &mod_ref, Position(2, 46))
+        .iter()
+        .map(completion::AutoCompletionItem::to_string)
+        .join("\n")
+    );
+    assert_eq!(
+      r#"
+Main [kind=Class, detail=class Main]
+Other [kind=Class, detail=class Other]
+Process [kind=Class, detail=class Process]
+Str [kind=Class, detail=class Str]
+Developer [kind=Class, detail=class Developer]
+"#
+      .trim(),
+      completion::auto_complete(&state, &mod_ref, Position(3, 39))
+        .iter()
+        .map(completion::AutoCompletionItem::to_string)
+        .join("\n")
+    );
+    assert_eq!(
+      "init [kind=Function, detail=init(): Developer]",
+      completion::auto_complete(&state, &mod_ref, Position(3, 42))
+        .iter()
+        .map(completion::AutoCompletionItem::to_string)
+        .join("\n")
+    );
+    assert_eq!(
+      r#"
+panic [kind=Function, detail=panic(a0: Str): T]
+println [kind=Function, detail=println(a0: Str): unit]
+"#
+      .trim(),
+      completion::auto_complete(&state, &mod_ref, Position(4, 40))
         .iter()
         .map(completion::AutoCompletionItem::to_string)
         .join("\n")

crates/samlang-core/src/services/api_tests.rs

@@ -49,12 +49,23 @@ fn search_expression(
         .as_nominal()
         .filter(|_| e.field_name.loc.contains_position(position))
         .map(|nominal_type| {
-          LocationCoverSearchResult::PropertyName(
-            e.field_name.loc,
-            nominal_type.module_reference,
-            nominal_type.id,
-            e.field_name.name,
-          )
+          if nominal_type.is_class_statics {
+            LocationCoverSearchResult::InterfaceMemberName {
+              loc: e.field_name.loc,
+              module_reference: nominal_type.module_reference,
+              class_name: nominal_type.id,
+              fn_name: e.field_name.name,
+              is_method: false,
+              type_: e.common.type_.clone(),
+            }
+          } else {
+            LocationCoverSearchResult::PropertyName(
+              e.field_name.loc,
+              nominal_type.module_reference,
+              nominal_type.id,
+              e.field_name.name,
+            )
+          }
         });
       if found.is_some() {
         return found;

crates/samlang-core/src/services/location_cover.rs

@@ -1,6 +1,6 @@
 [package]
 name = "samlang-heap"
-version = "0.9.0"
+version = "0.9.1"
 edition = "2021"
 
 [dependencies]