Skip to content
This repository has been archived by the owner on Jan 27, 2023. It is now read-only.

Commit

Permalink
Automatically compute imports for code injection, from current type m…
Browse files Browse the repository at this point in the history
…embers and method calls #114.
  • Loading branch information
sailro committed Jan 9, 2018
1 parent 1201355 commit 5a9926a
Show file tree
Hide file tree
Showing 6 changed files with 207 additions and 7 deletions.
2 changes: 2 additions & 0 deletions ChangeLog
Expand Up @@ -11,6 +11,8 @@
- Don't close Edit/Create instruction dialog on opc/operand inconsistency.
- Add editors for all primitive types for constant/custom attributes.
- Support for ILSpy 3.x
- Automatically compute imports for code injection, from current type
members and method calls.

bugfixes:
- Fix method matching with Reflector.
Expand Down
13 changes: 10 additions & 3 deletions Compilation/BaseLanguageHelper.cs
Expand Up @@ -44,7 +44,7 @@ internal abstract class BaseLanguageHelper : IReflectionVisitor, ILanguageHelper
protected const string NamespaceSeparator = ".";
protected const string Space = " ";
protected const string Quote = "\"";
protected string[] DefaultNamespaces = {"System", "System.Collections.Generic", "System.Text"};
protected IList<string> Namespaces = new List<string>();
protected const string VolatileModifierTypeFullname = "System.Runtime.CompilerServices.IsVolatile";

private readonly StringBuilder _identedbuilder = new StringBuilder();
Expand All @@ -67,7 +67,7 @@ protected BaseLanguageHelper()
protected abstract void WriteMethodsStubs(MethodDefinition mdef,
Mono.Collections.Generic.Collection<MethodDefinition> methods);

protected abstract void WriteDefaultNamespaces();
protected abstract void WriteNamespaces();
protected abstract void WriteType(MethodDefinition mdef);
protected abstract void WriteReferencedAssemblies(List<AssemblyNameReference> references);

Expand Down Expand Up @@ -412,7 +412,8 @@ protected string GenerateSourceCode(MethodDefinition mdef, List<AssemblyNameRefe
{
Reset();

WriteDefaultNamespaces();
CollectNamespaces(mdef.DeclaringType);
WriteNamespaces();
WriteLine();
WriteReferencedAssemblies(references);
WriteLine();
Expand All @@ -436,6 +437,12 @@ protected string GenerateSourceCode(MethodDefinition mdef, List<AssemblyNameRefe
return GetResult();
}

protected void CollectNamespaces(TypeDefinition type)
{
var nc = new NamespaceCollector(type);
Namespaces = nc.Collect();
}

protected string Surround(Enum item, SpaceSurrounder mode)
{
var result = item.ToString();
Expand Down
4 changes: 2 additions & 2 deletions Compilation/CSharpHelper.cs
Expand Up @@ -136,11 +136,11 @@ protected override void WriteMethodsStubs(MethodDefinition mdef, Mono.Collection
WriteMethodsStubs(mdef, methods, RegionStart, RegionEnd);
}

protected override void WriteDefaultNamespaces()
protected override void WriteNamespaces()
{
Write(RegionStart);
WriteLine("\" Imports \"");
foreach (var item in DefaultNamespaces)
foreach (var item in Namespaces)
{
Write(CSharpKeywords.@using, SpaceSurrounder.After);
Write(item);
Expand Down
190 changes: 190 additions & 0 deletions Compilation/NamespaceCollector.cs
@@ -0,0 +1,190 @@
/* Reflexil Copyright (c) 2007-2018 Sebastien Lebreton
Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the
"Software"), to deal in the Software without restriction, including
without limitation the rights to use, copy, modify, merge, publish,
distribute, sublicense, and/or sell copies of the Software, and to
permit persons to whom the Software is furnished to do so, subject to
the following conditions:
The above copyright notice and this permission notice shall be
included in all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */

using System.Linq;
using System.Collections.Generic;
using Mono.Cecil;
using Mono.Collections.Generic;
using Mono.Cecil.Cil;

namespace Reflexil.Compilation
{
internal class NamespaceCollector : IReflectionVisitor
{
private TypeDefinition _type;
private HashSet<string> _namespaces = new HashSet<string>();

public NamespaceCollector(TypeDefinition type)
{
_type = type;
}

private void VisitString(string str)
{
if (string.IsNullOrEmpty(str))
return;

if (_namespaces.Contains(str))
return;

_namespaces.Add(str);
}

internal IList<string> Collect()
{
_namespaces.Clear();
VisitString("System");
VisitString("System.Collections.Generic");
VisitString("System.Text");
VisitTypeDefinition(_type);
return _namespaces.ToList();
}

public void VisitTypeDefinition(TypeDefinition type)
{
VisitNestedTypeCollection(type.NestedTypes);
VisitFieldDefinitionCollection(type.Fields);
VisitPropertyDefinitionCollection(type.Properties);
VisitEventDefinitionCollection(type.Events);
VisitInterfaceCollection(type.Interfaces);
VisitMethodDefinitionCollection(type.Methods);
}

public void VisitNestedTypeCollection(Collection<TypeDefinition> nestedTypes)
{
foreach (var tdef in nestedTypes)
VisitNestedType(tdef);
}

public void VisitNestedType(TypeDefinition nestedType)
{
VisitTypeDefinition(nestedType);
}

public void VisitFieldDefinitionCollection(Collection<FieldDefinition> fields)
{
foreach (var fdef in fields)
VisitFieldDefinition(fdef);
}

public void VisitFieldDefinition(FieldDefinition field)
{
VisitTypeReference(field.FieldType);
}

public void VisitTypeReference(TypeReference type)
{
VisitString(type.Namespace);
}

public void VisitPropertyDefinitionCollection(Collection<PropertyDefinition> properties)
{
foreach (var pdef in properties)
VisitPropertyDefinition(pdef);
}

public void VisitPropertyDefinition(PropertyDefinition property)
{
VisitTypeReference(property.PropertyType);
}

public void VisitEventDefinitionCollection(Collection<EventDefinition> events)
{
foreach (var evt in events)
VisitEventDefinition(evt);
}

public void VisitEventDefinition(EventDefinition evt)
{
VisitTypeReference(evt.EventType);
}

public void VisitInterfaceCollection(Collection<InterfaceImplementation> interfaces)
{
foreach (var idef in interfaces)
VisitInterface(idef.InterfaceType);
}

public void VisitInterface(TypeReference interf)
{
VisitString(interf.Namespace);
}

public void VisitMethodDefinitionCollection(Collection<MethodDefinition> methods)
{
foreach (var mdef in methods)
VisitMethodDefinition(mdef);
}

public void VisitMethodDefinition(MethodDefinition method)
{
VisitTypeReference(method.ReturnType);
VisitParameterDefinitionCollection(method.Parameters);

if (method.Body == null)
return;

foreach (var ins in method.Body.Instructions)
{
var mref = ins.Operand as MethodReference;
if (mref != null)
VisitMethodReference(mref);
}
}

public void VisitMethodReference(MethodReference method)
{
VisitTypeReference(method.DeclaringType);
}

public void VisitParameterDefinitionCollection(Collection<ParameterDefinition> parameters)
{
foreach (var pdef in parameters)
VisitParameterDefinition(pdef);
}

public void VisitParameterDefinition(ParameterDefinition parameter)
{
VisitTypeReference(parameter.ParameterType);
}

public void VisitModuleDefinition(ModuleDefinition module) { }
public void VisitTypeDefinitionCollection(Collection<TypeDefinition> types) { }
public void VisitTypeReferenceCollection(Collection<TypeReference> refs) { }
public void VisitMemberReferenceCollection(Collection<MemberReference> members) { }
public void VisitMemberReference(MemberReference member) { }
public void VisitExternTypeCollection(Collection<TypeReference> externs) { }
public void VisitExternType(TypeReference externType) { }
public void VisitOverrideCollection(Collection<MethodReference> meth) { }
public void VisitOverride(MethodReference ov) { }
public void VisitConstructorCollection(Collection<MethodDefinition> ctors) { }
public void VisitConstructor(MethodDefinition ctor) { }
public void VisitPInvokeInfo(PInvokeInfo pinvk) { }
public void VisitSecurityDeclarationCollection(Collection<SecurityDeclaration> secDecls) { }
public void VisitSecurityDeclaration(SecurityDeclaration secDecl) { }
public void VisitCustomAttributeCollection(Collection<CustomAttribute> customAttrs) { }
public void VisitCustomAttribute(CustomAttribute customAttr) { }
public void VisitGenericParameterCollection(Collection<GenericParameter> genparams) { }
public void VisitGenericParameter(GenericParameter genparam) { }
public void VisitMarshalSpec(MarshalInfo marshalSpec) { }
public void TerminateModuleDefinition(ModuleDefinition module) { }
}
}
4 changes: 2 additions & 2 deletions Compilation/VisualBasicHelper.cs
Expand Up @@ -147,7 +147,7 @@ protected override void WriteMethodsStubs(MethodDefinition mdef, Mono.Collection
WriteMethodsStubs(mdef, methods, RegionStart, RegionEnd);
}

protected override void WriteDefaultNamespaces()
protected override void WriteNamespaces()
{
Write(VisualBasicKeywords.Option, SpaceSurrounder.After);
Write(VisualBasicKeywords.Explicit, SpaceSurrounder.After);
Expand All @@ -158,7 +158,7 @@ protected override void WriteDefaultNamespaces()
WriteLine();
Write(RegionStart);
WriteLine("\" Imports \"");
foreach (var item in DefaultNamespaces)
foreach (var item in Namespaces)
{
Write(VisualBasicKeywords.Imports, SpaceSurrounder.After);
WriteLine(item);
Expand Down
1 change: 1 addition & 0 deletions Reflexil.csproj
Expand Up @@ -77,6 +77,7 @@
<Compile Include="Compilation\CompilerProfile.cs" />
<Compile Include="Compilation\CSharpHelper.cs" />
<Compile Include="Compilation\CSharpKeywords.cs" />
<Compile Include="Compilation\NamespaceCollector.cs" />
<Compile Include="Compilation\SpaceSurrounder.cs" />
<Compile Include="Compilation\SupportedLanguage.cs" />
<Compile Include="Compilation\ILanguageHelper.cs" />
Expand Down

0 comments on commit 5a9926a

Please sign in to comment.