fix: fix complete after some special expr. No symbol will be added af…

…ter these expressions. Signed-off-by: he1pa <[email protected]>
kcl-lang · Sep 10, 2024 · 378cc29 · 378cc29
1 parent 74c4835
commit 378cc29
Show file tree

Hide file tree

Showing 5 changed files with 48 additions and 24 deletions.
diff --git a/kclvm/sema/src/advanced_resolver/node.rs b/kclvm/sema/src/advanced_resolver/node.rs
@@ -1051,33 +1051,38 @@ impl<'ctx> AdvancedResolver<'ctx> {
                 .borrow()
                 .get(&self.ctx.get_node_key(&expr.id))
             {
-                Some(ty) => {
-                    if let ast::Expr::Missing(_) = expr.node {
-                        return Ok(None);
-                    }
-                    let (_, end) = expr.get_span_pos();
-                    let mut expr_symbol = ExpressionSymbol::new(
-                        format!("@{}", expr.node.get_expr_name()),
-                        end.clone(),
-                        end,
-                        None,
-                    );
-                    expr_symbol.sema_info.ty = if matches!(&expr.node, | ast::Expr::Call(_)) {
-                        if let TypeKind::Function(func_ty) = &ty.kind {
-                            Some(func_ty.return_ty.clone())
+                Some(ty) => match expr.node {
+                    ast::Expr::Missing(_)
+                    | ast::Expr::Binary(_)
+                    | ast::Expr::CompClause(_)
+                    | ast::Expr::Keyword(_)
+                    | ast::Expr::Arguments(_)
+                    | ast::Expr::Compare(_) => return Ok(None),
+                    _ => {
+                        let (_, end) = expr.get_span_pos();
+                        let mut expr_symbol = ExpressionSymbol::new(
+                            format!("@{}", expr.node.get_expr_name()),
+                            end.clone(),
+                            end,
+                            None,
+                        );
+                        expr_symbol.sema_info.ty = if matches!(&expr.node, | ast::Expr::Call(_)) {
+                            if let TypeKind::Function(func_ty) = &ty.kind {
+                                Some(func_ty.return_ty.clone())
+                            } else {
+                                Some(ty.clone())
+                            }
                         } else {
                             Some(ty.clone())
-                        }
-                    } else {
-                        Some(ty.clone())
-                    };
+                        };
 
-                    Ok(self.gs.get_symbols_mut().alloc_expression_symbol(
-                        expr_symbol,
-                        self.ctx.get_node_key(&expr.id),
-                        self.ctx.current_pkgpath.clone().unwrap(),
-                    ))
-                }
+                        Ok(self.gs.get_symbols_mut().alloc_expression_symbol(
+                            expr_symbol,
+                            self.ctx.get_node_key(&expr.id),
+                            self.ctx.current_pkgpath.clone().unwrap(),
+                        ))
+                    }
+                },
                 None => Ok(None),
             },
             res => res,

diff --git a/kclvm/tools/src/LSP/src/completion.rs b/kclvm/tools/src/LSP/src/completion.rs
@@ -2151,4 +2151,12 @@ mod tests {
         15,
         Some('.')
     );
+
+    completion_label_test_snapshot!(
+        complete_after_compare_expr_1,
+        "src/test_data/completion_test/dot/special_expr/compare.k",
+        2,
+        23,
+        Some('.')
+    );
 }
diff --git a/.../src/snapshots/kcl_language_server__completion__tests__complete_after_compare_expr_1.snap b/.../src/snapshots/kcl_language_server__completion__tests__complete_after_compare_expr_1.snap
@@ -0,0 +1,5 @@
+---
+source: tools/src/LSP/src/completion.rs
+expression: "format!(\"{:?}\", got_labels)"
+---
+["capitalize(…)", "count(…)", "endswith(…)", "find(…)", "format(…)", "index(…)", "isalnum(…)", "isalpha(…)", "isdigit(…)", "islower(…)", "isspace(…)", "istitle(…)", "isupper(…)", "join(…)", "lower(…)", "lstrip(…)", "removeprefix(…)", "removesuffix(…)", "replace(…)", "rfind(…)", "rindex(…)", "rsplit(…)", "rstrip(…)", "split(…)", "splitlines(…)", "startswith(…)", "strip(…)", "title(…)", "upper(…)"]
diff --git a/kclvm/tools/src/LSP/src/test_data/completion_test/dot/compare/compare.k b/kclvm/tools/src/LSP/src/test_data/completion_test/dot/compare/compare.k
@@ -0,0 +1,3 @@
+v = ""
+if v == "" and "" == v :
+    a = 1
diff --git a/kclvm/tools/src/LSP/src/test_data/completion_test/dot/special_expr/compare.k b/kclvm/tools/src/LSP/src/test_data/completion_test/dot/special_expr/compare.k
@@ -0,0 +1,3 @@
+v = ""
+if v == "" and "" == v :
+    a = 1