Fixed Marshalling/Serialization of Code Formatting-reated types

Fabian · Fabian · commit 77c1c43fe7aa · 2017-01-23T22:25:23.000+01:00
diff --git a/RoslynScripting/FormatColorScheme.cs b/RoslynScripting/FormatColorScheme.cs
@@ -4,7 +4,7 @@
 
 namespace RoslynScripting
 {
-    //[Serializable]
+    [Serializable]
     public struct FormatColorScheme
     {
         public readonly Color Keyword;
diff --git a/RoslynScripting/FormattedText.cs b/RoslynScripting/FormattedText.cs
@@ -8,7 +8,7 @@
 
 namespace RoslynScripting
 {
-   // [Serializable]
+    [Serializable]
     public struct TextSpan
     {
         public readonly int Start;
@@ -121,9 +121,9 @@ public void AddPart(FormattedTextLinePart Part)
 
         public FormattedTextLinePart AppendText(string Text, TextFormat Format)
         {
-            var lastPart = Parts.Last();
-            var lastPartLineSpan = lastPart.LineSpan;
-            int SpanStart = _Parts.Any() ? lastPartLineSpan.End : 0;
+            var lastPart = Parts.LastOrDefault();
+            var lastPartLineSpan = lastPart?.LineSpan;
+            int SpanStart = _Parts.Any() ? ((TextSpan)lastPartLineSpan).End : 0;
             int SpanEnd = SpanStart + Text.Length;
 
             var LineSpan = TextSpan.FromBounds(SpanStart, SpanEnd);

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`
`5`	`5`	`namespace RoslynScripting`
`6`	`6`	`{`
`7`		`- //[Serializable]`
	`7`	`+ [Serializable]`
`8`	`8`	`public struct FormatColorScheme`
`9`	`9`	`{`
`10`	`10`	`public readonly Color Keyword;`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`
`9`	`9`	`namespace RoslynScripting`
`10`	`10`	`{`
`11`		`- // [Serializable]`
	`11`	`+ [Serializable]`
`12`	`12`	`public struct TextSpan`
`13`	`13`	`{`
`14`	`14`	`public readonly int Start;`
`@@ -121,9 +121,9 @@ public void AddPart(FormattedTextLinePart Part)`
`121`	`121`
`122`	`122`	`public FormattedTextLinePart AppendText(string Text, TextFormat Format)`
`123`	`123`	`{`
`124`		`- var lastPart = Parts.Last();`
`125`		`- var lastPartLineSpan = lastPart.LineSpan;`
`126`		`- int SpanStart = _Parts.Any() ? lastPartLineSpan.End : 0;`
	`124`	`+ var lastPart = Parts.LastOrDefault();`
	`125`	`+ var lastPartLineSpan = lastPart?.LineSpan;`
	`126`	`+ int SpanStart = _Parts.Any() ? ((TextSpan)lastPartLineSpan).End : 0;`
`127`	`127`	`int SpanEnd = SpanStart + Text.Length;`
`128`	`128`
`129`	`129`	`var LineSpan = TextSpan.FromBounds(SpanStart, SpanEnd);`