Added textDocument/documentSymbol

Author: spoenemann

handler/handler.go

@@ -142,6 +142,10 @@ func (handler *InoHandler) transformClangdParams(method string, raw *json.RawMes
 		p := params.(*lsp.DocumentOnTypeFormattingParams)
 		uri = p.TextDocument.URI
 		err = handler.ino2cppDocumentOnTypeFormattingParams(p)
+	case "textDocument/documentSymbol":
+		p := params.(*lsp.DocumentSymbolParams)
+		uri = p.TextDocument.URI
+		err = handler.ino2cppTextDocumentIdentifier(&p.TextDocument)
 	}
 	return
 }
@@ -324,6 +328,9 @@ func (handler *InoHandler) transformClangdResult(method string, uri lsp.Document
 		for index := range *r {
 			handler.cpp2inoTextEdit(&(*r)[index], uri)
 		}
+	case "textDocument/documentSymbol":
+		r := result.(*[]DocumentSymbol)
+		handler.cpp2inoDocumentSymbol(r, uri)
 	}
 	return result
 }
@@ -402,6 +409,31 @@ func (handler *InoHandler) cpp2inoTextEdit(edit *lsp.TextEdit, uri lsp.DocumentU
 	}
 }
 
+func (handler *InoHandler) cpp2inoDocumentSymbol(symbols *[]DocumentSymbol, uri lsp.DocumentURI) {
+	if data, ok := handler.data[uri]; ok {
+		for i := 0; i < len(*symbols); {
+			symbol := &(*symbols)[i]
+			symbol.Range.Start.Line = data.sourceLineMap[symbol.Range.Start.Line]
+			symbol.Range.End.Line = data.sourceLineMap[symbol.Range.End.Line]
+			symbol.SelectionRange.Start.Line = data.sourceLineMap[symbol.SelectionRange.Start.Line]
+			symbol.SelectionRange.End.Line = data.sourceLineMap[symbol.SelectionRange.End.Line]
+
+			duplicate := false
+			for j := 0; j < i; j++ {
+				if symbol.Name == (*symbols)[j].Name && symbol.Range.Start.Line == (*symbols)[j].Range.Start.Line {
+					duplicate = true
+					break
+				}
+			}
+			if duplicate {
+				*symbols = (*symbols)[:i+copy((*symbols)[i:], (*symbols)[i+1:])]
+			} else {
+				i++
+			}
+		}
+	}
+}
+
 // FromClangd handles a message received from clangd.
 func (handler *InoHandler) FromClangd(ctx context.Context, connection *jsonrpc2.Conn, req *jsonrpc2.Request) (interface{}, error) {
 	params, _, err := handler.transformStdioParams(req.Method, req.Params)

handler/protocol.go

@@ -62,6 +62,10 @@ func readParams(method string, raw *json.RawMessage) (interface{}, error) {
 		params := new(lsp.DocumentOnTypeFormattingParams)
 		err := json.Unmarshal(*raw, params)
 		return params, err
+	case "textDocument/documentSymbol":
+		params := new(lsp.DocumentSymbolParams)
+		err := json.Unmarshal(*raw, params)
+		return params, err
 	case "textDocument/publishDiagnostics":
 		params := new(lsp.PublishDiagnosticsParams)
 		err := json.Unmarshal(*raw, params)
@@ -114,6 +118,10 @@ func sendRequest(ctx context.Context, conn *jsonrpc2.Conn, method string, params
 		result := new([]lsp.TextEdit)
 		err := conn.Call(ctx, method, params, result)
 		return result, err
+	case "textDocument/documentSymbol":
+		result := new([]DocumentSymbol)
+		err := conn.Call(ctx, method, params, result)
+		return result, err
 	case "window/showMessageRequest":
 		result := new(lsp.MessageActionItem)
 		err := conn.Call(ctx, method, params, result)
@@ -144,3 +152,14 @@ type MarkupContent struct {
 	Kind  string `json:"kind"`
 	Value string `json:"value"`
 }
+
+// DocumentSymbol structure according to LSP
+type DocumentSymbol struct {
+	Name           string           `json:"name"`
+	Detail         string           `json:"detail,omitempty"`
+	Kind           lsp.SymbolKind   `json:"kind"`
+	Deprecated     bool             `json:"deprecated,omitempty"`
+	Range          lsp.Range        `json:"range"`
+	SelectionRange lsp.Range        `json:"selectionRange"`
+	Children       []DocumentSymbol `json:"children,omitempty"`
+}