Browse Source

Don't automatically load additional assemblies when an assembly node is selected in the tree view

pull/118/head
Daniel Grunwald 15 years ago
parent
commit
e6aafadd4d
  1. 13
      ILSpy/CSharpLanguage.cs

13
ILSpy/CSharpLanguage.cs

@ -134,10 +134,13 @@ namespace ICSharpCode.ILSpy
WriteProjectFile(new TextOutputWriter(output), files, assembly.MainModule); WriteProjectFile(new TextOutputWriter(output), files, assembly.MainModule);
} else { } else {
base.DecompileAssembly(assembly, fileName, output, options); base.DecompileAssembly(assembly, fileName, output, options);
AstBuilder codeDomBuilder = CreateAstBuilder(options, currentModule: assembly.MainModule); // don't automatically load additional assemblies when an assembly node is selected in the tree view
codeDomBuilder.AddAssembly(assembly, onlyAssemblyLevel: !options.FullDecompilation); using (options.FullDecompilation ? null : LoadedAssembly.DisableAssemblyLoad()) {
codeDomBuilder.RunTransformations(transformAbortCondition); AstBuilder codeDomBuilder = CreateAstBuilder(options, currentModule: assembly.MainModule);
codeDomBuilder.GenerateCode(output); codeDomBuilder.AddAssembly(assembly, onlyAssemblyLevel: !options.FullDecompilation);
codeDomBuilder.RunTransformations(transformAbortCondition);
codeDomBuilder.GenerateCode(output);
}
} }
} }
@ -449,7 +452,7 @@ namespace ICSharpCode.ILSpy
} else } else
return property.Name; return property.Name;
} }
public override bool ShowMember(MemberReference member) public override bool ShowMember(MemberReference member)
{ {
return showAllMembers || !AstBuilder.MemberIsHidden(member, new DecompilationOptions().DecompilerSettings); return showAllMembers || !AstBuilder.MemberIsHidden(member, new DecompilationOptions().DecompilerSettings);

Loading…
Cancel
Save