pimhwang
/
ILSpy
mirror of https://github.com/icsharpcode/ILSpy.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Fix handling of file extensions in project export.

pull/3410/head
Siegfried Pammer 4 months ago
parent
292c21d68e
commit
31bbcf41bc
7 changed files with 22 additions and 18 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 28
      ICSharpCode.Decompiler/CSharp/ProjectDecompiler/WholeProjectDecompiler.cs
  2. 2
      ICSharpCode.Decompiler/DebugInfo/PortablePdbWriter.cs
  3. 2
      ILSpy.BamlDecompiler/BamlResourceNodeFactory.cs
  4. 2
      ILSpy/Commands/GeneratePdbContextMenuEntry.cs
  5. 2
      ILSpy/Commands/SelectPdbContextMenuEntry.cs
  6. 2
      ILSpy/TextView/DecompilerTextView.cs
  7. 2
      ILSpy/TreeNodes/AssemblyTreeNode.cs

28
ICSharpCode.Decompiler/CSharp/ProjectDecompiler/WholeProjectDecompiler.cs
Unescape View File

@ -19,6 +19,7 @@
using System; using System;
using System.Collections.Concurrent; using System.Collections.Concurrent;
using System.Collections.Generic; using System.Collections.Generic;
using System.Diagnostics;
using System.IO; using System.IO;
using System.Linq; using System.Linq;
using System.Reflection.Metadata; using System.Reflection.Metadata;
@ -135,7 +136,7 @@ namespace ICSharpCode.Decompiler.CSharp.ProjectDecompiler
public void DecompileProject(MetadataFile file, string targetDirectory, CancellationToken cancellationToken = default(CancellationToken)) public void DecompileProject(MetadataFile file, string targetDirectory, CancellationToken cancellationToken = default(CancellationToken))
{ {
string projectFileName = Path.Combine(targetDirectory, CleanUpFileName(file.Name) + ".csproj"); string projectFileName = Path.Combine(targetDirectory, CleanUpFileName(file.Name, ".csproj"));
using (var writer = new StreamWriter(projectFileName)) using (var writer = new StreamWriter(projectFileName))
{ {
DecompileProject(file, targetDirectory, writer, cancellationToken); DecompileProject(file, targetDirectory, writer, cancellationToken);
@ -238,7 +239,7 @@ namespace ICSharpCode.Decompiler.CSharp.ProjectDecompiler
string GetFileFileNameForHandle(TypeDefinitionHandle h) string GetFileFileNameForHandle(TypeDefinitionHandle h)
{ {
var type = metadata.GetTypeDefinition(h); var type = metadata.GetTypeDefinition(h);
string file = CleanUpFileName(metadata.GetString(type.Name) + ".cs"); string file = CleanUpFileName(metadata.GetString(type.Name), ".cs");
string ns = metadata.GetString(type.Namespace); string ns = metadata.GetString(type.Namespace);
if (string.IsNullOrEmpty(ns)) if (string.IsNullOrEmpty(ns))
{ {
@ -339,8 +340,7 @@ namespace ICSharpCode.Decompiler.CSharp.ProjectDecompiler
{ {
foreach (var (name, value) in resourcesFile) foreach (var (name, value) in resourcesFile)
{ {
string fileName = SanitizeFileName(name) string fileName = SanitizeFileName(name);
.Replace('/', Path.DirectorySeparatorChar);
string dirName = Path.GetDirectoryName(fileName); string dirName = Path.GetDirectoryName(fileName);
if (!string.IsNullOrEmpty(dirName) && directories.Add(dirName)) if (!string.IsNullOrEmpty(dirName) && directories.Add(dirName))
{ {
@ -609,9 +609,14 @@ namespace ICSharpCode.Decompiler.CSharp.ProjectDecompiler
/// <summary> /// <summary>
/// Cleans up a node name for use as a file name. /// Cleans up a node name for use as a file name.
/// </summary> /// </summary>
public static string CleanUpFileName(string text) public static string CleanUpFileName(string text, string extension)
{ {
return CleanUpName(text, separateAtDots: false, treatAsFileName: false); Debug.Assert(!string.IsNullOrEmpty(extension));
if (!extension.StartsWith("."))
extension = "." + extension;
text = text + extension;
return CleanUpName(text, separateAtDots: false, treatAsFileName: !string.IsNullOrEmpty(extension), treatAsPath: false);
} }
/// <summary> /// <summary>
@ -620,7 +625,7 @@ namespace ICSharpCode.Decompiler.CSharp.ProjectDecompiler
/// </summary> /// </summary>
public static string SanitizeFileName(string fileName) public static string SanitizeFileName(string fileName)
{ {
return CleanUpName(fileName, separateAtDots: false, treatAsFileName: true); return CleanUpName(fileName, separateAtDots: false, treatAsFileName: true, treatAsPath: true);
} }
/// <summary> /// <summary>
@ -629,7 +634,7 @@ namespace ICSharpCode.Decompiler.CSharp.ProjectDecompiler
/// If <paramref name="treatAsFileName"/> is active, we check for file a extension and try to preserve it, /// If <paramref name="treatAsFileName"/> is active, we check for file a extension and try to preserve it,
/// if it's valid. /// if it's valid.
/// </summary> /// </summary>
static string CleanUpName(string text, bool separateAtDots, bool treatAsFileName) static string CleanUpName(string text, bool separateAtDots, bool treatAsFileName, bool treatAsPath)
{ {
// Remove anything that could be confused with a rooted path. // Remove anything that could be confused with a rooted path.
int pos = text.IndexOf(':'); int pos = text.IndexOf(':');
@ -692,7 +697,7 @@ namespace ICSharpCode.Decompiler.CSharp.ProjectDecompiler
if (separateAtDots) if (separateAtDots)
currentSegmentLength = 0; currentSegmentLength = 0;
} }
else if (treatAsFileName && (c is '/' or '\\') && currentSegmentLength > 1) else if (treatAsPath && (c is '/' or '\\') && currentSegmentLength > 1)
{ {
// if we treat this as a file name, we've started a new segment // if we treat this as a file name, we've started a new segment
b.Append(Path.DirectorySeparatorChar); b.Append(Path.DirectorySeparatorChar);
@ -732,13 +737,12 @@ namespace ICSharpCode.Decompiler.CSharp.ProjectDecompiler
/// </summary> /// </summary>
public static string CleanUpDirectoryName(string text) public static string CleanUpDirectoryName(string text)
{ {
return CleanUpName(text, separateAtDots: false, treatAsFileName: false); return CleanUpName(text, separateAtDots: false, treatAsFileName: false, treatAsPath: false);
} }
public static string CleanUpPath(string text) public static string CleanUpPath(string text)
{ {
return CleanUpName(text, separateAtDots: true, treatAsFileName: false) return CleanUpName(text, separateAtDots: true, treatAsFileName: true, treatAsPath: true);
.Replace('.', Path.DirectorySeparatorChar);
} }
static bool IsReservedFileSystemName(string name) static bool IsReservedFileSystemName(string name)

2
ICSharpCode.Decompiler/DebugInfo/PortablePdbWriter.cs
Unescape View File

@ -92,7 +92,7 @@ namespace ICSharpCode.Decompiler.DebugInfo
string ns = settings.UseNestedDirectoriesForNamespaces string ns = settings.UseNestedDirectoriesForNamespaces
? WholeProjectDecompiler.CleanUpPath(typeName.Namespace) ? WholeProjectDecompiler.CleanUpPath(typeName.Namespace)
: WholeProjectDecompiler.CleanUpDirectoryName(typeName.Namespace); : WholeProjectDecompiler.CleanUpDirectoryName(typeName.Namespace);
return Path.Combine(ns, WholeProjectDecompiler.CleanUpFileName(typeName.Name) + ".cs"); return Path.Combine(ns, WholeProjectDecompiler.CleanUpFileName(typeName.Name, ".cs"));
} }
var sourceFiles = reader.GetTopLevelTypeDefinitions().Where(t => IncludeTypeWhenGeneratingPdb(file, t, settings)).GroupBy(BuildFileNameFromTypeName).ToList(); var sourceFiles = reader.GetTopLevelTypeDefinitions().Where(t => IncludeTypeWhenGeneratingPdb(file, t, settings)).GroupBy(BuildFileNameFromTypeName).ToList();

2
ILSpy.BamlDecompiler/BamlResourceNodeFactory.cs
Unescape View File

@ -62,7 +62,7 @@ namespace ILSpy.BamlDecompiler
var typeDefinition = result.TypeName.HasValue ? typeSystem.MainModule.GetTypeDefinition(result.TypeName.Value.TopLevelTypeName) : null; var typeDefinition = result.TypeName.HasValue ? typeSystem.MainModule.GetTypeDefinition(result.TypeName.Value.TopLevelTypeName) : null;
if (typeDefinition != null) if (typeDefinition != null)
{ {
fileName = WholeProjectDecompiler.CleanUpPath(typeDefinition.ReflectionName) + ".xaml"; fileName = WholeProjectDecompiler.CleanUpPath(typeDefinition.ReflectionName + ".xaml");
var partialTypeInfo = new PartialTypeInfo(typeDefinition); var partialTypeInfo = new PartialTypeInfo(typeDefinition);
foreach (var member in result.GeneratedMembers) foreach (var member in result.GeneratedMembers)
{ {

2
ILSpy/Commands/GeneratePdbContextMenuEntry.cs
Unescape View File

@ -71,7 +71,7 @@ namespace ICSharpCode.ILSpy
return; return;
} }
SaveFileDialog dlg = new SaveFileDialog(); SaveFileDialog dlg = new SaveFileDialog();
dlg.FileName = WholeProjectDecompiler.CleanUpFileName(assembly.ShortName) + ".pdb"; dlg.FileName = WholeProjectDecompiler.CleanUpFileName(assembly.ShortName, ".pdb");
dlg.Filter = Resources.PortablePDBPdbAllFiles; dlg.Filter = Resources.PortablePDBPdbAllFiles;
dlg.InitialDirectory = Path.GetDirectoryName(assembly.FileName); dlg.InitialDirectory = Path.GetDirectoryName(assembly.FileName);
if (dlg.ShowDialog() != true) if (dlg.ShowDialog() != true)

2
ILSpy/Commands/SelectPdbContextMenuEntry.cs
Unescape View File

@ -38,7 +38,7 @@ namespace ICSharpCode.ILSpy
if (assembly == null) if (assembly == null)
return; return;
OpenFileDialog dlg = new OpenFileDialog(); OpenFileDialog dlg = new OpenFileDialog();
dlg.FileName = WholeProjectDecompiler.CleanUpFileName(assembly.ShortName) + ".pdb"; dlg.FileName = WholeProjectDecompiler.CleanUpFileName(assembly.ShortName, ".pdb");
dlg.Filter = Resources.PortablePDBPdbAllFiles; dlg.Filter = Resources.PortablePDBPdbAllFiles;
dlg.InitialDirectory = Path.GetDirectoryName(assembly.FileName); dlg.InitialDirectory = Path.GetDirectoryName(assembly.FileName);
if (dlg.ShowDialog() != true) if (dlg.ShowDialog() != true)

2
ILSpy/TextView/DecompilerTextView.cs
Unescape View File

@ -1091,7 +1091,7 @@ namespace ICSharpCode.ILSpy.TextView
SaveFileDialog dlg = new SaveFileDialog(); SaveFileDialog dlg = new SaveFileDialog();
dlg.DefaultExt = language.FileExtension; dlg.DefaultExt = language.FileExtension;
dlg.Filter = language.Name + "|*" + language.FileExtension + Properties.Resources.AllFiles; dlg.Filter = language.Name + "|*" + language.FileExtension + Properties.Resources.AllFiles;
dlg.FileName = WholeProjectDecompiler.CleanUpFileName(treeNodes.First().ToString()) + language.FileExtension; dlg.FileName = WholeProjectDecompiler.CleanUpFileName(treeNodes.First().ToString(), language.FileExtension);
if (dlg.ShowDialog() == true) if (dlg.ShowDialog() == true)
{ {
SaveToDisk(new DecompilationContext(language, treeNodes.ToArray(), options), dlg.FileName); SaveToDisk(new DecompilationContext(language, treeNodes.ToArray(), options), dlg.FileName);

2
ILSpy/TreeNodes/AssemblyTreeNode.cs
Unescape View File

@ -475,7 +475,7 @@ namespace ICSharpCode.ILSpy.TreeNodes
if (string.IsNullOrEmpty(language.ProjectFileExtension)) if (string.IsNullOrEmpty(language.ProjectFileExtension))
return false; return false;
SaveFileDialog dlg = new SaveFileDialog(); SaveFileDialog dlg = new SaveFileDialog();
dlg.FileName = WholeProjectDecompiler.CleanUpFileName(LoadedAssembly.ShortName) + language.ProjectFileExtension; dlg.FileName = WholeProjectDecompiler.CleanUpFileName(LoadedAssembly.ShortName, language.ProjectFileExtension);
dlg.Filter = language.Name + " project|*" + language.ProjectFileExtension + "|" + language.Name + " single file|*" + language.FileExtension + "|All files|*.*"; dlg.Filter = language.Name + " project|*" + language.ProjectFileExtension + "|" + language.Name + " single file|*" + language.FileExtension + "|All files|*.*";
if (dlg.ShowDialog() == true) if (dlg.ShowDialog() == true)
{ {

Write Preview
Loading…
Cancel
Save