Author: mkrueger
Date: 2008-01-25 06:49:22 -0500 (Fri, 25 Jan 2008)
New Revision: 93886
Modified:
trunk/monodevelop/main/src/addins/MonoDevelop.SourceEditor2/ChangeLog
trunk/monodevelop/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/ExtendibleTextEditor.cs
trunk/monodevelop/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SourceEditorOptions.cs
trunk/monodevelop/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SourceEditorView.cs
Log:
* MonoDevelop.SourceEditor/ExtendibleTextEditor.cs,
MonoDevelop.SourceEditor/SourceEditorView.cs,
MonoDevelop.SourceEditor/SourceEditorOptions.cs: Added auto insert
bracket option.
Modified: trunk/monodevelop/main/src/addins/MonoDevelop.SourceEditor2/ChangeLog
===================================================================
--- trunk/monodevelop/main/src/addins/MonoDevelop.SourceEditor2/ChangeLog
2008-01-25 11:48:40 UTC (rev 93885)
+++ trunk/monodevelop/main/src/addins/MonoDevelop.SourceEditor2/ChangeLog
2008-01-25 11:49:22 UTC (rev 93886)
@@ -1,6 +1,20 @@
2008-01-25 Mike Krüger <[EMAIL PROTECTED]>
* MonoDevelop.SourceEditor/ExtendibleTextEditor.cs,
+ MonoDevelop.SourceEditor/SourceEditorView.cs,
+ MonoDevelop.SourceEditor/SourceEditorOptions.cs: Added auto insert
+ bracket option.
+
+2008-01-25 Mike Krüger <[EMAIL PROTECTED]>
+
+ * MonoDevelop.SourceEditor/ExtendibleTextEditor.cs,
+ MonoDevelop.SourceEditor/SourceEditorView.cs,
+ MonoDevelop.SourceEditor/SourceEditorOptions.cs: Added auto insert
+ bracket option.
+
+2008-01-25 Mike Krüger <[EMAIL PROTECTED]>
+
+ * MonoDevelop.SourceEditor/ExtendibleTextEditor.cs,
MonoDevelop.SourceEditor/SourceEditorOptions.cs: Added property change
event.
Modified:
trunk/monodevelop/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/ExtendibleTextEditor.cs
===================================================================
---
trunk/monodevelop/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/ExtendibleTextEditor.cs
2008-01-25 11:48:40 UTC (rev 93885)
+++
trunk/monodevelop/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/ExtendibleTextEditor.cs
2008-01-25 11:49:22 UTC (rev 93886)
@@ -98,12 +98,38 @@
protected override bool OnKeyPressEvent (Gdk.EventKey evnt)
{
+ bool result = true;
if (extension != null) {
if (!extension.KeyPress (evnt.Key, evnt.State))
{
- return base.OnKeyPressEvent (evnt);
+ result = base.OnKeyPressEvent (evnt);
}
+ } else {
+ result = base.OnKeyPressEvent (evnt);
}
- return true;
+ char ch = (char)evnt.Key;
+ if
(SourceEditorOptions.Options.AutoInsertMatchingBracket) {
+ switch (ch) {
+ case '{':
+ if (extension != null) {
+ int offset = Caret.Offset;
+ extension.KeyPress
(Gdk.Key.Return, Gdk.ModifierType.None);
+ extension.KeyPress
((Gdk.Key)'}', Gdk.ModifierType.None);
+ Caret.Offset = offset;
+ extension.KeyPress
(Gdk.Key.Return, Gdk.ModifierType.None);
+ } else {
+ base.SimulateKeyPress
(Gdk.Key.Return, Gdk.ModifierType.None);
+ 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;
}
double mx, my;
@@ -309,7 +335,6 @@
public bool DoInsertTemplate ()
{
string word = GetWordBeforeCaret ();
- System.Console.WriteLine("word before:" + word);
CodeTemplateGroup templateGroup =
CodeTemplateService.GetTemplateGroupPerFilename (this.view.ContentName);
if (String.IsNullOrEmpty (word) || templateGroup ==
null)
return false;
Modified:
trunk/monodevelop/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SourceEditorOptions.cs
===================================================================
---
trunk/monodevelop/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SourceEditorOptions.cs
2008-01-25 11:48:40 UTC (rev 93885)
+++
trunk/monodevelop/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SourceEditorOptions.cs
2008-01-25 11:49:22 UTC (rev 93886)
@@ -194,7 +194,7 @@
}
}
- public bool EnableSyntaxHighlighting {
+ public override bool EnableSyntaxHighlighting {
get {
return PropertyService.Get
("EnableSyntaxHighlighting", true);
}
@@ -220,7 +220,7 @@
public bool AutoInsertMatchingBracket {
get {
- return PropertyService.Get
("AutoInsertMatchingBracket", true);
+ return PropertyService.Get
("AutoInsertMatchingBracket", false);
}
set {
if (value != AutoInsertMatchingBracket) {
Modified:
trunk/monodevelop/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SourceEditorView.cs
===================================================================
---
trunk/monodevelop/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SourceEditorView.cs
2008-01-25 11:48:40 UTC (rev 93885)
+++
trunk/monodevelop/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SourceEditorView.cs
2008-01-25 11:49:22 UTC (rev 93886)
@@ -209,7 +209,6 @@
#region IExtensibleTextEditor
ITextEditorExtension IExtensibleTextEditor.AttachExtension
(ITextEditorExtension extension)
{
- System.Console.WriteLine("Attach extension:" +
extension);
this.widget.TextEditor.Extension = extension;
return this.widget;
}
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
