diff --git a/documentation/ChangeLog.md b/documentation/ChangeLog.md
index ba4def73d..3646818f0 100644
--- a/documentation/ChangeLog.md
+++ b/documentation/ChangeLog.md
@@ -1,6 +1,10 @@
## release ChangeLog
### (NextVersion)
+ * Added support for Eclipse dark theme (#131). Namely:
+ * Syntax/source coloring now have different settings for dark theme.
+ * Fixed tools console colors, as well as content assist pop-up colors.
+
* Fixed: Unindent (Shift-Tab) broken, does nothing after empty lines in selection.
* Fixed Outline broken, due to error "CommonException: Invalid line, out of bounds". (#156)
diff --git a/plugin_ide.ui.tests/src-lang/melnorme/lang/ide/ui/editor/text/LangAutoEditStrategyTest.java b/plugin_ide.ui.tests/src-lang/melnorme/lang/ide/ui/editor/text/LangAutoEditStrategyTest.java
index 2bf3bf1fa..681faff0d 100644
--- a/plugin_ide.ui.tests/src-lang/melnorme/lang/ide/ui/editor/text/LangAutoEditStrategyTest.java
+++ b/plugin_ide.ui.tests/src-lang/melnorme/lang/ide/ui/editor/text/LangAutoEditStrategyTest.java
@@ -11,15 +11,6 @@
package melnorme.lang.ide.ui.editor.text;
import static melnorme.utilbox.core.Assert.AssertNamespace.assertTrue;
-import melnorme.lang.ide.core.text.BlockHeuristicsScannner;
-import melnorme.lang.ide.core.text.SamplePartitionScanner;
-import melnorme.lang.ide.core.text.Scanner_BaseTest;
-import melnorme.lang.ide.ui.CodeFormatterConstants;
-import melnorme.lang.ide.ui.CodeFormatterConstants.IndentMode;
-import melnorme.lang.ide.ui.editor.text.LangAutoEditPreferenceConstants;
-import melnorme.lang.ide.ui.editor.text.LangAutoEditStrategy;
-import melnorme.lang.ide.ui.text.util.LangAutoEditUtils;
-import melnorme.utilbox.misc.MiscUtil;
import org.eclipse.jface.text.BadLocationException;
import org.eclipse.jface.text.Document;
@@ -29,6 +20,15 @@
import org.eclipse.swt.SWT;
import org.junit.Test;
+import melnorme.lang.ide.core.text.BlockHeuristicsScannner;
+import melnorme.lang.ide.core.text.SamplePartitionScanner;
+import melnorme.lang.ide.core.text.Scanner_BaseTest;
+import melnorme.lang.ide.ui.CodeFormatterConstants;
+import melnorme.lang.ide.ui.CodeFormatterConstants.IndentMode;
+import melnorme.lang.ide.ui.LangAutoEditPreferenceConstants;
+import melnorme.lang.ide.ui.text.util.LangAutoEditUtils;
+import melnorme.utilbox.misc.MiscUtil;
+
public class LangAutoEditStrategyTest extends Scanner_BaseTest {
public static final String NEUTRAL_SRCX;
diff --git a/plugin_ide.ui/plugin.xml b/plugin_ide.ui/plugin.xml
index 213e5c632..6f01a6ad8 100644
--- a/plugin_ide.ui/plugin.xml
+++ b/plugin_ide.ui/plugin.xml
@@ -618,4 +618,12 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/plugin_ide.ui/resources/e4-dark_sourcehighlighting.css b/plugin_ide.ui/resources/e4-dark_sourcehighlighting.css
new file mode 100644
index 000000000..22769871f
--- /dev/null
+++ b/plugin_ide.ui/resources/e4-dark_sourcehighlighting.css
@@ -0,0 +1,45 @@
+/*******************************************************************************
+ * Copyright (c) 2015 Bruno Medeiros and other Contributors.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Bruno Medeiros - initial API and implementation
+ *******************************************************************************/
+
+IEclipsePreferences#com-googlecode-goclipse-ui {
+ preferences:
+
+ 'syntax_highlighting_text=255,255,255'
+ 'syntax_highlighting_keyword=127,0,85'
+ 'syntax_highlighting_value=127,0,85'
+ 'syntax_highlighting_primitive=127,0,85'
+ 'syntax_highlighting_builtin_function=255,255,255'
+ 'syntax_highlighting_operator=255,255,255'
+ 'syntax_highlighting_syntax_chars=255,255,255'
+
+ 'syntax_highlighting_character=0,75,200'
+ 'syntax_highlighting_string=0,75,200'
+ 'syntax_highlighting_multiline_string=230,75,0'
+
+ 'syntax_highlighting_comment=63,127,95'
+
+
+ 'matchingBracketsColor=102,112,125'
+
+ 'content_assist_proposals_background=52,57,61'
+ 'content_assist_proposals_foreground=238,238,238'
+ 'content_assist_parameters_background=52,57,61'
+ 'content_assist_parameters_foreground=238,238,238'
+
+
+ /* Console colors */
+
+ 'console.info_color=150,190,220'
+ 'console.stderr_color=255,0,0'
+ 'console.stdout_color=255,255,255'
+ 'console.background_color=0,215,0' /* Not actually used */
+
+}
\ No newline at end of file
diff --git a/plugin_ide.ui/src-lang/_org/eclipse/jdt/internal/ui/text/java/hover/SourceViewerInformationControl.java b/plugin_ide.ui/src-lang/_org/eclipse/jdt/internal/ui/text/java/hover/SourceViewerInformationControl.java
index cb2912708..d512e9b27 100644
--- a/plugin_ide.ui/src-lang/_org/eclipse/jdt/internal/ui/text/java/hover/SourceViewerInformationControl.java
+++ b/plugin_ide.ui/src-lang/_org/eclipse/jdt/internal/ui/text/java/hover/SourceViewerInformationControl.java
@@ -10,12 +10,6 @@
*******************************************************************************/
package _org.eclipse.jdt.internal.ui.text.java.hover;
-import melnorme.lang.ide.core.text.LangDocumentPartitionerSetup;
-import melnorme.lang.ide.ui.EditorPreferences;
-import melnorme.lang.ide.ui.EditorSettings_Actual;
-import melnorme.lang.ide.ui.LangUIPlugin;
-import melnorme.lang.ide.ui.editor.LangSourceViewer;
-
import org.eclipse.core.runtime.Assert;
import org.eclipse.jface.preference.IPreferenceStore;
import org.eclipse.jface.preference.PreferenceConverter;
@@ -52,6 +46,11 @@
import org.eclipse.ui.texteditor.AbstractTextEditor;
import _org.eclipse.cdt.ui.text.IColorManager;
+import melnorme.lang.ide.core.text.LangDocumentPartitionerSetup;
+import melnorme.lang.ide.ui.EditorSettings_Actual;
+import melnorme.lang.ide.ui.EditorSettings_Actual.EditorPrefConstants;
+import melnorme.lang.ide.ui.LangUIPlugin;
+import melnorme.lang.ide.ui.editor.LangSourceViewer;
/**
* Source viewer based implementation of IInformationControl.
@@ -249,10 +248,10 @@ protected static RGB blend(RGB bg, RGB fg, float factor) {
protected void initializeColors() {
IPreferenceStore store= LangUIPlugin.getInstance().getPreferenceStore();
RGB bgRGB;
- if (store.getBoolean(EditorPreferences.SOURCE_HOVER_BACKGROUND_COLOR_UseSystemDefault.key)) {
+ if (store.getBoolean(EditorPrefConstants.SOURCE_HOVER_BACKGROUND_COLOR_UseSystemDefault.key)) {
bgRGB= getVisibleBackgroundColor(fShell.getDisplay());
} else {
- bgRGB= PreferenceConverter.getColor(store, EditorPreferences.SOURCE_HOVER_BACKGROUND_COLOR_rgb.key);
+ bgRGB= PreferenceConverter.getColor(store, EditorPrefConstants.SOURCE_HOVER_BACKGROUND_COLOR_rgb.key);
}
if (bgRGB != null) {
fBackgroundColor= new Color(fShell.getDisplay(), bgRGB);
diff --git a/plugin_ide.ui/src-lang/melnorme/lang/ide/ui/EditorPreferences_Default.java b/plugin_ide.ui/src-lang/melnorme/lang/ide/ui/EditorPreferences_Default.java
deleted file mode 100644
index fd3de7f7b..000000000
--- a/plugin_ide.ui/src-lang/melnorme/lang/ide/ui/EditorPreferences_Default.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2015, 2015 Bruno Medeiros and other Contributors.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Bruno Medeiros - initial API and implementation
- *******************************************************************************/
-package melnorme.lang.ide.ui;
-
-import melnorme.lang.ide.core.utils.prefs.BooleanPreference;
-import melnorme.lang.ide.ui.preferences.ColorPreference;
-
-import org.eclipse.swt.graphics.RGB;
-
-
-interface EditorPreferences_Default {
-
- BooleanPreference SOURCE_HOVER_BACKGROUND_COLOR_UseSystemDefault =
- new BooleanPreference(LangUIPlugin.PLUGIN_ID, "SourceHover.bg_color.useSystemDefault", true);
-
- ColorPreference SOURCE_HOVER_BACKGROUND_COLOR_rgb =
- new ColorPreference(LangUIPlugin.PLUGIN_ID, "SourceHover.bg_color.rgb", new RGB(255, 255, 255));
-
-}
\ No newline at end of file
diff --git a/plugin_ide.ui/src/melnorme/lang/ide/ui/LangAutoEditPreferenceConstants_Actual.java b/plugin_ide.ui/src-lang/melnorme/lang/ide/ui/LangAutoEditPreferenceConstants_Default.java
similarity index 68%
rename from plugin_ide.ui/src/melnorme/lang/ide/ui/LangAutoEditPreferenceConstants_Actual.java
rename to plugin_ide.ui/src-lang/melnorme/lang/ide/ui/LangAutoEditPreferenceConstants_Default.java
index 8c206cb15..3d6fd90d2 100644
--- a/plugin_ide.ui/src/melnorme/lang/ide/ui/LangAutoEditPreferenceConstants_Actual.java
+++ b/plugin_ide.ui/src-lang/melnorme/lang/ide/ui/LangAutoEditPreferenceConstants_Default.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2014, 2014 Bruno Medeiros and other Contributors.
+ * Copyright (c) 2015 Bruno Medeiros and other Contributors.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -12,28 +12,26 @@
import melnorme.lang.ide.core.utils.prefs.BooleanPreference;
-
-
-public interface LangAutoEditPreferenceConstants_Actual {
+interface LangAutoEditPreferenceConstants_Default {
public static final String QUALIFIER = LangUIPlugin.PLUGIN_ID;
- BooleanPreference AE_CLOSE_STRINGS =
+ public static BooleanPreference AE_CLOSE_STRINGS =
new BooleanPreference(QUALIFIER, "EDITOR_CLOSE_STRINGS", true);
- BooleanPreference AE_CLOSE_BRACKETS =
+ public static BooleanPreference AE_CLOSE_BRACKETS =
new BooleanPreference(QUALIFIER, "EDITOR_CLOSE_BRACKETS", true);
- BooleanPreference AE_CLOSE_BRACES =
+ public static BooleanPreference AE_CLOSE_BRACES =
new BooleanPreference(QUALIFIER, "EDITOR_CLOSE_BRACES", true);
- BooleanPreference AE_SMART_INDENT =
+ public static BooleanPreference AE_SMART_INDENT =
new BooleanPreference(QUALIFIER, "autoedit.editorSmartIndent", true);
- BooleanPreference AE_SMART_DEINDENT =
+ public static BooleanPreference AE_SMART_DEINDENT =
new BooleanPreference(QUALIFIER, "autoedit.smart_deindent", true);
- BooleanPreference AE_PARENTHESES_AS_BLOCKS =
+ public static BooleanPreference AE_PARENTHESES_AS_BLOCKS =
new BooleanPreference(QUALIFIER, "autoedit.parentheses_as_blocks", true);
// Not used currently?
- BooleanPreference AE_SMART_PASTE =
+ public static BooleanPreference AE_SMART_PASTE =
new BooleanPreference(QUALIFIER, "autoedit.smartPaste", true);
}
\ No newline at end of file
diff --git a/plugin_ide.ui/src-lang/melnorme/lang/ide/ui/LangUIPreferencesInitializer.java b/plugin_ide.ui/src-lang/melnorme/lang/ide/ui/LangUIPreferencesInitializer.java
index 1e1a058ba..db2fdaec9 100644
--- a/plugin_ide.ui/src-lang/melnorme/lang/ide/ui/LangUIPreferencesInitializer.java
+++ b/plugin_ide.ui/src-lang/melnorme/lang/ide/ui/LangUIPreferencesInitializer.java
@@ -11,13 +11,13 @@
package melnorme.lang.ide.ui;
-import melnorme.lang.ide.ui.EditorSettings_Actual.EditorPrefConstants;
-
import org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer;
import org.eclipse.jface.preference.IPreferenceStore;
import org.eclipse.jface.resource.StringConverter;
import org.eclipse.swt.graphics.RGB;
+import melnorme.lang.ide.ui.EditorSettings_Actual.EditorPrefConstants;
+
public abstract class LangUIPreferencesInitializer extends AbstractPreferenceInitializer
implements EditorPrefConstants, ContentAssistConstants {
diff --git a/plugin_ide.ui/src-lang/melnorme/lang/ide/ui/editor/text/EditorPrefConstants_Common.java b/plugin_ide.ui/src-lang/melnorme/lang/ide/ui/editor/text/EditorPrefConstants_Common.java
index 0fb2018b7..fe4b1cce2 100644
--- a/plugin_ide.ui/src-lang/melnorme/lang/ide/ui/editor/text/EditorPrefConstants_Common.java
+++ b/plugin_ide.ui/src-lang/melnorme/lang/ide/ui/editor/text/EditorPrefConstants_Common.java
@@ -10,7 +10,12 @@
*******************************************************************************/
package melnorme.lang.ide.ui.editor.text;
+import org.eclipse.swt.graphics.RGB;
+
+import melnorme.lang.ide.core.utils.prefs.BooleanPreference;
+import melnorme.lang.ide.ui.LangUIPlugin;
import melnorme.lang.ide.ui.EditorSettings_Actual.EditorPrefConstants;
+import melnorme.lang.ide.ui.preferences.ColorPreference;
/**
* This interface should not be accessed by name directly,
@@ -19,15 +24,16 @@
*/
public interface EditorPrefConstants_Common {
- String MATCHING_BRACKETS= "matchingBrackets";
- String MATCHING_BRACKETS_COLOR= "matchingBracketsColor";
- String HIGHLIGHT_BRACKET_AT_CARET_LOCATION= "highlightBracketAtCaretLocation";
+ String MATCHING_BRACKETS = "editor.matchingBrackets";
+ String MATCHING_BRACKETS_COLOR = "editor.matchingBracketsColor";
+ String HIGHLIGHT_BRACKET_AT_CARET_LOCATION = "editor.highlightBracketAtCaretLocation";
+ String ENCLOSING_BRACKETS = "editor.enclosingBrackets";
+
+
+ BooleanPreference SOURCE_HOVER_BACKGROUND_COLOR_UseSystemDefault =
+ new BooleanPreference(LangUIPlugin.PLUGIN_ID, "SourceHover.bg_color.useSystemDefault", true);
- /**
- * Preference key for enclosing brackets.
- *
- * @since 3.8
- */
- String ENCLOSING_BRACKETS= "enclosingBrackets";
+ ColorPreference SOURCE_HOVER_BACKGROUND_COLOR_rgb =
+ new ColorPreference(LangUIPlugin.PLUGIN_ID, "SourceHover.bg_color.rgb", new RGB(255, 255, 255));
}
\ No newline at end of file
diff --git a/plugin_ide.ui/src-lang/melnorme/lang/ide/ui/editor/text/LangAutoEditStrategyExt.java b/plugin_ide.ui/src-lang/melnorme/lang/ide/ui/editor/text/LangAutoEditStrategyExt.java
index 599aef565..74b81c18d 100644
--- a/plugin_ide.ui/src-lang/melnorme/lang/ide/ui/editor/text/LangAutoEditStrategyExt.java
+++ b/plugin_ide.ui/src-lang/melnorme/lang/ide/ui/editor/text/LangAutoEditStrategyExt.java
@@ -14,6 +14,7 @@
import static melnorme.utilbox.core.CoreUtil.array;
import melnorme.lang.ide.core.text.BlockHeuristicsScannner;
import melnorme.lang.ide.core.text.BlockHeuristicsScannner.BlockTokenRule;
+import melnorme.lang.ide.ui.LangAutoEditPreferenceConstants;
import melnorme.utilbox.misc.ArrayUtil;
import org.eclipse.jface.text.BadLocationException;
diff --git a/plugin_ide.ui/src-lang/melnorme/lang/ide/ui/editor/text/LangAutoEditsPreferencesAdapter.java b/plugin_ide.ui/src-lang/melnorme/lang/ide/ui/editor/text/LangAutoEditsPreferencesAdapter.java
index 056279224..9c81450f4 100644
--- a/plugin_ide.ui/src-lang/melnorme/lang/ide/ui/editor/text/LangAutoEditsPreferencesAdapter.java
+++ b/plugin_ide.ui/src-lang/melnorme/lang/ide/ui/editor/text/LangAutoEditsPreferencesAdapter.java
@@ -13,6 +13,7 @@
import melnorme.lang.ide.ui.CodeFormatterConstants;
import melnorme.lang.ide.ui.CodeFormatterConstants.IndentMode;
+import melnorme.lang.ide.ui.LangAutoEditPreferenceConstants;
import melnorme.lang.ide.ui.text.util.AutoEditUtils;
// Originally was RubyPreferencesInterpreter from DLTK
diff --git a/plugin_ide.ui/src-lang/melnorme/lang/ide/ui/preferences/ColorPreference.java b/plugin_ide.ui/src-lang/melnorme/lang/ide/ui/preferences/ColorPreference.java
index 6b18e1487..875f7de92 100644
--- a/plugin_ide.ui/src-lang/melnorme/lang/ide/ui/preferences/ColorPreference.java
+++ b/plugin_ide.ui/src-lang/melnorme/lang/ide/ui/preferences/ColorPreference.java
@@ -10,22 +10,23 @@
*******************************************************************************/
package melnorme.lang.ide.ui.preferences;
-import melnorme.lang.ide.core.utils.prefs.PreferenceHelper;
-import melnorme.lang.ide.core.utils.prefs.PreferencesLookupHelper;
-import melnorme.util.swt.jface.text.ColorManager;
-
import org.eclipse.core.runtime.preferences.IEclipsePreferences;
import org.eclipse.jface.resource.StringConverter;
import org.eclipse.swt.graphics.Color;
import org.eclipse.swt.graphics.RGB;
+import melnorme.lang.ide.core.utils.prefs.PreferenceHelper;
+import melnorme.lang.ide.core.utils.prefs.PreferencesLookupHelper;
+import melnorme.lang.ide.ui.LangUIPlugin;
+import melnorme.util.swt.jface.text.ColorManager;
+
/**
* Helper to work with a color preference.
*/
public class ColorPreference extends PreferenceHelper {
public ColorPreference(String key, RGB defaultValue) {
- super(key, defaultValue);
+ super(LangUIPlugin.PLUGIN_ID, key, defaultValue);
}
public ColorPreference(String pluginId, String key, RGB defaultValue) {
super(pluginId, key, defaultValue);
diff --git a/plugin_ide.ui/src-lang/melnorme/lang/ide/ui/preferences/LangEditorConfigurationBlock.java b/plugin_ide.ui/src-lang/melnorme/lang/ide/ui/preferences/LangEditorConfigurationBlock.java
index eedc02a72..b7098f166 100644
--- a/plugin_ide.ui/src-lang/melnorme/lang/ide/ui/preferences/LangEditorConfigurationBlock.java
+++ b/plugin_ide.ui/src-lang/melnorme/lang/ide/ui/preferences/LangEditorConfigurationBlock.java
@@ -8,17 +8,20 @@
* Contributors:
* IBM Corporation - initial API and implementation (JDT)
* DLTK team ? - DLTK modifications
- * Bruno Medeiros - Lang modifications
+ * Bruno Medeiros - Lang rewrite
*******************************************************************************/
package melnorme.lang.ide.ui.preferences;
+import melnorme.lang.ide.ui.ContentAssistConstants;
+import melnorme.lang.ide.ui.EditorSettings_Actual.EditorPrefConstants;
import melnorme.lang.ide.ui.preferences.EditorAppearanceColorsComponent.EditorColorItem;
import melnorme.lang.ide.ui.preferences.common.AbstractComponentsPrefPage;
import melnorme.lang.ide.ui.preferences.common.AbstractPreferencesBlock;
+import melnorme.util.swt.components.fields.CheckBoxField;
+import org.eclipse.swt.SWT;
import org.eclipse.swt.widgets.Composite;
-//originally from DLTK version 5.0.0
public class LangEditorConfigurationBlock extends AbstractPreferencesBlock {
public LangEditorConfigurationBlock(AbstractComponentsPrefPage mainPreferencePage) {
@@ -36,6 +39,10 @@ protected void createContents(Composite topControl) {
}
protected void createAppearanceGroup(Composite parent) {
+ createBooleanField(parent,
+ EditorPrefConstants.MATCHING_BRACKETS,
+ new CheckBoxField(PreferencesMessages.EditorPreferencePage_matchingBrackets));
+
createEditorAppearanceColorsComponent(parent);
}
@@ -50,7 +57,22 @@ protected void createEditorAppearanceColorsComponent(Composite parent) {
}
protected EditorColorItem[] createEditorAppearanceColorEntries() {
- return new EditorColorItem[] { };
+ return new EditorColorItem[] {
+ new EditorColorItem(
+ PreferencesMessages.EditorPreferencePage_matchingBracketsHighlightColor,
+ EditorPrefConstants.MATCHING_BRACKETS_COLOR),
+ new EditorColorItem(
+ PreferencesMessages.EditorPreferencePage_backgroundForMethodParameters,
+ ContentAssistConstants.PARAMETERS_BACKGROUND),
+ new EditorColorItem(
+ PreferencesMessages.EditorPreferencePage_foregroundForMethodParameters,
+ ContentAssistConstants.PARAMETERS_FOREGROUND),
+ new EditorColorItem(
+ PreferencesMessages.EditorPreferencePage_sourceHoverBackgroundColor,
+ EditorPrefConstants.SOURCE_HOVER_BACKGROUND_COLOR_rgb.key,
+ EditorPrefConstants.SOURCE_HOVER_BACKGROUND_COLOR_UseSystemDefault.key,
+ SWT.COLOR_INFO_BACKGROUND),
+ };
}
}
\ No newline at end of file
diff --git a/plugin_ide.ui/src-lang/melnorme/lang/ide/ui/preferences/LangEditorTypingConfigurationBlock.java b/plugin_ide.ui/src-lang/melnorme/lang/ide/ui/preferences/LangEditorTypingConfigurationBlock.java
index af5d4a4d7..0dc19bbd8 100644
--- a/plugin_ide.ui/src-lang/melnorme/lang/ide/ui/preferences/LangEditorTypingConfigurationBlock.java
+++ b/plugin_ide.ui/src-lang/melnorme/lang/ide/ui/preferences/LangEditorTypingConfigurationBlock.java
@@ -12,8 +12,12 @@
import static melnorme.utilbox.core.CoreUtil.areEqual;
import static melnorme.utilbox.core.CoreUtil.array;
+
+import org.eclipse.jface.layout.GridLayoutFactory;
+import org.eclipse.swt.widgets.Composite;
+
import melnorme.lang.ide.ui.CodeFormatterConstants;
-import melnorme.lang.ide.ui.editor.text.LangAutoEditPreferenceConstants;
+import melnorme.lang.ide.ui.LangAutoEditPreferenceConstants;
import melnorme.lang.ide.ui.preferences.common.AbstractComponentsPrefPage;
import melnorme.lang.ide.ui.preferences.common.AbstractPreferencesBlock;
import melnorme.util.swt.components.fields.CheckBoxField;
@@ -22,9 +26,6 @@
import melnorme.utilbox.core.DevelopmentCodeMarkers;
import melnorme.utilbox.fields.IFieldValueListener;
-import org.eclipse.jface.layout.GridLayoutFactory;
-import org.eclipse.swt.widgets.Composite;
-
public class LangEditorTypingConfigurationBlock extends AbstractPreferencesBlock {
public LangEditorTypingConfigurationBlock(AbstractComponentsPrefPage prefPage) {
diff --git a/plugin_ide.ui/src/com/googlecode/goclipse/ui/preferences/GoSourceColoringConfigurationBlock.java b/plugin_ide.ui/src/com/googlecode/goclipse/ui/preferences/GoSourceColoringConfigurationBlock.java
index 462833cb8..3349f4341 100644
--- a/plugin_ide.ui/src/com/googlecode/goclipse/ui/preferences/GoSourceColoringConfigurationBlock.java
+++ b/plugin_ide.ui/src/com/googlecode/goclipse/ui/preferences/GoSourceColoringConfigurationBlock.java
@@ -21,7 +21,7 @@ public class GoSourceColoringConfigurationBlock extends AbstractSourceColoringCo
new SourceColoringElement("Text", GoColorPreferences.SYNTAX_COLORING__TEXT.key),
new SourceColoringElement("Keyword", GoColorPreferences.SYNTAX_COLORING__KEYWORD.key),
- new SourceColoringElement("Keyword - Literal", GoColorPreferences.SYNTAX_COLORING__VALUE.key),
+ new SourceColoringElement("Keyword - Literal", GoColorPreferences.SYNTAX_COLORING__KEYWORD_LITERAL.key),
new SourceColoringElement("Primitive", GoColorPreferences.SYNTAX_COLORING__PRIMITIVE.key),
new SourceColoringElement("Built-in function", GoColorPreferences.SYNTAX_COLORING__BUILTIN_FUNCTION.key),
new SourceColoringElement("Operator", GoColorPreferences.SYNTAX_COLORING__OPERATOR.key),
diff --git a/plugin_ide.ui/src/com/googlecode/goclipse/ui/text/GoColorPreferences.java b/plugin_ide.ui/src/com/googlecode/goclipse/ui/text/GoColorPreferences.java
index 4d63afaeb..e801c9908 100644
--- a/plugin_ide.ui/src/com/googlecode/goclipse/ui/text/GoColorPreferences.java
+++ b/plugin_ide.ui/src/com/googlecode/goclipse/ui/text/GoColorPreferences.java
@@ -1,3 +1,13 @@
+/*******************************************************************************
+ * Copyright (c) 2015 Bruno Medeiros and other Contributors.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Bruno Medeiros - initial API and implementation
+ *******************************************************************************/
package com.googlecode.goclipse.ui.text;
import org.eclipse.swt.graphics.RGB;
@@ -11,7 +21,7 @@ public interface GoColorPreferences {
new ColoringItemPreference("syntax_highlighting_text", true, new RGB(0, 0, 0), false, false, false);
public static final ColoringItemPreference SYNTAX_COLORING__KEYWORD =
new ColoringItemPreference("syntax_highlighting_keyword", true, new RGB(127, 0, 85), true, false, false);
- public static final ColoringItemPreference SYNTAX_COLORING__VALUE =
+ public static final ColoringItemPreference SYNTAX_COLORING__KEYWORD_LITERAL =
new ColoringItemPreference("syntax_highlighting_value", true, new RGB(127, 0, 85), true, true, false);
public static final ColoringItemPreference SYNTAX_COLORING__PRIMITIVE =
new ColoringItemPreference("syntax_highlighting_primitive", true, new RGB(127, 0, 85), false, true, false);
diff --git a/plugin_ide.ui/src/com/googlecode/goclipse/ui/text/GoScanner.java b/plugin_ide.ui/src/com/googlecode/goclipse/ui/text/GoScanner.java
index 012aab629..5f7162a83 100644
--- a/plugin_ide.ui/src/com/googlecode/goclipse/ui/text/GoScanner.java
+++ b/plugin_ide.ui/src/com/googlecode/goclipse/ui/text/GoScanner.java
@@ -19,7 +19,7 @@ public class GoScanner extends AbstractLangScanner {
private static String tokenPrefProperties[] = new String[] {
GoUIPreferenceConstants.SYNTAX_COLORING__TEXT.key,
GoUIPreferenceConstants.SYNTAX_COLORING__KEYWORD.key,
- GoUIPreferenceConstants.SYNTAX_COLORING__VALUE.key,
+ GoUIPreferenceConstants.SYNTAX_COLORING__KEYWORD_LITERAL.key,
GoUIPreferenceConstants.SYNTAX_COLORING__PRIMITIVE.key,
GoUIPreferenceConstants.SYNTAX_COLORING__BUILTIN_FUNCTION.key,
GoUIPreferenceConstants.SYNTAX_COLORING__OPERATOR.key,
@@ -42,7 +42,7 @@ protected void initRules(ArrayList2 rules) {
WordRule wordRule = new WordRule(new JavaWordDetector(), tkDefault);
final IToken keyword = getToken(GoUIPreferenceConstants.SYNTAX_COLORING__KEYWORD.key);
- final IToken value = getToken(GoUIPreferenceConstants.SYNTAX_COLORING__VALUE.key);
+ final IToken value = getToken(GoUIPreferenceConstants.SYNTAX_COLORING__KEYWORD_LITERAL.key);
final IToken primitive = getToken(GoUIPreferenceConstants.SYNTAX_COLORING__PRIMITIVE.key);
final IToken builtinFunction = getToken(GoUIPreferenceConstants.SYNTAX_COLORING__BUILTIN_FUNCTION.key);
final IToken textToken = getToken(GoUIPreferenceConstants.SYNTAX_COLORING__TEXT.key);
diff --git a/plugin_ide.ui/src/melnorme/lang/ide/ui/CodeFormatterConstants_Actual.java b/plugin_ide.ui/src/melnorme/lang/ide/ui/CodeFormatterConstants_Actual.java
index 5ceb4d64f..4c9d7fb91 100644
--- a/plugin_ide.ui/src/melnorme/lang/ide/ui/CodeFormatterConstants_Actual.java
+++ b/plugin_ide.ui/src/melnorme/lang/ide/ui/CodeFormatterConstants_Actual.java
@@ -20,15 +20,4 @@ public interface CodeFormatterConstants_Actual {
IntPreference FORMATTER_INDENTATION_SPACES_SIZE =
new IntPreference(QUALIFIER, "CodeFormatterConstants.FORMATTER_INDENTATION_SIZE", 4);
- class Helper {
-
- public static void initDefaults() {
- // This will ensure default value is initialized
- FORMATTER_INDENT_MODE.get();
- FORMATTER_TAB_SIZE.get();
- FORMATTER_INDENTATION_SPACES_SIZE.get();
- }
-
- }
-
}
\ No newline at end of file
diff --git a/plugin_ide.ui/src/melnorme/lang/ide/ui/EditorPreferences.java b/plugin_ide.ui/src/melnorme/lang/ide/ui/EditorPreferences.java
deleted file mode 100644
index e94d022c7..000000000
--- a/plugin_ide.ui/src/melnorme/lang/ide/ui/EditorPreferences.java
+++ /dev/null
@@ -1,6 +0,0 @@
-package melnorme.lang.ide.ui;
-
-
-public interface EditorPreferences extends EditorPreferences_Default {
-
-}
\ No newline at end of file
diff --git a/plugin_ide.ui/src-lang/melnorme/lang/ide/ui/editor/text/LangAutoEditPreferenceConstants.java b/plugin_ide.ui/src/melnorme/lang/ide/ui/LangAutoEditPreferenceConstants.java
similarity index 71%
rename from plugin_ide.ui/src-lang/melnorme/lang/ide/ui/editor/text/LangAutoEditPreferenceConstants.java
rename to plugin_ide.ui/src/melnorme/lang/ide/ui/LangAutoEditPreferenceConstants.java
index 0588e767e..8b7a121bf 100644
--- a/plugin_ide.ui/src-lang/melnorme/lang/ide/ui/editor/text/LangAutoEditPreferenceConstants.java
+++ b/plugin_ide.ui/src/melnorme/lang/ide/ui/LangAutoEditPreferenceConstants.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2010, 2011 IBM Corporation and others.
+ * Copyright (c) 2015 Bruno Medeiros and other Contributors.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -8,11 +8,11 @@
* Contributors:
* Bruno Medeiros - initial API and implementation
*******************************************************************************/
-package melnorme.lang.ide.ui.editor.text;
+package melnorme.lang.ide.ui;
-import melnorme.lang.ide.ui.LangAutoEditPreferenceConstants_Actual;
+import melnorme.lang.tooling.LANG_SPECIFIC;
-
-public interface LangAutoEditPreferenceConstants extends LangAutoEditPreferenceConstants_Actual {
+@LANG_SPECIFIC
+public interface LangAutoEditPreferenceConstants extends LangAutoEditPreferenceConstants_Default {
}
\ No newline at end of file