First steps towards reviving CodeLens

vsintegration/src/FSharp.Editor/CodeLens/CodeLensProvider.fs

@@ -28,51 +28,43 @@ type internal CodeLensProvider
         settings: EditorOptions
     ) =
 
-    let lineLensProvider = ResizeArray()
+    let tryGetTextDocument (buffer: ITextBuffer) (factory: ITextDocumentFactoryService) = 
+        match factory.TryGetTextDocument buffer with
+        | true, document -> Some document
+        | _ -> None
+
     let taggers = ResizeArray()
+    let lineLensProviders = ResizeArray()
     let componentModel = Package.GetGlobalService(typeof<ComponentModelHost.SComponentModel>) :?> ComponentModelHost.IComponentModel
     let workspace = componentModel.GetService<VisualStudioWorkspace>()
 
-    /// Returns an provider for the textView if already one has been created. Else create one.
-    let addCodeLensProviderOnce wpfView buffer =
-        let res = taggers |> Seq.tryFind(fun (view, _) -> view = wpfView)
-        match res with
-        | Some (_, (tagger, _)) -> tagger
-        | None ->
-            let documentId = 
-                lazy (
-                    match textDocumentFactory.TryGetTextDocument(buffer) with
-                    | true, textDocument ->
-                         Seq.tryHead (workspace.CurrentSolution.GetDocumentIdsWithFilePath(textDocument.FilePath))
-                    | _ -> None
-                    |> Option.get
-                )
-
-            let tagger = CodeLensGeneralTagger(wpfView, buffer)
-            let service = FSharpCodeLensService(serviceProvider, workspace, documentId, buffer, metadataAsSource, componentModel.GetService(), typeMap, tagger, settings)
-            let provider = (wpfView, (tagger, service))
-            wpfView.Closed.Add (fun _ -> taggers.Remove provider |> ignore)
-            taggers.Add((wpfView, (tagger, service)))
-            tagger
+    let tryGetCodeLensTagger wpfView buffer =
+        taggers 
+        |> Seq.tryFind (fun (view, _) -> view = wpfView) 
+        |> Option.map (fun (_, (tagger, _)) -> tagger)
+        |> Option.orElse
+            (textDocumentFactory 
+            |> tryGetTextDocument buffer
+            |> Option.map (fun document -> workspace.CurrentSolution.GetDocumentIdsWithFilePath document.FilePath)
+            |> Option.bind Seq.tryHead
+            |> Option.map (fun documentId -> 
+                let tagger = CodeLensGeneralTagger(wpfView, buffer)
+                let service = FSharpCodeLensService(serviceProvider, workspace, documentId, buffer, metadataAsSource, componentModel.GetService(), typeMap, tagger, settings)
+                let provider = (wpfView, (tagger, service))
+                wpfView.Closed.Add (fun _ -> taggers.Remove provider |> ignore)
+                taggers.Add provider
+                tagger))
 
-    /// Returns an provider for the textView if already one has been created. Else create one.
-    let addLineLensProviderOnce wpfView buffer =
-        let res = lineLensProvider |> Seq.tryFind(fun (view, _) -> view = wpfView)
-        match res with
-        | None ->
-            let documentId = 
-                lazy (
-                    match textDocumentFactory.TryGetTextDocument(buffer) with
-                    | true, textDocument ->
-                         Seq.tryHead (workspace.CurrentSolution.GetDocumentIdsWithFilePath(textDocument.FilePath))
-                    | _ -> None
-                    |> Option.get
-                )
+    let addLineLensProvider wpfView buffer =
+        textDocumentFactory
+        |> tryGetTextDocument buffer
+        |> Option.map (fun document -> workspace.CurrentSolution.GetDocumentIdsWithFilePath(document.FilePath))
+        |> Option.bind Seq.tryHead
+        |> Option.map (fun documentId ->
             let service = FSharpCodeLensService(serviceProvider, workspace, documentId, buffer, metadataAsSource, componentModel.GetService(), typeMap, LineLensDisplayService(wpfView, buffer), settings)
             let provider = (wpfView, service)
-            wpfView.Closed.Add (fun _ -> lineLensProvider.Remove provider |> ignore)
-            lineLensProvider.Add(provider)
-        | _ -> ()
+            wpfView.Closed.Add (fun _ -> lineLensProviders.Remove provider |> ignore)
+            lineLensProviders.Add(provider))
 
     [<Export(typeof<AdornmentLayerDefinition>); Name("CodeLens");
       Order(Before = PredefinedAdornmentLayers.Text);
@@ -92,11 +84,18 @@ type internal CodeLensProvider
                     | :? IWpfTextView as view -> view
                     | _ -> failwith "error"
             
-                box(addCodeLensProviderOnce wpfView buffer) :?> _
+                match tryGetCodeLensTagger wpfView buffer with
+                | Some tagger -> box tagger :?> _
+                | None -> null
             else
                 null
 
     interface IWpfTextViewCreationListener with
         override _.TextViewCreated view =
             if settings.CodeLens.Enabled && settings.CodeLens.ReplaceWithLineLens then
-                addLineLensProviderOnce view (view.TextBuffer) |> ignore
\ No newline at end of file
+                let provider = 
+                    lineLensProviders 
+                    |> Seq.tryFind (fun (v, _) -> v = view)
+
+                if provider.IsNone then
+                    addLineLensProvider view (view.TextBuffer) |> ignore
\ No newline at end of file

vsintegration/src/FSharp.Editor/CodeLens/FSharpCodeLensService.fs

@@ -42,7 +42,7 @@ type internal FSharpCodeLensService
     (
         serviceProvider: IServiceProvider,
         workspace: Workspace, 
-        documentId: Lazy<DocumentId>,
+        documentId: DocumentId,
         buffer: ITextBuffer, 
         metadataAsSource: FSharpMetadataAsSourceService,
         classificationFormatMapService: IClassificationFormatMapService,
@@ -153,7 +153,7 @@ type internal FSharpCodeLensService
 #if DEBUG
             logInfof "Rechecking code due to buffer edit!"
 #endif
-            let! document = workspace.CurrentSolution.GetDocument(documentId.Value) |> Option.ofObj
+            let! document = workspace.CurrentSolution.GetDocument documentId |> Option.ofObj
             let! parseFileResults, checkFileResults = document.GetFSharpParseAndCheckResultsAsync(nameof(FSharpUseMutationWhenValueIsMutableFixProvider)) |> liftAsync
             let parsedInput = parseFileResults.ParseTree
 #if DEBUG