Skip to content

Commit a189e43

Browse files
committed
[REF] path method in PackageSymbol
Package symbols only have a single path. Before this commit, the `PackageSymbol::paths` method always returned a single-element Vec<String>. This commit renames it to `path` (singular) and makes it return the single path instead.
1 parent d684121 commit a189e43

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

server/src/core/symbols/package_symbol.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -82,10 +82,10 @@ impl PackageSymbol {
8282
PackageSymbol::PythonPackage(p) => p.module_symbols.insert(file.borrow().name().clone(), file.clone()),
8383
};
8484
}
85-
pub fn paths(&self) -> Vec<String> {
85+
pub fn path(&self) -> &String {
8686
match self {
87-
PackageSymbol::Module(m) => vec![m.path.clone()],
88-
PackageSymbol::PythonPackage(p) => vec![p.path.clone()],
87+
PackageSymbol::Module(m) => &m.path,
88+
PackageSymbol::PythonPackage(p) => &p.path,
8989
}
9090
}
9191
pub fn is_external(&self) -> bool {

server/src/core/symbols/symbol.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -847,7 +847,7 @@ impl Symbol {
847847
Symbol::Root(_) => vec![],
848848
Symbol::Namespace(n) => n.paths(),
849849
Symbol::DiskDir(d) => vec![d.path.clone()],
850-
Symbol::Package(p) => p.paths(),
850+
Symbol::Package(p) => vec![p.path().clone()],
851851
Symbol::File(f) => vec![f.path.clone()],
852852
Symbol::Compiled(c) => vec![c.path.clone()],
853853
Symbol::Class(_) => vec![],
@@ -860,7 +860,7 @@ impl Symbol {
860860

861861
pub fn get_symbol_first_path(&self) -> String{
862862
match self{
863-
Symbol::Package(p) => PathBuf::from(p.paths()[0].clone()).join("__init__.py").sanitize() + p.i_ext().as_str(),
863+
Symbol::Package(p) => PathBuf::from(p.path().clone()).join("__init__.py").sanitize() + p.i_ext().as_str(),
864864
Symbol::File(f) => f.path.clone(),
865865
Symbol::DiskDir(_) => panic!("invalid symbol type to extract path"),
866866
Symbol::Root(_) => panic!("invalid symbol type to extract path"),

0 commit comments

Comments
 (0)