Skip to content

fix(codegen): resolve duplicate attribute injection in Analysis Mode #163

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cct08311github merged 1 commit into from
Mar 11, 2026
Merged

fix(codegen): resolve duplicate attribute injection in Analysis Mode #163

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 22 additions & 16 deletions src/WalkingTec.Mvvm.Mvc/CodeGenVM.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -437,11 +437,19 @@ public string InjectAnalysisAttributes()
{
string attrName = field.IsDimensionField ? "Dimension" : "Measure";

// Skip if attribute already exists on this property
var alreadyHasAttr = Regex.IsMatch(
content,
@"\[" + attrName + @"[\](]" + @".*\n\s*public\s+\S+\??\s+" + Regex.Escape(field.FieldName) + @"\s",
RegexOptions.Multiline);
var propMatch = Regex.Match(content, @"\bpublic\s+\S+\??\s+" + Regex.Escape(field.FieldName) + @"\s*\{");
if (!propMatch.Success) continue;

int propIndex = propMatch.Index;
int prevBrace = content.LastIndexOf('}', propIndex);
int prevSemi = content.LastIndexOf(';', propIndex);
int prevOpen = content.LastIndexOf('{', propIndex);

int startIdx = Math.Max(Math.Max(prevBrace, prevSemi), prevOpen);
if (startIdx == -1) startIdx = 0;

string block = content.Substring(startIdx, propIndex - startIdx);
bool alreadyHasAttr = block.Contains("[" + attrName + "]") || block.Contains("[" + attrName + "(");
if (alreadyHasAttr) continue;

// Build attribute string
Expand Down Expand Up @@ -475,19 +483,17 @@ public string InjectAnalysisAttributes()
attrStr = "[Measure]";
}

// Find property declaration and insert attribute before it
var propPattern = @"(\n)((\s*)\[[\s\S]*?)?((\s*)(public\s+\S+\??\s+" + Regex.Escape(field.FieldName) + @"\s*\{))";
var propMatch = Regex.Match(content, propPattern);
if (propMatch.Success)
int indentStart = propIndex - 1;
while (indentStart >= 0 && (content[indentStart] == ' ' || content[indentStart] == '\t'))
{
string indent = propMatch.Groups[5].Value;
if (string.IsNullOrEmpty(indent)) indent = propMatch.Groups[3].Value;
if (string.IsNullOrEmpty(indent)) indent = " ";
string insertion = indent + attrStr + "\n";
int insertPos = propMatch.Groups[4].Index;
content = content.Insert(insertPos, insertion);
modified = true;
indentStart--;
}
string indent = content.Substring(indentStart + 1, propIndex - indentStart - 1);
if (string.IsNullOrEmpty(indent)) indent = " ";

string insertion = attrStr + "\n" + indent;
content = content.Insert(propIndex, insertion);
modified = true;
}

if (modified && content != originalContent)
Expand Down
Loading