Merge pull request #310 from Pivot-Studio/fix/lsp_wasm_circle

fix: wasm circle

Author: Chronostasys

.github/workflows/npmpkg.yml

@@ -4,6 +4,7 @@ on:
     branches:
       - master
       - release/*
+      - wasm/*
     paths:
     - '**.rs'
     - '**/Cargo.*'

src/ast/compiler.rs

@@ -17,7 +17,7 @@ use inkwell::{
     passes::{PassManager, PassManagerBuilder},
     OptimizationLevel,
 };
-use log::{debug, trace, warn};
+use log::{trace, warn};
 #[cfg(feature = "llvm")]
 use pl_linker::{linker::create_with_target, mun_target::spec::Target};
 use rustc_hash::FxHashSet;
@@ -50,6 +50,7 @@ pub fn compile_dry(db: &dyn Db, docs: MemDocsInput) -> Option<ModWrapper> {
     let input = docs.get_file_params(db, docs.file(db).clone(), true);
     input?;
     let input = input.unwrap();
+    log::trace!("entering compile_dry_file");
     let re = compile_dry_file(db, input);
     // calculate find references results
     if docs.action(db) != ActionType::FindReferences {
@@ -77,7 +78,7 @@ pub fn compile_dry_file(db: &dyn Db, docs: FileCompileInput) -> Option<ModWrappe
     let re = docs.get_file_content(db);
     re?;
     let src = re.unwrap();
-    debug!("src {:#?} id {:?}", src.text(db), src);
+    log::trace!("src {:#?} id {:?}", src.text(db), src.path(db));
     let parse_result = parse(db, src);
     if let Err(e) = parse_result {
         log::error!("source code parse failed {}", e);
@@ -91,6 +92,7 @@ pub fn compile_dry_file(db: &dyn Db, docs: FileCompileInput) -> Option<ModWrappe
         docs.docs(db),
         docs.config(db),
     );
+    log::trace!("entering emit");
     Some(program.emit(db))
 }
 

src/ast/node/program.rs

@@ -235,6 +235,8 @@ impl Program {
             let wrapper = ConfigWrapper::new(db, self.config(db), u);
             let mut mod_id = wrapper.use_node(db).get_last_id();
             let path = wrapper.resolve_dep_path(db);
+            let p = self.config(db).project;
+            log::trace!("load dep {:?} for {:?} (project {:?})", path, pkgname, p);
             let f = path.to_str().unwrap().to_string();
             let mut f = self.docs(db).get_file_params(db, f, false);
             let mut symbol_opt = None;
@@ -291,6 +293,7 @@ impl Program {
             }
             modmap.insert(mod_id.unwrap(), module);
         }
+        log::trace!("done deps compile");
         let filepath = Path::new(self.params(db).file(db));
         let abs = crate::utils::canonicalize(filepath).unwrap();
         let dir = abs.parent().unwrap().to_str().unwrap();
@@ -489,7 +492,7 @@ mod salsa_structs;
 /// compile a pi file to llvm ir, or do some lsp analysis
 #[salsa::tracked]
 pub fn emit_file(db: &dyn Db, params: ProgramEmitParam) -> ModWrapper {
-    log::info!("emit_file: {}", params.fullpath(db),);
+    log::trace!("emit_file: {}", params.fullpath(db),);
     let v = RefCell::new(FxHashSet::default());
     let mut ctx = ctx::Ctx::new(
         params.fullpath(db),

src/lsp/wasm.rs

@@ -174,7 +174,7 @@ fn add_pl_libs(db: &mut Database, docs: Arc<Mutex<RefCell<MemDocs>>>) {
 #[wasm_bindgen]
 pub fn set_init_content(content: &str) -> String {
     console_error_panic_hook::set_once();
-    wasm_logger::init(wasm_logger::Config::new(log::Level::Error));
+    wasm_logger::init(wasm_logger::Config::new(log::Level::Warn));
     let docin = *DOCIN;
     let binding = &DB.inner;
     let db = &mut *binding.borrow_mut();

src/utils/read_config.rs

@@ -11,8 +11,18 @@ use crate::{
 };
 
 pub fn get_config_path(current: String) -> Result<String, &'static str> {
+    log::trace!("get_config_path: {:?}", current);
     #[cfg(target_arch = "wasm32")] // TODO support std on wasm
-    return Ok("http://www.test.com/Kagari.toml".to_string());
+    {
+        if current.starts_with("http") {
+            return Ok("http://www.test.com/Kagari.toml".to_string());
+        }
+        if current.starts_with("core") {
+            return Ok("core/Kagari.toml".to_string());
+        } else if current.starts_with("std") {
+            return Ok("std/Kagari.toml".to_string());
+        }
+    }
 
     let mut cur_path = PathBuf::from(current);
     if cur_path.is_file() && !cur_path.pop() {