Fix inference in chained calls

Author: CppCXY

Cargo.lock

@@ -1,6 +1,6 @@
 use emmylua_parser::{
-    LuaAstNode, LuaAstToken, LuaClosureExpr, LuaIndexExpr, LuaIndexKey, LuaLiteralExpr,
-    LuaLiteralToken, LuaNameExpr, LuaTableExpr, LuaVarExpr,
+    LuaAstNode, LuaAstToken, LuaClosureExpr, LuaExpr, LuaIndexExpr, LuaIndexKey, LuaLiteralExpr,
+    LuaLiteralToken, LuaNameExpr, LuaTableExpr,
 };
 
 use crate::{
@@ -70,7 +70,7 @@ pub fn analyze_index_expr(analyzer: &mut DeclAnalyzer, index_expr: LuaIndexExpr)
     let file_id = analyzer.get_file_id();
     let syntax_id = index_expr.get_syntax_id();
     let prefix = index_expr.get_prefix_expr()?;
-    if let LuaVarExpr::NameExpr(name_expr) = prefix {
+    if let LuaExpr::NameExpr(name_expr) = prefix {
         let name_token = name_expr.get_name_token()?;
         let name_token_text = name_token.get_name_text();
         if name_token_text == "_G" || name_token_text == "_ENV" {

crates/code_analysis/src/compilation/analyzer/decl/exprs.rs

@@ -1,6 +1,6 @@
 use emmylua_parser::{
-    LuaAssignStat, LuaAstNode, LuaAstToken, LuaForRangeStat, LuaForStat, LuaFuncStat, LuaIndexExpr,
-    LuaLocalFuncStat, LuaLocalStat, LuaSyntaxKind, LuaVarExpr,
+    LuaAssignStat, LuaAstNode, LuaAstToken, LuaExpr, LuaForRangeStat, LuaForStat, LuaFuncStat,
+    LuaIndexExpr, LuaLocalFuncStat, LuaLocalStat, LuaSyntaxKind, LuaVarExpr,
 };
 
 use crate::{
@@ -117,7 +117,7 @@ fn analyze_maybe_global_index_expr(
 ) -> Option<()> {
     let file_id = analyzer.get_file_id();
     let prefix = index_expr.get_prefix_expr()?;
-    if let LuaVarExpr::NameExpr(name_expr) = prefix {
+    if let LuaExpr::NameExpr(name_expr) = prefix {
         let name_token = name_expr.get_name_token()?;
         let name_token_text = name_token.get_name_text();
         if name_token_text == "_G" || name_token_text == "_ENV" {

crates/code_analysis/src/compilation/analyzer/decl/stats.rs

@@ -7,7 +7,7 @@ use crate::{
 };
 use decl::{LuaDecl, LuaDeclId};
 use emmylua_parser::{
-    LuaAstNode, LuaChunk, LuaFuncStat, LuaNameExpr, LuaSyntaxId, LuaSyntaxKind, LuaVarExpr,
+    LuaAstNode, LuaChunk, LuaExpr, LuaFuncStat, LuaNameExpr, LuaSyntaxId, LuaSyntaxKind, LuaVarExpr,
 };
 use rowan::{TextRange, TextSize};
 use scope::{LuaScope, LuaScopeId, LuaScopeKind, ScopeOrDeclId};
@@ -283,7 +283,7 @@ impl LuaDeclarationTree {
         if let LuaVarExpr::IndexExpr(index_name) = func_name {
             let prefix = index_name.get_prefix_expr()?;
             match prefix {
-                LuaVarExpr::NameExpr(prefix_name) => {
+                LuaExpr::NameExpr(prefix_name) => {
                     let name = prefix_name.get_name_text()?;
                     let decl = self.find_local_decl(&name, prefix_name.get_position());
                     if let Some(decl) = decl {
@@ -295,10 +295,11 @@ impl LuaDeclarationTree {
                         .get_global_decl_id(&LuaMemberKey::Name(name.into()))?;
                     return Some(LuaDeclOrMemberId::Decl(id));
                 }
-                LuaVarExpr::IndexExpr(prefx_index) => {
+                LuaExpr::IndexExpr(prefx_index) => {
                     let member_id = LuaMemberId::new(prefx_index.get_syntax_id(), self.file_id);
                     return Some(LuaDeclOrMemberId::Member(member_id));
                 }
+                _ => return None,
             }
         }
 

crates/code_analysis/src/db_index/declaration/decl_tree.rs

@@ -1,6 +1,5 @@
 use emmylua_parser::{
-    LuaAstNode, LuaExpr, LuaIndexExpr, LuaIndexKey, LuaSyntaxId, LuaSyntaxKind, LuaSyntaxNode,
-    LuaTableExpr, LuaVarExpr,
+    LuaAstNode, LuaIndexExpr, LuaIndexKey, LuaSyntaxId, LuaSyntaxKind, LuaSyntaxNode, LuaTableExpr,
 };
 use rowan::TextRange;
 use smol_str::SmolStr;
@@ -27,15 +26,7 @@ pub fn infer_index_expr(
     index_expr: LuaIndexExpr,
 ) -> InferResult {
     let prefix_expr = index_expr.get_prefix_expr()?;
-    let prefix_type = match prefix_expr {
-        LuaVarExpr::IndexExpr(prefix_index) => {
-            infer_expr(db, config, LuaExpr::IndexExpr(prefix_index))?
-        }
-        LuaVarExpr::NameExpr(prefix_name) => {
-            infer_expr(db, config, LuaExpr::NameExpr(prefix_name))?
-        }
-    };
-
+    let prefix_type = infer_expr(db, config, prefix_expr)?;
     let member_key = index_expr.get_index_key()?;
     if let Some(member_type) = infer_member_by_member_key(
         db,

crates/code_analysis/src/semantic/infer/infer_index.rs

@@ -1,4 +1,4 @@
-use emmylua_parser::{LuaAstNode, LuaExpr, LuaIndexExpr, LuaNameExpr, LuaVarExpr};
+use emmylua_parser::{LuaAstNode, LuaExpr, LuaIndexExpr, LuaNameExpr};
 
 use crate::{
     semantic::{
@@ -97,14 +97,7 @@ fn infer_index_expr_property_owner(
     index_expr: LuaIndexExpr,
 ) -> Option<LuaPropertyOwnerId> {
     let prefix_expr = index_expr.get_prefix_expr()?;
-    let prefix_type = match prefix_expr {
-        LuaVarExpr::IndexExpr(prefix_index) => {
-            infer_expr(db, infer_config, LuaExpr::IndexExpr(prefix_index))?
-        }
-        LuaVarExpr::NameExpr(prefix_name) => {
-            infer_expr(db, infer_config, LuaExpr::NameExpr(prefix_name))?
-        }
-    };
+    let prefix_type = infer_expr(db, infer_config, prefix_expr.into())?;
 
     let member_key = index_expr.get_index_key()?.into();
     if let Some(member_info) = infer_member_property_owner_by_member_key(

crates/code_analysis/src/semantic/semantic_info/infer_expr_property_owner.rs

@@ -1,6 +1,6 @@
 [package]
 name = "emmylua_parser"
-version = "0.8.1"
+version = "0.9.0"
 edition = "2021"
 authors = ["CppCXY"]
 description = "A parser for EmmyLua and luals"

crates/emmylua_parser/Cargo.toml

@@ -1094,4 +1094,24 @@ Syntax(Chunk)@0..205
 
         assert_ast_eq!(code, result);
     }
+
+    #[test]
+    fn test_error_for_completion() {
+        let code = "a():";
+        let result = r#"
+Syntax(Chunk)@0..4
+  Syntax(Block)@0..4
+    Syntax(AssignStat)@0..4
+      Syntax(IndexExpr)@0..4
+        Syntax(CallExpr)@0..3
+          Syntax(NameExpr)@0..1
+            Token(TkName)@0..1 "a"
+          Syntax(CallArgList)@1..3
+            Token(TkLeftParen)@1..2 "("
+            Token(TkRightParen)@2..3 ")"
+        Token(TkColon)@3..4 ":"
+        "#;
+        
+        assert_ast_eq!(code, result);
+    }
 }

crates/emmylua_parser/src/grammar/lua/test.rs

@@ -257,7 +257,7 @@ impl LuaAstNode for LuaIndexExpr {
 }
 
 impl LuaIndexExpr {
-    pub fn get_prefix_expr(&self) -> Option<LuaVarExpr> {
+    pub fn get_prefix_expr(&self) -> Option<LuaExpr> {
         self.child()
     }
 

crates/emmylua_parser/src/syntax/node/lua/expr.rs

@@ -1,8 +1,7 @@
 #[cfg(test)]
 mod tests {
     use crate::{
-        parser::ParserConfig, syntax::traits::LuaAstNode, LuaAst, LuaDocDescription, LuaLocalStat,
-        LuaParser, LuaVarExpr,
+        parser::ParserConfig, syntax::traits::LuaAstNode, LuaAst, LuaDocDescription, LuaExpr, LuaLocalStat, LuaParser, LuaVarExpr
     };
 
     #[allow(unused)]
@@ -211,7 +210,7 @@ mod tests {
                         }
                         LuaVarExpr::IndexExpr(field_exp) => {
                             match field_exp.get_prefix_expr().unwrap() {
-                                LuaVarExpr::NameExpr(name) => {
+                                LuaExpr::NameExpr(name) => {
                                     assert_eq!(name.get_name_token().unwrap().get_name_text(), "t");
                                 }
                                 _ => {}