duplicate line improvement

TheJoeFin · Mar 4, 2024 · 54202e6 · 54202e6
1 parent 03bfd61
commit 54202e6
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/Text-Grab/Utilities/StringMethods.cs b/Text-Grab/Utilities/StringMethods.cs
@@ -741,4 +741,9 @@ public static int GetNewLineIndexToRight(ref string mainString, int index)
 
         return newLineIndex;
     }
+
+    public static bool EndsWithNewline(this string s)
+    {
+        return Regex.IsMatch(s, @"\n$");
+    }
 }
diff --git a/Text-Grab/Views/EditTextWindow.xaml.cs b/Text-Grab/Views/EditTextWindow.xaml.cs
@@ -1178,8 +1178,13 @@ private void DuplicateSelectedLine(object sender, ExecutedRoutedEventArgs e)
         int selectionLength = PassedTextControl.SelectionLength;
         SelectLine();
         string lineText = PassedTextControl.SelectedText;
-        PassedTextControl.SelectedText = lineText + Environment.NewLine + lineText;
-        PassedTextControl.Select(replaceCaret + (Environment.NewLine.Length + lineText.Length), selectionLength);
+        bool lineEndsInNewLine = lineText.EndsWithNewline();
+        PassedTextControl.SelectedText = $"{ lineText}{(lineEndsInNewLine ? "" : Environment.NewLine)}{ lineText}";
+        int length = lineText.Length;
+        if (!lineEndsInNewLine)
+            length += Environment.NewLine.Length;
+
+        PassedTextControl.Select(replaceCaret + length, selectionLength);
     }
 
     private void MarginsMenuItem_Checked(object sender, RoutedEventArgs e)