mirror of
https://github.com/ZuneDev/ZuneUIXTools.git
synced 2026-07-27 13:11:59 -07:00
Fix subsequent usages of deduplicated namespace prefixes
This commit is contained in:
@@ -154,9 +154,9 @@ public class Disassembler
|
|||||||
foreach (var typeImport in _loadResult.ImportTables.TypeImports)
|
foreach (var typeImport in _loadResult.ImportTables.TypeImports)
|
||||||
{
|
{
|
||||||
var uri = typeImport.Owner.Uri;
|
var uri = typeImport.Owner.Uri;
|
||||||
if (!_importedUris.TryGetValue(uri, out var baseNamespacePrefix))
|
if (!_importedUris.TryGetValue(uri, out var namespacePrefix))
|
||||||
{
|
{
|
||||||
baseNamespacePrefix = uri;
|
var baseNamespacePrefix = uri;
|
||||||
var schemeLength = uri.IndexOf("://");
|
var schemeLength = uri.IndexOf("://");
|
||||||
if (schemeLength > 0)
|
if (schemeLength > 0)
|
||||||
{
|
{
|
||||||
@@ -197,7 +197,7 @@ public class Disassembler
|
|||||||
continue;
|
continue;
|
||||||
|
|
||||||
baseNamespacePrefix = baseNamespacePrefix.Camelize();
|
baseNamespacePrefix = baseNamespacePrefix.Camelize();
|
||||||
var namespacePrefix = baseNamespacePrefix;
|
namespacePrefix = baseNamespacePrefix;
|
||||||
|
|
||||||
// Prevent similar imports from generating the same prefix
|
// Prevent similar imports from generating the same prefix
|
||||||
int duplicateCount = 0;
|
int duplicateCount = 0;
|
||||||
@@ -209,7 +209,7 @@ public class Disassembler
|
|||||||
yield return new NamespaceImport(uri, namespacePrefix);
|
yield return new NamespaceImport(uri, namespacePrefix);
|
||||||
}
|
}
|
||||||
|
|
||||||
yield return new TypeImport(new(baseNamespacePrefix, typeImport.Name));
|
yield return new TypeImport(new(namespacePrefix, typeImport.Name));
|
||||||
};
|
};
|
||||||
|
|
||||||
foreach (var constructorImport in _loadResult.ImportTables.ConstructorImports)
|
foreach (var constructorImport in _loadResult.ImportTables.ConstructorImports)
|
||||||
|
|||||||
Reference in New Issue
Block a user