Merge pull request #41 from joyme123/fix-hover-markdown

fix(hover): fix hover markdown syntax

format/document.go

@@ -29,6 +29,10 @@ func FormatDocumentWithValidation(doc *parser.Document, selfValidation bool) (st
 
 	writeBuf := func(node parser.Node, addtionalLine bool) {
 		if addtionalLine {
+			if len(buf.Bytes()) > 0 && buf.Bytes()[buf.Len()-1] != '\n' {
+				// if preNode doesn't have \n at end of line, set \n for it
+				buf.WriteString("\n")
+			}
 			buf.WriteString("\n")
 		}
 

format/document_test.go

@@ -165,6 +165,7 @@ exception Xception2 {
 }
 
 struct EmptyStruct {}
+
 struct OneField {
     1: EmptyStruct field
 }

lsp/hover.go

@@ -2,6 +2,7 @@ package lsp
 
 import (
 	"context"
+	"strings"
 
 	"github.com/joyme123/thrift-ls/lsp/codejump"
 	"go.lsp.dev/protocol"
@@ -25,10 +26,19 @@ func (s *Server) hover(ctx context.Context, params *protocol.HoverParams) (*prot
 		return nil, nil
 	}
 
+	markdown_prefix := "```thrift\n"
+	if strings.HasPrefix(content, "\n") {
+		markdown_prefix = "```thrift"
+	}
+	markdown_suffix := "\n```"
+	if strings.HasSuffix(content, "\n") {
+		markdown_suffix = "```"
+	}
+
 	return &protocol.Hover{
 		Contents: protocol.MarkupContent{
 			Kind:  protocol.Markdown,
-			Value: "```thrift\n" + content + "```",
+			Value: markdown_prefix + content + markdown_suffix,
 		},
 	}, nil
 }