fix type check for union

Author: CppCXY

crates/code_analysis/src/lib.rs

@@ -2,21 +2,21 @@ mod compilation;
 mod config;
 mod db_index;
 mod diagnostic;
+mod profile;
 mod semantic;
 mod vfs;
-mod profile;
 
 pub use compilation::*;
 pub use config::*;
 pub use db_index::*;
 pub use diagnostic::*;
 use log::{error, info};
 use lsp_types::Uri;
+pub use profile::Profile;
 pub use semantic::*;
 use std::{collections::HashSet, env, path::PathBuf, sync::Arc};
 use tokio_util::sync::CancellationToken;
 pub use vfs::*;
-pub use profile::Profile;
 
 #[macro_use]
 extern crate rust_i18n;
@@ -131,26 +131,44 @@ impl EmmyLuaAnalysis {
     pub fn update_files_by_uri(&mut self, files: Vec<(Uri, Option<String>)>) -> Vec<FileId> {
         let mut removed_files = HashSet::new();
         let mut updated_files = HashSet::new();
-        for (uri, text) in files {
-            let is_new_text = text.is_some();
-            let file_id = self
-                .compilation
-                .get_db_mut()
-                .get_vfs_mut()
-                .set_file_content(&uri, text);
-            removed_files.insert(file_id);
-            if is_new_text {
-                updated_files.insert(file_id);
+        {
+            let _p = Profile::new("update files");
+            for (uri, text) in files {
+                let is_new_text = text.is_some();
+                let file_id = self
+                    .compilation
+                    .get_db_mut()
+                    .get_vfs_mut()
+                    .set_file_content(&uri, text);
+                removed_files.insert(file_id);
+                if is_new_text {
+                    updated_files.insert(file_id);
+                }
             }
         }
-
         self.compilation
             .remove_index(removed_files.into_iter().collect());
         let updated_files: Vec<FileId> = updated_files.into_iter().collect();
         self.compilation.update_index(updated_files.clone());
         updated_files
     }
 
+    // pub fn parrallel_update_files_by_uri(
+    //     &mut self,
+    //     files: Vec<(Uri, Option<String>)>,
+    // ) -> Vec<FileId> {
+    //     let mut removed_files = HashSet::new();
+    //     let mut updated_files = HashSet::new();
+    //     {
+    //         let _p = Profile::new("parrallel update files");
+    //     }
+    //     self.compilation
+    //         .remove_index(removed_files.into_iter().collect());
+    //     let updated_files: Vec<FileId> = updated_files.into_iter().collect();
+    //     self.compilation.update_index(updated_files.clone());
+    //     updated_files
+    // }
+
     pub fn update_files_by_path(&mut self, files: Vec<(PathBuf, Option<String>)>) -> Vec<FileId> {
         let files = files
             .into_iter()

crates/code_analysis/src/semantic/type_compact/mod.rs

@@ -5,9 +5,12 @@ use std::ops::Deref;
 
 use func_type::infer_doc_func_type_compact;
 
-use crate::db_index::{
-    DbIndex, LuaGenericType, LuaMemberKey, LuaMemberOwner, LuaObjectType, LuaTupleType, LuaType,
-    LuaTypeDeclId,
+use crate::{
+    db_index::{
+        DbIndex, LuaGenericType, LuaMemberKey, LuaMemberOwner, LuaObjectType, LuaTupleType,
+        LuaType, LuaTypeDeclId,
+    },
+    LuaUnionType,
 };
 
 use super::{InferGuard, LuaInferConfig};
@@ -115,6 +118,9 @@ fn infer_type_compact(
         }
         // TODO implement the check for table
         (LuaType::Tuple(_), _) => compact_type.is_table(),
+        (LuaType::Union(a), LuaType::Union(b)) => {
+            infer_union_union_type_compact(db, config, a, b, infer_guard).unwrap_or(false)
+        }
         (LuaType::Union(a), _) => a
             .get_types()
             .iter()
@@ -409,3 +415,35 @@ fn infer_generic_type_compact(
 
     Some(true)
 }
+
+// a diffcult compare
+fn infer_union_union_type_compact(
+    db: &DbIndex,
+    config: &mut LuaInferConfig,
+    source: &LuaUnionType,
+    compact_type: &LuaUnionType,
+    infer_guard: &mut InferGuard,
+) -> Option<bool> {
+    let a_types = source.get_types();
+    let b_types = compact_type.get_types();
+
+    for a_type in a_types {
+        if !b_types
+            .iter()
+            .any(|b_type| infer_type_compact(db, config, a_type, b_type, infer_guard))
+        {
+            return Some(false);
+        }
+    }
+
+    for b_type in b_types {
+        if !a_types
+            .iter()
+            .any(|a_type| infer_type_compact(db, config, a_type, b_type, infer_guard))
+        {
+            return Some(false);
+        }
+    }
+
+    Some(false)
+}