e370589 · ghcide · git.iko.soy

on master help sign in

Switch Hover from MarkedString to MarkupContent (#1473)

e370589Moritz Kiefer7 years ago

src/Development/IDE/Functions/AtPoint.hs+1−1

@@ -58,7 +58,7 @@ atPoint tcs srcSpans pos = do

58 SpanInfo{..} <- listToMaybe $ orderSpans $ spansAtPoint pos srcSpans

59 ty <- spaninfoType

60 let mbName = getNameM spaninfoSource

61− mbDefinedAt = HoverHeading . ("Defined " <>) . T.pack . showSDocUnsafe . pprNameDefnLoc <$> mbName

61+ mbDefinedAt = fmap (\name -> HoverMarkdown $ "**Defined " <> T.pack (showSDocUnsafe $ pprNameDefnLoc name) <> "**\n") mbName

62 mbDocs = fmap (\name -> getDocumentation name tcs) mbName

63 docInfo = maybe [] (map HoverMarkdown . docHeaders) mbDocs

64 range = Range

src/Development/IDE/Types/LSP.hs+1−4

@@ -16,9 +16,7 @@ import Development.IDE.Types.Diagnostics

17-- | Different types of content we can show on hover.

18data HoverText

19− = HoverHeading !T.Text

20− -- ^ A header that explains the content below it.

21− | HoverDamlCode !T.Text

19+ = HoverDamlCode !T.Text

22 -- ^ Highlighted DAML-Code

20 -- ^ Highlighted DAML-Code

23 | HoverMarkdown !T.Text

21 | HoverMarkdown !T.Text

24 -- ^ Markdown text.

22 -- ^ Markdown text.

@@ -26,7 +24,6 @@ data HoverText

27getHoverTextContent :: HoverText -> T.Text

25getHoverTextContent :: HoverText -> T.Text

28getHoverTextContent = \case

26getHoverTextContent = \case

29− HoverHeading t -> t

30 HoverDamlCode t -> t

27 HoverDamlCode t -> t

31 HoverMarkdown t -> t

28 HoverMarkdown t -> t