← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/monodevelop/oneiric

« back to all changes in this revision

Viewing changes to src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/RefactoringOptions.cs

  • Committer: Bazaar Package Importer
  • Author(s): Jo Shields
  • Date: 2011-06-27 17:03:13 UTC
  • mto: (1.8.1 upstream)
  • mto: This revision was merged to the branch mainline in revision 54.
  • Revision ID: james.westby@ubuntu.com-20110627170313-6cvz3s19x6e9hqe9
Import upstream version 2.5.92+dfsg

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/RefactoringOptions.cs
71
71
                
72
72
                public Mono.TextEditor.TextEditorData GetTextEditorData ()
73
73
                {
74
 
                        return Document.TextEditorData;
 
74
                        return Document.Editor;
75
75
                }
76
76
                
77
77
                public INRefactoryASTProvider GetASTProvider ()
89
89
                
90
90
                public MonoDevelop.Projects.Dom.Parser.IParser GetParser ()
91
91
                {
92
 
                        return ProjectDomService.GetParser (Document.FileName, MimeType);
 
92
                        return ProjectDomService.GetParser (Document.FileName);
93
93
                }
94
94
                
95
95
                public ICSharpCode.NRefactory.Ast.INode ParseMember (IMember member)
100
100
                        if (provider == null) 
101
101
                                return null;
102
102
                        
103
 
                        int start = Document.TextEditor.GetPositionFromLineColumn (member.BodyRegion.Start.Line, member.BodyRegion.Start.Column);
104
 
                        int end = Document.TextEditor.GetPositionFromLineColumn (member.BodyRegion.End.Line, member.BodyRegion.End.Column);
105
 
                        string memberBody = Document.TextEditor.GetText (start, end);
 
103
                        int start = Document.Editor.Document.LocationToOffset (member.BodyRegion.Start.Line, member.BodyRegion.Start.Column);
 
104
                        int end = Document.Editor.Document.LocationToOffset (member.BodyRegion.End.Line, member.BodyRegion.End.Column);
 
105
                        string memberBody = Document.Editor.GetTextBetween (start, end);
106
106
                        return provider.ParseText (memberBody);
107
107
                }
108
108
                
109
109
                public static string GetWhitespaces (Document document, int insertionOffset)
110
110
                {
111
111
                        StringBuilder result = new StringBuilder ();
112
 
                        for (int i = insertionOffset; i < document.TextEditor.TextLength; i++) {
113
 
                                char ch = document.TextEditor.GetCharAt (i);
 
112
                        for (int i = insertionOffset; i < document.Editor.Length; i++) {
 
113
                                char ch = document.Editor.GetCharAt (i);
114
114
                                if (ch == ' ' || ch == '\t') {
115
115
                                        result.Append (ch);
116
116
                                } else {
119
119
                        }
120
120
                        return result.ToString ();
121
121
                }
 
122
                
122
123
                public static string GetIndent (Document document, IMember member)
123
124
                {
124
 
                        return GetWhitespaces (document, document.TextEditor.GetPositionFromLineColumn (member.Location.Line, 1));
 
125
                        return GetWhitespaces (document, document.Editor.Document.LocationToOffset (member.Location.Line, 1));
125
126
                }
126
127
                public string GetWhitespaces (int insertionOffset)
127
128
                {
135
136
                
136
137
                public IReturnType ShortenTypeName (IReturnType fullyQualifiedTypeName)
137
138
                {
138
 
                        return Document.ParsedDocument.CompilationUnit.ShortenTypeName (fullyQualifiedTypeName, Document.TextEditor.CursorLine, Document.TextEditor.CursorColumn);
 
139
                        return Document.ParsedDocument.CompilationUnit.ShortenTypeName (fullyQualifiedTypeName, Document.Editor.Caret.Line, Document.Editor.Caret.Column);
139
140
                }
140
141
                
141
142
                public ParsedDocument ParseDocument ()
142
143
                {
143
 
                        return ProjectDomService.Parse (Dom.Project, Document.FileName, DesktopService.GetMimeTypeForUri (Document.FileName), Document.TextEditor.Text);
 
144
                        return ProjectDomService.Parse (Dom.Project, Document.FileName, Document.Editor.Text);
144
145
                }
145
146
        }
146
147
}