From e954ed37db3cceb03c2b099189e7621e5ccf3a53 Mon Sep 17 00:00:00 2001 From: TIHan Date: Tue, 19 Mar 2019 10:34:39 -0700 Subject: [PATCH 1/2] Removed status bar updates until VS has a fix --- .../Navigation/GoToDefinition.fs | 39 ++++++++++--------- 1 file changed, 21 insertions(+), 18 deletions(-) diff --git a/vsintegration/src/FSharp.Editor/Navigation/GoToDefinition.fs b/vsintegration/src/FSharp.Editor/Navigation/GoToDefinition.fs index f664db8de1b..7c6ea1fa8df 100644 --- a/vsintegration/src/FSharp.Editor/Navigation/GoToDefinition.fs +++ b/vsintegration/src/FSharp.Editor/Navigation/GoToDefinition.fs @@ -115,38 +115,41 @@ type internal FSharpNavigableItem(document: Document, textSpan: TextSpan) = member __.DisplayTaggedParts = ImmutableArray.Empty member __.ChildItems = ImmutableArray.Empty +// TODO: Uncomment code when VS has a fix for updating the status bar. type internal StatusBar(statusBar: IVsStatusbar) = - let mutable searchIcon = int16 Microsoft.VisualStudio.Shell.Interop.Constants.SBAI_Find :> obj + let mutable _searchIcon = int16 Microsoft.VisualStudio.Shell.Interop.Constants.SBAI_Find :> obj - let clear() = + let _clear() = // unfreeze the statusbar statusBar.FreezeOutput 0 |> ignore statusBar.Clear() |> ignore member __.Message(msg: string) = - let _, frozen = statusBar.IsFrozen() - // unfreeze the status bar - if frozen <> 0 then statusBar.FreezeOutput 0 |> ignore - statusBar.SetText msg |> ignore - // freeze the status bar - statusBar.FreezeOutput 1 |> ignore + () + //let _, frozen = statusBar.IsFrozen() + //// unfreeze the status bar + //if frozen <> 0 then statusBar.FreezeOutput 0 |> ignore + //statusBar.SetText msg |> ignore + //// freeze the status bar + //statusBar.FreezeOutput 1 |> ignore member this.TempMessage(msg: string) = - this.Message msg - async { - do! Async.Sleep 4000 - match statusBar.GetText() with - | 0, currentText when currentText <> msg -> () - | _ -> clear() - }|> Async.Start + () + //this.Message msg + //async { + // do! Async.Sleep 4000 + // match statusBar.GetText() with + // | 0, currentText when currentText <> msg -> () + // | _ -> clear() + //}|> Async.Start - member __.Clear() = clear() + member __.Clear() = () //clear() /// Animated magnifying glass that displays on the status bar while a symbol search is in progress. member __.Animate() : IDisposable = - statusBar.Animation (1, &searchIcon) |> ignore + //statusBar.Animation (1, &searchIcon) |> ignore { new IDisposable with - member __.Dispose() = statusBar.Animation(0, &searchIcon) |> ignore } + member __.Dispose() = () } //statusBar.Animation(0, &searchIcon) |> ignore } type internal GoToDefinition(checker: FSharpChecker, projectInfoManager: FSharpProjectOptionsManager) = let userOpName = "GoToDefinition" From b0d9b1122931a61ab0671d774f6d23e716fd8ec2 Mon Sep 17 00:00:00 2001 From: TIHan Date: Tue, 19 Mar 2019 10:43:33 -0700 Subject: [PATCH 2/2] Using underscores --- vsintegration/src/FSharp.Editor/Navigation/GoToDefinition.fs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/vsintegration/src/FSharp.Editor/Navigation/GoToDefinition.fs b/vsintegration/src/FSharp.Editor/Navigation/GoToDefinition.fs index 7c6ea1fa8df..e1591ed0561 100644 --- a/vsintegration/src/FSharp.Editor/Navigation/GoToDefinition.fs +++ b/vsintegration/src/FSharp.Editor/Navigation/GoToDefinition.fs @@ -124,7 +124,7 @@ type internal StatusBar(statusBar: IVsStatusbar) = statusBar.FreezeOutput 0 |> ignore statusBar.Clear() |> ignore - member __.Message(msg: string) = + member __.Message(_msg: string) = () //let _, frozen = statusBar.IsFrozen() //// unfreeze the status bar @@ -133,7 +133,7 @@ type internal StatusBar(statusBar: IVsStatusbar) = //// freeze the status bar //statusBar.FreezeOutput 1 |> ignore - member this.TempMessage(msg: string) = + member this.TempMessage(_msg: string) = () //this.Message msg //async {