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

fix(els): rename not working

Browse source
This commit is contained in:
Shunsuke Shibayama 2024-01-24 22:08:06 +09:00
parent 2fdf5224b5
commit c514d0d83d
9 changed files with 108 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

15
crates/erg_compiler/codegen.rs
View file

@ -86,12 +86,21 @@ fn debind(ident: &Identifier) -> Option<Str> {
}
}
fn escape_name(name: &str, vis: &VisibilityModifier, def_line: u32, def_col: u32) -> Str {
fn escape_name(
name: &str,
vis: &VisibilityModifier,
def_line: u32,
def_col: u32,
is_attr: bool,
) -> Str {
let name = name.replace('!', "__erg_proc__");
let name = name.replace('$', "__erg_shared__");
// For public APIs, mangling is not performed because `hasattr`, etc. cannot be used.
// For automatically generated variables, there is no possibility of conflict.
if vis.is_private() && !name.starts_with('%') {
if is_attr {
return Str::from(format!("::{name}"));
}
let line_mangling = match (def_line, def_col) {
(0, 0) => "".to_string(),
(0, _) => format!("_C{def_col}"),
@ -115,6 +124,7 @@ fn escape_ident(ident: Identifier) -> Str {
&ident.vi.vis.modifier,
ident.vi.def_loc.loc.ln_begin().unwrap_or(0),
ident.vi.def_loc.loc.col_begin().unwrap_or(0),
ident.vi.kind.is_instance_attr(),
)
} else if let Some(py_name) = ident.vi.py_name {
py_name
@ -126,6 +136,7 @@ fn escape_ident(ident: Identifier) -> Str {
vis,
ident.vi.def_loc.loc.ln_begin().unwrap_or(0),
ident.vi.def_loc.loc.col_begin().unwrap_or(0),
ident.vi.kind.is_instance_attr(),
)
}
}
@ -1055,6 +1066,7 @@ impl PyCodeGenerator {
&VisibilityModifier::Public,
vi.def_loc.loc.ln_begin().unwrap_or(0),
vi.def_loc.loc.col_begin().unwrap_or(0),
false,
)
.to_string()
}
@ -1430,6 +1442,7 @@ impl PyCodeGenerator {
&VisibilityModifier::Public,
0,
0,
false,
)
})
.collect::<Vec<_>>();