fix:(rust) fix bugs (#11)

Author: AsterDY

src/lang/collect/collect.go

@@ -250,10 +250,6 @@ func (c *Collector) Collect(ctx context.Context) error {
 				log.Error("dep token %v not found: %v\n", token, err)
 				continue
 			}
-			// remove self
-			if sym.Location.Include(dep.Location) {
-				continue
-			}
 
 			// NOTICE: some internal symbols may not been get by DocumentSymbols, thus we let Unknown symbol pass
 			if dep.Kind == SKUnknown && c.internal(dep.Location) {
@@ -264,6 +260,14 @@ func (c *Collector) Collect(ctx context.Context) error {
 					dep.Name = token.Text
 				}
 			}
+
+			// remove local symbols
+			if sym.Location.Include(dep.Location) {
+				continue
+			} else {
+				c.syms[dep.Location] = dep
+			}
+
 			c.deps[sym] = append(c.deps[sym], dependency{
 				Location: token.Location,
 				Symbol:   dep,

src/lang/collect/collect_test.go

@@ -19,6 +19,7 @@ import (
 	"encoding/json"
 	"fmt"
 	"os"
+	"path/filepath"
 	"testing"
 	"time"
 
@@ -31,8 +32,10 @@ var testroot = "../../../testdata"
 
 func TestCollector_Collect(t *testing.T) {
 	root := testroot + "/rust2"
+
+	root, _ = filepath.Abs(root)
 	log.SetLogLevel(log.DebugLevel)
-	rustLSP, err := lsp.NewLSPClient(root, root+"/src/main.rs", time.Second*15, lsp.ClientOptions{
+	rustLSP, err := lsp.NewLSPClient(root, root+"/src/main.rs", time.Second*5, lsp.ClientOptions{
 		Server:   "rust-analyzer",
 		Language: "rust",
 		Verbose:  true,

src/lang/collect/export.go

@@ -70,6 +70,9 @@ func (c *Collector) Export(ctx context.Context) (*uniast.Repository, error) {
 		repo.Modules[name] = newModule(name, rel)
 	}
 
+	// not allow local symbols inside another symbol
+	c.filterLocalSymbols()
+
 	// export symbols
 	for _, symbol := range c.syms {
 		visited := make(map[*lsp.DocumentSymbol]*uniast.Identity)
@@ -90,6 +93,23 @@ func (c *Collector) Export(ctx context.Context) (*uniast.Repository, error) {
 	return &repo, nil
 }
 
+// NOTICE: for rust and golang, each entity has separate location
+// TODO: some language may allow local symbols inside another symbol,
+func (c *Collector) filterLocalSymbols() {
+	// filter symbols
+	for loc1 := range c.syms {
+		for loc2 := range c.syms {
+			if loc1 == loc2 {
+				continue
+			}
+			if loc2.Include(loc1) {
+				delete(c.syms, loc1)
+				break
+			}
+		}
+	}
+}
+
 func (c *Collector) exportSymbol(repo *uniast.Repository, symbol *DocumentSymbol, refName string, visited map[*DocumentSymbol]*uniast.Identity) (*uniast.Identity, error) {
 	if symbol == nil {
 		return nil, errors.New("symbol is nil")

src/lang/lsp/client.go

@@ -1,11 +1,11 @@
 // Copyright 2025 CloudWeGo Authors
-// 
+//
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
-// 
+//
 //     https://www.apache.org/licenses/LICENSE-2.0
-// 
+//
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -50,7 +50,7 @@ func NewLSPClient(repo string, openfile string, wait time.Duration, opts ClientO
 		return nil, err
 	}
 
-	cli, err := initLSPClient(context.Background(), svr, "file://"+repo, opts.Verbose)
+	cli, err := initLSPClient(context.Background(), svr, lsp.DocumentURI(NewURI(repo)), opts.Verbose)
 	if err != nil {
 		return nil, err
 	}
@@ -110,7 +110,7 @@ type initializeResult struct {
 	Capabilities interface{} `json:"capabilities,omitempty"`
 }
 
-func initLSPClient(ctx context.Context, svr io.ReadWriteCloser, dir string, verbose bool) (*LSPClient, error) {
+func initLSPClient(ctx context.Context, svr io.ReadWriteCloser, dir lsp.DocumentURI, verbose bool) (*LSPClient, error) {
 	h := newLSPHandler()
 	stream := jsonrpc2.NewBufferedStream(svr, jsonrpc2.VSCodeObjectCodec{})
 	conn := jsonrpc2.NewConn(ctx, stream, h)
@@ -131,7 +131,7 @@ func initLSPClient(ctx context.Context, svr io.ReadWriteCloser, dir string, verb
 
 	initParams := initializeParams{
 		ProcessID:    os.Getpid(),
-		RootURI:      lsp.DocumentURI(dir),
+		RootURI:      dir,
 		Capabilities: cs,
 		Trace:        lsp.Trace(trace),
 		ClientInfo:   lsp.ClientInfo{Name: "vscode"},

src/lang/lsp/client_test.go

@@ -220,7 +220,7 @@ func TestRust(t *testing.T) {
 
 	// definition
 	t.Run("definition", func(t *testing.T) {
-		uri := NewURI("/root/codes/abcoder/testdata/rust2/src/main.rs")
+		uri := NewURI(rootDir + "/rust2/src/main.rs")
 		definition, err := rustLSP.Definition(context.Background(), uri, Position{9, 27})
 		if err != nil {
 			t.Fatalf("Find Definition failed: %v", err)

src/lang/lsp/lsp.go

@@ -20,6 +20,7 @@ import (
 	"fmt"
 	"math"
 	"os"
+	"path/filepath"
 	"sort"
 	"strings"
 
@@ -127,6 +128,9 @@ func (l DocumentURI) File() string {
 }
 
 func NewURI(file string) DocumentURI {
+	if !filepath.IsAbs(file) {
+		file, _ = filepath.Abs(file)
+	}
 	return DocumentURI("file://" + file)
 }
 

src/lang/lsp/spec.go

@@ -76,6 +76,9 @@ type LanguageSpec interface {
 
 	// if a symbol is a Function or Method symbol,  return the token index of Receiver (-1 means not found),TypeParameters, InputParameters and Outputs
 	FunctionSymbol(sym DocumentSymbol) (int, []int, []int, []int)
+
+	// Handle a unloaded internal symbol, like `lazy_static!` in rust
+	GetUnloadedSymbol(from Token, define Location) (string, error)
 }
 
 // Patcher is used to patch the AST of a module

src/lang/rust/get_merge_use.go renamed to src/lang/rust/ast.go

@@ -17,9 +17,12 @@ package rust
 import (
 	"bufio"
 	"fmt"
+	"os"
 	"strings"
 
+	"github.com/cloudwego/abcoder/src/lang/lsp"
 	"github.com/cloudwego/abcoder/src/lang/uniast"
+	"github.com/cloudwego/abcoder/src/lang/utils"
 )
 
 // UseNode represents a module node in the dependency tree
@@ -281,3 +284,47 @@ func GetRustContentDefine(name, fileContent string) (string, error) {
 
 	return buffer.String(), nil
 }
+
+func ExtractLazyStaticeSymbol(loc lsp.Location) (string, error) {
+	file := loc.URI.File()
+	bs, err := os.ReadFile(file)
+	if err != nil {
+		return "", err
+	}
+	src := string(bs)
+	lines := utils.CountLines(src)
+	is := false
+	for i := loc.Range.Start.Line; i >= 0; i-- {
+		if strings.Contains(src[lines[i]:], "lazy_static::") || strings.Contains(src[lines[i]:], "lazy_static!") {
+			is = true
+			break
+		}
+	}
+	if !is {
+		return "", fmt.Errorf("not found lazy_static")
+	}
+	// find first `;` outside code block
+	i := lines[loc.Range.Start.Line]
+	count := 0
+	codes := ""
+	ss := src[i:]
+	for x, c := range ss {
+		if c == '{' {
+			count++
+		}
+		if c == '}' {
+			count--
+		}
+		if c == ';' && count == 0 {
+			if x >= len(ss) {
+				x = len(ss) - 1
+			}
+			codes = strings.TrimSpace(ss[:x+1])
+			break
+		}
+	}
+	if codes != "" {
+		codes = fmt.Sprintf("lazy_static::lazy_static! {\n%s\n}", codes)
+	}
+	return codes, nil
+}

src/lang/rust/get_merge_use_test.go renamed to src/lang/rust/ast_test.go

@@ -27,7 +27,10 @@ type RustModulePatcher struct {
 }
 
 func (p *RustModulePatcher) Patch(ast *uniast.Module) {
-	filepath.Walk(p.Root, func(path string, info os.FileInfo, err error) error {
+	if ast.Dir == "" {
+		return
+	}
+	filepath.Walk(filepath.Join(p.Root, ast.Dir), func(path string, info os.FileInfo, err error) error {
 		if err != nil {
 			return err
 		}