Address PR comments

Author: Omar Tawfik

vsintegration/src/FSharp.Editor/BraceMatchingService.fs

@@ -25,7 +25,7 @@ open Microsoft.VisualStudio.Text.Tagging
 open Microsoft.FSharp.Compiler.Parser
 open Microsoft.FSharp.Compiler.SourceCodeServices
 
-// TODO: add defines flags if available from project sites and files
+// FSROSLYNTODO: add defines flags if available from project sites and files
 
 [<ExportBraceMatcher(FSharpCommonConstants.FSharpLanguageName)>]
 type internal FSharpBraceMatchingService() =
@@ -95,13 +95,16 @@ type internal FSharpBraceMatchingService() =
         member this.FindBracesAsync(document: Document, position: int, cancellationToken: CancellationToken): Task<Nullable<BraceMatchingResult>> =
             document.GetTextAsync(cancellationToken).ContinueWith(
                 fun (sourceTextTask: Task<SourceText>) ->
-                    try match getBraceMatchingResult(sourceTextTask.Result, Some(document.Name), [], position, cancellationToken) with
-                        | None -> Nullable()
-                        | Some(braceMatchingResult) -> Nullable(braceMatchingResult)
-                    with ex -> 
-                        Assert.Exception(ex)
-                        reraise()
-                , TaskContinuationOptions.OnlyOnRanToCompletion)
+                    if sourceTextTask.Status = TaskStatus.RanToCompletion then
+                        try match getBraceMatchingResult(sourceTextTask.Result, Some(document.Name), [], position, cancellationToken) with
+                            | None -> Nullable()
+                            | Some(braceMatchingResult) -> Nullable(braceMatchingResult)
+                        with ex -> 
+                            Assert.Exception(ex)
+                            reraise()
+                    else
+                        raise(sourceTextTask.Exception.GetBaseException())
+                , cancellationToken)
 
     // Helper function to proxy Roslyn types to tests
     static member FindMatchingBrace(sourceText: SourceText, fileName: Option<string>, defines: string list, position: int, cancellationToken: CancellationToken) : Option<int> =

vsintegration/src/FSharp.Editor/ColorizationService.fs

@@ -25,8 +25,8 @@ open Microsoft.VisualStudio.Text.Tagging
 
 open Microsoft.FSharp.Compiler.SourceCodeServices
 
-// TODO: add types colorization if available from intellisense
-// TODO: add defines flags if available from project sites and files
+// FSROSLYNTODO: add types colorization if available from intellisense
+// FSROSLYNTODO: add defines flags if available from project sites and files
 
 type private SourceLineData(lexStateAtEndOfLine: FSharpTokenizerLexState, hashCode: int, classifiedSpans: IReadOnlyList<ClassifiedSpan>) =
     member val LexStateAtEndOfLine = lexStateAtEndOfLine
@@ -97,15 +97,17 @@ type internal FSharpColorizationService() =
         member this.AddSyntacticClassificationsAsync(document: Document, textSpan: TextSpan, result: List<ClassifiedSpan>, cancellationToken: CancellationToken) =
             document.GetTextAsync(cancellationToken).ContinueWith(
                 fun (sourceTextTask: Task<SourceText>) ->
-                    result.AddRange(FSharpColorizationService.GetColorizationData(sourceTextTask.Result, textSpan, None, [], cancellationToken))
-                , TaskContinuationOptions.OnlyOnRanToCompletion)
+                    if sourceTextTask.Status = TaskStatus.RanToCompletion then
+                        result.AddRange(FSharpColorizationService.GetColorizationData(sourceTextTask.Result, textSpan, None, [], cancellationToken))
+                , cancellationToken)
 
         member this.AddSemanticClassificationsAsync(document: Document, textSpan: TextSpan, result: List<ClassifiedSpan>, cancellationToken: CancellationToken) =
             document.GetTextAsync(cancellationToken).ContinueWith(
                 fun (sourceTextTask: Task<SourceText>) ->
-                    //TODO: Replace with types data when available from intellisense (behaving as AddSyntacticClassificationsAsync() for now)
-                    result.AddRange(FSharpColorizationService.GetColorizationData(sourceTextTask.Result, textSpan, None, [], cancellationToken))
-                , TaskContinuationOptions.OnlyOnRanToCompletion)
+                    if sourceTextTask.Status = TaskStatus.RanToCompletion then
+                        //FSROSLYNTODO: Replace with types data when available from intellisense (behaving as AddSyntacticClassificationsAsync() for now)
+                        result.AddRange(FSharpColorizationService.GetColorizationData(sourceTextTask.Result, textSpan, None, [], cancellationToken))
+                , cancellationToken)
 
         member this.AdjustStaleClassification(text: SourceText, classifiedSpan: ClassifiedSpan) : ClassifiedSpan =
             let tokens = FSharpColorizationService.GetColorizationData(text, classifiedSpan.TextSpan, None, [], CancellationToken.None)

vsintegration/src/FSharp.Editor/IndentationService.fs

@@ -46,15 +46,20 @@ type internal FSharpIndentationService() =
                      | _ -> spaces
             Some(loop 0 0)
 
+    // 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>) ->
-                    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()
-                , TaskContinuationOptions.OnlyOnRanToCompletion)
+                    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)