Fix subsequent usages of deduplicated namespace prefixes

This commit is contained in:
Yoshi Askharoun
2025-01-27 23:51:32 -06:00
parent 3e9e1fef0f
commit 2060bda2b2
+4 -4
View File
@@ -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)