Removing some broken CodeLens behavior

Author: psfinaki

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

@@ -15,7 +15,6 @@ open Microsoft.CodeAnalysis.ExternalAccess.FSharp.Editor.Shared.Utilities
 
 [<Export(typeof<IWpfTextViewCreationListener>)>]
 [<Export(typeof<IViewTaggerProvider>)>]
-[<TagType(typeof<CodeLensGeneralTag>)>]
 [<ContentType(FSharpConstants.FSharpContentTypeName)>]
 [<TextViewRole(PredefinedTextViewRoles.Document)>]
 type internal CodeLensProvider  
@@ -33,28 +32,10 @@ type internal CodeLensProvider
         | 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>()
 
-    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))
-
     let addLineLensProvider wpfView buffer =
         textDocumentFactory
         |> tryGetTextDocument buffer
@@ -66,33 +47,14 @@ type internal CodeLensProvider
             wpfView.Closed.Add (fun _ -> lineLensProviders.Remove provider |> ignore)
             lineLensProviders.Add(provider))
 
-    [<Export(typeof<AdornmentLayerDefinition>); Name("CodeLens");
-      Order(Before = PredefinedAdornmentLayers.Text);
-      TextViewRole(PredefinedTextViewRoles.Document)>]
-    member val CodeLensAdornmentLayerDefinition : AdornmentLayerDefinition = null with get, set
-    
     [<Export(typeof<AdornmentLayerDefinition>); Name("LineLens");
       Order(Before = PredefinedAdornmentLayers.Text);
       TextViewRole(PredefinedTextViewRoles.Document)>]
     member val LineLensAdornmentLayerDefinition : AdornmentLayerDefinition = null with get, set
 
-    interface IViewTaggerProvider with
-        override _.CreateTagger(view, buffer) =
-            if settings.CodeLens.Enabled && not settings.CodeLens.ReplaceWithLineLens then
-                let wpfView =
-                    match view with
-                    | :? IWpfTextView as view -> view
-                    | _ -> failwith "error"
-            
-                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
+            if settings.CodeLens.Enabled then
                 let provider = 
                     lineLensProviders 
                     |> Seq.tryFind (fun (v, _) -> v = view)

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

@@ -126,7 +126,6 @@
     <Compile Include="AutomaticCompletion\BraceCompletionSessionProvider.fsi" />
     <Compile Include="AutomaticCompletion\BraceCompletionSessionProvider.fs" />
     <Compile Include="CodeLens\AbstractCodeLensDisplayService.fs" />
-    <Compile Include="CodeLens\CodeLensGeneralTagger.fs" />
     <Compile Include="CodeLens\LineLensDisplayService.fs" />
     <Compile Include="CodeLens\FSharpCodeLensService.fs" />
     <Compile Include="CodeLens\CodeLensProvider.fs" />

vsintegration/src/FSharp.Editor/FSharp.Editor.fsproj

@@ -75,13 +75,11 @@ type LanguageServicePerformanceOptions =
 [<CLIMutable>]
 type CodeLensOptions =
   { Enabled : bool
-    ReplaceWithLineLens: bool
     UseColors: bool
     Prefix : string }
     static member Default =
       { Enabled = false
         UseColors = false
-        ReplaceWithLineLens = true
         Prefix = "// " }
 
 [<CLIMutable>]

vsintegration/src/FSharp.Editor/Options/EditorOptions.fs

@@ -27,9 +27,6 @@
                             <CheckBox x:Name="useColors" IsChecked="{Binding UseColors}"
                                   Content="{x:Static local:Strings.CodeLens_UseColors}"
                                   IsEnabled="{Binding IsChecked, ElementName=enableCodeLens}"/>
-                            <CheckBox x:Name="replaceWithLineLens" IsChecked="{Binding ReplaceWithLineLens}"
-                                  Content="{x:Static local:Strings.CodeLens_Replace_LineLens}"
-                                  IsEnabled="{Binding IsChecked, ElementName=enableCodeLens}"/>
                             <Grid>
                                 <Grid.ColumnDefinitions>
                                     <ColumnDefinition Width="Auto"/>