← Back to branch summary

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

« back to all changes in this revision

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

  • Committer: Package Import Robot
  • Author(s): Jo Shields
  • Date: 2012-02-05 10:49:36 UTC
  • mto: (10.3.1)
  • mto: This revision was merged to the branch mainline in revision 25.
  • Revision ID: package-import@ubuntu.com-20120205104936-4ujoylapu24cquuo
Tags: upstream-2.8.6.3+dfsg
Import upstream version 2.8.6.3+dfsg

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/RefactoryCommands.cs
204
204
                                                        // remove used namespaces for conflict resolving. 
205
205
                                                        if (options.Document.CompilationUnit.IsNamespaceUsedAt (ns, options.ResolveResult.ResolvedExpression.Region.Start))
206
206
                                                                continue;
207
 
                                                        CommandInfo info = resolveMenu.CommandInfos.Add ("using " + ns + ";", new RefactoryOperation (new ResolveNameOperation (ctx, doc, resolveResult, ns).AddImport));
 
207
                                                        string escaped_ns = ns.Replace ("_", "__");
 
208
                                                        CommandInfo info = resolveMenu.CommandInfos.Add ("using " + escaped_ns + ";", new RefactoryOperation (new ResolveNameOperation (ctx, doc, resolveResult, ns).AddImport));
208
209
                                                        info.Icon = MonoDevelop.Ide.Gui.Stock.AddNamespace;
209
210
                                                }
210
211
                                                if (!(resolveResult is UnresolvedMemberResolveResult))
518
519
                        {
519
520
                                int pos = doc.Editor.Document.LocationToOffset (resolveResult.ResolvedExpression.Region.Start.Line, resolveResult.ResolvedExpression.Region.Start.Column);
520
521
                                if (pos < 0) {
521
 
                                        LoggingService.LogError ("Invalie expression position: " + resolveResult.ResolvedExpression);
 
522
                                        LoggingService.LogError ("Invalid expression position: " + resolveResult.ResolvedExpression);
522
523
                                        return;
523
524
                                }
524
525
                                doc.Editor.Insert (pos, ns + ".");