Replaced txtOutput TextBox in GrammarExplorer with ConsoleTextBox.

IronyProject · Mar 11, 2018 · fefa362 · fefa362
1 parent c16476b
commit fefa362
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 11 deletions.
diff --git a/Irony.GrammarExplorer/fmGrammarExplorer.Designer.cs b/Irony.GrammarExplorer/fmGrammarExplorer.Designer.cs
diff --git a/Irony.GrammarExplorer/fmGrammarExplorer.cs b/Irony.GrammarExplorer/fmGrammarExplorer.cs
@@ -355,7 +355,7 @@ private void RunSample() {
       ClearRuntimeInfo();
       Stopwatch sw = new Stopwatch();
       int oldGcCount;
-      txtOutput.Text = "";
+      txtOutput.Text = string.Empty;
       try {
         if (_parseTree == null)
           ParseSample();
@@ -367,7 +367,7 @@ private void RunSample() {
 
         sw.Start();
         var iRunner = _grammar as ICanRunSample;
-        var args = new RunSampleArgs(_language, txtSource.Text, _parseTree);
+        var args = new RunSampleArgs(_language, txtSource.Text, _parseTree, txtOutput);
         string output = iRunner.RunSample(args);
         sw.Stop();
         lblRunTime.Text = sw.ElapsedMilliseconds.ToString();

diff --git a/Irony.WinForms/ConsoleTextBox.cs b/Irony.WinForms/ConsoleTextBox.cs
@@ -36,7 +36,6 @@ public ConsoleTextBox() {
     protected override FastColoredTextBox CreateFastColoredTextBox() {
       var textBox = new FctbConsoleTextBox {
         LeftPadding = 2,
-        PreferredLineWidth = 80,
         ShowLineNumbers = false,
         WordWrap = true,
         WordWrapMode = WordWrapMode.CharWrapPreferredWidth,
@@ -53,8 +52,11 @@ private FctbConsoleTextBox Console {
 
     [Browsable(false), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
     public override string Text {
-      get { return base.Text; }
-      set { base.Text = value; }
+      get { return Console.Text; }
+      set {
+        Console.Clear();
+        Console.WriteLine(value);
+      }
     }
 
     protected override void OnHandleDestroyed(EventArgs e) {

diff --git a/Irony.WinForms/FastColoredTextBox/ConsoleTextBox.cs b/Irony.WinForms/FastColoredTextBox/ConsoleTextBox.cs
@@ -26,6 +26,19 @@ public bool IsReadLineMode
             set { isReadLineMode = value; }
         }
 
+        public new void Clear()
+        {
+            isUpdating = true;
+            try
+            {
+                base.Clear();
+            }
+            finally
+            {
+                isUpdating = false;
+            }
+        }
+
         /// <summary>
         /// Append line to end of text.
         /// </summary>

diff --git a/Irony.WinForms/IronyTextBoxBase.cs b/Irony.WinForms/IronyTextBoxBase.cs
@@ -118,6 +118,12 @@ protected override void OnPaint(PaintEventArgs args) {
       }
     }
 
+    [DefaultValue(false)]
+    public bool ReadOnly {
+      get { return FastColoredTextBox.ReadOnly; }
+      set { FastColoredTextBox.ReadOnly = value; }
+    }
+
     /// <summary>
     /// Selects a range of text in the text box.
     /// </summary>