Merge pull request #32 from joyme123/fix-document-symbols

fix: fix document symbols
joyme123 · Nov 28, 2023 · bee9c15 · bee9c15
2 parents d2c02f5 + 3b33ea4
commit bee9c15
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 21 deletions.
diff --git a/README.md b/README.md
@@ -15,6 +15,7 @@ thrift-ls implements language server protocol
 - dignostic
 - rename
 - format
+- document symbols
 
 ## As Thrift Langugae Server
 
@@ -72,4 +73,6 @@ config file default location:
 - windows: `C:\Users\${user}\.thriftls\config.yaml`
 - macos, linux: `~/.thriftls/config.yaml`
 
+## TODO
 
+[] optimize code completion
diff --git a/lsp/symbols/const.go b/lsp/symbols/const.go
@@ -14,8 +14,8 @@ func ConstSymbol(cst *parser.Const) *protocol.DocumentSymbol {
 	res := &protocol.DocumentSymbol{
 		Name:           cst.Name.Name.Text,
 		Kind:           protocol.SymbolKindConstant,
-		Range:          lsputils.ASTNodeToRange(cst),
-		SelectionRange: lsputils.ASTNodeToRange(cst),
+		Range:          lsputils.ASTNodeToRange(cst.Name.Name),
+		SelectionRange: lsputils.ASTNodeToRange(cst.Name.Name),
 	}
 
 	return res

diff --git a/lsp/symbols/enum.go b/lsp/symbols/enum.go
@@ -17,8 +17,8 @@ func EnumSymbol(enum *parser.Enum) *protocol.DocumentSymbol {
 		Name:           enum.Name.Name.Text,
 		Detail:         "Enum",
 		Kind:           protocol.SymbolKindEnum,
-		Range:          lsputils.ASTNodeToRange(enum),
-		SelectionRange: lsputils.ASTNodeToRange(enum),
+		Range:          lsputils.ASTNodeToRange(enum.Name.Name),
+		SelectionRange: lsputils.ASTNodeToRange(enum.Name.Name),
 	}
 
 	for i := range enum.Values {
@@ -42,8 +42,8 @@ func EnumValueSymbol(v *parser.EnumValue) *protocol.DocumentSymbol {
 		Name:           v.Name.Name.Text,
 		Detail:         strconv.FormatInt(v.Value, 10),
 		Kind:           protocol.SymbolKindNumber,
-		Range:          lsputils.ASTNodeToRange(v),
-		SelectionRange: lsputils.ASTNodeToRange(v),
+		Range:          lsputils.ASTNodeToRange(v.Name.Name),
+		SelectionRange: lsputils.ASTNodeToRange(v.Name.Name),
 	}
 
 	return res

diff --git a/lsp/symbols/field.go b/lsp/symbols/field.go
@@ -14,16 +14,16 @@ func FieldSymbol(field *parser.Field) *protocol.DocumentSymbol {
 
 	detail := ""
 	if field.RequiredKeyword != nil {
-		detail = field.RequiredKeyword.Literal.Text
+		detail = field.RequiredKeyword.Literal.Text + " "
 	}
 	detail += format.MustFormatFieldType(field.FieldType)
 
 	res := &protocol.DocumentSymbol{
 		Name:           field.Identifier.Name.Text,
 		Detail:         detail,
 		Kind:           protocol.SymbolKindField,
-		Range:          lsputils.ASTNodeToRange(field),
-		SelectionRange: lsputils.ASTNodeToRange(field),
+		Range:          lsputils.ASTNodeToRange(field.Identifier.Name),
+		SelectionRange: lsputils.ASTNodeToRange(field.Identifier.Name),
 	}
 
 	return res

diff --git a/lsp/symbols/service.go b/lsp/symbols/service.go
@@ -14,8 +14,8 @@ func ServiceSymbol(svc *parser.Service) *protocol.DocumentSymbol {
 	res := &protocol.DocumentSymbol{
 		Name:           svc.Name.Name.Text,
 		Kind:           protocol.SymbolKindInterface,
-		Range:          lsputils.ASTNodeToRange(svc),
-		SelectionRange: lsputils.ASTNodeToRange(svc),
+		Range:          lsputils.ASTNodeToRange(svc.Name.Name),
+		SelectionRange: lsputils.ASTNodeToRange(svc.Name.Name),
 	}
 
 	for i := range svc.Functions {
@@ -37,8 +37,8 @@ func FunctionSymbol(fn *parser.Function) *protocol.DocumentSymbol {
 	res := &protocol.DocumentSymbol{
 		Name:           fn.Name.Name.Text,
 		Kind:           protocol.SymbolKindFunction,
-		Range:          lsputils.ASTNodeToRange(fn),
-		SelectionRange: lsputils.ASTNodeToRange(fn),
+		Range:          lsputils.ASTNodeToRange(fn.Name.Name),
+		SelectionRange: lsputils.ASTNodeToRange(fn.Name.Name),
 	}
 
 	return res

diff --git a/lsp/symbols/struct_like.go b/lsp/symbols/struct_like.go
@@ -15,8 +15,8 @@ func StructSymbol(st *parser.Struct) *protocol.DocumentSymbol {
 		Name:           st.Identifier.Name.Text,
 		Detail:         "Struct",
 		Kind:           protocol.SymbolKindStruct,
-		Range:          lsputils.ASTNodeToRange(st),
-		SelectionRange: lsputils.ASTNodeToRange(st),
+		Range:          lsputils.ASTNodeToRange(st.Identifier.Name),
+		SelectionRange: lsputils.ASTNodeToRange(st.Identifier.Name),
 	}
 
 	for i := range st.Fields {
@@ -40,8 +40,8 @@ func UnionSymbol(un *parser.Union) *protocol.DocumentSymbol {
 		Name:           un.Name.Name.Text,
 		Detail:         "Union",
 		Kind:           protocol.SymbolKindStruct,
-		Range:          lsputils.ASTNodeToRange(un),
-		SelectionRange: lsputils.ASTNodeToRange(un),
+		Range:          lsputils.ASTNodeToRange(un.Name.Name),
+		SelectionRange: lsputils.ASTNodeToRange(un.Name.Name),
 	}
 
 	for i := range un.Fields {
@@ -65,8 +65,8 @@ func ExceptionSymbol(ex *parser.Exception) *protocol.DocumentSymbol {
 		Name:           ex.Name.Name.Text,
 		Detail:         "Exception",
 		Kind:           protocol.SymbolKindStruct,
-		Range:          lsputils.ASTNodeToRange(ex),
-		SelectionRange: lsputils.ASTNodeToRange(ex),
+		Range:          lsputils.ASTNodeToRange(ex.Name.Name),
+		SelectionRange: lsputils.ASTNodeToRange(ex.Name.Name),
 	}
 
 	for i := range ex.Fields {

diff --git a/lsp/symbols/typedef.go b/lsp/symbols/typedef.go
@@ -12,8 +12,8 @@ func TypedefSymbol(td *parser.Typedef) *protocol.DocumentSymbol {
 		Name:           td.Alias.Name.Text,
 		Detail:         format.MustFormatFieldType(td.T),
 		Kind:           protocol.SymbolKindTypeParameter,
-		Range:          lsputils.ASTNodeToRange(td),
-		SelectionRange: lsputils.ASTNodeToRange(td),
+		Range:          lsputils.ASTNodeToRange(td.Alias.Name),
+		SelectionRange: lsputils.ASTNodeToRange(td.Alias.Name),
 	}
 
 	return res