特定状況で折りたたむとフリーズしてしまうバグを修正した

diff --git a/Common/EditView.cs b/Common/EditView.cs
index 6de6a4c..b059743 100644 (file)
--- a/Common/EditView.cs
+++ b/Common/EditView.cs
@@ -783,6 +783,8 @@ namespace FooEditEngine
                     row = this.LayoutLines.GetLineNumberFromIndex(foldingData.End) + 1;\r
                 else\r
                     row = this.LayoutLines.GetLineNumberFromIndex(foldingData.Start);\r
+                if(row > this.LayoutLines.Count - 1)\r
+                    row = this.LayoutLines.GetLineNumberFromIndex(foldingData.Start);\r
             }\r
             return row;\r
         }\r
@@ -845,7 +847,7 @@ namespace FooEditEngine
                 int lineHeadIndex = this.LayoutLines.GetIndexFromLineNumber(row);\r
                 int lineLength = this.LayoutLines.GetLengthFromLineNumber(row);\r
 \r
-                if (this.LayoutLines.FoldingCollection.IsHidden(lineHeadIndex))\r
+                if (this.LayoutLines.FoldingCollection.IsHidden(lineHeadIndex) && row < this.LayoutLines.Count - 1)\r
                     continue;\r
 \r
                 ITextLayout layout = this.LayoutLines.GetLayout(row);\r

diff --git a/Metro/FooEditEngine/Properties/AssemblyInfo.cs b/Metro/FooEditEngine/Properties/AssemblyInfo.cs
index 8723fc8..19ebc2e 100644 (file)
--- a/Metro/FooEditEngine/Properties/AssemblyInfo.cs
+++ b/Metro/FooEditEngine/Properties/AssemblyInfo.cs
@@ -24,6 +24,6 @@ using System.Runtime.InteropServices;
 // すべての値を指定するか、以下のように '*' を使用してビルドおよびリビジョン番号を\r
 // 既定値にすることができます:\r
 // [assembly: AssemblyVersion("1.0.*")]\r
-[assembly: AssemblyVersion("1.14.0.0")]\r
-[assembly: AssemblyFileVersion("1.14.0.0")]\r
+[assembly: AssemblyVersion("1.15.0.0")]\r
+[assembly: AssemblyFileVersion("1.15.0.0")]\r
 [assembly: ComVisible(false)]
\ No newline at end of file

diff --git a/WPF/FooEditEngine/Properties/AssemblyInfo.cs b/WPF/FooEditEngine/Properties/AssemblyInfo.cs
index 72d619c..503dde3 100644 (file)
--- a/WPF/FooEditEngine/Properties/AssemblyInfo.cs
+++ b/WPF/FooEditEngine/Properties/AssemblyInfo.cs
@@ -51,8 +51,8 @@ using System.Windows;
 // すべての値を指定するか、下のように '*' を使ってビルドおよびリビジョン番号を \r
 // 既定値にすることができます:\r
 // [assembly: AssemblyVersion("1.0.*")]\r
-[assembly: AssemblyVersion("1.115.0.0")]\r
-[assembly: AssemblyFileVersion("1.115.0.0")]\r
+[assembly: AssemblyVersion("1.116.0.0")]\r
+[assembly: AssemblyFileVersion("1.116.0.0")]\r
 \r
 #if DEBUG\r
 [assembly: System.Runtime.CompilerServices.InternalsVisibleTo("UnitTest")]\r

diff --git a/Windows/FooEditEngine/Properties/AssemblyInfo.cs b/Windows/FooEditEngine/Properties/AssemblyInfo.cs
index c0a8cb8..7fad0b8 100644 (file)
--- a/Windows/FooEditEngine/Properties/AssemblyInfo.cs
+++ b/Windows/FooEditEngine/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // すべての値を指定するか、下のように '*' を使ってビルドおよびリビジョン番号を \r
 // 既定値にすることができます:\r
 // [assembly: AssemblyVersion("1.0.*")]\r
-[assembly: AssemblyVersion("1.30.0.0")]\r
-[assembly: AssemblyFileVersion("1.30.0.0")]\r
+[assembly: AssemblyVersion("1.31.0.0")]\r
+[assembly: AssemblyFileVersion("1.31.0.0")]\r