LSP symbol search

Author: a

exec.go

@@ -1587,7 +1587,7 @@ Lsp refs
 		return
 	}
 
-	v := strings.Split(arg, " ")
+	v := strings.SplitN(arg, " ", 2)
 	arg = v[0]
 	var rest string
 	if len(v) > 1 {
@@ -1618,6 +1618,8 @@ Lsp refs
 		srv.ExecCodeAction(lspb, rest, executeLspTextEdits, func(tolook string) {
 			Load(ec, 0, false, []rune(tolook))
 		})
+	case "symbol":
+		Warn(srv.WorkspaceSymbol(rest))
 	default:
 		Warn("wrong argument")
 	}

extra/LookFile/lookfile.go

@@ -146,7 +146,7 @@ func readEvents(buf *util.BufferConn, searchChan chan<- string, moveChan chan<-
 	}
 }
 
-func searcher(buf *util.BufferConn, cwd string, searchChan <-chan string, moveChan <-chan int, openChan <-chan struct{}) {
+func searcher(p9clnt *clnt.Clnt, buf *util.BufferConn, cwd string, searchChan <-chan string, moveChan <-chan int, openChan <-chan struct{}) {
 	resultChan := make(chan *lookFileResult, 1)
 	var searchDone chan struct{}
 	curNeedle := ""
@@ -185,8 +185,12 @@ func searcher(buf *util.BufferConn, cwd string, searchChan <-chan string, moveCh
 			if needle != "" {
 				resultList = resultList[0:0]
 				searchDone = make(chan struct{})
-				go fileSystemSearch(cwd, resultChan, searchDone, needle, exact, MAX_RESULTS)
-				go tagsSearch(resultChan, searchDone, needle, exact, MAX_RESULTS)
+				if needle[0] == '@' {
+					go lspSymbolSearch(p9clnt, cwd, resultChan, searchDone, needle[1:])
+				} else {
+					go fileSystemSearch(cwd, resultChan, searchDone, needle, exact, MAX_RESULTS)
+					go tagsSearch(resultChan, searchDone, needle, exact, MAX_RESULTS)
+				}
 			} else {
 				displayResults(buf, curSelected, resultList)
 			}
@@ -255,7 +259,11 @@ func displayResults(buf *util.BufferConn, curSelected int, resultList []*lookFil
 		result.start = len(t)
 		t = append(t, []rune(result.show)...)
 		//t = append(t, []rune(fmt.Sprintf(" (%d)", result.score))...)
-		result.end = len(t)
+		if result.loadEnd > 0 {
+			result.end = result.loadEnd + result.start
+		} else {
+			result.end = len(t)
+		}
 		t = append(t, []rune("\n")...)
 		for i := range result.mpos {
 			color[result.mpos[i]+s] = 0x03
@@ -316,5 +324,5 @@ func main() {
 	moveChan := make(chan int, 1)
 
 	go readEvents(buf, searchChan, moveChan, openChan)
-	searcher(buf, cwd, searchChan, moveChan, openChan)
+	searcher(p9clnt, buf, cwd, searchChan, moveChan, openChan)
 }

extra/LookFile/search.go

@@ -1,13 +1,18 @@
 package main
 
 import (
+	"fmt"
+	"io/ioutil"
 	"os"
 	"path/filepath"
 	"strings"
 	"unicode"
 	"unicode/utf8"
 
 	"github.com/aarzilli/yacco/regexp"
+	"github.com/aarzilli/yacco/util"
+	"github.com/lionkov/go9p/p"
+	"github.com/lionkov/go9p/p/clnt"
 )
 
 var Extensions []string
@@ -23,6 +28,7 @@ type lookFileResult struct {
 	mpos   []int
 	needle string
 
+	loadEnd    int
 	start, end int
 }
 
@@ -138,13 +144,6 @@ func fileSystemSearch(edDir string, resultChan chan<- *lookFileResult, searchDon
 				continue
 			}
 
-			/*
-				off := utf8.RuneCountInString(relPath) - utf8.RuneCountInString(fi[i].Name())
-
-				if !strings.HasSuffix(relPath, fi[i].Name()) {
-					off = -1
-				}*/
-
 			d := depth
 			if fi[i].IsDir() {
 				relPath += "/"
@@ -209,7 +208,7 @@ func fileSystemSearchMatch(exact bool, needlerx []*regexp.Regex, relPath, needle
 	}
 
 	select {
-	case resultChan <- &lookFileResult{score, relPath, mpos, needle, 0, 0}:
+	case resultChan <- &lookFileResult{score, relPath, mpos, needle, 0, 0, 0}:
 	case <-searchDone:
 		return -1
 	}
@@ -347,7 +346,7 @@ func tagsSearch(resultChan chan<- *lookFileResult, searchDone chan struct{}, nee
 		}
 
 		select {
-		case resultChan <- &lookFileResult{score, x, []int{}, needle, 0, 0}:
+		case resultChan <- &lookFileResult{score, x, []int{}, needle, 0, 0, 0}:
 		case <-searchDone:
 			return
 		}
@@ -358,3 +357,31 @@ func tagsSearch(resultChan chan<- *lookFileResult, searchDone chan struct{}, nee
 		}
 	}
 }
+
+func lspSymbolSearch(p9clnt *clnt.Clnt, cwd string, resultChan chan<- *lookFileResult, searchDone chan struct{}, needle string) {
+	lspfd, err := p9clnt.FOpen(fmt.Sprintf("/%s/lsp", os.Getenv("winid")), p.OWRITE)
+	util.Allergic(debug, err)
+	fmt.Fprintf(lspfd, "symbol %s", needle)
+	lspfd.Close()
+
+	lspfd, err = p9clnt.FOpen(fmt.Sprintf("/%s/lsp", os.Getenv("winid")), p.OREAD)
+	util.Allergic(debug, err)
+	resp, err := ioutil.ReadAll(lspfd)
+	util.Allergic(debug, err)
+	lspfd.Close()
+
+	for i, line := range strings.Split(string(resp), "\n") {
+		v := strings.SplitN(line, " ", 3)
+		if len(v) != 3 {
+			continue
+		}
+		if v[1] == "Field" {
+			continue
+		}
+		rel, _ := filepath.Rel(cwd, v[0])
+		if rel != "" {
+			v[0] = rel
+		}
+		resultChan <- &lookFileResult{show: v[0] + " " + strings.ToLower(v[1]) + " " + v[2], loadEnd: len([]rune(v[0])), score: i, needle: "@" + needle}
+	}
+}

fs.go

@@ -17,6 +17,7 @@ import (
 	"github.com/aarzilli/yacco/config"
 	"github.com/aarzilli/yacco/edit"
 	"github.com/aarzilli/yacco/hl"
+	"github.com/aarzilli/yacco/lsp"
 	"github.com/aarzilli/yacco/util"
 
 	"github.com/lionkov/go9p/p"
@@ -223,6 +224,8 @@ func FsAddEditor(n int) {
 	prop.Add(bufdir, "prop", user, nil, 0660, prop)
 	jumps := &ReadOnlyP9{srv.File{}, bwr(jumpFileFn)}
 	jumps.Add(bufdir, "jumps", user, nil, 0440, jumps)
+	lsp := &ReadWriteP9{srv.File{}, bwr(readLspFn), bww(writeLspFn)}
+	lsp.Add(bufdir, "lsp", user, nil, 0660, lsp)
 }
 
 func FsRemoveEditor(n int) {
@@ -1222,3 +1225,50 @@ func clunkLogFileFn(conn string) error {
 	}
 	return nil
 }
+
+var lspout = make(map[int]string)
+
+func readLspFn(i int, off int64) ([]byte, syscall.Errno) {
+	if off > 0 {
+		return []byte{}, 0
+	}
+	ec := bufferExecContext(i)
+	if ec == nil {
+		return nil, syscall.ENOENT
+	}
+	return []byte(lspout[i]), 0
+}
+
+func writeLspFn(i int, data []byte, off int64) syscall.Errno {
+	ec := bufferExecContext(i)
+	if ec == nil {
+		return syscall.ENOENT
+	}
+	srv, lspb := lsp.BufferToLsp(Wnd.tagbuf.Dir, ec.ed.bodybuf, ec.ed.sfr.Fr.Sel, true, Warn, defaultLookForLsp)
+	if srv == nil {
+		return syscall.EIO
+	}
+
+	v := strings.SplitN(string(data), " ", 2)
+	arg := v[0]
+	var rest string
+	if len(v) > 1 {
+		rest = v[1]
+	}
+
+	switch arg {
+	case "refs":
+		lspout[i] = srv.References(lspb)
+	case "ca":
+		lspout[i] = ""
+		srv.ExecCodeAction(lspb, rest, executeLspTextEdits, func(tolook string) {
+			Load(*ec, 0, false, []rune(tolook))
+		})
+	case "symbol":
+		lspout[i] = srv.WorkspaceSymbol(rest)
+	default:
+		return syscall.EIO
+	}
+
+	return 0
+}

lsp/lsp.go

@@ -1,6 +1,7 @@
 package lsp
 
 import (
+	"bytes"
 	"context"
 	"encoding/json"
 	"fmt"
@@ -296,8 +297,9 @@ func (srv *LspSrv) References(a LspBufferPos) string {
 	return appendLocs("", locs, a.Path, a.Ln)
 }
 
+const sillyURI = "file://"
+
 func appendLocs(s string, defs []locationAndKind, curPath string, ln int) string {
-	const sillyURI = "file://"
 	if len(defs) <= 0 {
 		return s
 	}
@@ -468,7 +470,51 @@ func (srv *LspSrv) ExecCodeAction(a LspBufferPos, rest string, execEdit func([]T
 		srv.look = oldlook
 	}()
 	var out any
-	srv.conn.Call(context.Background(), "workspace/executeCommand", &ExecuteCommandParams{Command: cmd.Command, Arguments: cmd.Arguments}, out)
+	srv.conn.Call(context.Background(), "workspace/executeCommand", &ExecuteCommandParams{Command: cmd.Command, Arguments: cmd.Arguments}, &out)
+}
+
+var kindToString = map[SymbolKind]string{
+	1:  "File",
+	2:  "Module",
+	3:  "Namespace",
+	4:  "Package",
+	5:  "Class",
+	6:  "Method",
+	7:  "Property",
+	8:  "Field",
+	9:  "Constructor",
+	10: "Enum",
+	11: "Interface",
+	12: "Function",
+	13: "Variable",
+	14: "Constant",
+	15: "String",
+	16: "Number",
+	17: "Boolean",
+	18: "Array",
+	19: "Object",
+	20: "Key",
+	21: "Null",
+	22: "EnumMember",
+	23: "Struct",
+	24: "Event",
+	25: "Operator",
+	26: "TypeParameter",
+}
+
+func (srv *LspSrv) WorkspaceSymbol(query string) string {
+	var out []SymbolInformation
+	err := srv.conn.Call(context.Background(), "workspace/symbol", &WorkspaceSymbolParams{Query: query}, &out)
+	lspLog(fmt.Sprintf("workspace/symbol %q %v\n", query, err))
+	var buf bytes.Buffer
+	for i := range out {
+		uri := out[i].Location.URI
+		if strings.HasPrefix(uri, sillyURI) {
+			uri = uri[len(sillyURI):]
+		}
+		fmt.Fprintf(&buf, "%s:%d %s %s\n", uri, out[i].Location.Range.Start.Line+1, kindToString[out[i].Kind], out[i].Name)
+	}
+	return buf.String()
 }
 
 func issfx(a, b []uint16) bool {