BlocksMod/FernFlower
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

adjustable indentation

Browse Source
This commit is contained in:
Roman Shevchenko 2014-05-30 15:44:27 +04:00
parent 0a5a2c671e
commit 7189d18bfe
4 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dist/docs/readme.txt vendored
View File

@ -67,7 +67,7 @@ urc : full name of user-supplied class implementing IIdentifierRenamer. It is
inn (1): check for IntelliJ IDEA-specific @NotNull annotation and remove inserted code if found
lac (0): decompile lambda expressions to anonymous classes
nls (0): define new line character to be used for output. 0 - '\r\n' (Windows), 1 - '\n' (Linux)
ind : indentation string (default is " " (3 spaces))
The default logging level is INFO. This value can be overwritten by setting the option 'log' as follows:

5
src/de/fernflower/main/DecompilerContext.java
View File

@ -87,13 +87,14 @@ public class DecompilerContext {
mapDefault.put(IFernflowerPreferences.REMOVE_EMPTY_RANGES, "1");
mapDefault.put(IFernflowerPreferences.NEW_LINE_SEPARATOR, "0");
mapDefault.put(IFernflowerPreferences.INDENT_STRING, " ");
mapDefault.put(IFernflowerPreferences.IDEA_NOT_NULL_ANNOTATION, "1");
if(propertiesCustom != null) {
mapDefault.putAll(propertiesCustom);
}
currentContext.set(new DecompilerContext(mapDefault));
}

3
src/de/fernflower/main/extern/IFernflowerPreferences.java vendored
View File

@ -50,7 +50,8 @@ public interface IFernflowerPreferences {
public static final String NEW_LINE_SEPARATOR = "nls";
public static final String IDEA_NOT_NULL_ANNOTATION = "inn";
public static final String LAMBDA_TO_ANONYMOUS_CLASS = "lac";
public static final String INDENT_STRING = "ind";
public static final String LINE_SEPARATOR_WIN = "\r\n";
public static final String LINE_SEPARATOR_LIN = "\n";
}

10
src/de/fernflower/util/InterpreterUtil.java
View File

@ -25,10 +25,11 @@ import java.util.Collection;
import java.util.HashSet;
import java.util.List;
import de.fernflower.main.DecompilerContext;
import de.fernflower.main.extern.IFernflowerPreferences;
public class InterpreterUtil {
public static final String INDENT_STRING = " ";
public static void copyFile(File in, File out) throws IOException {
FileChannel inChannel = new FileInputStream(in).getChannel();
FileChannel outChannel = new FileOutputStream(out).getChannel();
@ -65,9 +66,10 @@ public class InterpreterUtil {
}
public static String getIndentString(int length) {
StringBuffer buf = new StringBuffer();
String indent = (String) DecompilerContext.getProperty(IFernflowerPreferences.INDENT_STRING);
StringBuilder buf = new StringBuilder();
while(length-->0) {
buf.append(INDENT_STRING);
buf.append(indent);
}
return buf.toString();
}