simplify method

eclipse-n4js · Aug 9, 2024 · add4be0 · add4be0
1 parent 6e91873
commit add4be0
Showing 1 changed file with 14 additions and 4 deletions.
diff --git a/plugins/org.eclipse.n4js.ts.model/model/TypeRefs.xcore b/plugins/org.eclipse.n4js.ts.model/model/TypeRefs.xcore
@@ -820,8 +820,13 @@ abstract class StructuralTypeRef {
 	 * (if non-empty) or the genStructuralMembers.
 	 */
 	op TStructMember[] getStructuralMembers() {
-		return (if (structuralType !== null) structuralType.ownedMembers else if (!astStructuralMembers.empty) astStructuralMembers else genStructuralMembers).
-			unmodifiableView;
+		if (structuralType !== null) {
+			return structuralType.ownedMembers.unmodifiableView;
+		}
+		if (!astStructuralMembers.empty) {
+			return astStructuralMembers.unmodifiableView;
+		}
+		return genStructuralMembers.unmodifiableView;
 	}
 	op TStructMember[] getStructuralMembersWithCallConstructSignatures() {
 		val structType = getStructuralType();
@@ -881,8 +886,13 @@ class ParameterizedTypeRefStructural extends ParameterizedTypeRef, StructuralTyp
 	 * (if non-empty) or the genStructuralMembers.
 	 */
 	op TStructMember[] getStructuralMembers() {
-		return (if (structuralType !== null) structuralType.ownedMembers else if (!astStructuralMembers.empty) astStructuralMembers else genStructuralMembers).
-			unmodifiableView;
+		if (structuralType !== null) {
+			return structuralType.ownedMembers.unmodifiableView;
+		}
+		if (!astStructuralMembers.empty) {
+			return astStructuralMembers.unmodifiableView;
+		}
+		return genStructuralMembers.unmodifiableView;
 	}
 	/*
 	 * Overrides {@link TypeRef#internalGetTypeRefAsString(boolean)}