From 49f16f5c3e7e53cef19619475920a5e05c0ead0e Mon Sep 17 00:00:00 2001
From: Felix Becker <felix.b@outlook.com>
Date: Wed, 19 Oct 2016 03:39:28 +0200
Subject: [PATCH] Improve hover output

---
 src/Server/TextDocument.php             | 10 +++++-----
 tests/Server/TextDocument/HoverTest.php |  6 +++---
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/Server/TextDocument.php b/src/Server/TextDocument.php
index c85acde..0d3bb2f 100644
--- a/src/Server/TextDocument.php
+++ b/src/Server/TextDocument.php
@@ -178,10 +178,6 @@ class TextDocument
             return null;
         }
         $contents = [];
-        $docBlock = $def->getAttribute('docBlock');
-        if ($docBlock !== null) {
-            $contents[] = $docBlock->getSummary();
-        }
         $defLine = clone $def;
         $defLine->setAttribute('comments', []);
         if (isset($defLine->stmts)) {
@@ -190,7 +186,11 @@ class TextDocument
         $defText = $this->prettyPrinter->prettyPrint([$defLine]);
         $lines = explode("\n", $defText);
         if (isset($lines[0])) {
-            $contents[] = new MarkedString('php', $lines[0]);
+            $contents[] = new MarkedString('php', "<?php\n" . $lines[0]);
+        }
+        $docBlock = $def->getAttribute('docBlock');
+        if ($docBlock !== null) {
+            $contents[] = $docBlock->getSummary();
         }
         return new Hover($contents, Range::fromNode($node));
     }
diff --git a/tests/Server/TextDocument/HoverTest.php b/tests/Server/TextDocument/HoverTest.php
index 67456f8..848616c 100644
--- a/tests/Server/TextDocument/HoverTest.php
+++ b/tests/Server/TextDocument/HoverTest.php
@@ -18,8 +18,8 @@ class HoverTest extends ServerTestCase
         $reference = $this->getReferenceLocations('TestClass')[0];
         $result = $this->textDocument->hover(new TextDocumentIdentifier($reference->uri), $reference->range->start);
         $this->assertEquals(new Hover([
-            'Pariatur ut laborum tempor voluptate consequat ea deserunt.',
-            new MarkedString('php', 'class TestClass implements \\TestInterface')
+            new MarkedString('php', "<?php\nclass TestClass implements \\TestInterface"),
+            'Pariatur ut laborum tempor voluptate consequat ea deserunt.'
         ], $reference->range), $result);
     }
 
@@ -30,7 +30,7 @@ class HoverTest extends ServerTestCase
         $uri = pathToUri(realpath(__DIR__ . '/../../../fixtures/references.php'));
         $result = $this->textDocument->hover(new TextDocumentIdentifier($uri), new Position(13, 7));
         $this->assertEquals(new Hover(
-            [new MarkedString('php', '$var = 123;')],
+            [new MarkedString('php', "<?php\n\$var = 123;")],
             new Range(new Position(13, 5), new Position(13, 9))
         ), $result);
     }