Author: mkrueger
Date: 2008-02-04 07:50:34 -0500 (Mon, 04 Feb 2008)
New Revision: 94740

Modified:
   trunk/monodevelop/main/src/addins/MonoDevelop.SourceEditor2/ChangeLog
   
trunk/monodevelop/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/EditActions.cs
   
trunk/monodevelop/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/ExtendibleTextEditor.cs
Log:
* MonoDevelop.SourceEditor/ExtendibleTextEditor.cs,
  MonoDevelop.SourceEditor/EditActions.cs: Bug 354129 - Auto add
  second brackets, quotation mark

Modified: trunk/monodevelop/main/src/addins/MonoDevelop.SourceEditor2/ChangeLog
===================================================================
--- trunk/monodevelop/main/src/addins/MonoDevelop.SourceEditor2/ChangeLog       
2008-02-04 12:50:12 UTC (rev 94739)
+++ trunk/monodevelop/main/src/addins/MonoDevelop.SourceEditor2/ChangeLog       
2008-02-04 12:50:34 UTC (rev 94740)
@@ -1,5 +1,11 @@
 2008-02-04  Mike Krüger <[EMAIL PROTECTED]> 
 
+       * MonoDevelop.SourceEditor/ExtendibleTextEditor.cs,
+         MonoDevelop.SourceEditor/EditActions.cs: Bug 354129 - Auto add second
+         brackets, quotation mark
+
+2008-02-04  Mike Krüger <[EMAIL PROTECTED]> 
+
        * MonoDevelop.SourceEditor/SourceEditorView.cs: Implemented Bug 323946 -
          Undo/Redo functionality are not context sensitive.
 

Modified: 
trunk/monodevelop/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/EditActions.cs
===================================================================
--- 
trunk/monodevelop/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/EditActions.cs
 2008-02-04 12:50:12 UTC (rev 94739)
+++ 
trunk/monodevelop/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/EditActions.cs
 2008-02-04 12:50:34 UTC (rev 94740)
@@ -43,5 +43,33 @@
                                base.Run (data);
                }
        }
-
+       
+       public class AdvancedBackspaceAction : BackspaceAction
+       {
+               const string open    = "'\"([{<";
+               const string closing = "'\")]}>";
+               
+               int GetNextNonWsCharOffset (TextEditorData data, int offset)
+               {
+                       int result = offset;
+                       while (Char.IsWhiteSpace 
(data.Document.Buffer.GetCharAt (result))) {
+                               result++;
+                               if (result >= data.Document.Buffer.Length)
+                                       return -1;
+                       }
+                       return result;
+               }
+               
+               protected override void RemoveCharBeforCaret (TextEditorData 
data)
+               {
+                       char ch = data.Document.Buffer.GetCharAt 
(data.Caret.Offset - 1);
+                       int idx = open.IndexOf (ch);
+                       if (idx >= 0) {
+                               int nextCharOffset = GetNextNonWsCharOffset 
(data, data.Caret.Offset);
+                               if (nextCharOffset >= 0 && closing[idx] == 
data.Document.Buffer.GetCharAt (nextCharOffset))
+                                       data.Document.Buffer.Remove 
(data.Caret.Offset, nextCharOffset - data.Caret.Offset + 1);
+                       }
+                       base.RemoveCharBeforCaret (data);
+               }
+       }
 }

Modified: 
trunk/monodevelop/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/ExtendibleTextEditor.cs
===================================================================
--- 
trunk/monodevelop/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/ExtendibleTextEditor.cs
        2008-02-04 12:50:12 UTC (rev 94739)
+++ 
trunk/monodevelop/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/ExtendibleTextEditor.cs
        2008-02-04 12:50:34 UTC (rev 94740)
@@ -87,6 +87,7 @@
                                        extension.TextChanged (args.Offset, 
args.Offset + Math.Max (args.Count, args.Value != null ? args.Value.Length : 
0));
                        };
                        keyBindings [GetKeyCode (Gdk.Key.Tab)] = new TabAction 
(this);
+                       keyBindings [GetKeyCode (Gdk.Key.BackSpace)] = new 
AdvancedBackspaceAction ();
                        this.PopupMenu += delegate {
                                this.ShowPopup ();
                        };
@@ -137,6 +138,15 @@
                                case '(':
                                        Buffer.Insert (Caret.Offset, new 
StringBuilder (")"));
                                        break;
+                               case '<':
+                                       Buffer.Insert (Caret.Offset, new 
StringBuilder (">"));
+                                       break;
+                               case '\'':
+                                       Buffer.Insert (Caret.Offset, new 
StringBuilder ("'"));
+                                       break;
+                               case '"':
+                                       Buffer.Insert (Caret.Offset, new 
StringBuilder ("\""));
+                                       break;
                                }
                        }
                        return result;

_______________________________________________
Mono-patches maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches

Reply via email to