Fix edge case in LSP symbol doc hover

private/buf/buflsp/hover_test.go

@@ -167,6 +167,20 @@ func TestHover(t *testing.T) {
 			character:        3,  // On "map" keyword
 			expectedContains: "language-spec#maps",
 		},
+		{
+			name:          "hover_on_message_after_import_with_trailing_comment",
+			protoFile:     "testdata/hover/unused_import.proto",
+			line:          4, // Line with "message TestTopLevel {"
+			character:     8, // On "TestTopLevel"
+			expectNoHover: true,
+		},
+		{
+			name:          "hover_on_message_after_import_with_trailing_comment_no_blank_line",
+			protoFile:     "testdata/hover/unused_import_no_blank_line.proto",
+			line:          3, // Line with "message TestTopLevel {}"
+			character:     8, // On "TestTopLevel"
+			expectNoHover: true,
+		},
 	}
 
 	for _, tt := range tests {

private/buf/buflsp/symbol.go

@@ -555,22 +555,28 @@ func (s *symbol) getDocsFromComments() string {
 	// traversing backwards for leading comments only.
 	tok, _ := def.Context().Stream().Around(def.Span().Start)
 	cursor := token.NewCursorAt(tok)
-	var seenNewline bool
+	// Count consecutive newlines. If we accumulate 2+ without encountering a comment,
+	// there's a blank line separating the comments from the symbol.
+	newlinesSeen := 0
+	if tok.Kind() == token.Space {
+		newlinesSeen = strings.Count(tok.Text(), "\n")
+		if newlinesSeen >= 2 {
+			return ""
+		}
+	}
 	for {
 		t := cursor.PrevSkippable()
 		if t.Kind() == token.Comment {
-			text := commentToMarkdown(t.Text())
-			if seenNewline {
-				text += "\n"
+			if isTrailingComment(t) {
+				break
 			}
-			seenNewline = false
+			text := commentToMarkdown(t.Text()) + "\n"
+			newlinesSeen = 0
 			comments = append(comments, text)
 		} else if t.Kind() == token.Space {
-			if strings.Contains(t.Text(), "\n") {
-				if seenNewline {
-					break
-				}
-				seenNewline = true
+			newlinesSeen += strings.Count(t.Text(), "\n")
+			if newlinesSeen >= 2 {
+				break
 			}
 		} else {
 			break
@@ -795,3 +801,19 @@ func plural(i int) string {
 	}
 	return "s"
 }
+
+// isTrailingComment returns true if the comment has code on the same line before it.
+func isTrailingComment(t token.Token) bool {
+	if t.Kind() != token.Comment {
+		return false
+	}
+	for c := token.NewCursorAt(t); ; {
+		p := c.PrevSkippable()
+		if p.IsZero() || strings.Contains(p.Text(), "\n") {
+			return false
+		}
+		if p.Kind() != token.Space {
+			return true
+		}
+	}
+}

private/buf/buflsp/testdata/hover/unused_import.proto

@@ -0,0 +1,6 @@
+syntax = "proto3";
+
+import "google/protobuf/cpp_features.proto"; // unused import
+
+message TestTopLevel {
+}

private/buf/buflsp/testdata/hover/unused_import_no_blank_line.proto

@@ -0,0 +1,4 @@
+syntax = "proto3";
+
+import "google/protobuf/cpp_features.proto"; // unused import
+message TestTopLevel {}