Вильданов Савелий

cs/Markdown/ListOfTokens.cs

@@ -4,7 +4,7 @@ public class ListOfTokens<T> : List<T>
 {
     public new void Add(T token)
     {
-        if(!(token is null))
+        if (!(token is null))
             base.Add(token);
     }
 }

cs/Markdown/Md.cs

@@ -4,9 +4,8 @@ public class Md
 {
     public static string Render(string markdown)
     {
-        Preparator preparator = new Preparator();
+        TokenGenerator tokenGenerator = new TokenGenerator();
         Converter converter = new Converter();
-        preparator.Paragrapher(markdown);
-        return converter.ConvertWithTokens(preparator.GetTokens());
+        return converter.ConvertWithTokens(tokenGenerator.SplitParagraphs(markdown));
     }
 }

cs/Markdown/Parsers/BoldParser.cs

@@ -1,9 +1,10 @@
 using System.Collections;
+using System.Security.Principal;
 using Markdown.TagsType;
 
 namespace Markdown.Parsers;
 
-public class BoldParser
+public class BoldParser : IParser
 {
     private readonly Stack<Token> tagsStack;
     private readonly GeneralParser.IsValidTag isValidOpenBoldTag;
@@ -24,7 +25,7 @@ public BoldParser()
         index = 0;
     }
 
-    public Token BoldParse(string text, int i)
+    private Token BoldParse(string text, int i)
     {
         index = i;
         index++;
@@ -34,35 +35,43 @@ public Token BoldParse(string text, int i)
         if (IsEmptyStringInsideBold(text, i))
         {
             index = text.Length;
-            return new Token("____");
+            return new Token("____", new TextTag());
         }
 
         if (IsBoldClosed)
         {
-            if (!isValidOpenBoldTag(text, i+1))
+            if (!isValidOpenBoldTag(text, i + 1))
             {
-                return (new Token("__"));
+                return (new Token("__", new TextTag()));
             }
         }
         else
         {
             if (!isValidCloseBoldTag(text, i))
             {
-                return new Token("__");
+                if (isValidOpenBoldTag(text, i))
+                {
+                    if (tagsStack.Count != 0)
+                        tagsStack.Pop();
+                    return addBoldTag(new BoldTag(), true);
+                }
+
+                return new Token("__", new TextTag());
             }
         }
 
-
         if (tagsStack.Count > 1 &&
             tagsStack.Any(p => p.Type is {MarkdownTag: "_"}) &&
             tagsStack.Peek().Type is {MarkdownTag: "__"})
         {
             tagsStack.Pop();
         }
+
         if (!IsBoldClosed && i == text.Length - 1)
         {
             tagsStack.Pop();
         }
+
         var boldTag = addBoldTag(new BoldTag(), IsBoldClosed);
         IsBoldClosed = !IsBoldClosed;
 
@@ -84,8 +93,6 @@ public bool IsNextSymbolBold(string text, int i)
         return false;
     }
 
-    public int GetNewIndex() => index;
-
     private bool IsEmptyStringInsideBold(string text, int i)
     {
         int nextIndex = i + 1;
@@ -96,4 +103,16 @@ private bool IsEmptyStringInsideBold(string text, int i)
 
         return false;
     }
+
+    public bool TryParse(char symbol, string text, int i)
+    {
+        return symbol == '_' && IsNextSymbolBold(text, i);
+    }
+
+    public Token Parse(string text, ref int i)
+    {
+        var token = BoldParse(text, i);
+        i = index;
+        return token;
+    }
 }

cs/Markdown/Parsers/GeneralParser.cs

@@ -22,14 +22,14 @@ public static Token GenerateTagToken(ITagsType tag, bool isClose)
     {
         if (isClose)
         {
-            var temp = new Token(tag.GetHtmlOpenTag(), tag);
+            var temp = new Token(tag.GetHtmlOpenTag, tag);
             tagsStack.Push(temp);
             return temp;
         }
 
         if (tagsStack.Count != 0 && tagsStack.Peek().Type?.MarkdownTag == tag.MarkdownTag)
             tag.HasPair = true;
-        return new Token(tag.GetHtmlCloseTag(), tag);
+        return new Token(tag.GetHtmlCloseTag, tag);
     }
 
     public static void ClosePairTag(Token token)

cs/Markdown/Parsers/HeadingParser.cs

@@ -0,0 +1,17 @@
+using Markdown.TagsType;
+
+namespace Markdown.Parsers;
+
+public class HeadingParser : IParser
+{
+    public bool TryParse(char symbol, string text, int index)
+    {
+        return symbol == '#';
+    }
+
+    public Token Parse(string text, ref int index)
+    {
+        var headingTag = new HeadingTag();
+        return new Token(headingTag.GetHtmlOpenTag, headingTag);
+    }
+}

cs/Markdown/Parsers/IParser.cs

@@ -0,0 +1,7 @@
+namespace Markdown.Parsers;
+
+public interface IParser
+{
+    bool TryParse(char symbol, string text, int index);
+    Token Parse(string text, ref int index);
+}

cs/Markdown/Parsers/ItalicParser.cs

@@ -2,7 +2,7 @@
 
 namespace Markdown.Parsers;
 
-public class ItalicParser
+public class ItalicParser : IParser
 {
     private readonly GeneralParser.IsValidTag isValidOpenItalicTag;
     private readonly GeneralParser.IsValidTag isValidCloseItalicTag;
@@ -22,25 +22,32 @@ public ItalicParser()
         IsHaveInsideItalicTag = false;
     }
 
-    public Token ItalicParse(string text, int i)
+    private Token ItalicParse(string text, int i)
     {
         if (i != 0 && i != text.Length - 1)
             IsHaveInsideItalicTag = true;
         if (isItalicClosed)
         {
             if (!isValidOpenItalicTag(text, i))
             {
-                return new Token("_");
+                return new Token("_", new TextTag());
             }
         }
         else
         {
             if (!isValidCloseItalicTag(text, i))
             {
-                return new Token("_");
+                if (isValidOpenItalicTag(text, i))
+                {
+                    if (tagsStack.Count != 0)
+                        tagsStack.Pop();
+                    return addItalicTag(new ItalicTag(), true);
+                }
+
+                return new Token("_", new TextTag());
             }
         }
-        
+
         if (tagsStack.Count > 1 && !isItalicClosed && BoldParser.IsBoldClosed)
         {
             tagsStack.Pop();
@@ -55,4 +62,14 @@ public Token ItalicParse(string text, int i)
 
         return result;
     }
+
+    public bool TryParse(char symbol, string text, int i)
+    {
+        return symbol == '_';
+    }
+
+    public Token Parse(string text, ref int index)
+    {
+        return ItalicParse(text, index);
+    }
 }

cs/Markdown/Parsers/LinkParser.cs

@@ -4,7 +4,7 @@
 
 namespace Markdown.Parsers;
 
-public class LinkParser
+public class LinkParser : IParser
 {
     private LinkTag linkTag;
     private StringBuilder nameOfLink;
@@ -43,9 +43,21 @@ public Token LinkParse(string text)
 
     private Token GenerateLinkToken()
     {
-        var context = linkTag.GetHtmlOpenTag() + linkTag.LinkUrl + "\">" + linkTag.LinkName + linkTag.GetHtmlCloseTag();
+        var context = linkTag.GetHtmlOpenTag + linkTag.LinkName + linkTag.GetHtmlCloseTag;
         urlOfLink.Clear();
         nameOfLink.Clear();
         return new Token(context, linkTag);
     }
+
+    public bool TryParse(char symbol,  string text, int i)
+    {
+        return symbol == '[';
+    }
+
+    public Token Parse(string text, ref int i)
+    {
+        var token = LinkParse(text);
+        i = text.Length-1;
+        return token;
+    }
 }

cs/Markdown/Parsers/SlashParser.cs

@@ -2,39 +2,53 @@
 
 namespace Markdown.Parsers;
 
-public class SlashParser
+public class SlashParser : IParser
 {
+    private int index;
+    private BoldParser boldParser;
 
-    private int Index;
-
-    public SlashParser()
+    public SlashParser(BoldParser boldParser)
     {
-        Index = 0;
+        this.boldParser = boldParser;
+        index = 0;
     }
-    public Token QuotedToken(string text, int i, bool isNextSymbolBold)
+
+    private Token QuotedToken(string text, int i, bool isNextSymbolBold)
     {
         i++;
-        Index = i;
-        if (Index < text.Length)
+        index = i;
+        if (index < text.Length)
         {
-            switch (text[Index])
+            switch (text[index])
             {
                 case '_':
-                    if (Index + 1 < text.Length && isNextSymbolBold)
+                    if (index + 1 < text.Length && isNextSymbolBold)
                     {
-                        Index++;
-                        return new Token(new BoldTag().MarkdownTag);
+                        index++;
+                        return new Token(new BoldTag().MarkdownTag, new TextTag());
                     }
-                    return new Token(new ItalicTag().MarkdownTag);
+
+                    return new Token(new ItalicTag().MarkdownTag, new TextTag());
                 case '#':
-                    return new Token(new HeadingTag().MarkdownTag);
+                    return new Token(new HeadingTag().MarkdownTag, new TextTag());
             }
         }
 
-        Index--;
-        return new Token("\\");
+        index--;
+        return new Token("\\", new TextTag());
+    }
+
+    public int GetIndex() => index;
+
+    public bool TryParse(char symbol, string text, int i)
+    {
+        return symbol == '\\';
+    }
+
+    public Token Parse(string text, ref int i)
+    {
+        var token = QuotedToken(text, i, boldParser.IsNextSymbolBold(text, i + 1));
+        i = index;
+        return token;
     }
-
-    public int GetIndex() => Index;
-
 }