Address PR comments

Author: Omar Tawfik

vsintegration/src/FSharp.Editor/BraceMatchingService.fs

@@ -35,10 +35,5 @@ type internal FSharpBraceMatchingService() =
                                        CommonRoslynHelpers.FSharpRangeToTextSpan(sourceText, right)))
             }
 
-            Async.StartAsTask(computation, TaskCreationOptions.None, cancellationToken).ContinueWith(fun(task: Task<Nullable<BraceMatchingResult>>) ->
-                if task.Status = TaskStatus.RanToCompletion then
-                    task.Result
-                else
-                    Assert.Exception(task.Exception.GetBaseException())
-                    raise(task.Exception.GetBaseException())
-            , cancellationToken)
+            Async.StartAsTask(computation, TaskCreationOptions.None, cancellationToken)
+                 .ContinueWith(CommonRoslynHelpers.GetCompletedTaskResult, cancellationToken)

vsintegration/src/FSharp.Editor/BreakpointResolutionService.fs

@@ -53,13 +53,8 @@ type internal FSharpBreakpointResolutionService() =
                        | Some(range) -> BreakpointResolutionResult.CreateSpanResult(document, CommonRoslynHelpers.FSharpRangeToTextSpan(sourceText, range))
             }
 
-            Async.StartAsTask(computation, TaskCreationOptions.None, cancellationToken).ContinueWith(fun(task: Task<BreakpointResolutionResult>) ->
-                if task.Status = TaskStatus.RanToCompletion then
-                    task.Result
-                else
-                    Assert.Exception(task.Exception.GetBaseException())
-                    raise(task.Exception.GetBaseException())
-            , cancellationToken)
+            Async.StartAsTask(computation, TaskCreationOptions.None, cancellationToken)
+                 .ContinueWith(CommonRoslynHelpers.GetCompletedTaskResult, cancellationToken)
 
         // FSROSLYNTODO: enable placing breakpoints by when user suplies fully-qualified function names
         member this.ResolveBreakpointsAsync(_, _, _): Task<IEnumerable<BreakpointResolutionResult>> =

vsintegration/src/FSharp.Editor/IndentationService.fs

@@ -49,17 +49,11 @@ type internal FSharpIndentationService() =
     // FSROSLYNTODO: post beta5, update implementation to use ISynchronousIndentationService instead to guarentee Indentation is UI-blocking
     interface IIndentationService with
         member this.GetDesiredIndentationAsync(document: Document, lineNumber: int, cancellationToken: CancellationToken): Task<Nullable<IndentationResult>> =
-            document.GetTextAsync(cancellationToken).ContinueWith(
-                fun (sourceTextTask: Task<SourceText>) ->
-                    if sourceTextTask.Status = TaskStatus.RanToCompletion then
-                        // FSROSLYNTODO: post beta5, update to use document.Options.GetOption() instead
-                        let tabSize = document.Project.Solution.Workspace.Options.GetOption(FormattingOptions.TabSize, FSharpCommonConstants.FSharpLanguageName)
-                        try match FSharpIndentationService.GetDesiredIndentation(sourceTextTask.Result, lineNumber, tabSize) with
-                            | None -> Nullable<IndentationResult>()
-                            | Some(indentation) -> Nullable<IndentationResult>(IndentationResult(sourceTextTask.Result.Lines.[lineNumber].Start, indentation))
-                        with ex -> 
-                            Assert.Exception(ex)
-                            reraise()
-                    else
-                        raise(sourceTextTask.Exception.GetBaseException())
-                , cancellationToken)
+            document.GetTextAsync(cancellationToken).ContinueWith(fun (sourceTextTask: Task<SourceText>) ->
+                let sourceText = CommonRoslynHelpers.GetCompletedTaskResult(sourceTextTask)
+                // FSROSLYNTODO: post beta5, update to use document.Options.GetOption() instead
+                let tabSize = document.Project.Solution.Workspace.Options.GetOption(FormattingOptions.TabSize, FSharpCommonConstants.FSharpLanguageName)
+                match FSharpIndentationService.GetDesiredIndentation(sourceText, lineNumber, tabSize) with
+                | None -> Nullable<IndentationResult>()
+                | Some(indentation) -> Nullable<IndentationResult>(IndentationResult(sourceText.Lines.[lineNumber].Start, indentation))
+            , cancellationToken)

vsintegration/src/FSharp.Editor/LanguageDebugInfoService.fs

@@ -74,12 +74,8 @@ type internal FSharpLanguageDebugInfoService() =
                        | None -> Unchecked.defaultof<DebugDataTipInfo>
                        | Some(textSpan) -> new DebugDataTipInfo(textSpan, sourceText.GetSubText(textSpan).ToString())
             }
-
-            Async.StartAsTask(computation, TaskCreationOptions.None, cancellationToken).ContinueWith(fun(task: Task<DebugDataTipInfo>) ->
-                if task.Status = TaskStatus.RanToCompletion then
-                    task.Result
-                else
-                    Assert.Exception(task.Exception.GetBaseException())
-                    raise(task.Exception.GetBaseException())
-            , cancellationToken)
+            
+            Async.StartAsTask(computation, TaskCreationOptions.None, cancellationToken)
+                 .ContinueWith(CommonRoslynHelpers.GetCompletedTaskResult, cancellationToken)
+            
 

vsintegration/src/FSharp.LanguageService/CommonRoslynHelpers.fs

@@ -3,6 +3,7 @@
 namespace Microsoft.VisualStudio.FSharp.LanguageService
 
 open System
+open System.Threading.Tasks
 open Microsoft.CodeAnalysis
 open Microsoft.CodeAnalysis.Text
 open Microsoft.FSharp.Compiler.SourceCodeServices
@@ -35,3 +36,10 @@ module internal CommonRoslynHelpers =
         let startPosition = sourceText.Lines.[range.StartLine - 1].Start + range.StartColumn
         let endPosition = sourceText.Lines.[range.EndLine - 1].Start + range.EndColumn
         TextSpan(startPosition, endPosition - startPosition)
+
+    let GetCompletedTaskResult(task: Task<'TResult>) =
+        if task.Status = TaskStatus.RanToCompletion then
+            task.Result
+        else
+            Assert.Exception(task.Exception.GetBaseException())
+            raise(task.Exception.GetBaseException())

vsintegration/src/FSharp.LanguageService/FSharp.LanguageService.fsproj

@@ -51,9 +51,9 @@
     <EmbeddedResource Include="VSPackage.resx" />
     <EmbeddedResource Include="FSLangSvcStrings.resx" />
     <Compile Include="AssemblyInfo.fs" />
+    <Compile Include="Error.fs" />
     <Compile Include="CommonConstants.fs" />
     <Compile Include="CommonRoslynHelpers.fs" />
-    <Compile Include="Error.fs" />
     <Compile Include="Quickparse.fs" />
     <Compile Include="Vs.fs" />
     <Compile Include="Colorize.fs" />