Fix #258

Fix #266

Author: CppCXY

crates/emmylua_code_analysis/src/compilation/test/and_or_test.rs

@@ -57,4 +57,21 @@ mod test {
             "Union(LuaUnionType { types: [Nil, IntegerConst(2)] })"
         );
     }
+
+    #[test]
+    fn test_issue_258() {
+        let mut ws = VirtualWorkspace::new();
+
+        ws.def(
+            r#"
+            local a            --- @type string|nil
+            local b            --- @type string|nil
+            c = a or b
+            "#,
+        );
+
+        let c = ws.expr_ty("c");
+        let c_desc = ws.humanize_type(c);
+        assert_eq!(c_desc, "(string|nil)");
+    }
 }

crates/emmylua_code_analysis/src/compilation/test/flow.rs

@@ -300,4 +300,23 @@ end
         "#
         ));
     }
+
+    #[test]
+    fn test_issue_266() {
+        let mut ws = VirtualWorkspace::new();
+
+        assert!(ws.check_code_for(DiagnosticCode::AssignTypeMismatch, r#"
+        --- @return string
+        function baz() end
+
+        local a
+        a = baz() -- a has type nil but should be string    
+        d = a    
+        "#));
+
+        let d = ws.expr_ty("d");
+        let d_desc = ws.humanize_type(d);
+        assert_eq!(d_desc, "string");
+    }
+
 }