Simplify Language.FindHoverInformation

pherrymason · Jan 14, 2024 · 5ee17d3 · 5ee17d3
1 parent 6700bca
commit 5ee17d3
Show file tree

Hide file tree

Showing 7 changed files with 42 additions and 25 deletions.
diff --git a/server/lsp/indexables/enum.go b/server/lsp/indexables/enum.go
@@ -74,3 +74,7 @@ func (e Enum) GetEnumerator(identifier string) Enumerator {
 
 	panic(fmt.Sprint(identifier, " enumerator not found"))
 }
+
+func (e Enum) GetHoverInfo() string {
+	return e.name
+}
diff --git a/server/lsp/indexables/enumerator.go b/server/lsp/indexables/enumerator.go
@@ -1,6 +1,9 @@
 package indexables
 
-import "github.com/tliron/glsp/protocol_3_16"
+import (
+	"fmt"
+	"github.com/tliron/glsp/protocol_3_16"
+)
 
 type Enumerator struct {
 	name  string
@@ -39,3 +42,7 @@ func (e Enumerator) GetDeclarationRange() Range {
 func (e Enumerator) GetDocumentRange() Range {
 	return e.documentRange
 }
+
+func (e Enumerator) GetHoverInfo() string {
+	return fmt.Sprintf("%s: %s", e.name, e.value)
+}
diff --git a/server/lsp/indexables/function.go b/server/lsp/indexables/function.go
@@ -1,6 +1,9 @@
 package indexables
 
-import protocol "github.com/tliron/glsp/protocol_3_16"
+import (
+	"fmt"
+	protocol "github.com/tliron/glsp/protocol_3_16"
+)
 
 type FunctionType int
 
@@ -99,3 +102,7 @@ func (f Function) AddFunction(f2 *Function) {
 func (f Function) AddStruct(s Struct) {
 	f.Structs[s.name] = s
 }
+
+func (f Function) GetHoverInfo() string {
+	return fmt.Sprintf("%s %s()", f.GetReturnType(), f.GetName())
+}
diff --git a/server/lsp/indexables/indexable.go b/server/lsp/indexables/indexable.go
@@ -11,6 +11,7 @@ type Indexable interface {
 	GetDocumentURI() string
 	GetDeclarationRange() Range
 	GetDocumentRange() Range
+	GetHoverInfo() string
 }
 
 type IndexableCollection []Indexable

diff --git a/server/lsp/indexables/struct.go b/server/lsp/indexables/struct.go
@@ -1,6 +1,9 @@
 package indexables
 
-import protocol "github.com/tliron/glsp/protocol_3_16"
+import (
+	"fmt"
+	protocol "github.com/tliron/glsp/protocol_3_16"
+)
 
 type Struct struct {
 	name    string
@@ -51,3 +54,7 @@ func NewStructMember(name string, baseType string, posRange Range) StructMember
 		posRange: posRange,
 	}
 }
+
+func (s Struct) GetHoverInfo() string {
+	return fmt.Sprintf("%s", s.name)
+}
diff --git a/server/lsp/indexables/variable.go b/server/lsp/indexables/variable.go
@@ -1,6 +1,9 @@
 package indexables
 
-import protocol "github.com/tliron/glsp/protocol_3_16"
+import (
+	"fmt"
+	protocol "github.com/tliron/glsp/protocol_3_16"
+)
 
 type Variable struct {
 	Name string
@@ -43,3 +46,7 @@ func (v Variable) GetDeclarationRange() Range {
 func (v Variable) GetDocumentRange() Range {
 	return v.documentRange
 }
+
+func (v Variable) GetHoverInfo() string {
+	return fmt.Sprintf("%s %s", v.GetType(), v.GetName())
+}
diff --git a/server/lsp/language.go b/server/lsp/language.go
@@ -3,7 +3,6 @@ package lsp
 import "C"
 import (
 	"errors"
-	"fmt"
 	"github.com/pherrymason/c3-lsp/lsp/indexables"
 	protocol "github.com/tliron/glsp/protocol_3_16"
 )
@@ -67,30 +66,15 @@ func (l *Language) FindHoverInformation(doc *Document, params *protocol.HoverPar
 
 	identifier := l.findClosestSymbolDeclaration(word, params.TextDocument.URI, params.Position)
 
-	// TODO: Move below code to a factory, and to be called from server so Language has less knowledge about LSP protocol.
 	// expected behaviour:
 	// hovering on variables: display variable type + any description
 	// hovering on functions: display function signature
 	// hovering on members: same as variable
-	var hover protocol.Hover
-	switch v := identifier.(type) {
-	case indexables.Variable:
-		hover = protocol.Hover{
-			Contents: protocol.MarkupContent{
-				Kind:  protocol.MarkupKindMarkdown,
-				Value: fmt.Sprintf("%s %s", v.GetType(), v.GetName()),
-			},
-		}
-
-	case *indexables.Function:
-		hover = protocol.Hover{
-			Contents: protocol.MarkupContent{
-				Kind:  protocol.MarkupKindMarkdown,
-				Value: fmt.Sprintf("%s %s()", v.GetReturnType(), v.GetName()),
-			},
-		}
-	case *indexables.Struct:
-	default:
+	hover := protocol.Hover{
+		Contents: protocol.MarkupContent{
+			Kind:  protocol.MarkupKindMarkdown,
+			Value: identifier.GetHoverInfo(),
+		},
 	}
 
 	return hover, nil