Skip to content

Commit c3c59f2

Browse files
author
Federico Fissore
committed
New editor: restored EOL markers. Fixes #3817
1 parent a63d8d0 commit c3c59f2

File tree

1 file changed

+9
-3
lines changed

1 file changed

+9
-3
lines changed

app/src/processing/app/syntax/SketchTextArea.java

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,7 @@ private void setTheme(String name) throws IOException {
101101
IOUtils.closeQuietly(defaultXmlInputStream);
102102
}
103103

104+
setEOLMarkersVisible(processing.app.Theme.getBoolean("editor.eolmarkers"));
104105
setBackground(processing.app.Theme.getColor("editor.bgcolor"));
105106
setHighlightCurrentLine(processing.app.Theme.getBoolean("editor.linehighlight"));
106107
setCurrentLineHighlightColor(processing.app.Theme.getColor("editor.linehighlight.color"));
@@ -127,9 +128,14 @@ private void setTheme(String name) throws IOException {
127128
setSyntaxTheme(TokenTypes.LITERAL_STRING_DOUBLE_QUOTE, "literal_string_double_quote");
128129
setSyntaxTheme(TokenTypes.PREPROCESSOR, "preprocessor");
129130

130-
Style style = getSyntaxScheme().getStyle(TokenTypes.IDENTIFIER);
131-
style.foreground = processing.app.Theme.getColor("editor.fgcolor");
132-
getSyntaxScheme().setStyle(TokenTypes.IDENTIFIER, style);
131+
setColorForToken(TokenTypes.IDENTIFIER, "editor.fgcolor");
132+
setColorForToken(TokenTypes.WHITESPACE, "editor.eolmarkers.color");
133+
}
134+
135+
private void setColorForToken(int tokenType, String colorKeyFromTheme) {
136+
Style style = getSyntaxScheme().getStyle(tokenType);
137+
style.foreground = processing.app.Theme.getColor(colorKeyFromTheme);
138+
getSyntaxScheme().setStyle(tokenType, style);
133139
}
134140

135141
private void setSyntaxTheme(int tokenType, String id) {

0 commit comments

Comments
 (0)