Browse Source

Fixed crash when performing "Introduce Method" context action on an inner class.

pull/2/head
Daniel Grunwald 15 years ago
parent
commit
dfacaa8706
  1. 5
      src/AddIns/Misc/SharpRefactoring/Project/Src/GenerateCode.cs

5
src/AddIns/Misc/SharpRefactoring/Project/Src/GenerateCode.cs

@ -195,7 +195,10 @@ namespace SharpRefactoring
if (isNew) if (isNew)
targetClass = info.CompilationUnit.Classes.FirstOrDefault(c => c.DotNetName == c.Namespace + "." + (result as string)); targetClass = info.CompilationUnit.Classes.FirstOrDefault(c => c.DotNetName == c.Namespace + "." + (result as string));
else else
targetClass = info.CompilationUnit.Classes.FirstOrDefault(c => c.DotNetName == targetClass.DotNetName); targetClass = info.CompilationUnit.Classes.Flatten(c => c.InnerClasses).FirstOrDefault(c => c.DotNetName == targetClass.DotNetName);
if (targetClass == null)
return;
if (IsEqualClass(rr.CallingClass, targetClass)) { if (IsEqualClass(rr.CallingClass, targetClass)) {
newMember = targetClass.GetInnermostMember(editor.Caret.Line, editor.Caret.Column); newMember = targetClass.GetInnermostMember(editor.Caret.Line, editor.Caret.Column);

Loading…
Cancel
Save