fix recursive ref lookup when original ref has already been incremented

Author: p1-alexandrevaney

openapi_python_client/resolver/collision_resolver.py

@@ -1,6 +1,7 @@
 import hashlib
-from typing import Any, Dict, List, Tuple
+import re
 
+from typing import Any, Dict, List, Tuple
 from .reference import Reference
 from .resolver_types import SchemaData
 
@@ -72,7 +73,9 @@ def _get_from_ref(self, ref: Reference, attr: SchemaData) -> SchemaData:
                 self._errors.append(f"Did not find data corresponding to the reference {ref.value}")
 
         if list(cursor) == ["$ref"]:
-            ref2 = Reference(cursor["$ref"], self._parent)
+            ref2 = cursor["$ref"]
+            ref2 = re.sub(r'(.*)_\d',r'\1',ref2)
+            ref2 = Reference(ref2, self._parent)
             if ref2.is_remote():
                 attr = self._refs[ref2.abs_path]
             return self._get_from_ref(ref2, attr)