@@ -156,8 +156,13 @@ TypeInfo TypeInfo::resolveType(TypeInfo const& __type, CodeModelItem __scope)
     otherType.setQualifiedName(__item->qualifiedName());
   }
 
-  if (TypeAliasModelItem __alias = __item.dynamicCast<_TypeAliasModelItem>())
-    return resolveType(TypeInfo::combine(__alias->type(), otherType), __scope);
+  if (TypeAliasModelItem __alias = __item.dynamicCast<_TypeAliasModelItem>()) {
+    TypeInfo updatedTypeInfo = TypeInfo::combine(__alias->type(), otherType);
+    // avoid endless recursion on trivial identity (because this model doesn't, e.g., handle templates)
+    if (updatedTypeInfo != __type) {
+      return resolveType(updatedTypeInfo, __scope);
+    }
+  }
 
   return otherType;
 }
Original file line number	Diff line number	Diff line change
`@@ -156,8 +156,13 @@ TypeInfo TypeInfo::resolveType(TypeInfo const& __type, CodeModelItem __scope)`
`156`	`156`	`otherType.setQualifiedName(__item->qualifiedName());`
`157`	`157`	`}`
`158`	`158`
`159`		`- if (TypeAliasModelItem __alias = __item.dynamicCast<_TypeAliasModelItem>())`
`160`		`- return resolveType(TypeInfo::combine(__alias->type(), otherType), __scope);`
	`159`	`+ if (TypeAliasModelItem __alias = __item.dynamicCast<_TypeAliasModelItem>()) {`
	`160`	`+ TypeInfo updatedTypeInfo = TypeInfo::combine(__alias->type(), otherType);`
	`161`	`+ // avoid endless recursion on trivial identity (because this model doesn't, e.g., handle templates)`
	`162`	`+ if (updatedTypeInfo != __type) {`
	`163`	`+ return resolveType(updatedTypeInfo, __scope);`
	`164`	`+ }`
	`165`	`+ }`
`161`	`166`
`162`	`167`	`return otherType;`
`163`	`168`	`}`