Browse Source

Fixed link mode in extract method/introduce constant action.

newNRvisualizers
Mike Krüger 14 years ago
parent
commit
83d4cb2e71
  1. 4
      ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/ExtractMethod/ExtractMethodAction.cs
  2. 5
      ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/IntroduceConstantAction.cs

4
ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/ExtractMethod/ExtractMethodAction.cs

@ -173,12 +173,12 @@ namespace ICSharpCode.NRefactory.CSharp.Refactoring.ExtractMethod
invocation.Arguments.Add(argumentExpression); invocation.Arguments.Add(argumentExpression);
} }
script.InsertWithCursor(context.TranslateString("Extract method"), method, Script.InsertPosition.Before);
foreach (var node in statements.Skip (1)) { foreach (var node in statements.Skip (1)) {
script.Remove(node); script.Remove(node);
} }
script.Replace(statements [0], new ExpressionStatement(invocation)); script.Replace(statements [0], new ExpressionStatement(invocation));
script.Link(target, method.NameToken); script.InsertWithCursor(context.TranslateString("Extract method"), method, Script.InsertPosition.Before);
//script.Link(target, method.NameToken);
}); });
} }
} }

5
ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/IntroduceConstantAction.cs

@ -78,11 +78,10 @@ namespace ICSharpCode.NRefactory.CSharp.Refactoring
Variables = { initializer } Variables = { initializer }
}; };
script.InsertWithCursor(context.TranslateString("Create constant"), decl, Script.InsertPosition.Before);
var variableUsage = new IdentifierExpression(name); var variableUsage = new IdentifierExpression(name);
script.Replace(pexpr, variableUsage); script.Replace(pexpr, variableUsage);
script.Link(initializer.NameToken, variableUsage); // script.Link(initializer.NameToken, variableUsage);
script.InsertWithCursor(context.TranslateString("Create constant"), decl, Script.InsertPosition.Before);
}); });
} }
} }

Loading…
Cancel
Save