Merge pull request #313 from Pivot-Studio/Chronostasys/issue312

fix #312

Author: Chronostasys

.gitattributes

@@ -1,2 +1,3 @@
 # Set default behavior to automatically normalize line endings.
 * text=auto
+*.pi eol=lf

Cargo.lock

@@ -98,3 +98,8 @@ lto = "fat"
 incremental = true
 codegen-units = 1
 # rpath = true
+
+
+[dev-dependencies]
+expect-test = "1.4.1"
+

Cargo.toml

@@ -12,6 +12,7 @@
 
 ## 注意事项
 
+
 - 修改`Ctx`结构体成员或者增加函数的时候，若不熟悉rust或者代码，容易出现生命周期问题。若出现此类问题，请按照以下三点依次尝试：
   - `Ctx`中所有直接或间接由`context`生成的类型（几乎都是inkwell库中的类型）的生命周期泛型应该为`'ctx`
   - 所有被borrow的字段的borrow的生命周期应该为`'a`，除了`context`字段（`context`生命周期是`'a`）

src/ast/README.md

@@ -779,7 +779,7 @@ impl<'a, 'ctx> LLVMBuilder<'a, 'ctx> {
     ) -> (DIType<'ctx>, u64) {
         let field_pltype = match field.typenode.get_type(ctx, &self.clone().into(), true) {
             Ok(field_pltype) => field_pltype,
-            Err(_) => ctx.get_type("i64", Default::default()).unwrap(),
+            Err(_) => ctx.get_type("i64", Default::default()).unwrap().tp,
         };
         let di_type = self.get_ditype(&field_pltype.borrow(), ctx);
         let debug_type = di_type.unwrap();

src/ast/builder/llvmbuilder.rs

@@ -1,3 +1,4 @@
+use super::node::program::cycle_deps_recover;
 use super::node::program::ModWrapper;
 #[cfg(feature = "llvm")]
 use crate::ast::jit_config::IS_JIT;
@@ -67,7 +68,7 @@ pub fn compile_dry(db: &dyn Db, docs: MemDocsInput) -> Option<ModWrapper> {
     re
 }
 
-#[salsa::tracked]
+#[salsa::tracked(recovery_fn=cycle_deps_recover)]
 pub fn compile_dry_file(db: &dyn Db, docs: FileCompileInput) -> Option<ModWrapper> {
     if docs.file(db).ends_with(".toml") {
         log::error!("lsp error: toml file {}", docs.file(db));

src/ast/compiler.rs

@@ -8,6 +8,7 @@ use super::node::node_result::NodeResult;
 use super::node::NodeEnum;
 use super::node::TypeNode;
 use super::plmod::CompletionItemWrapper;
+use super::plmod::GlobType;
 use super::plmod::GlobalVar;
 use super::plmod::LSPDef;
 use super::plmod::Mod;
@@ -54,8 +55,6 @@ use rustc_hash::FxHashMap;
 use rustc_hash::FxHashSet;
 use std::cell::RefCell;
 
-use std::path::Path;
-
 use std::path::PathBuf;
 use std::sync::Arc;
 mod builtins;
@@ -139,17 +138,10 @@ impl<'a, 'ctx> Ctx<'a> {
         config: Config,
         db: &'a dyn Db,
     ) -> Ctx<'a> {
-        let f = Path::new(Path::new(src_file_path).file_stem().unwrap())
-            .file_name()
-            .take()
-            .unwrap()
-            .to_str()
-            .unwrap()
-            .to_string();
         Ctx {
             need_highlight: 0,
             generic_types: FxHashMap::default(),
-            plmod: Mod::new(f, src_file_path.to_string()),
+            plmod: Mod::new(src_file_path.to_string()),
             father: None,
             init_func: None,
             function: None,
@@ -698,15 +690,15 @@ impl<'a, 'ctx> Ctx<'a> {
             },
         );
     }
-    pub fn get_type(&self, name: &str, range: Range) -> Result<Arc<RefCell<PLType>>, PLDiag> {
+    pub fn get_type(&self, name: &str, range: Range) -> Result<GlobType, PLDiag> {
         if let Some(pv) = self.generic_types.get(name) {
             self.set_if_refs_tp(pv.clone(), range);
             self.send_if_go_to_def(
                 range,
                 pv.borrow().get_range().unwrap_or(range),
                 self.plmod.path.clone(),
             );
-            return Ok(pv.clone());
+            return Ok(pv.clone().into());
         }
         if let Ok(pv) = self.plmod.get_type(name, range, self) {
             return Ok(pv);
@@ -774,15 +766,15 @@ impl<'a, 'ctx> Ctx<'a> {
         }
         self.set_if_refs_tp(pltype.clone(), range);
         self.send_if_go_to_def(range, range, self.plmod.path.clone());
-        self.plmod.types.insert(name, pltype);
+        self.plmod.types.insert(name, pltype.into());
         Ok(())
     }
     pub fn add_type_without_check(&mut self, pltype: Arc<RefCell<PLType>>) {
         if let PLType::Generic(_) = &*pltype.borrow() {
             unreachable!()
         }
         let name = pltype.borrow().get_name();
-        self.plmod.types.insert(name, pltype);
+        self.plmod.types.insert(name, pltype.into());
     }
     #[inline]
     fn add_generic_type(&mut self, name: String, pltype: Arc<RefCell<PLType>>) {
@@ -1001,6 +993,9 @@ impl<'a, 'ctx> Ctx<'a> {
     fn get_type_completions_in_ns(&self, ns: &str, m: &mut FxHashMap<String, CompletionItem>) {
         self.with_ns(ns, |ns| {
             for (k, v) in ns.types.iter() {
+                if !v.visibal_outside() {
+                    continue;
+                }
                 let mut insert_text = None;
                 let mut command = None;
                 let tp = match &*v.clone().borrow() {
@@ -1020,6 +1015,10 @@ impl<'a, 'ctx> Ctx<'a> {
                     }
                     _ => continue, // skip completion for primary types
                 };
+                if k.starts_with('|') {
+                    // skip method
+                    continue;
+                }
                 let mut item = CompletionItem {
                     label: k.to_string(),
                     kind: Some(tp),
@@ -1042,7 +1041,7 @@ impl<'a, 'ctx> Ctx<'a> {
 
     pub fn get_type_completions(&self) -> Vec<CompletionItem> {
         let mut m = FxHashMap::default();
-        self.get_pltp_completions(&mut m, |tp| !matches!(tp, PLType::Fn(_)));
+        self.get_pltp_completions(&mut m, |tp| !matches!(&*tp.borrow(), PLType::Fn(_)));
         self.plmod.get_ns_completions_pri(&mut m);
         m.values().cloned().collect()
     }
@@ -1088,7 +1087,7 @@ impl<'a, 'ctx> Ctx<'a> {
     fn get_pltp_completions(
         &self,
         vmap: &mut FxHashMap<String, CompletionItem>,
-        filter: impl Fn(&PLType) -> bool,
+        filter: impl Fn(&GlobType) -> bool,
     ) {
         self.plmod
             .get_pltp_completions(vmap, &filter, &self.generic_types, true);

src/ast/ctx.rs

@@ -136,6 +136,8 @@ define_error!(
     TUPLE_WRONG_DECONSTRUCT_PARAM_LEN = "tuple wrong deconstruct param len",
     DEF_DECONSTRUCT_MUST_HAVE_VALUE = "def deconstruct must have value",
     STRUCT_FIELD_NOT_EXISTS = "struct field not exists",
+    TRY_TO_EXPORT_NON_REEXPORT_SYMBOL = "try to export non reexport symbol",
+    CYCLE_DEPENDENCY = "cycle dependency not allowed",
 );
 macro_rules! define_warn {
     ($(
@@ -230,6 +232,13 @@ impl Pos {
 }
 use std::fmt::Debug;
 impl PLDiag {
+    #[cfg(test)]
+    pub fn rm_file(&mut self) {
+        self.raw.source = None;
+        self.raw.labels.iter_mut().for_each(|label| {
+            label.file = String::new();
+        })
+    }
     pub fn print(&self, path: &str, f: impl Fn(&dyn Db, &str) -> Source + 'static, db: &dyn Db) {
         let mut colors = ColorGenerator::new();
         let mut rb = Report::build(
@@ -263,8 +272,8 @@ impl PLDiag {
             if let Some((tpl, args)) = &label.txt {
                 lab = Label::new((
                     label.file.as_str(),
-                    label.range.start.utf8_offset(&f(db, path))
-                        ..label.range.end.utf8_offset(&f(db, path)),
+                    label.range.start.utf8_offset(&f(db, label.file.as_str()))
+                        ..label.range.end.utf8_offset(&f(db, label.file.as_str())),
                 ));
                 let mut msg = tpl.clone();
                 msg = msg.format(
@@ -276,9 +285,9 @@ impl PLDiag {
                 lab = lab.with_message(msg);
             } else {
                 lab = Label::new((
-                    path,
-                    label.range.start.utf8_offset(&f(db, path))
-                        ..label.range.end.utf8_offset(&f(db, path)),
+                    label.file.as_str(),
+                    label.range.start.utf8_offset(&f(db, label.file.as_str()))
+                        ..label.range.end.utf8_offset(&f(db, label.file.as_str())),
                 ));
             }
             rb = rb.with_label(lab.with_color(color));

src/ast/diag.rs

@@ -28,7 +28,7 @@ macro_rules! add_basic_types {
             paste::paste! {
                 let [<pltype_$ident>] = PLType::Primitive(PriType::[<$ident:upper>]);
                 $map
-                .insert(stringify!($ident).to_string(), Arc::new(RefCell::new( [<pltype_$ident>])));
+                .insert(stringify!($ident).to_string(),$crate::ast::plmod::GlobType::new([<pltype_$ident>]));
             }
         )*
     };

src/ast/macros.rs

@@ -309,7 +309,7 @@ impl Node for IsNode {
                     );
                     let cond = builder.try_load2var(Default::default(), cond, ctx).unwrap();
                     let cond = builder.build_int_truncate(cond, &PriType::BOOL, "trunctemp");
-                    cond.new_output(ctx.get_type("bool", Default::default()).unwrap())
+                    cond.new_output(ctx.get_type("bool", Default::default()).unwrap().tp)
                         .set_const()
                         .to_result()
                 } else {