fix stackoverflow

OpportunityLiu · OpportunityLiu · commit 5ed5ea791a61 · 2020-05-31T00:39:13.000+08:00
diff --git a/EhTagClient/MarkdigExt/Extension.cs b/EhTagClient/MarkdigExt/Extension.cs
@@ -38,21 +38,26 @@ public static (string url, string title, string isNsfw) GetData(this LinkInline
 
             return (url, title, null);
         }
-        public static Record GetTag(string tag, Namespace ns)
+        public static string GetTagName(string tag, Namespace ns)
         {
             var table = Context.Database[ns];
-            return table.Data[tag];
+            var record = table.Find(tag, true);
+            if (record == null)
+                return null;
+            if (record.Name.Text == null)
+                record.Name.Render();
+            return record.Name.Text;
         }
 
-        public static Record GetTag(string tag)
+        public static string GetTagName(string tag)
         {
-            var record = GetTag(tag, Context.Namespace);
+            var record = GetTagName(tag, Context.Namespace);
             if (record != null) return record;
             foreach (var item in Context.Database.Keys)
             {
                 if (item != Context.Namespace)
                 {
-                    record = GetTag(tag, item);
+                    record = GetTagName(tag, item);
                     if (record != null) return record;
                 }
             }
diff --git a/EhTagClient/MarkdigExt/Html/CodeInlineRenderer.cs b/EhTagClient/MarkdigExt/Html/CodeInlineRenderer.cs
@@ -10,12 +10,12 @@ class CodeInlineRenderer : HtmlObjectRenderer<CodeInline>
         protected override void Write(HtmlRenderer renderer, CodeInline obj)
         {
             var content = obj.Content;
-            var tag = Extension.GetTag(content);
+            var tag = Extension.GetTagName(content);
             if (renderer.EnableHtmlForInline)
                 renderer.Write("<ruby>");
             if (tag != null)
             {
-                renderer.WriteEscape(tag.Name.Text);
+                renderer.WriteEscape(tag);
                 if (renderer.EnableHtmlForInline)
                 {
                     renderer.Write("<rp>(</rp><rt>");
diff --git a/EhTagClient/MarkdigExt/Json/JsonRenderer.cs b/EhTagClient/MarkdigExt/Json/JsonRenderer.cs
@@ -152,11 +152,11 @@ sealed class CodeInlineRenderer : JsonObjectRenderer<CodeInline>
         protected override void WriteContent(JsonRenderer renderer, CodeInline obj)
         {
             var content = obj.Content;
-            var tag = Extension.GetTag(content);
+            var tag = Extension.GetTagName(content);
             if (tag != null)
             {
                 renderer.WriteProperty("tag", content);
-                renderer.WriteProperty("text", tag.Name.Text);
+                renderer.WriteProperty("text", tag);
             }
             else
             {
diff --git a/EhTagClient/RecordDictionary.cs b/EhTagClient/RecordDictionary.cs
@@ -2,13 +2,15 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.IO;
 using System.Linq;
 using System.Text;
 using KVP = System.Collections.Generic.KeyValuePair<string, EhTagClient.Record>;
 
 namespace EhTagClient
 {
+    [DebuggerDisplay(@"Namespace={Namespace} Count={Count}")]
     public class RecordDictionary
     {
         public RecordDictionary(Namespace ns, RepoClient repoClient)
@@ -38,7 +40,7 @@ public struct DataDic : IReadOnlyDictionary<string, Record>
 
             internal DataDic(RecordDictionary parent) => _Parent = parent;
 
-            public Record this[string key] => _Parent.Find(key);
+            public Record this[string key] => _Parent.Find(key, false);
 
             public IEnumerable<string> Keys
             {
@@ -66,7 +68,7 @@ public IEnumerable<Record> Values
 
             public bool TryGetValue(string key, out Record value)
             {
-                value = _Parent.Find(key);
+                value = _Parent.Find(key, false);
                 return !(value is null);
 
             }
@@ -108,7 +110,8 @@ public void Load()
                     switch (state)
                     {
                         case 0:
-                            prefix.AppendLine(line);
+                            prefix.Append(line);
+                            prefix.Append('\n');
                             if (record.Key != null)
                             {
                                 state = 1;
@@ -123,19 +126,22 @@ public void Load()
                             else
                                 continue;
                         case 1:
-                            prefix.AppendLine(line);
+                            prefix.Append(line);
+                            prefix.Append('\n');
                             if (line == sep)
                             {
                                 state = 2;
                                 continue;
                             }
                             else
                             {
-                                frontMatters.AppendLine(line);
+                                frontMatters.Append(line);
+                                frontMatters.Append('\n');
                                 continue;
                             }
                         case 2:
-                            prefix.AppendLine(line);
+                            prefix.Append(line);
+                            prefix.Append('\n');
                             if (record.Key != null)
                             {
                                 state = 3;
@@ -144,7 +150,8 @@ public void Load()
                             else
                                 continue;
                         case 3:
-                            prefix.AppendLine(line);
+                            prefix.Append(line);
+                            prefix.Append('\n');
                             if (record.Key is null)
                             {
                                 state = 2;
@@ -158,7 +165,8 @@ public void Load()
                         case 4:
                             if (record.Key is null)
                             {
-                                suffix.AppendLine(line);
+                                suffix.Append(line);
+                                suffix.Append('\n');
                                 state = 5;
                                 continue;
                             }
@@ -168,7 +176,8 @@ public void Load()
                                 continue;
                             }
                         default:
-                            suffix.AppendLine(line);
+                            suffix.Append(line);
+                            suffix.Append('\n');
                             continue;
                     }
                 }
@@ -216,13 +225,16 @@ public void Save()
             }
         }
 
-        public Record Find(string key)
+        public Record Find(string key, bool skipRender)
         {
             if (!MapData.TryGetValue(key, out var index))
                 return null;
-            Context.Namespace = Namespace;
             var record = RawData[index].Value;
-            record.Render(key);
+            if (!skipRender)
+            {
+                Context.Namespace = Namespace;
+                record.Render(key);
+            }
             return record;
         }
 

Original file line number	Diff line number	Diff line change
`@@ -38,21 +38,26 @@ public static (string url, string title, string isNsfw) GetData(this LinkInline`
`38`	`38`
`39`	`39`	`return (url, title, null);`
`40`	`40`	`}`
`41`		`- public static Record GetTag(string tag, Namespace ns)`
	`41`	`+ public static string GetTagName(string tag, Namespace ns)`
`42`	`42`	`{`
`43`	`43`	`var table = Context.Database[ns];`
`44`		`- return table.Data[tag];`
	`44`	`+ var record = table.Find(tag, true);`
	`45`	`+ if (record == null)`
	`46`	`+ return null;`
	`47`	`+ if (record.Name.Text == null)`
	`48`	`+ record.Name.Render();`
	`49`	`+ return record.Name.Text;`
`45`	`50`	`}`
`46`	`51`
`47`		`- public static Record GetTag(string tag)`
	`52`	`+ public static string GetTagName(string tag)`
`48`	`53`	`{`
`49`		`- var record = GetTag(tag, Context.Namespace);`
	`54`	`+ var record = GetTagName(tag, Context.Namespace);`
`50`	`55`	`if (record != null) return record;`
`51`	`56`	`foreach (var item in Context.Database.Keys)`
`52`	`57`	`{`
`53`	`58`	`if (item != Context.Namespace)`
`54`	`59`	`{`
`55`		`- record = GetTag(tag, item);`
	`60`	`+ record = GetTagName(tag, item);`
`56`	`61`	`if (record != null) return record;`
`57`	`62`	`}`
`58`	`63`	`}`
Original file line number	Diff line number	Diff line change
`@@ -10,12 +10,12 @@ class CodeInlineRenderer : HtmlObjectRenderer<CodeInline>`
`10`	`10`	`protected override void Write(HtmlRenderer renderer, CodeInline obj)`
`11`	`11`	`{`
`12`	`12`	`var content = obj.Content;`
`13`		`- var tag = Extension.GetTag(content);`
	`13`	`+ var tag = Extension.GetTagName(content);`
`14`	`14`	`if (renderer.EnableHtmlForInline)`
`15`	`15`	`renderer.Write("<ruby>");`
`16`	`16`	`if (tag != null)`
`17`	`17`	`{`
`18`		`- renderer.WriteEscape(tag.Name.Text);`
	`18`	`+ renderer.WriteEscape(tag);`
`19`	`19`	`if (renderer.EnableHtmlForInline)`
`20`	`20`	`{`
`21`	`21`	`renderer.Write("<rp>(</rp><rt>");`
Original file line number	Diff line number	Diff line change
`@@ -152,11 +152,11 @@ sealed class CodeInlineRenderer : JsonObjectRenderer<CodeInline>`
`152`	`152`	`protected override void WriteContent(JsonRenderer renderer, CodeInline obj)`
`153`	`153`	`{`
`154`	`154`	`var content = obj.Content;`
`155`		`- var tag = Extension.GetTag(content);`
	`155`	`+ var tag = Extension.GetTagName(content);`
`156`	`156`	`if (tag != null)`
`157`	`157`	`{`
`158`	`158`	`renderer.WriteProperty("tag", content);`
`159`		`- renderer.WriteProperty("text", tag.Name.Text);`
	`159`	`+ renderer.WriteProperty("text", tag);`
`160`	`160`	`}`
`161`	`161`	`else`
`162`	`162`	`{`
Original file line number	Diff line number	Diff line change
`@@ -2,13 +2,15 @@`
`2`	`2`	`using System;`
`3`	`3`	`using System.Collections;`
`4`	`4`	`using System.Collections.Generic;`
	`5`	`+using System.Diagnostics;`
`5`	`6`	`using System.IO;`
`6`	`7`	`using System.Linq;`
`7`	`8`	`using System.Text;`
`8`	`9`	`using KVP = System.Collections.Generic.KeyValuePair<string, EhTagClient.Record>;`
`9`	`10`
`10`	`11`	`namespace EhTagClient`
`11`	`12`	`{`
	`13`	`+ [DebuggerDisplay(@"Namespace={Namespace} Count={Count}")]`
`12`	`14`	`public class RecordDictionary`
`13`	`15`	`{`
`14`	`16`	`public RecordDictionary(Namespace ns, RepoClient repoClient)`
`@@ -38,7 +40,7 @@ public struct DataDic : IReadOnlyDictionary<string, Record>`
`38`	`40`
`39`	`41`	`internal DataDic(RecordDictionary parent) => _Parent = parent;`
`40`	`42`
`41`		`- public Record this[string key] => _Parent.Find(key);`
	`43`	`+ public Record this[string key] => _Parent.Find(key, false);`
`42`	`44`
`43`	`45`	`public IEnumerable<string> Keys`
`44`	`46`	`{`
`@@ -66,7 +68,7 @@ public IEnumerable<Record> Values`
`66`	`68`
`67`	`69`	`public bool TryGetValue(string key, out Record value)`
`68`	`70`	`{`
`69`		`- value = _Parent.Find(key);`
	`71`	`+ value = _Parent.Find(key, false);`
`70`	`72`	`return !(value is null);`
`71`	`73`
`72`	`74`	`}`
`@@ -108,7 +110,8 @@ public void Load()`
`108`	`110`	`switch (state)`
`109`	`111`	`{`
`110`	`112`	`case 0:`
`111`		`- prefix.AppendLine(line);`
	`113`	`+ prefix.Append(line);`
	`114`	`+ prefix.Append('\n');`
`112`	`115`	`if (record.Key != null)`
`113`	`116`	`{`
`114`	`117`	`state = 1;`
`@@ -123,19 +126,22 @@ public void Load()`
`123`	`126`	`else`
`124`	`127`	`continue;`
`125`	`128`	`case 1:`
`126`		`- prefix.AppendLine(line);`
	`129`	`+ prefix.Append(line);`
	`130`	`+ prefix.Append('\n');`
`127`	`131`	`if (line == sep)`
`128`	`132`	`{`
`129`	`133`	`state = 2;`
`130`	`134`	`continue;`
`131`	`135`	`}`
`132`	`136`	`else`
`133`	`137`	`{`
`134`		`- frontMatters.AppendLine(line);`
	`138`	`+ frontMatters.Append(line);`
	`139`	`+ frontMatters.Append('\n');`
`135`	`140`	`continue;`
`136`	`141`	`}`
`137`	`142`	`case 2:`
`138`		`- prefix.AppendLine(line);`
	`143`	`+ prefix.Append(line);`
	`144`	`+ prefix.Append('\n');`
`139`	`145`	`if (record.Key != null)`
`140`	`146`	`{`
`141`	`147`	`state = 3;`
`@@ -144,7 +150,8 @@ public void Load()`
`144`	`150`	`else`
`145`	`151`	`continue;`
`146`	`152`	`case 3:`
`147`		`- prefix.AppendLine(line);`
	`153`	`+ prefix.Append(line);`
	`154`	`+ prefix.Append('\n');`
`148`	`155`	`if (record.Key is null)`
`149`	`156`	`{`
`150`	`157`	`state = 2;`
`@@ -158,7 +165,8 @@ public void Load()`
`158`	`165`	`case 4:`
`159`	`166`	`if (record.Key is null)`
`160`	`167`	`{`
`161`		`- suffix.AppendLine(line);`
	`168`	`+ suffix.Append(line);`
	`169`	`+ suffix.Append('\n');`
`162`	`170`	`state = 5;`
`163`	`171`	`continue;`
`164`	`172`	`}`
`@@ -168,7 +176,8 @@ public void Load()`
`168`	`176`	`continue;`
`169`	`177`	`}`
`170`	`178`	`default:`
`171`		`- suffix.AppendLine(line);`
	`179`	`+ suffix.Append(line);`
	`180`	`+ suffix.Append('\n');`
`172`	`181`	`continue;`
`173`	`182`	`}`
`174`	`183`	`}`
`@@ -216,13 +225,16 @@ public void Save()`
`216`	`225`	`}`
`217`	`226`	`}`
`218`	`227`
`219`		`- public Record Find(string key)`
	`228`	`+ public Record Find(string key, bool skipRender)`
`220`	`229`	`{`
`221`	`230`	`if (!MapData.TryGetValue(key, out var index))`
`222`	`231`	`return null;`
`223`		`- Context.Namespace = Namespace;`
`224`	`232`	`var record = RawData[index].Value;`
`225`		`- record.Render(key);`
	`233`	`+ if (!skipRender)`
	`234`	`+ {`
	`235`	`+ Context.Namespace = Namespace;`
	`236`	`+ record.Render(key);`
	`237`	`+ }`
`226`	`238`	`return record;`
`227`	`239`	`}`
`228`	`240`