Merge remote-tracking branch 'FabricMC/dev/0.10' into dev/0.10.0

# Conflicts:
#	src/main/java/net/fabricmc/loom/api/LoomGradleExtensionAPI.java
#	src/main/java/net/fabricmc/loom/extension/MinecraftGradleExtension.java

2 files changed, 23 insertions, 4 deletions

diff --git a/src/main/java/net/fabricmc/loom/decompilers/cfr/CFRObfuscationMapping.java b/src/main/java/net/fabricmc/loom/decompilers/cfr/CFRObfuscationMapping.java
index c8baa2a7..aae26019 100644
--- a/src/main/java/net/fabricmc/loom/decompilers/cfr/CFRObfuscationMapping.java
+++ b/src/main/java/net/fabricmc/loom/decompilers/cfr/CFRObfuscationMapping.java
@@ -30,6 +30,7 @@ import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collection;
 import java.util.LinkedList;
 import java.util.List;
 
@@ -126,6 +127,10 @@ public class CFRObfuscationMapping extends NullMapping {
 					}
 				}
 
+				if (comment != null && !recordComponentDocs.isEmpty()) {
+					print(" * ");
+				}
+
 				for (String componentDoc : recordComponentDocs) {
 					print(" * ").print(componentDoc).newln();
 				}
@@ -154,13 +159,23 @@ public class CFRObfuscationMapping extends NullMapping {
 					lines.addAll(Arrays.asList(comment.split("\\R")));
 				}
 
-				for (MappingTree.MethodArgMapping arg : mapping.getArgs()) {
+				final Collection<? extends MappingTree.MethodArgMapping> methodArgs = mapping.getArgs();
+				final List<String> params = new ArrayList<>();
+
+				for (MappingTree.MethodArgMapping arg : methodArgs) {
 					String argComment = arg.getComment();
 
 					if (argComment != null) {
-						lines.addAll(Arrays.asList(("@param " + arg.getSrcName() + " " + argComment).split("\\R")));
+						params.addAll(Arrays.asList(("@param " + arg.getSrcName() + " " + argComment).split("\\R")));
 					}
 				}
+
+				// Add a blank line between params and the comment.
+				if (!lines.isEmpty() && !params.isEmpty()) {
+					lines.add("");
+				}
+
+				lines.addAll(params);
 			}
 
 			if (!lines.isEmpty()) {
diff --git a/src/main/java/net/fabricmc/loom/decompilers/cfr/LoomCFRDecompiler.java b/src/main/java/net/fabricmc/loom/decompilers/cfr/LoomCFRDecompiler.java
index bbfb0be2..cb715139 100644
--- a/src/main/java/net/fabricmc/loom/decompilers/cfr/LoomCFRDecompiler.java
+++ b/src/main/java/net/fabricmc/loom/decompilers/cfr/LoomCFRDecompiler.java
@@ -32,6 +32,7 @@ import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.Map;
 import java.util.jar.Attributes;
 import java.util.jar.JarOutputStream;
@@ -64,7 +65,10 @@ public class LoomCFRDecompiler implements LoomDecompiler {
 	@Override
 	public void decompile(Path compiledJar, Path sourcesDestination, Path linemapDestination, DecompilationMetadata metaData) {
 		final String path = compiledJar.toAbsolutePath().toString();
-		final Options options = OptionsImpl.getFactory().create(DECOMPILE_OPTIONS);
+		final Map<String, String> allOptions = new HashMap<>(DECOMPILE_OPTIONS);
+		allOptions.putAll(metaData.options());
+
+		final Options options = OptionsImpl.getFactory().create(allOptions);
 
 		ClassFileSourceImpl classFileSource = new ClassFileSourceImpl(options);
 
@@ -138,7 +142,7 @@ public class LoomCFRDecompiler implements LoomDecompiler {
 		decompiler.decompile(Paths.get("input.jar"),
 				Paths.get("output-sources.jar"),
 				lineMap,
-				new DecompilationMetadata(4, null, Collections.emptyList(), null)
+				new DecompilationMetadata(4, null, Collections.emptyList(), null, Collections.emptyMap())
 		);
 
 		LineNumberRemapper lineNumberRemapper = new LineNumberRemapper();