From f049612b13a6ba743e58b983afa9c9a2aaf88e9e Mon Sep 17 00:00:00 2001
From: Chris Simon <chris@devcycles.io>
Date: Fri, 12 Jan 2024 11:52:59 +0000
Subject: [PATCH] Fix merge/rebase issues in language server Hover.fs

---
 .../Contextive.LanguageServer/Hover.fs        | 41 +------------------
 1 file changed, 1 insertion(+), 40 deletions(-)

diff --git a/src/language-server/Contextive.LanguageServer/Hover.fs b/src/language-server/Contextive.LanguageServer/Hover.fs
index ec6ad708..bad940c4 100644
--- a/src/language-server/Contextive.LanguageServer/Hover.fs
+++ b/src/language-server/Contextive.LanguageServer/Hover.fs
@@ -40,11 +40,6 @@ module private Filtering =
         | Seq.Empty -> terms
         | _ -> relevantTerms
 
-let private getTokenAtPosition (p: HoverParams) (tokenFinder: TextDocument.TokenFinder) =
-    match p.TextDocument with
-    | null -> None
-    | document -> tokenFinder (document.Uri) p.Position
-
     let findMatchingTerms (tokenAndCandidateTerms: CandidateTerms.TokenAndCandidateTerms seq) =
         Seq.filter (fun t ->
             let candidateMatchesTerm = termEqualsToken t
@@ -76,42 +71,8 @@ let private hoverResult (contexts: Definitions.FindResult) =
     | None -> Lsp.noHoverResult
     | Some(c) -> Hover(Contents = (c |> Lsp.markupContent))
 
-let private getContextHeading (context: Definitions.Context) =
-    match context.Name with
-    | null | "" -> None
-    | _ -> Some $"### 💠 {context.Name} Context"
-
-let private getContextDomainVisionStatement (context: Definitions.Context) =
-    match context.DomainVisionStatement with
-    | null | "" -> None
-    | _ -> Some $"_Vision: {context.DomainVisionStatement}_"
-
-let private getContextHover (tokenAndCandidateTerms: CandidateTerms.TokenAndCandidateTerms seq) (context: Definitions.Context) =
-    let relevantTerms = CandidateTerms.filterRelevantTerms context.Terms tokenAndCandidateTerms
-    if Seq.length relevantTerms = 0 then
-        None
-    else
-        [getTermHoverContent relevantTerms]
-        |> Seq.append
-            ([getContextHeading; getContextDomainVisionStatement]
-            |> Seq.map (fun f -> f context))
-        |> concatWithNewLinesIfExists
-
-let private ContextSeparator = "\n\n***\n\n"
-
-let private getContextsHoverContent (tokenAndCandidateTerms: CandidateTerms.TokenAndCandidateTerms seq) (contexts: Definitions.FindResult)  =
-    contexts
-    |> Seq.map (getContextHover tokenAndCandidateTerms)
-    |> concatIfExists ContextSeparator
-
-let private hoverResult (tokensAndCandidateTerms:  CandidateTerms.TokenAndCandidateTerms seq) (contexts: Definitions.FindResult) =
-    let content = getContextsHoverContent tokensAndCandidateTerms contexts
-    match content with
-    | None -> noHoverResult
-    | Some(c) -> Hover(Contents = (c |> markupContent))
-
 let private hoverContentForToken (uri:string) (termFinder:Definitions.Finder) (tokensAndCandidateTerms: CandidateTerms.TokenAndCandidateTerms seq) = async {
-        let! findResult = termFinder uri (CandidateTerms.termFilterForCandidateTerms tokensAndCandidateTerms)
+        let! findResult = termFinder uri (Filtering.termFilterForCandidateTerms tokensAndCandidateTerms)
         return
             if Seq.isEmpty findResult then
                 Lsp.noHoverResult