language-servers/erg
1
0
Fork 0
mirror of https://github.com/erg-lang/erg.git synced 2025-08-04 02:39:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

chore: fix mod_name

Browse source
This commit is contained in:
Shunsuke Shibayama 2024-06-19 16:28:48 +09:00
parent bc23f9d045
commit 575df7485a
2 changed files with 21 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

18
crates/erg_common/pathutil.rs
View file

@ -241,6 +241,7 @@ pub fn remove_verbatim(path: &Path) -> String {
/// $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
/// foo/__pycache__/__init__.d.er -> foo
/// math.d.er -> math
/// ```
/// FIXME: split by `.` instead of `/`
@ -303,9 +304,22 @@ pub fn mod_name(path: &Path) -> Str {
.to_string_lossy()
.trim_end_matches(".d.er")
.to_string();
for parent in path.components().rev().skip(1) {
let mut parents = path.components().rev().skip(1);
while let Some(parent) = parents.next() {
let parent = parent.as_os_str().to_string_lossy();
if parent.ends_with(".d") {
if parent == "__pycache__" {
if name == "__init__" {
let p = parents
.next()
.unwrap()
.as_os_str()
.to_string_lossy()
.trim_end_matches(".d")
.to_string();
name = p;
}
break;
} else if parent.ends_with(".d") {
let p = parent.trim_end_matches(".d").to_string();
if name == "__init__" {
name = p;