Author: mkrueger
Date: 2008-01-23 12:47:24 -0500 (Wed, 23 Jan 2008)
New Revision: 93676
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/SourceEditorView.cs
trunk/monodevelop/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SourceEditorWidget.cs
Log:
* MonoDevelop.SourceEditor/SourceEditorWidget.cs,
MonoDevelop.SourceEditor/ExtendibleTextEditor.cs,
MonoDevelop.SourceEditor/SourceEditorView.cs: Worked on code
completion.
Modified: trunk/monodevelop/main/src/addins/MonoDevelop.SourceEditor2/ChangeLog
===================================================================
--- trunk/monodevelop/main/src/addins/MonoDevelop.SourceEditor2/ChangeLog
2008-01-23 17:06:49 UTC (rev 93675)
+++ trunk/monodevelop/main/src/addins/MonoDevelop.SourceEditor2/ChangeLog
2008-01-23 17:47:24 UTC (rev 93676)
@@ -1,13 +1,17 @@
2008-01-23 Mike Krüger <[EMAIL PROTECTED]>
- * gtk-gui/MonoDevelop.SourceEditor.OptionPanels.GeneralOptionsPanel.cs,
- gtk-gui/gui.stetic, MonoDevelop.SourceEditor.mdp,
+ * MonoDevelop.SourceEditor/SourceEditorWidget.cs,
MonoDevelop.SourceEditor/ExtendibleTextEditor.cs,
- MonoDevelop.SourceEditor/SourceEditorView.cs,
- MonoDevelop.SourceEditor/EditActions.cs: Worked on code templates.
+ MonoDevelop.SourceEditor/SourceEditorView.cs: Worked on code
completion.
2008-01-23 Mike Krüger <[EMAIL PROTECTED]>
+ * MonoDevelop.SourceEditor/SourceEditorWidget.cs,
+ MonoDevelop.SourceEditor/ExtendibleTextEditor.cs,
+ MonoDevelop.SourceEditor/SourceEditorView.cs: Worked on code
completion.
+
+2008-01-23 Mike Krüger <[EMAIL PROTECTED]>
+
* gtk-gui/MonoDevelop.SourceEditor.OptionPanels.GeneralOptionsPanel.cs,
gtk-gui/gui.stetic, MonoDevelop.SourceEditor.mdp,
MonoDevelop.SourceEditor/ExtendibleTextEditor.cs,
@@ -26,15 +30,6 @@
2008-01-22 Mike Krüger <[EMAIL PROTECTED]>
* gtk-gui/MonoDevelop.SourceEditor.OptionPanels.HighlightingPanel.cs,
- gtk-gui/gui.stetic, ChangeLog,
- MonoDevelop.SourceEditor.OptionPanels/BehaviorPanel.cs,
- MonoDevelop.SourceEditor.OptionPanels/HighlightingPanel.cs,
- MonoDevelop.SourceEditor/ExtendibleTextEditor.cs,
- MonoDevelop.SourceEditor/SourceEditorOptions.cs: Worked on style
panel.
-
-2008-01-22 Mike Krüger <[EMAIL PROTECTED]>
-
- * gtk-gui/MonoDevelop.SourceEditor.OptionPanels.HighlightingPanel.cs,
gtk-gui/MonoDevelop.SourceEditor.OptionPanels.GeneralOptionsPanel.cs,
gtk-gui/objects.xml,
gtk-gui/MonoDevelop.SourceEditor.OptionPanels.BehaviorPanel.cs,
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-23 17:06:49 UTC (rev 93675)
+++
trunk/monodevelop/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/ExtendibleTextEditor.cs
2008-01-23 17:47:24 UTC (rev 93676)
@@ -66,6 +66,9 @@
public ExtendibleTextEditor (SourceEditorView view)
{
this.view = view;
+ this.Buffer.TextReplaced += delegate {
+ this.HideLanguageItemWindow ();
+ };
this.ColorStyle = SyntaxModeService.GetColorStyle
(this, SourceEditorOptions.Options.ColorSheme);
base.TextEditorData.Caret.PositionChanged += delegate {
if (extension != null)
@@ -92,11 +95,11 @@
protected override bool OnKeyPressEvent (Gdk.EventKey evnt)
{
if (extension != null) {
- if (extension.KeyPress (evnt.Key, evnt.State)) {
- return true;
+ if (!extension.KeyPress (evnt.Key, evnt.State))
{
+ return base.OnKeyPressEvent (evnt);
}
}
- return base.OnKeyPressEvent (evnt);
+ return true;
}
double mx, my;
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-23 17:06:49 UTC (rev 93675)
+++
trunk/monodevelop/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SourceEditorView.cs
2008-01-23 17:47:24 UTC (rev 93676)
@@ -37,7 +37,7 @@
namespace MonoDevelop.SourceEditor
{
- public class SourceEditorView : AbstractViewContent,
ITextEditorExtension, IPositionable, IExtensibleTextEditor, IBookmarkBuffer,
IClipboardHandler, ICompletionWidget, IDocumentInformation
+ public class SourceEditorView : AbstractViewContent, IPositionable,
IExtensibleTextEditor, IBookmarkBuffer, IClipboardHandler, ICompletionWidget,
IDocumentInformation
{
SourceEditorWidget widget;
bool isDisposed = false;
@@ -209,8 +209,9 @@
#region IExtensibleTextEditor
ITextEditorExtension IExtensibleTextEditor.AttachExtension
(ITextEditorExtension extension)
{
+ System.Console.WriteLine("Attach extension:" +
extension);
this.widget.TextEditor.Extension = extension;
- return this;
+ return this.widget;
}
// protected override void OnMoveCursor (MovementStep step, int
count, bool extend_selection)
@@ -370,26 +371,6 @@
}
#endregion
-#region ITextEditorExtension
- bool ITextEditorExtension.KeyPress (Gdk.Key key,
Gdk.ModifierType modifier)
- {
- return false;
- }
-
- void ITextEditorExtension.CursorPositionChanged ()
- {
- }
-
- void ITextEditorExtension.TextChanged (int startIndex, int
endIndex)
- {
- }
-
- object ITextEditorExtension.GetExtensionCommandTarget ()
- {
- return null;
- }
-#endregion
-
#region IPositionable
public void JumpTo (int line, int column)
{
@@ -545,11 +526,13 @@
this.widget.TextEditor.TextEditorData.DeleteSelectedText ();
int idx = complete_word.IndexOf ('|'); // | in the
completion text now marks the caret position
- if (idx >= 0)
+ if (idx >= 0) {
complete_word = complete_word.Remove (idx, 1);
- else
+ } else {
idx = complete_word.Length;
- this.widget.TextEditor.Buffer.Insert
(ctx.TriggerOffset, new StringBuilder (complete_word));
+ }
+
+ this.widget.TextEditor.Buffer.Replace
(ctx.TriggerOffset, String.IsNullOrEmpty (partial_word) ? 0 :
partial_word.Length, new StringBuilder (complete_word));
this.widget.TextEditor.Caret.Offset = ctx.TriggerOffset
+ idx;
}
Modified:
trunk/monodevelop/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SourceEditorWidget.cs
===================================================================
---
trunk/monodevelop/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SourceEditorWidget.cs
2008-01-23 17:06:49 UTC (rev 93675)
+++
trunk/monodevelop/main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SourceEditorWidget.cs
2008-01-23 17:47:24 UTC (rev 93676)
@@ -38,7 +38,7 @@
namespace MonoDevelop.SourceEditor
{
- public partial class SourceEditorWidget : Gtk.Bin
+ public partial class SourceEditorWidget : Gtk.Bin, ITextEditorExtension
{
SourceEditorView view;
bool isClassBrowserVisible = true;
@@ -69,6 +69,27 @@
}
}
+#region ITextEditorExtension
+ object ITextEditorExtension.GetExtensionCommandTarget ()
+ {
+ return null;
+ }
+
+ void ITextEditorExtension.TextChanged (int startIndex, int
endIndex)
+ {
+ }
+
+ void ITextEditorExtension.CursorPositionChanged ()
+ {
+ }
+
+ bool ITextEditorExtension.KeyPress (Gdk.Key key,
Gdk.ModifierType modifier)
+ {
+ this.textEditor.SimulateKeyPress (key, modifier);
+ return true;
+ }
+#endregion
+
void PrepareEvent (object sender, ButtonPressEventArgs args)
{
args.RetVal = true;
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
