Fixed code formatter for map lookups

CodeFormatter/src/main/java/org/openzen/zenscript/formatter/ExpressionFormatter.java

@@ -178,9 +178,10 @@ public class ExpressionFormatter implements ExpressionVisitor<ExpressionString>
 				}
 				case INDEXGET: {
 					StringBuilder result = new StringBuilder();
-					result.append(expression.target);
+					result.append(((GetLocalVariableExpression) expression.target).variable.name);
 					result.append("[");
-					for (int i = 0; i < expression.arguments.arguments.length - 1; i++) {
+					//why -1?
+					for (int i = 0; i < expression.arguments.arguments.length; i++) {
 						if (i > 0)
 							result.append(", ");
 						

CodeFormatter/src/main/java/org/openzen/zenscript/formatter/StatementFormatter.java

@@ -132,8 +132,8 @@ public class StatementFormatter implements StatementVisitor<Void> {
 	public Void visitExpression(ExpressionStatement statement) {
 		WhitespaceInfo whitespace = statement.getTag(WhitespaceInfo.class);
 		beginSingleLine(whitespace);
-		output.append(statement.expression.accept(expressionFormatter).value)
-			  .append(";");
+        String value = statement.expression.accept(expressionFormatter).value;
+        output.append(value).append(";");
 		endSingleLine(whitespace);
 		return null;
 	}
@@ -278,7 +278,8 @@ public class StatementFormatter implements StatementVisitor<Void> {
 		}
 		if (statement.initializer != null) {
 			output.append(" = ");
-			output.append(statement.initializer.accept(expressionFormatter).value);
+            String value = statement.initializer.accept(expressionFormatter).value;
+            output.append(value);
 		}
 		output.append(";");
 		endSingleLine(whitespace);

CodeFormatter/src/main/java/org/openzen/zenscript/formatter/TypeFormatter.java

@@ -90,7 +90,7 @@ public class TypeFormatter implements TypeVisitor<String>, GenericParameterBound
 	@Override
 	public String visitDefinition(DefinitionTypeID definition) {
 		String importedName = importer.importDefinition(definition.definition);
-		if (definition.typeArguments == null)
+		if (definition.typeArguments == null || definition.typeArguments.length == 0)
 			return importedName;
 		
 		StringBuilder result = new StringBuilder();