Author: mkrueger
Date: 2008-02-04 07:03:15 -0500 (Mon, 04 Feb 2008)
New Revision: 94737

Modified:
   trunk/monodevelop/main/src/addins/Mono.Texteditor/ChangeLog
   
trunk/monodevelop/main/src/addins/Mono.Texteditor/Mono.TextEditor/DefaultEditActions.cs
   trunk/monodevelop/main/src/addins/Mono.Texteditor/Mono.TextEditor/Document.cs
Log:
* Mono.TextEditor/DefaultEditActions.cs, Mono.TextEditor/Document.cs:
  Implemented Bug 313786 - New editor needs to handle cr/lf issues,
  encoding.

Modified: trunk/monodevelop/main/src/addins/Mono.Texteditor/ChangeLog
===================================================================
--- trunk/monodevelop/main/src/addins/Mono.Texteditor/ChangeLog 2008-02-04 
11:42:35 UTC (rev 94736)
+++ trunk/monodevelop/main/src/addins/Mono.Texteditor/ChangeLog 2008-02-04 
12:03:15 UTC (rev 94737)
@@ -1,5 +1,11 @@
 2008-02-04  Mike Krüger <[EMAIL PROTECTED]> 
 
+       * Mono.TextEditor/DefaultEditActions.cs, Mono.TextEditor/Document.cs:
+         Implemented Bug 313786 - New editor needs to handle cr/lf issues,
+         encoding.
+
+2008-02-04  Mike Krüger <[EMAIL PROTECTED]> 
+
        * Mono.TextEditor/Document.cs: Implemented Bug 323946 - Undo/Redo
          functionality are not context sensitive.
 

Modified: 
trunk/monodevelop/main/src/addins/Mono.Texteditor/Mono.TextEditor/DefaultEditActions.cs
===================================================================
--- 
trunk/monodevelop/main/src/addins/Mono.Texteditor/Mono.TextEditor/DefaultEditActions.cs
     2008-02-04 11:42:35 UTC (rev 94736)
+++ 
trunk/monodevelop/main/src/addins/Mono.Texteditor/Mono.TextEditor/DefaultEditActions.cs
     2008-02-04 12:03:15 UTC (rev 94737)
@@ -595,7 +595,9 @@
        {
                public override void Run (TextEditorData data)
                {
-                       StringBuilder newLine = new StringBuilder ("\n");
+                       StringBuilder newLine = new StringBuilder 
(data.Document.Eol);
+                       
+                       
 /*                     if (TextEditorOptions.Options.AutoIndent) {
                                LineSegment line = data.Document.GetLine 
(data.Caret.Line);
                                for (int i = 0; i < line.EditableLength; i++) {
@@ -606,7 +608,7 @@
                                }
                        }*/
                        data.Document.Buffer.Insert (data.Caret.Offset, 
newLine);
-                       data.Caret.Column = newLine.Length - 1;
+                       data.Caret.Column = 0;
                        data.Caret.Line++;
                }
        }

Modified: 
trunk/monodevelop/main/src/addins/Mono.Texteditor/Mono.TextEditor/Document.cs
===================================================================
--- 
trunk/monodevelop/main/src/addins/Mono.Texteditor/Mono.TextEditor/Document.cs   
    2008-02-04 11:42:35 UTC (rev 94736)
+++ 
trunk/monodevelop/main/src/addins/Mono.Texteditor/Mono.TextEditor/Document.cs   
    2008-02-04 12:03:15 UTC (rev 94737)
@@ -39,7 +39,7 @@
                IBuffer      buffer;
                LineSplitter splitter;
                SyntaxMode   syntaxMode = null;
-               
+               string       eol = null;
                public IBuffer Buffer {
                        get {
                                return buffer;
@@ -56,6 +56,17 @@
                        }
                }
                
+               public string Eol {
+                       get {
+                               if (eol == null && splitter.LineCount > 0) {
+                                       LineSegment line = splitter.Get (0);
+                                       if (line.DelimiterLength > 0) 
+                                               eol = Buffer.GetTextAt 
(line.EditableLength, line.DelimiterLength);
+                               }
+                               return !String.IsNullOrEmpty (eol) ? eol : 
Environment.NewLine;
+                       }
+               }
+               
                string mimeType;
                public string MimeType {
                        get {

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

Reply via email to