git.iko.soy/ghcide
on master help sign in
Switch Hover from MarkedString to MarkupContent (#1473)

MarkedString is deprecated in LSP (both the protocol itself and the Haskell library) so we should move away from it.

commite370589e7785d4e6851641b145b30bc3700bce08 authorMoritz Kiefer <moritz.kiefer@purelyfunctional.org> dateFri 31 May 2019, 15:43 (7 years ago) parent6cba2e5
2 files changed+2−5
compare with master
unifiedsplit
src/Development/IDE/Functions/AtPoint.hs+1−1 src/Development/IDE/Types/LSP.hs+1−4
src/Development/IDE/Functions/AtPoint.hs+1−1
@@ -58,7 +58,7 @@ atPoint tcs srcSpans pos = do
5858 SpanInfo{..} <- listToMaybe $ orderSpans $ spansAtPoint pos srcSpans
5959 ty <- spaninfoType
6060 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
6262 mbDocs = fmap (\name -> getDocumentation name tcs) mbName
6363 docInfo = maybe [] (map HoverMarkdown . docHeaders) mbDocs
6464 range = Range
src/Development/IDE/Types/LSP.hs+1−4
@@ -16,9 +16,7 @@ import Development.IDE.Types.Diagnostics
1616
1717-- | Different types of content we can show on hover.
1818data HoverText
19− = HoverHeading !T.Text
20− -- ^ A header that explains the content below it.
21− | HoverDamlCode !T.Text
19+ = HoverDamlCode !T.Text
2220 -- ^ Highlighted DAML-Code
2321 | HoverMarkdown !T.Text
2422 -- ^ Markdown text.
@@ -26,7 +24,6 @@ data HoverText
2624
2725getHoverTextContent :: HoverText -> T.Text
2826getHoverTextContent = \case
29− HoverHeading t -> t
3027 HoverDamlCode t -> t
3128 HoverMarkdown t -> t
3229