Changeset 11785 for branches/CodeEditor

Timestamp:

01/16/15 10:43:48 (9 years ago)

Author:

jkarder

Message:

#2077:

• added <Ctrl> + <G> keystroke to display a go to line dialog
• minor code changes

Location:

branches/CodeEditor/HeuristicLab.CodeEditor/3.4

Files:

• CodeEditor.cs (modified) (4 diffs)
• GoToLineDialog.Designer.cs (added)
• GoToLineDialog.cs (added)
• HeuristicLab.CodeEditor-3.4.csproj (modified) (1 diff)

branches/CodeEditor/HeuristicLab.CodeEditor/3.4/CodeEditor.cs

@@ -209 +209 @@
       var moveLinesUpCommand = new Input.RoutedCommand();
       moveLinesUpCommand.InputGestures.Add(new Input.KeyGesture(Input.Key.Up, Input.ModifierKeys.Alt));
-      var moveLinesUpCommandBinding = new Input.CommandBinding(moveLinesUpCommand, (sender, args) => MoveLines(MovementDirection.Up));
+      var moveLinesUpCommandBinding = new Input.CommandBinding(moveLinesUpCommand, (sender, args) => ExecuteMoveLinesCommand(MovementDirection.Up));
       TextEditor.CommandBindings.Add(moveLinesUpCommandBinding);
       #endregion
@@ -216 +216 @@
       var moveLinesDownCommand = new Input.RoutedCommand();
       moveLinesDownCommand.InputGestures.Add(new Input.KeyGesture(Input.Key.Down, Input.ModifierKeys.Alt));
-      var moveLinesDownCommandBinding = new Input.CommandBinding(moveLinesDownCommand, (sender, args) => MoveLines(MovementDirection.Down));
+      var moveLinesDownCommandBinding = new Input.CommandBinding(moveLinesDownCommand, (sender, args) => ExecuteMoveLinesCommand(MovementDirection.Down));
       TextEditor.CommandBindings.Add(moveLinesDownCommandBinding);
+      #endregion
+
+      #region GoToLineCommand
+      var goToLineCommand = new Input.RoutedCommand();
+      goToLineCommand.InputGestures.Add(new Input.KeyGesture(Input.Key.G, Input.ModifierKeys.Control));
+      var goToLineCommandBinding = new Input.CommandBinding(goToLineCommand, (sender, args) => ExecuteGoToLineCommand());
+      TextEditor.CommandBindings.Add(goToLineCommandBinding);
       #endregion
 
@@ -270 +277 @@
 
     private enum MovementDirection { Up, Down }
-    private void MoveLines(MovementDirection movementDirection) {
+    private void ExecuteMoveLinesCommand(MovementDirection movementDirection) {
       var textArea = TextEditor.TextArea;
       var selection = textArea.Selection;
@@ -366 +373 @@
     }
 
+    private void ExecuteGoToLineCommand() {
+      using (var dlg = new GoToLineDialog(TextEditor)) {
+        var result = dlg.ShowDialog(this);
+        if (result == Forms.DialogResult.OK) {
+          int lineNumber = dlg.Line;
+          var line = Doc.GetLineByNumber(lineNumber);
+          int offset = line.Offset;
+          if (TextUtilities.GetLeadingWhitespace(Doc, line).Length > 0)
+            offset = TextUtilities.GetNextCaretPosition(Doc, offset, LogicalDirection.Forward, CaretPositioningMode.WordStart);
+          TextEditor.CaretOffset = offset;
+        }
+      }
+    }
+
     #region Compiler Errors
     public void ShowCompileErrors(CompilerErrorCollection compilerErrors) {

branches/CodeEditor/HeuristicLab.CodeEditor/3.4/HeuristicLab.CodeEditor-3.4.csproj

@@ -125 +125 @@
     <Compile Include="CodeViewer.Designer.cs">
       <DependentUpon>CodeViewer.cs</DependentUpon>
+    </Compile>
+    <Compile Include="GoToLineDialog.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="GoToLineDialog.Designer.cs">
+      <DependentUpon>GoToLineDialog.cs</DependentUpon>
     </Compile>
     <Compile Include="LanguageFeatures\CodeFolding\CodeFoldingResult.cs" />