Fixing C# line-by-line and link-entity in a filter #1145

rappen · rappen · commit c4b2dda82951 · 2025-11-22T16:55:30.000+01:00
diff --git a/FetchXmlBuilder/Converters/CSharpCodeGenerator.cs b/FetchXmlBuilder/Converters/CSharpCodeGenerator.cs
@@ -383,7 +383,12 @@ private string GetLinkEntitiesLbL(IEnumerable<LinkEntity> linkEntities, string L
                 if (AnyAllFilterLinkEntity)
                 {
                     linkcode += $"var {linkname} = new LinkEntity{parms};{CRLF}";
-                    linkcode += $"{LineStart}.AnyAllFilterLinkEntity = {linkname};{CRLF}";
+                    linkcode += $"{LineStart}";
+                    if (LineStart == GetQueryObjectName(settings.QExStyle))
+                    {
+                        linkcode += $".Criteria";
+                    }
+                    linkcode += $".AnyAllFilterLinkEntity = {linkname};{CRLF}";
                 }
                 else
                 {
@@ -840,7 +845,7 @@ private string GetLinkEntitiesOI(DataCollection<LinkEntity> linkEntities, string
             var linkcodes = new List<string>();
             foreach (var link in linkEntities)
             {
-                string linkcode = GetLinkEntityOI(link, ownerName, indentslevel, ref namestree);
+                var linkcode = GetLinkEntityOI(link, ownerName, indentslevel, ref namestree);
                 linkcodes.Add(linkcode);
             }
             linkscode += string.Join($"{betweenchar}{CRLF}", linkcodes);

Original file line number	Diff line number	Diff line change
`@@ -383,7 +383,12 @@ private string GetLinkEntitiesLbL(IEnumerable<LinkEntity> linkEntities, string L`
`383`	`383`	`if (AnyAllFilterLinkEntity)`
`384`	`384`	`{`
`385`	`385`	`linkcode += $"var {linkname} = new LinkEntity{parms};{CRLF}";`
`386`		`- linkcode += $"{LineStart}.AnyAllFilterLinkEntity = {linkname};{CRLF}";`
	`386`	`+ linkcode += $"{LineStart}";`
	`387`	`+ if (LineStart == GetQueryObjectName(settings.QExStyle))`
	`388`	`+ {`
	`389`	`+ linkcode += $".Criteria";`
	`390`	`+ }`
	`391`	`+ linkcode += $".AnyAllFilterLinkEntity = {linkname};{CRLF}";`
`387`	`392`	`}`
`388`	`393`	`else`
`389`	`394`	`{`
`@@ -840,7 +845,7 @@ private string GetLinkEntitiesOI(DataCollection<LinkEntity> linkEntities, string`
`840`	`845`	`var linkcodes = new List<string>();`
`841`	`846`	`foreach (var link in linkEntities)`
`842`	`847`	`{`
`843`		`- string linkcode = GetLinkEntityOI(link, ownerName, indentslevel, ref namestree);`
	`848`	`+ var linkcode = GetLinkEntityOI(link, ownerName, indentslevel, ref namestree);`
`844`	`849`	`linkcodes.Add(linkcode);`
`845`	`850`	`}`
`846`	`851`	`linkscode += string.Join($"{betweenchar}{CRLF}", linkcodes);`