Skip to content

Allow visible white space, and visible line endings to be configured independently. #20

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 28, 2016
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 33 additions & 6 deletions src/main/java/com/diffplug/gradle/oomph/ConventionStyle.java
Original file line number Diff line number Diff line change
Expand Up @@ -37,12 +37,9 @@ public void niceText(String fontSize) {
props.put("org.eclipse.jface.textfont", "1|" + font + "|" + fontSize + "|0|WINDOWS|1|-12|0|0|0|400|0|0|0|0|3|2|1|49|" + font);
});
// visible whitespace
extension.workspaceProp(".metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.editors.prefs", props -> {
props.put("eclipse.preferences.version", "1");
props.put("showCarriageReturn", "false");
props.put("showLineFeed", "false");
props.put("showWhitespaceCharacters", "true");
});
showWhiteSpace(true);
showLineEndings(false);

// show line numbers
lineNumbers(true);
}
Expand All @@ -62,4 +59,34 @@ public void lineNumbers(boolean showLineNumbers) {
props.put("lineNumberRuler", Boolean.toString(showLineNumbers));
});
}

/** Determines whether or not to show white space not including line endings. */
public void showWhiteSpace(boolean showWhiteSpace) {
extension.workspaceProp(".metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.editors.prefs", props -> {
props.put("eclipse.preferences.version", "1");
props.put("showWhitespaceCharacters", Boolean.toString(showWhiteSpace));
});
}

/** Determines whether or not to show line ending characters (carriage return/line feeds). */
public void showLineEndings(boolean showLineEndings) {
showLineFeed(showLineEndings);
showCarriageReturn(showLineEndings);
}

/** Determines whether or not to show line feeds. */
public void showLineFeed(boolean showLineFeed) {
extension.workspaceProp(".metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.editors.prefs", props -> {
props.put("eclipse.preferences.version", "1");
props.put("showLineFeed", Boolean.toString(showLineFeed));
});
}

/** Determines whether or not to show carriage returns. */
public void showCarriageReturn(boolean showCarriageReturn) {
extension.workspaceProp(".metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.editors.prefs", props -> {
props.put("eclipse.preferences.version", "1");
props.put("showCarriageReturn", Boolean.toString(showCarriageReturn));
});
}
}