More parser fixes for #357

Author: distantcam

src/ServiceInsight.Desktop/CodeParser/BaseParser.cs

@@ -1,5 +1,6 @@
 namespace Particular.ServiceInsight.Desktop.CodeParser
 {
+    using System;
     using System.Collections.Generic;
     using System.Linq;
     using System.Text;
@@ -43,9 +44,9 @@ protected void TryExtract(ref SourcePart text, string lex)
             }
         }
 
-        protected bool TryExtract(List<CodeLexem> res, ref SourcePart text, string lex, LexemType type)
+        protected bool TryExtract(List<CodeLexem> res, ref SourcePart text, string lex, LexemType type, StringComparison comparisonType = StringComparison.Ordinal)
         {
-            if (text.StartsWith(lex))
+            if (text.StartsWith(lex, comparisonType))
             {
                 res.Add(new CodeLexem(type, CutString(ref text, lex.Length)));
                 return true;

src/ServiceInsight.Desktop/CodeParser/JsonParser.cs

@@ -27,6 +27,8 @@ protected override List<CodeLexem> Parse(SourcePart text)
 
                     while (reader.Read())
                     {
+                        var length = text.Length;
+
                         switch (reader.TokenType)
                         {
                             case JsonToken.StartArray: Extract(list, ref text, "[", LexemType.Symbol); break;
@@ -55,6 +57,14 @@ protected override List<CodeLexem> Parse(SourcePart text)
 
                             default: list.Add(new CodeLexem(LexemType.Error, reader.TokenType.ToString())); break;
                         }
+
+                        if (length == text.Length)
+                        {
+                            // Parser chocked on something, dump the rest of the
+                            // string and exit.
+                            list.Add(new CodeLexem(CutString(ref text, text.Length)));
+                            return list;
+                        }
                     }
                 }
 
@@ -80,7 +90,7 @@ protected override List<CodeLexem> Parse(SourcePart text)
 
         void Extract(List<CodeLexem> res, ref SourcePart text, string lex, LexemType type)
         {
-            while (!TryExtract(res, ref text, lex, type))
+            while (!TryExtract(res, ref text, lex, type, StringComparison.OrdinalIgnoreCase))
             {
                 var length = text.Length;
 

src/ServiceInsight.Tests/JsonParserTests.cs

@@ -93,5 +93,21 @@ public void should_parse_complex_json_graphs()
             lexemes.Count(lx => lx.Type == LexemType.Value).ShouldBe(8);
             lexemes.Count(lx => lx.Type == LexemType.LineBreak).ShouldBe(11);
         }
+
+        [Test]
+        public void issue357()
+        {
+            const string JsonGraph = "{ \"foo\":true, \"bar\":false }";
+
+            var lexemes = new CodeLexem(JsonGraph).Parse(CodeLanguage.Json);
+
+            lexemes.Count().ShouldBe(17);
+            lexemes.Count(lx => lx.Type == LexemType.Property).ShouldBe(2);
+            lexemes.Count(lx => lx.Type == LexemType.Value).ShouldBe(2);
+            lexemes.Count(lx => lx.Type == LexemType.Quotes).ShouldBe(4);
+            lexemes.Count(lx => lx.Type == LexemType.Space).ShouldBe(3);
+            lexemes.Count(lx => lx.Type == LexemType.Symbol).ShouldBe(5);
+            lexemes.Count(lx => lx.Type == LexemType.Complex).ShouldBe(0);
+        }
     }
 }