Bug 575289: [R-Editor, Rd-Editor] Make use of added theme color
Change-Id: I37c599347edb7ff4bdd40bfa6921a182f2a38a7b
diff --git a/r/org.eclipse.statet.r.ui/src/org/eclipse/statet/r/ui/RUIPreferenceConstants.java b/r/org.eclipse.statet.r.ui/src/org/eclipse/statet/r/ui/RUIPreferenceConstants.java
index eedb7e7..756eab9 100644
--- a/r/org.eclipse.statet.r.ui/src/org/eclipse/statet/r/ui/RUIPreferenceConstants.java
+++ b/r/org.eclipse.statet.r.ui/src/org/eclipse/statet/r/ui/RUIPreferenceConstants.java
@@ -119,10 +119,11 @@
final IEclipsePreferences pref = scope.getNode(RUI.BUNDLE_ID);
final ThemeUtil theme = new ThemeUtil();
- final String defaultColor = theme.getColorPrefValue(IWaThemeConstants.CODE_DEFAULT_COLOR);
- final String commentColor = theme.getColorPrefValue(IWaThemeConstants.CODE_COMMENT_COLOR);
- final String commentTasktagColor = theme.getColorPrefValue(IWaThemeConstants.CODE_COMMENT_TASKTAG_COLOR);
- final String keywordColor = theme.getColorPrefValue(IWaThemeConstants.CODE_KEYWORD_COLOR);
+ final String defaultColor= theme.getColorPrefValue(IWaThemeConstants.CODE_DEFAULT_COLOR);
+ final String bracketColor= theme.getColorPrefValue(IWaThemeConstants.CODE_BRACKET_COLOR);
+ final String commentColor= theme.getColorPrefValue(IWaThemeConstants.CODE_COMMENT_COLOR);
+ final String commentTasktagColor= theme.getColorPrefValue(IWaThemeConstants.CODE_COMMENT_TASKTAG_COLOR);
+ final String keywordColor= theme.getColorPrefValue(IWaThemeConstants.CODE_KEYWORD_COLOR);
String color;
pref.put(R.TS_DEFAULT_ROOT + TEXTSTYLE_COLOR_SUFFIX, defaultColor);
@@ -288,7 +289,7 @@
pref.putBoolean(R.TS_OPERATORS_SUB_USERDEFINED_ROOT + TEXTSTYLE_UNDERLINE_SUFFIX, false);
pref.putBoolean(R.TS_OPERATORS_SUB_USERDEFINED_ROOT + TEXTSTYLE_STRIKETHROUGH_SUFFIX, false);
- pref.put(R.TS_GROUPING_ROOT + TEXTSTYLE_COLOR_SUFFIX, defaultColor);
+ pref.put(R.TS_GROUPING_ROOT + TEXTSTYLE_COLOR_SUFFIX, bracketColor);
pref.putBoolean(R.TS_GROUPING_ROOT + TEXTSTYLE_BOLD_SUFFIX, false);
pref.putBoolean(R.TS_GROUPING_ROOT + TEXTSTYLE_ITALIC_SUFFIX, false);
pref.putBoolean(R.TS_GROUPING_ROOT + TEXTSTYLE_UNDERLINE_SUFFIX, false);
@@ -309,6 +310,12 @@
pref.putBoolean(Rd.TS_DEFAULT_ROOT + TEXTSTYLE_UNDERLINE_SUFFIX, false);
pref.putBoolean(Rd.TS_DEFAULT_ROOT + TEXTSTYLE_STRIKETHROUGH_SUFFIX, false);
+ pref.put(Rd.TS_BRACKETS_ROOT + TEXTSTYLE_COLOR_SUFFIX, bracketColor);
+ pref.putBoolean(Rd.TS_BRACKETS_ROOT + TEXTSTYLE_BOLD_SUFFIX, false);
+ pref.putBoolean(Rd.TS_BRACKETS_ROOT + TEXTSTYLE_ITALIC_SUFFIX, false);
+ pref.putBoolean(Rd.TS_BRACKETS_ROOT + TEXTSTYLE_UNDERLINE_SUFFIX, false);
+ pref.putBoolean(Rd.TS_BRACKETS_ROOT + TEXTSTYLE_STRIKETHROUGH_SUFFIX, false);
+
pref.put(Rd.TS_VERBATIM_ROOT + TEXTSTYLE_COLOR_SUFFIX,
theme.getColorPrefValue(IWaThemeConstants.CODE_VERBATIM_COLOR) );
pref.putBoolean(Rd.TS_VERBATIM_ROOT + TEXTSTYLE_BOLD_SUFFIX, false);
@@ -361,12 +368,6 @@
pref.putBoolean(Rd.TS_UNLISTED_TAG_ROOT + TEXTSTYLE_ITALIC_SUFFIX, true);
pref.putBoolean(Rd.TS_UNLISTED_TAG_ROOT + TEXTSTYLE_UNDERLINE_SUFFIX, false);
pref.putBoolean(Rd.TS_UNLISTED_TAG_ROOT + TEXTSTYLE_STRIKETHROUGH_SUFFIX, false);
-
- pref.put(Rd.TS_BRACKETS_ROOT + TEXTSTYLE_COLOR_SUFFIX, defaultColor);
- pref.putBoolean(Rd.TS_BRACKETS_ROOT + TEXTSTYLE_BOLD_SUFFIX, false);
- pref.putBoolean(Rd.TS_BRACKETS_ROOT + TEXTSTYLE_ITALIC_SUFFIX, false);
- pref.putBoolean(Rd.TS_BRACKETS_ROOT + TEXTSTYLE_UNDERLINE_SUFFIX, false);
- pref.putBoolean(Rd.TS_BRACKETS_ROOT + TEXTSTYLE_STRIKETHROUGH_SUFFIX, false);
}
}
