Fixed infinite choice option generation (#783)

* Fixed infinite choice option generate

* Fixed mistake

Author: SimonCockx

rosetta-lang/model/RosettaSimple.xcore

@@ -100,10 +100,14 @@ class Choice extends Data {
 }
 
 class ChoiceOption extends Attribute {
+	String _hardcodedName
 	contains RosettaCardinality _hardcodedCardinality
 
 	op String getName() {
-		NodeModelUtils.findNodesForFeature(typeCall, Literals.TYPE_CALL__TYPE).head.text.strip
+		if (_hardcodedName === null) {
+			_hardcodedName = NodeModelUtils.getTokenText(NodeModelUtils.findNodesForFeature(typeCall, Literals.TYPE_CALL__TYPE).head)
+		}
+		return _hardcodedName
 	}
 
 	op RosettaCardinality getCard() {

rosetta-lang/src/main/java/com/regnosys/rosetta/generator/GeneratorScope.java

@@ -269,12 +269,24 @@ private void computeActualNames() {
 			List<GeneratedIdentifier> ids = idsByDesiredName.get(desiredName);
 			for (int i = 0; i < ids.size(); i++) {
 				GeneratedIdentifier id = ids.get(i);
-				String name = id.getDesiredName();
+				String name = desiredName;
 				if (ids.size() > 1) {
 					name += i;
 				}
-				while (takenNames.contains(name) || !isValidIdentifier(name)) {
-					name = escapeName(name);
+				boolean lastWasValid = true;
+				while (true) {
+					boolean isValid = isValidIdentifier(name);
+					if (!lastWasValid && !isValid) {
+						// Escaping the invalid identifier did not work - throw an exception. Otherwise we could end up in an infinite loop.
+						// If this is thrown, this usually indicates there is an implementation error in `escapeName` or `isValidIdentifier`.
+						throw new RuntimeException("Tried escaping the identifier `" + name + "`, but it is still not a valid identifier.");
+					}
+					if (takenNames.contains(name) || !isValid) {
+						name = escapeName(name);
+					} else {
+						break;
+					}
+					lastWasValid = isValid;
 				}
 				takenNames.add(name);
 				this.actualNames.put(id, name);