Changeset 17838 for stable

Timestamp:

02/16/21 12:05:06 (3 years ago)

Author:

mkommend

Message:

#3045: Merged r17384, r17385, r17386 into stable.

Location:

stable

Files:

• . (modified) (1 prop)
• HeuristicLab.CodeEditor/3.4/CodeEditor.cs (modified) (1 diff)
• HeuristicLab.Scripting.Views/3.3/CompilerErrorDialog.Designer.cs (copied) (copied from trunk/HeuristicLab.Scripting.Views/3.3/CompilerErrorDialog.Designer.cs)
• HeuristicLab.Scripting.Views/3.3/CompilerErrorDialog.cs (copied) (copied from trunk/HeuristicLab.Scripting.Views/3.3/CompilerErrorDialog.cs)
• HeuristicLab.Scripting.Views/3.3/HeuristicLab.Scripting.Views-3.3.csproj (modified) (1 diff)
• HeuristicLab.Scripting.Views/3.3/ScriptView.Designer.cs (modified) (1 diff)
• HeuristicLab.Scripting.Views/3.3/ScriptView.cs (modified) (1 diff)

stable/HeuristicLab.CodeEditor/3.4/CodeEditor.cs

@@ -282 +282 @@
     public override void ScrollToPosition(int line, int column) {
       var segment = GetSegmentAtLocation(line, column);
-      TextEditor.CaretOffset = segment.Offset + segment.Length;
+      TextEditor.CaretOffset = segment.Offset;
       TextEditor.ScrollToLine(line);
     }

stable/HeuristicLab.Scripting.Views/3.3/HeuristicLab.Scripting.Views-3.3.csproj

@@ -97 +97 @@
     <Compile Include="CSharpScriptView.Designer.cs">
       <DependentUpon>CSharpScriptView.cs</DependentUpon>
+    </Compile>
+    <Compile Include="CompilerErrorDialog.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="CompilerErrorDialog.Designer.cs">
+      <DependentUpon>CompilerErrorDialog.cs</DependentUpon>
     </Compile>
     <Compile Include="ExecutableScriptView.cs">

stable/HeuristicLab.Scripting.Views/3.3/ScriptView.Designer.cs

@@ -184 +184 @@
       this.errorListView.UseCompatibleStateImageBehavior = false;
       this.errorListView.View = System.Windows.Forms.View.Details;
+      this.errorListView.MouseClick += new System.Windows.Forms.MouseEventHandler(this.errorListView_MouseClick);
       this.errorListView.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.errorListView_MouseDoubleClick);
       // 

stable/HeuristicLab.Scripting.Views/3.3/ScriptView.cs

@@ -209 +209 @@
     }
 
+    private void errorListView_MouseClick(object sender, MouseEventArgs e) {
+      if (e.Button != MouseButtons.Left) return;
+
+      var item = errorListView.SelectedItems[0];
+      var message = (CompilerError)item.Tag;
+
+      codeEditor.ScrollToPosition(message.Line, message.Column);
+      codeEditor.Focus();
+    }
+
     private void errorListView_MouseDoubleClick(object sender, MouseEventArgs e) {
-      if (e.Button == MouseButtons.Left) {
-        var item = errorListView.SelectedItems[0];
-        var message = (CompilerError)item.Tag;
-        codeEditor.ScrollToPosition(message.Line, message.Column);
-        codeEditor.Focus();
-      }
+      if (e.Button != MouseButtons.Left) return;
+
+      var item = errorListView.SelectedItems[0];
+      var message = (CompilerError)item.Tag;
+
+      using (var dialog = new CompilerErrorDialog(message)) {
+        dialog.ShowDialog(this);
+      };
     }
     #endregion