monocul.us/de4dot-cex
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update renamer to better rename methods and args

Browse Source 
Finds InitializeComponent() method and renames it if necessary.
Finds all event handlers and names the args sender and e respectively.
Finds all field event handlers and names them <field>_<event>, eg.
button_Click.
This commit is contained in:
de4dot 2011-11-04 19:08:23 +01:00
parent 7486b73da3
commit 2236300943
1 changed files with 143 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

149
de4dot.code/renamer/MemberRefs.cs
View File

@ -382,6 +382,8 @@ namespace de4dot.renamer {
windowsFormsControlClasses["System.Windows.Forms.WebBrowser"] = true;
}
Dictionary<MethodDef, string> newMethodsNames = new Dictionary<MethodDef, string>();
public IDefFinder defFinder;
public TypeInfo baseType = null;
public IList<TypeInfo> interfaces = new List<TypeInfo>(); // directly implemented interfaces
@ -631,12 +633,35 @@ namespace de4dot.renamer {
if (DotNetUtils.getArgIndex(methodDef.MethodDefinition, ldarg) != 0)
continue;
return ldstr.Operand as string;
var className = ldstr.Operand as string;
if (className == null)
continue;
findInitializeComponentMethod(methodDef);
return className;
}
}
return null;
}
void findInitializeComponentMethod(MethodDef possibleInitMethod) {
foreach (var methodDef in methods.getAll()) {
if (methodDef.OldName != ".ctor")
continue;
if (methodDef.MethodDefinition.Body == null)
continue;
foreach (var instr in methodDef.MethodDefinition.Body.Instructions) {
if (instr.OpCode.Code != Code.Call)
continue;
if (!MemberReferenceHelper.compareMethodReferenceAndDeclaringType(possibleInitMethod.MethodDefinition, instr.Operand as MethodReference))
continue;
newMethodsNames[possibleInitMethod] = "InitializeComponent";
return;
}
}
}
static bool isWindowsFormsSetNameMethod(MethodReference method) {
if (method == null)
return false;
@ -826,6 +851,9 @@ namespace de4dot.renamer {
prepareRenameFields(); // must be first
prepareRenameProperties();
prepareRenameEvents();
initializeEventHandlerNames();
prepareRenameMethods(); // must be last
}
}
@ -970,6 +998,92 @@ namespace de4dot.renamer {
}
}
void initializeEventHandlerNames() {
var ourFields = new Dictionary<FieldReferenceAndDeclaringTypeKey, FieldDef>();
foreach (var fieldDef in fields.getAll())
ourFields[new FieldReferenceAndDeclaringTypeKey(fieldDef.FieldDefinition)] = fieldDef;
var ourMethods = new Dictionary<MethodReferenceAndDeclaringTypeKey, MethodDef>();
foreach (var methodDef in methods.getAll())
ourMethods[new MethodReferenceAndDeclaringTypeKey(methodDef.MethodDefinition)] = methodDef;
var variableNameState = MemberRenameState.variableNameState;
foreach (var methodDef in methods.getAll()) {
if (methodDef.MethodDefinition.Body == null)
continue;
if (methodDef.MethodDefinition.IsStatic)
continue;
var instructions = methodDef.MethodDefinition.Body.Instructions;
for (int i = 0; i < instructions.Count - 5; i++) {
// We're looking for this code pattern:
// ldarg.0
// ldfld field
// ldarg.0
// ldftn method
// newobj event_handler_ctor
// callvirt add_SomeEvent
if (DotNetUtils.getArgIndex(methodDef.MethodDefinition, instructions[i]) != 0)
continue;
var ldfld = instructions[i + 1];
if (ldfld.OpCode.Code != Code.Ldfld)
continue;
var fieldRef = ldfld.Operand as FieldReference;
if (fieldRef == null)
continue;
FieldDef fieldDef;
if (!ourFields.TryGetValue(new FieldReferenceAndDeclaringTypeKey(fieldRef), out fieldDef))
continue;
if (DotNetUtils.getArgIndex(methodDef.MethodDefinition, instructions[i + 2]) != 0)
continue;
var ldftn = instructions[i + 3];
if (ldftn.OpCode.Code != Code.Ldftn)
continue;
var methodRef = ldftn.Operand as MethodReference;
if (methodRef == null)
continue;
MethodDef handlerMethod;
if (!ourMethods.TryGetValue(new MethodReferenceAndDeclaringTypeKey(methodRef), out handlerMethod))
continue;
var newobj = instructions[i + 4];
if (newobj.OpCode.Code != Code.Newobj)
continue;
if (!isEventHandlerCtor(newobj.Operand as MethodReference))
continue;
var call = instructions[i + 5];
if (call.OpCode.Code != Code.Call && call.OpCode.Code != Code.Callvirt)
continue;
var addHandler = call.Operand as MethodReference;
if (addHandler == null)
continue;
if (!addHandler.Name.StartsWith("add_", StringComparison.Ordinal))
continue;
var eventName = addHandler.Name.Substring(4);
if (!MemberRenameState.variableNameState.IsValidName(eventName))
continue;
newMethodsNames[handlerMethod] = string.Format("{0}_{1}", fieldDef.NewName, eventName);
}
}
}
static bool isEventHandlerCtor(MethodReference method) {
if (method == null)
return false;
if (method.Name != ".ctor")
return false;
if (!DotNetUtils.isMethod(method, "System.Void", "(System.Object,System.IntPtr)"))
return false;
if (!method.DeclaringType.FullName.EndsWith("EventHandler", StringComparison.Ordinal))
return false;
return true;
}
static MethodReference getOverrideMethod(MethodDefinition meth) {
if (meth == null || !meth.HasOverrides)
return null;
@ -1142,6 +1256,9 @@ namespace de4dot.renamer {
return;
methodDef.Renamed = true;
if (suggestedName == null)
newMethodsNames.TryGetValue(methodDef, out suggestedName);
bool canRenameName = true;
if (IsDelegate && methodDef.isVirtual()) {
switch (methodDef.MethodDefinition.Name) {
@ -1173,11 +1290,19 @@ namespace de4dot.renamer {
}
if (methodDef.ParamDefs.Count > 0) {
var newVariableNameState = variableNameState.clone();
foreach (var paramDef in methodDef.ParamDefs) {
if (!newVariableNameState.IsValidName(paramDef.OldName)) {
paramDef.NewName = newVariableNameState.getNewParamName(paramDef.OldName, paramDef.ParameterDefinition);
paramDef.Renamed = true;
if (isEventHandler(methodDef)) {
methodDef.ParamDefs[0].NewName = "sender";
methodDef.ParamDefs[0].Renamed = true;
methodDef.ParamDefs[1].NewName = "e";
methodDef.ParamDefs[1].Renamed = true;
}
else {
var newVariableNameState = variableNameState.clone();
foreach (var paramDef in methodDef.ParamDefs) {
if (!newVariableNameState.IsValidName(paramDef.OldName)) {
paramDef.NewName = newVariableNameState.getNewParamName(paramDef.OldName, paramDef.ParameterDefinition);
paramDef.Renamed = true;
}
}
}
}
@ -1188,6 +1313,18 @@ namespace de4dot.renamer {
MemberRenameState.add(methodDef);
}
static bool isEventHandler(MethodDef methodDef) {
if (methodDef.MethodDefinition.Parameters.Count != 2)
return false;
if (methodDef.MethodDefinition.MethodReturnType.ReturnType.FullName != "System.Void")
return false;
if (methodDef.MethodDefinition.Parameters[0].ParameterType.FullName != "System.Object")
return false;
if (!methodDef.MethodDefinition.Parameters[1].ParameterType.FullName.Contains("EventArgs"))
return false;
return true;
}
string getPinvokeName(MethodDef methodDef) {
var entryPoint = methodDef.MethodDefinition.PInvokeInfo.EntryPoint;
if (Regex.IsMatch(entryPoint, @"^#\d+$"))