Get rid of InnerGetVersionColumns()

SergeiPavlov · SergeiPavlov · commit ed81e6b57613 · 2022-08-30T18:55:01.000-07:00
diff --git a/Orm/Xtensive.Orm/Orm/Model/TypeInfo.cs b/Orm/Xtensive.Orm/Orm/Model/TypeInfo.cs
@@ -687,7 +687,10 @@ private IEnumerable<FieldInfo> InnerGetVersionFields()
     public IReadOnlyList<ColumnInfo> GetVersionColumns()
     {
       if (versionColumns == null) {
-        var result = InnerGetVersionColumns().ToList();
+        var result = InnerGetVersionFields()
+          .SelectMany(f => f.Columns)
+          .OrderBy(c => c.Field.MappingInfo.Offset)
+          .ToList();
         if (!IsLocked) {
           return result;
         }
@@ -696,11 +699,6 @@ public IReadOnlyList<ColumnInfo> GetVersionColumns()
       return versionColumns;
     }
 
-    private IEnumerable<ColumnInfo> InnerGetVersionColumns() =>
-      InnerGetVersionFields()
-        .SelectMany(f => f.Columns)
-        .OrderBy(c => c.Field.MappingInfo.Offset);
-
     /// <inheritdoc/>
     public override void UpdateState()
     {

Original file line number	Diff line number	Diff line change
`@@ -687,7 +687,10 @@ private IEnumerable<FieldInfo> InnerGetVersionFields()`
`687`	`687`	`public IReadOnlyList<ColumnInfo> GetVersionColumns()`
`688`	`688`	`{`
`689`	`689`	`if (versionColumns == null) {`
`690`		`- var result = InnerGetVersionColumns().ToList();`
	`690`	`+ var result = InnerGetVersionFields()`
	`691`	`+ .SelectMany(f => f.Columns)`
	`692`	`+ .OrderBy(c => c.Field.MappingInfo.Offset)`
	`693`	`+ .ToList();`
`691`	`694`	`if (!IsLocked) {`
`692`	`695`	`return result;`
`693`	`696`	`}`
`@@ -696,11 +699,6 @@ public IReadOnlyList<ColumnInfo> GetVersionColumns()`
`696`	`699`	`return versionColumns;`
`697`	`700`	`}`
`698`	`701`
`699`		`- private IEnumerable<ColumnInfo> InnerGetVersionColumns() =>`
`700`		`- InnerGetVersionFields()`
`701`		`- .SelectMany(f => f.Columns)`
`702`		`- .OrderBy(c => c.Field.MappingInfo.Offset);`
`703`		`-`
`704`	`702`	`/// <inheritdoc/>`
`705`	`703`	`public override void UpdateState()`
`706`	`704`	`{`