Fix an error on empty tokens, fix wrongly ordered vertices in graph.

Also make sidebar list items display same text as vertices.

Author: craigmjohnston

Graphs/TokenVertex.cs

@@ -1,5 +1,6 @@
 namespace GrunCS.Graphs
 {
+    using System;
     using Antlr4.Runtime;
     using Antlr4.Runtime.Tree;
 
@@ -41,9 +42,7 @@ public override string Text
         {
             get
             {
-                string text = this.Token.Text;
-
-                if (string.IsNullOrWhiteSpace(text) && !text.Contains("\n"))
+                if (string.IsNullOrWhiteSpace(this.Token.Text) && (this.Token.Text == null || !this.Token.Text.Contains("\n")))
                 {
                     return $"<{MainWindow.LexerSymbolicNames[this.Token.Type]}>";
                 }

MainWindow.xaml

@@ -22,12 +22,13 @@
         <GridSplitter Grid.Column="1" Width="5" HorizontalAlignment="Stretch" />
         <controls:ZoomControl Grid.Column="2" Zoom="1" ZoomBoxOpacity="0.5" Mode="Fill">
             <graphs:TokenGraphLayout x:Name="GraphLayout" Margin="10" Graph="{Binding Path=Graph}"
-                                     LayoutAlgorithmType="EfficientSugiyama" OverlapRemovalAlgorithmType="FSA">
+                                     LayoutAlgorithmType="EfficientSugiyama">
                 <graphs:TokenGraphLayout.LayoutParameters>
                     <layout:EfficientSugiyamaLayoutParameters 
                         EdgeRouting="Orthogonal"
-                        OptimizeWidth="True"
-                        PositionMode="0"></layout:EfficientSugiyamaLayoutParameters>
+                        PositionMode="0"
+                        LayerDistance="17"
+                        MinimizeEdgeLength="True"></layout:EfficientSugiyamaLayoutParameters>
                 </graphs:TokenGraphLayout.LayoutParameters>
             </graphs:TokenGraphLayout>
         </controls:ZoomControl>

MainWindow.xaml.cs

@@ -5,6 +5,7 @@
     using System.Data;
     using System.IO;
     using System.Reflection;
+    using System.Windows;
     using System.Windows.Controls;
     using System.Windows.Input;
     using System.Windows.Media;
@@ -48,12 +49,22 @@ private TreeViewItem Traverse(ITree tree, Parser parser)
             }
             else if (tree.Payload is IToken)
             {
-                text = ((IToken) tree.Payload).Text.Replace("\n", "\\n");
+                var token = (IToken) tree.Payload;
+                
+                if (string.IsNullOrWhiteSpace(token.Text) && (token.Text == null || !token.Text.Contains("\n")))
+                {
+                    text = $"<{MainWindow.LexerSymbolicNames[token.Type]}>";
+                }
+                else
+                {
+                    text = token.Text.Replace("\n", "\\n");
+                }
             }
 
             var result = new TreeViewItem
             {
-                Header = text
+                Header = text,
+                FontWeight = tree is IRuleNode ? FontWeights.Bold : FontWeights.Normal
             };
 
             if (tree is IErrorNode)

MainWindowViewModel.cs

@@ -27,11 +27,8 @@ protected virtual void OnPropertyChanged([CallerMemberName] string propertyName
         {
             this.PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
         }
-        
-        
-        
-
 
+        
         private PayloadVertex DrawTraverse(TokenGraph graph, ITree tree, Parser parser)
         {
             PayloadVertex vertex;