Skip to content

Commit 20dd07b

Browse files
committed
Refactor target name handling and normalization
- Simplified target variable construction in `LibraryDefinitionCSharpCodeGenerator.cs` by using `targetName` directly. - Updated `ClassName` property in `LibrarySetCSharpCodeGenerator.cs` to normalize `VersionedLibraryIdentifier` without underscores. - Improved library dependency normalization by removing underscore formatting before normalization.
1 parent d51d689 commit 20dd07b

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

Cql/CodeGeneration.NET/LibraryDefinitionCSharpCodeGenerator.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ private string GetTargetedMemberName(
115115
{
116116
var target = targetName == LibraryName
117117
? "this"
118-
: $"{IdentifierNormalizer.Normalize(CqlVersionedLibraryIdentifier.Parse(targetName).FormatDelimited('_'))}.Instance";
118+
: $"{IdentifierNormalizer.Normalize(targetName)}.Instance";
119119
var member = IdentifierNormalizer.Normalize(memberName);
120120
return $"{target}.{member}";
121121
}

Cql/CodeGeneration.NET/LibrarySetCSharpCodeGenerator.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ public LibraryWriter(
144144

145145
private CqlVersionedLibraryIdentifier LibraryVersionedIdentifier => Library.VersionedLibraryIdentifier!;
146146
public string LibraryName { get; } = Library.VersionedLibraryIdentifier;
147-
private string ClassName { get; } = IdentifierNormalizer.Normalize(Library.VersionedLibraryIdentifier.FormatDelimited('_'));
147+
private string ClassName { get; } = IdentifierNormalizer.Normalize(Library.VersionedLibraryIdentifier);
148148

149149
public LibraryWriter AddIndent(int addIndent = 1)
150150
{
@@ -206,7 +206,7 @@ private void WriteLibraryInterfaceImplementation()
206206
var dependencies =
207207
LibrarySetWriter.LibrarySet
208208
.GetLibraryDependencies(LibraryName, throwError: true)
209-
.Select(dep => IdentifierNormalizer.Normalize(dep.VersionedLibraryIdentifier.FormatDelimited('_')))
209+
.Select(dep => IdentifierNormalizer.Normalize(dep.VersionedLibraryIdentifier))
210210
.Select(typeName => $"{typeName}.Instance");
211211
IndentedTextWriter.WriteLine($"""
212212
public ILibrary[] Dependencies => [{string.Join(", ", dependencies)}];

0 commit comments

Comments
 (0)