VS plugin Bugfix :: Defensive checks added to prevent TaskListService…

… crashes (#17411)
dotnet · Aug 15, 2024 · e124950 · e124950
1 parent 786a223
commit e124950
Showing 1 changed file with 27 additions and 15 deletions.
diff --git a/vsintegration/src/FSharp.Editor/TaskList/TaskListService.fs b/vsintegration/src/FSharp.Editor/TaskList/TaskListService.fs
@@ -83,23 +83,35 @@ type internal FSharpTaskListService [<ImportingConstructor>] () as this =
                 )
                 |> extractContractedComments
 
-            for ct in contractedTokens do
+            if contractedTokens |> List.isEmpty then
+                ()
+            else
                 let lineTxt = line.ToString()
-                let tokenSize = 1 + (ct.Right - ct.Left)
 
-                for (dText, d) in descriptors do
-                    let idx =
-                        lineTxt.IndexOf(dText, ct.Left, tokenSize, StringComparison.OrdinalIgnoreCase)
-
-                    if idx > -1 then
-                        let taskLength = 1 + ct.Right - idx
-                        let idxAfterDesc = idx + dText.Length
-                        // A descriptor followed by another letter is not a todocomment, like todoabc. But TODO, TODO2 or TODO: should be.
-                        if idxAfterDesc >= lineTxt.Length || not (Char.IsLetter(lineTxt.[idxAfterDesc])) then
-                            let taskText = lineTxt.Substring(idx, taskLength).TrimEnd([| '*'; ')' |])
-                            let taskSpan = new TextSpan(line.Span.Start + idx, taskText.Length)
-
-                            foundTaskItems.Add(new FSharpTaskListItem(d, taskText, doc, taskSpan))
+                for ct in contractedTokens do
+
+                    let tokenSize = 1 + (ct.Right - ct.Left)
+
+                    for (dText, d) in descriptors do
+                        if
+                            tokenSize < 0
+                            || ct.Left >= lineTxt.Length
+                            || tokenSize > (lineTxt.Length - ct.Left)
+                        then
+                            ()
+                        else
+                            let idx =
+                                lineTxt.IndexOf(dText, ct.Left, tokenSize, StringComparison.OrdinalIgnoreCase)
+
+                            if idx > -1 then
+                                let taskLength = 1 + ct.Right - idx
+                                let idxAfterDesc = idx + dText.Length
+                                // A descriptor followed by another letter is not a todocomment, like todoabc. But TODO, TODO2 or TODO: should be.
+                                if idxAfterDesc >= lineTxt.Length || not (Char.IsLetter(lineTxt.[idxAfterDesc])) then
+                                    let taskText = lineTxt.Substring(idx, taskLength).TrimEnd([| '*'; ')' |])
+                                    let taskSpan = new TextSpan(line.Span.Start + idx, taskText.Length)
+
+                                    foundTaskItems.Add(new FSharpTaskListItem(d, taskText, doc, taskSpan))
 
         foundTaskItems.ToImmutable()