Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 18 additions & 15 deletions lang/collect/export.go
Original file line number Diff line number Diff line change
Expand Up @@ -161,37 +161,40 @@ func (c *Collector) exportSymbol(repo *uniast.Repository, symbol *DocumentSymbol
return id, nil
}

name := symbol.Name
if name == "" {
if refName == "" {
e = fmt.Errorf("both symbol %v name and refname is empty", symbol)
return
}
// NOTICE: use refName as id when symbol name is missing
name = refName
}
// Check NeedStdSymbol
file := symbol.Location.URI.File()
mod, path, err := c.spec.NameSpace(file)
if err != nil {
e = err
return
}

if !c.NeedStdSymbol && mod == "" {
e = ErrStdSymbol
return
}

tmp := uniast.NewIdentity(mod, path, name)
id = &tmp
visited[symbol] = id

// Load eternal symbol on demands
// Load external symbol on demands
if !c.LoadExternalSymbol && (!c.internal(symbol.Location) || symbol.Kind == SKUnknown) {
e = ErrExternalSymbol
return
}

// Construct Identity and save to visited
name := symbol.Name
if name == "" {
if refName == "" {
e = fmt.Errorf("both symbol %v name and refname is empty", symbol)
return
}
// NOTICE: use refName as id when symbol name is missing
name = refName
}
tmp := uniast.NewIdentity(mod, path, name)
id = &tmp
// Save to visited ONLY WHEN no errors occur
visited[symbol] = id

// Walk down from repo struct
if repo.Modules[mod] == nil {
repo.Modules[mod] = newModule(mod, "", c.Language)
}
Expand Down
16 changes: 8 additions & 8 deletions testdata/rust2/src/entity/inter.rs
Original file line number Diff line number Diff line change
Expand Up @@ -35,14 +35,14 @@ pub trait Addable {

pub struct AnyInt(i64);

impl AnyInt {
pub fn id() -> i64 {
0
}
pub fn add(&self, b: i64) -> i64 {
self.0 + b
}
}
//impl AnyInt {
// pub fn id() -> i64 {
// 0
// }
// pub fn add(&self, b: i64) -> i64 {
// self.0 + b
// }
//}

impl Addable for AnyInt {
fn add(&self, b: i64) -> i64 {
Expand Down