language-servers/erg
1
0
Fork 0
mirror of https://github.com/erg-lang/erg.git synced 2025-10-03 05:54:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update pathutil.rs

Browse source
This commit is contained in:
Shunsuke Shibayama 2024-02-16 16:24:15 +09:00
parent abc967e10d
commit 0b618da4c2
1 changed files with 30 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

32
crates/erg_common/pathutil.rs
View file

@ -238,10 +238,12 @@ pub fn remove_verbatim(path: &Path) -> String {
/// e.g.
/// ```txt
/// http.d/client.d.er -> http.client
/// .../torch/1.0.0/src/lib.d.er -> torch
/// .../torch/1.0.0/src/random.d.er -> torch/random
/// $ERG_PATH/pkgs/certified/torch/1.0.0/src/lib.d.er -> torch
/// $ERG_PATH/pkgs/certified/torch/1.0.0/src/random.d.er -> torch/random
/// /users/foo/torch/src/lib.d.er -> torch
/// math.d.er -> math
/// ```
/// FIXME: split by `.` instead of `/`
pub fn mod_name(path: &Path) -> Str {
let path = match path.strip_prefix(erg_pkgs_path()) {
Ok(path) => {
@ -267,6 +269,32 @@ pub fn mod_name(path: &Path) -> Str {
.join("/");
return Str::rc(format!("{mod_root}/{sub}").trim_end_matches('/'));
}
// using local or git path
Err(_) if path.display().to_string().split("/src/").count() > 1 => {
// <mod_root>/src/<sub>
let path = path.display().to_string();
let mod_root = path
.split("/src/")
.next()
.unwrap()
.split('/')
.last()
.unwrap();
let sub = path
.split("/src/")
.nth(1)
.unwrap()
.split('/')
.map(|c| {
c.trim_end_matches("lib.d.er")
.trim_end_matches(".d.er")
.trim_end_matches(".d")
.to_string()
})
.collect::<Vec<_>>()
.join("/");
return Str::rc(format!("{mod_root}/{sub}").trim_end_matches('/'));
}
Err(_) => path,
};
let mut name = path