added first steps of multi commenting

Author: maxijabase

Interop/HotkeyControl.cs

@@ -23,6 +23,7 @@ public class HotkeyControl
             { "ReformatAll", "Ctrl+Shift+R" },
             { "GoToLine", "Ctrl+G" },
             { "CommentLine", "Ctrl+K" },
+            { "UncommentLine", "Ctrl+Shift+K" },
             { "TransformUppercase", "Ctrl+U" },
             { "TransformLowercase", "Ctrl+Shift+U" },
             { "DeleteLine", "Ctrl+D" },

Interop/TranslationProvider.cs

@@ -164,7 +164,8 @@ private void FillToEnglishDefaults()
             language.Add("Folding", "Foldings");
             language.Add("FoldingsExpand", "Expand all");
             language.Add("FoldingsCollapse", "Collapse all");
-            language.Add("CommentLine", "Toggle comment");
+            language.Add("CommentLine", "Comment selection");
+            language.Add("UncommentLine", "Uncomment selection");
             language.Add("SelectAll", "Select all");
             language.Add("SearchReplace", "Find & Replace");
             language.Add("Tools", "Tools");

UI/Components/EditorElement/EditorElement.xaml.cs

@@ -740,6 +740,7 @@ public async void Close(bool ForcedToSave = false, bool CheckSavings = true)
         {
             regularyTimer.Stop();
             regularyTimer.Close();
+
             if (fileWatcher != null)
             {
                 fileWatcher.EnableRaisingEvents = false;
@@ -766,45 +767,73 @@ public async void Close(bool ForcedToSave = false, bool CheckSavings = true)
                 }
             }
 
+            Parent = null;
+
             Program.MainWindow.EditorsReferences.Remove(this);
             Program.MainWindow.MenuI_ReopenLastClosedTab.IsEnabled = true;
             Program.RecentFilesStack.Push(FullFilePath);
-            Parent = null; //to prevent a ring depency which disables the GC from work
             Program.MainWindow.UpdateWindowTitle();
         }
 
-        public void ToggleCommentOnLine()
+        public void ToggleComment(bool comment)
         {
-            var line = editor.Document.GetLineByOffset(editor.CaretOffset);
-            var lineText = editor.Document.GetText(line);
-            var leadingWhiteSpaces = 0;
-            foreach (var l in lineText)
+            // Get the selection segments
+            var selectionSegments = editor.TextArea.Selection.Segments;
+
+            var lineList = new List<DocumentLine>();
+            var document = editor.TextArea.Document;
+
+            // If there's no selection, add to lineList the line the caret is standing on
+            if (!selectionSegments.Any())
             {
-                if (char.IsWhiteSpace(l))
-                {
-                    leadingWhiteSpaces++;
-                }
-                else
+                lineList.Add(document.GetLineByOffset(editor.TextArea.Caret.Offset));
+            }
+            else
+            {
+                // Get all the lines from that selection and store them in a list
+                foreach (var segment in selectionSegments)
                 {
-                    break;
+                    var lineStart = document.GetLineByOffset(segment.StartOffset).LineNumber;
+                    var lineEnd = document.GetLineByOffset(segment.EndOffset).LineNumber;
+                    for (var i = lineStart; i <= lineEnd; i++)
+                    {
+                        lineList.Add(editor.Document.GetLineByNumber(i));
+                    }
                 }
             }
 
-            lineText = lineText.Trim();
-            if (lineText.Length > 1)
+            // For each line, apply comment logic
+            foreach (var line in lineList)
             {
-                if (lineText[0] == '/' && lineText[1] == '/')
+                var lineText = editor.Document.GetText(line);
+                var leadingWhiteSpaces = 0;
+                foreach (var l in lineText)
                 {
-                    editor.Document.Remove(line.Offset + leadingWhiteSpaces, 2);
+                    if (char.IsWhiteSpace(l))
+                    {
+                        leadingWhiteSpaces++;
+                    }
+                    else
+                    {
+                        break;
+                    }
                 }
-                else
+                lineText = lineText.Trim();
+                if (lineText.Length > 1)
                 {
-                    editor.Document.Insert(line.Offset + leadingWhiteSpaces, "//");
+                    if (!comment && lineText[0] == '/' && lineText[1] == '/')
+                    {
+                        editor.Document.Remove(line.Offset + leadingWhiteSpaces, 3);
+                    }
+                    else if (comment && lineText[0] != '/' && lineText[1] != '/')
+                    {
+                        editor.Document.Insert(line.Offset + leadingWhiteSpaces, "// ");
+                    }
+                }
+                else if (comment)
+                {
+                    editor.Document.Insert(line.Offset + leadingWhiteSpaces, "// ");
                 }
-            }
-            else
-            {
-                editor.Document.Insert(line.Offset + leadingWhiteSpaces, "//");
             }
         }
 

UI/MainWindow/MainWindow.xaml

@@ -140,7 +140,8 @@
               <MenuItem x:Name="MenuI_FoldingsCollapse" Header="Collapse All" Click="Menu_CollapseAll" />
             </MenuItem>
             <MenuItem x:Name="MenuI_GoToLine" Header="Jump To" Click="Menu_JumpTo"/>
-            <MenuItem x:Name="MenuI_CommentLine" Header="Toggle comment (//)" Click="Menu_ToggleCommentLine"/>
+            <MenuItem x:Name="MenuI_CommentLine" Header="Comment selection (//)" Click="Menu_CommentLine"/>
+            <MenuItem x:Name="MenuI_UncommentLine" Header="Uncomment selection (//)" Click="Menu_UncommentLine"/>
             <MenuItem x:Name="MenuI_SelectAll" Header="Select All" Click="Menu_SelectAll"/>
             <Separator />
             <MenuItem x:Name="MenuI_SearchReplace" Header="Find &amp; Replace" Click="Menu_FindAndReplace"/>

UI/MainWindow/MainWindowCommands.cs

@@ -425,12 +425,12 @@ private void Command_SelectAll()
         /// <summary>
         /// Comment or uncomment the line the caret is in.
         /// </summary>
-        private void Command_ToggleCommentLine()
+        private void Command_ToggleCommentLine(bool comment)
         {
             var ee = GetCurrentEditorElement();
             if (ee != null && !ee.editor.IsReadOnly)
             {
-                ee.ToggleCommentOnLine();
+                ee.ToggleComment(comment);
             }
         }
 

UI/MainWindow/MainWindowInputHandler.cs

@@ -76,7 +76,8 @@ private void LoadCommandsDictionary()
                 { "ReformatCurrent", () => Command_TidyCode(false) },
                 { "ReformatAll", () => Command_TidyCode(true) },
                 { "GoToLine", Command_GoToLine },
-                { "CommentLine", Command_ToggleCommentLine },
+                { "CommentLine", () => Command_ToggleCommentLine(true) },
+                { "UncommentLine", () => Command_ToggleCommentLine(false) },
                 { "TransformUppercase", () => Command_ChangeCase(true) },
                 { "TransformLowercase", () => Command_ChangeCase(false) },
                 { "DeleteLine", Command_DeleteLine },

UI/MainWindow/MainWindowMenuHandler.cs

@@ -157,9 +157,14 @@ private void Menu_JumpTo(object sender, RoutedEventArgs e)
             Command_GoToLine();
         }
 
-        private void Menu_ToggleCommentLine(object sender, RoutedEventArgs e)
+        private void Menu_CommentLine(object sender, RoutedEventArgs e)
         {
-            Command_ToggleCommentLine();
+            Command_ToggleCommentLine(true);
+        }
+
+        private void Menu_UncommentLine(object sender, RoutedEventArgs e)
+        {
+            Command_ToggleCommentLine(false);
         }
 
         private void Menu_SelectAll(object sender, RoutedEventArgs e)