Handle tabfolding edge-case inside python editor. (#14004) (#14005)

reddyashish · web-flow · commit 5c3962b29fd1 · 2023-05-18T12:18:59.000-04:00
(cherry picked from commit 054ef8c)
diff --git a/src/Libraries/PythonNodeModelsWpf/TabFoldingStrategy.cs b/src/Libraries/PythonNodeModelsWpf/TabFoldingStrategy.cs
@@ -1,11 +1,8 @@
-using Dynamo.UI.Controls;
-using ICSharpCode.AvalonEdit.Document;
-using ICSharpCode.AvalonEdit.Folding;
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using System.Windows.Media.Animation;
+using ICSharpCode.AvalonEdit.Document;
+using ICSharpCode.AvalonEdit.Folding;
 
 namespace PythonNodeModelsWpf
 {
@@ -73,7 +70,7 @@ internal IEnumerable<NewFolding> CreateNewFoldingsByLine(ITextSource document)
                     }
                     else if (tabLevel != currentTabLevel && currentTabLevel < tabLevel)
                     {
-                        while (currentTabLevel < tabLevel)
+                        while (currentTabLevel < tabLevel && startOffsets.Any())
                         {
                             // we close all nested tabs
                             var tempFolding = new NewFolding();
@@ -92,7 +89,7 @@ internal IEnumerable<NewFolding> CreateNewFoldingsByLine(ITextSource document)
                 }
                 else if (whiteSpaces == 0 && tabLevel > 0)
                 {
-                    while(tabLevel> 0)
+                    while(tabLevel> 0 && startOffsets.Any())
                     { 
                         // we close all nested tabs
                         var tempFolding = new NewFolding();

Original file line number	Diff line number	Diff line change
`@@ -1,11 +1,8 @@`
`1`		`-using Dynamo.UI.Controls;`
`2`		`-using ICSharpCode.AvalonEdit.Document;`
`3`		`-using ICSharpCode.AvalonEdit.Folding;`
`4`	`1`	`using System;`
`5`	`2`	`using System.Collections.Generic;`
`6`	`3`	`using System.Linq;`
`7`		`-using System.Text;`
`8`		`-using System.Windows.Media.Animation;`
	`4`	`+using ICSharpCode.AvalonEdit.Document;`
	`5`	`+using ICSharpCode.AvalonEdit.Folding;`
`9`	`6`
`10`	`7`	`namespace PythonNodeModelsWpf`
`11`	`8`	`{`
`@@ -73,7 +70,7 @@ internal IEnumerable<NewFolding> CreateNewFoldingsByLine(ITextSource document)`
`73`	`70`	`}`
`74`	`71`	`else if (tabLevel != currentTabLevel && currentTabLevel < tabLevel)`
`75`	`72`	`{`
`76`		`- while (currentTabLevel < tabLevel)`
	`73`	`+ while (currentTabLevel < tabLevel && startOffsets.Any())`
`77`	`74`	`{`
`78`	`75`	`// we close all nested tabs`
`79`	`76`	`var tempFolding = new NewFolding();`
`@@ -92,7 +89,7 @@ internal IEnumerable<NewFolding> CreateNewFoldingsByLine(ITextSource document)`
`92`	`89`	`}`
`93`	`90`	`else if (whiteSpaces == 0 && tabLevel > 0)`
`94`	`91`	`{`
`95`		`- while(tabLevel> 0)`
	`92`	`+ while(tabLevel> 0 && startOffsets.Any())`
`96`	`93`	`{`
`97`	`94`	`// we close all nested tabs`
`98`	`95`	`var tempFolding = new NewFolding();`