Changeset 10506 for trunk/sources/HeuristicLab.HLScript.Views/3.3/ScriptView.cs

Timestamp:

02/25/14 13:55:01 (10 years ago)

Author:

jkarder

Message:

#2136: applied some of the changes suggested in comment:11:ticket:2136

• change namespaces to HeuristicLab.Scripting.*
• added extra compile button and registered F6 as a shortcut
• changed the order of the output window and the error list
• tabs (output window and error list) are selected automatically
• thrown exceptions are shown using the PluginInfrastructure
• removed namespace declaration in the script
• names in the VariableStore are now conform to C# property names

File:

• trunk/sources/HeuristicLab.HLScript.Views/3.3/ScriptView.cs (modified) (9 diffs)

trunk/sources/HeuristicLab.HLScript.Views/3.3/ScriptView.cs

@@ -22 +22 @@
 using System;
 using System.CodeDom.Compiler;
-using System.Collections.Generic;
 using System.Drawing;
+using System.Globalization;
 using System.Linq;
 using System.Windows.Forms;
@@ -31 +31 @@
 using HeuristicLab.MainForm;
 
-namespace HeuristicLab.HLScript.Views {
+namespace HeuristicLab.Scripting.Views {
 
   [View("Script View")]
@@ -45 +45 @@
     public ScriptView() {
       InitializeComponent();
+      errorListView.SmallImageList.Images.AddRange(new Image[] { VSImageLibrary.Warning, VSImageLibrary.Error });
+      AdjustErrorListViewColumnSizes();
     }
 
@@ -68 +70 @@
     }
     private void Content_ScriptExecutionStarted(object sender, EventArgs e) {
-      Locked = true;
-      ReadOnly = true;
-      startStopButton.Image = VSImageLibrary.Stop;
-    }
-    private void Content_ScriptExecutionFinished(object sender, EventArgs e) {
-      Locked = false;
-      ReadOnly = false;
-      startStopButton.Image = VSImageLibrary.Play;
-      running = false;
+      if (InvokeRequired)
+        Invoke((Action<object, EventArgs>)Content_ScriptExecutionStarted, sender, e);
+      else {
+        Locked = true;
+        ReadOnly = true;
+        startStopButton.Image = VSImageLibrary.Stop;
+        infoTabControl.SelectedTab = outputTabPage;
+      }
+    }
+    private void Content_ScriptExecutionFinished(object sender, EventArgs<Exception> e) {
+      if (InvokeRequired)
+        Invoke((Action<object, EventArgs<Exception>>)Content_ScriptExecutionFinished, sender, e);
+      else {
+        Locked = false;
+        ReadOnly = false;
+        startStopButton.Image = VSImageLibrary.Play;
+        running = false;
+        var ex = e.Value;
+        if (ex != null)
+          PluginInfrastructure.ErrorHandling.ShowErrorDialog(this, ex);
+      }
     }
     private void Content_ConsoleOutputChanged(object sender, EventArgs<string> e) {
-      if (InvokeRequired) Invoke((Action<object, EventArgs<string>>)Content_ConsoleOutputChanged, sender, e);
+      if (InvokeRequired)
+        Invoke((Action<object, EventArgs<string>>)Content_ConsoleOutputChanged, sender, e);
       else {
         outputTextBox.AppendText(e.Value);
@@ -111 +126 @@
     protected override void SetEnabledStateOfControls() {
       base.SetEnabledStateOfControls();
+      compileButton.Enabled = Content != null && !Locked && !ReadOnly;
       startStopButton.Enabled = Content != null && (!Locked || running);
       codeEditor.Enabled = Content != null && !Locked && !ReadOnly;
@@ -116 +132 @@
 
     #region Child Control event handlers
+    private void compileButton_Click(object sender, EventArgs e) {
+      Compile();
+    }
+
     private void startStopButton_Click(object sender, EventArgs e) {
       if (running) {
@@ -134 +154 @@
     #region global HotKeys
     protected override bool ProcessCmdKey(ref Message msg, Keys keyData) {
-      if (keyData == Keys.F5) {
-        if (Content == null || Locked)
-          return base.ProcessCmdKey(ref msg, keyData);
-        outputTextBox.Clear();
-        bool result = Compile();
-        if (result) {
-          outputTextBox.Clear();
-          Content.Execute();
-          running = true;
-        }
-        return true;
-      } else if (keyData == (Keys.F5 | Keys.Shift)) {
-        Content.Kill();
+      switch (keyData) {
+        case Keys.F5:
+          if (Content != null && !Locked) {
+            if (Compile()) {
+              outputTextBox.Clear();
+              Content.Execute();
+              running = true;
+            } else
+              infoTabControl.SelectedTab = errorListTabPage;
+          }
+          break;
+        case Keys.F5 | Keys.Shift:
+          if (running) Content.Kill();
+          break;
+        case Keys.F6:
+          if (!Compile() || Content.CompileErrors.HasWarnings)
+            infoTabControl.SelectedTab = errorListTabPage;
+          break;
       }
       return base.ProcessCmdKey(ref msg, keyData);
@@ -157 +182 @@
       Locked = true;
       errorListView.Items.Clear();
-      outputTextBox.Clear();
-      outputTextBox.AppendText("Compiling ... ");
+      outputTextBox.Text = "Compiling ... ";
       try {
         Content.Compile();
@@ -165 +189 @@
       } catch {
         outputTextBox.AppendText("Compilation failed.");
-        ShowCompilationErrors();
         return false;
       } finally {
-        OnContentChanged();
+        ShowCompilationResults();
         ReadOnly = false;
         Locked = false;
-      }
-    }
-    #endregion
-
-    private void ShowCompilationErrors() {
+        OnContentChanged();
+      }
+    }
+    #endregion
+
+    private void ShowCompilationResults() {
       if (Content.CompileErrors.Count == 0) return;
-      var warnings = new List<CompilerError>();
-      var errors = new List<CompilerError>();
-      foreach (CompilerError ce in Content.CompileErrors) {
-        if (ce.IsWarning) warnings.Add(ce);
-        else errors.Add(ce);
-      }
-      var msgs = warnings.OrderBy(x => x.Line)
-                         .ThenBy(x => x.Column)
-                   .Concat(errors.OrderBy(x => x.Line)
-                                 .ThenBy(x => x.Column));
-      outputTextBox.AppendText(Environment.NewLine);
-      outputTextBox.AppendText("---");
-      outputTextBox.AppendText(Environment.NewLine);
+      var msgs = Content.CompileErrors.OfType<CompilerError>()
+                                      .OrderBy(x => x.IsWarning)
+                                      .ThenBy(x => x.Line)
+                                      .ThenBy(x => x.Column);
       foreach (var m in msgs) {
-        var item = new ListViewItem(new[] {
+        var item = new ListViewItem();
+        item.SubItems.AddRange(new[] {
           m.IsWarning ? "Warning" : "Error",
           m.ErrorNumber,
-          m.Line.ToString(),
-          m.Column.ToString(),
+          m.Line.ToString(CultureInfo.InvariantCulture),
+          m.Column.ToString(CultureInfo.InvariantCulture),
           m.ErrorText
         });
+        item.ImageIndex = m.IsWarning ? 0 : 1;
         errorListView.Items.Add(item);
-        outputTextBox.AppendText(string.Format("{0} {1} ({2}:{3}): {4}",
-                                 item.SubItems[0].Text,
-                                 item.SubItems[1].Text,
-                                 item.SubItems[2].Text,
-                                 item.SubItems[3].Text,
-                                 item.SubItems[4].Text));
-        outputTextBox.AppendText(Environment.NewLine);
-      }
+      }
+      AdjustErrorListViewColumnSizes();
+    }
+
+    private void AdjustErrorListViewColumnSizes() {
+      foreach (ColumnHeader ch in errorListView.Columns)
+        // adjusts the column width to the width of the column
+        // header or the column content, whichever is greater
+        ch.Width = -2;
     }
   }