← Back to branch summary

~ubuntu-branches/ubuntu/saucy/monodevelop/saucy-proposed

« back to all changes in this revision

Viewing changes to src/core/Mono.Texteditor/Mono.TextEditor/TextEditorData.cs

  • Committer: Package Import Robot
  • Author(s): Jo Shields
  • Date: 2012-06-22 20:35:35 UTC
  • mfrom: (10.3.2)
  • Revision ID: package-import@ubuntu.com-20120622203535-zrozwvcf6kfk6l6i
Tags: 3.0.3.2+dfsg-1
* [3fd89ae] Imported Upstream version 3.0.3.2+dfsg
* [379a680] Remove old patches we haven't used for ages from git.
* [d71161d] Remove correct_paths_in_monodevelop-core-addins.pc.patch.
  Upstream claim to have fixed this by moving assembly install locations.
* [15dbfb9] Fix install location for MonoDevelop.Gettext.dll.config.
* [26eb434] Fix install location for MonoDevelop.SourceEditor2.dll.config.
* [4169974] Upstream commit 53282c9 which finally reconciles the 
  MonoDevelop.Gettext.dll install location with the 
  monodevelop-core-addins.pc location.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/core/Mono.Texteditor/Mono.TextEditor/TextEditorData.cs
435
435
                {
436
436
                        if (IsDisposed)
437
437
                                return;
 
438
                        document.WaitForFoldUpdateFinished ();
438
439
                        IsDisposed = true;
439
440
                        options = options.Kill ();
440
441
                        HeightTree.Dispose ();
812
813
                        switch (selection.SelectionMode) {
813
814
                        case SelectionMode.Normal:
814
815
                                var segment = selection.GetSelectionRange (this);
815
 
                                if (Caret.Offset > segment.Offset)
816
 
                                        Caret.Offset -= System.Math.Min (segment.Length, Caret.Offset - segment.Offset);
817
816
                                int len = System.Math.Min (segment.Length, Document.TextLength - segment.Offset);
 
817
                                var loc = selection.Anchor < selection.Lead ? selection.Anchor : selection.Lead;
 
818
                                caret.Location = loc;
 
819
                                EnsureCaretIsNotVirtual ();
818
820
                                if (len > 0)
819
821
                                        Remove (segment.Offset, len);
 
822
                                caret.Location = loc;
820
823
                                break;
821
824
                        case SelectionMode.Block:
822
825
                                DocumentLocation visStart = LogicalToVisualLocation (selection.Anchor);
1094
1097
                        }
1095
1098
                        return 0;
1096
1099
                }
 
1100
 
1097
1101
                #endregion
1098
1102
                
1099
1103
                public Stream OpenStream ()
1381
1385
 
1382
1386
                void HandleTextEditorDataDocumentFolded (object sender, FoldSegmentEventArgs e)
1383
1387
                {
1384
 
                        int start = OffsetToLineNumber (e.FoldSegment.StartLine.Offset);
1385
 
                        int end = OffsetToLineNumber (e.FoldSegment.EndLine.Offset);
 
1388
                        int start = e.FoldSegment.StartLine.LineNumber;
 
1389
                        int end = e.FoldSegment.EndLine.LineNumber;
1386
1390
                        
1387
1391
                        if (e.FoldSegment.IsFolded) {
1388
1392
                                if (e.FoldSegment.Marker != null)