Bug 569759 - Unable to change color of var or record keyword
Change-Id: I526c611e81a42f5c1799143893e86864d74bf439
Signed-off-by: Kalyan Prasad Tatavarthi <kalyan_prasad@in.ibm.com>
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/javaeditor/JavaEditorMessages.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/javaeditor/JavaEditorMessages.java
index 480568a..7e92b1c 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/javaeditor/JavaEditorMessages.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/javaeditor/JavaEditorMessages.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2015 IBM Corporation and others.
+ * Copyright (c) 2000, 2020 IBM Corporation and others.
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0
@@ -143,6 +143,7 @@
public static String SemanticHighlighting_interfaces;
public static String SemanticHighlighting_annotations;
public static String SemanticHighlighting_typeArguments;
+ public static String SemanticHighlighting_restrictedIdentifiers;
public static String JavaEditor_FormatElementAction_description;
public static String JavaEditor_FormatElementAction_label;
public static String JavaEditor_FormatElementDialog_label;
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/javaeditor/JavaEditorMessages.properties b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/javaeditor/JavaEditorMessages.properties
index fc9a280..2db54fc 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/javaeditor/JavaEditorMessages.properties
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/javaeditor/JavaEditorMessages.properties
@@ -1,5 +1,5 @@
###############################################################################
-# Copyright (c) 2000, 2016 IBM Corporation and others.
+# Copyright (c) 2000, 2020 IBM Corporation and others.
#
# This program and the accompanying materials
# are made available under the terms of the Eclipse Public License 2.0
@@ -131,6 +131,7 @@
SemanticHighlighting_annotations= Annotations
SemanticHighlighting_typeArguments= Type arguments
SemanticHighlighting_abstractClasses= Abstract classes
+SemanticHighlighting_restrictedIdentifiers= Restricted identifiers
JavaEditor_FormatElementAction_description=Format enclosing text element
JavaEditor_FormatElementAction_label=Format Eleme&nt
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/javaeditor/SemanticHighlightingReconciler.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/javaeditor/SemanticHighlightingReconciler.java
index e8ab54d..6bf5f7a 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/javaeditor/SemanticHighlightingReconciler.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/javaeditor/SemanticHighlightingReconciler.java
@@ -54,7 +54,7 @@
import org.eclipse.jdt.internal.ui.javaeditor.SemanticHighlightingManager.HighlightedPosition;
import org.eclipse.jdt.internal.ui.javaeditor.SemanticHighlightingManager.Highlighting;
import org.eclipse.jdt.internal.ui.javaeditor.SemanticHighlightings.DeprecatedMemberHighlighting;
-import org.eclipse.jdt.internal.ui.javaeditor.SemanticHighlightings.RestrictedKeywordsHighlighting;
+import org.eclipse.jdt.internal.ui.javaeditor.SemanticHighlightings.RestrictedIdentifiersHighlighting;
import org.eclipse.jdt.internal.ui.text.java.IJavaReconcilingListener;
import org.eclipse.jdt.internal.ui.util.ASTHelper;
@@ -137,7 +137,7 @@
if (offset > -1 && length > 0) {
for (int i= 0; i < fJobSemanticHighlightings.length; i++) {
SemanticHighlighting semanticHighlighting= fJobSemanticHighlightings[i];
- if (semanticHighlighting instanceof RestrictedKeywordsHighlighting) {
+ if (semanticHighlighting instanceof RestrictedIdentifiersHighlighting) {
addPosition(offset, length, fJobHighlightings[i]);
return false;
}
@@ -156,7 +156,7 @@
if (offset > -1 && length > 0) {
for (int i= 0; i < fJobSemanticHighlightings.length; i++) {
SemanticHighlighting semanticHighlighting= fJobSemanticHighlightings[i];
- if (semanticHighlighting instanceof RestrictedKeywordsHighlighting) {
+ if (semanticHighlighting instanceof RestrictedIdentifiersHighlighting) {
addPosition(offset, length, fJobHighlightings[i]);
return false;
}
@@ -175,9 +175,9 @@
if (offset > -1 && length > 0) {
for (int i= 0; i < fJobSemanticHighlightings.length; i++) {
SemanticHighlighting semanticHighlighting= fJobSemanticHighlightings[i];
- if (semanticHighlighting instanceof RestrictedKeywordsHighlighting) {
+ if (semanticHighlighting instanceof RestrictedIdentifiersHighlighting) {
addPosition(offset, length, fJobHighlightings[i]);
- return false;
+ return true;
}
}
}
@@ -194,7 +194,7 @@
if (offset > -1) {
for (int i= 0; i < fJobSemanticHighlightings.length; i++) {
SemanticHighlighting semanticHighlighting= fJobSemanticHighlightings[i];
- if (semanticHighlighting instanceof RestrictedKeywordsHighlighting) {
+ if (semanticHighlighting instanceof RestrictedIdentifiersHighlighting) {
addPosition(offset, length, fJobHighlightings[i]);
return true;
}
@@ -224,7 +224,7 @@
if (offset > -1 && length > 0) {
for (int i= 0; i < fJobSemanticHighlightings.length; i++) {
SemanticHighlighting semanticHighlighting= fJobSemanticHighlightings[i];
- if (semanticHighlighting instanceof RestrictedKeywordsHighlighting) {
+ if (semanticHighlighting instanceof RestrictedIdentifiersHighlighting) {
addPosition(offset, length, fJobHighlightings[i]);
return false;
}
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/javaeditor/SemanticHighlightings.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/javaeditor/SemanticHighlightings.java
index 9f27fcb..26a6a8b 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/javaeditor/SemanticHighlightings.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/javaeditor/SemanticHighlightings.java
@@ -54,8 +54,6 @@
import org.eclipse.jdt.ui.PreferenceConstants;
-import org.eclipse.jdt.internal.ui.preferences.PreferencesMessages;
-
/**
* Semantic highlightings
*
@@ -1924,7 +1922,7 @@
/**
*
*/
- static final class RestrictedKeywordsHighlighting extends SemanticHighlighting {
+ static final class RestrictedIdentifiersHighlighting extends SemanticHighlighting {
@Override
public String getPreferenceKey() {
@@ -1953,7 +1951,7 @@
@Override
public String getDisplayName() {
- return PreferencesMessages.JavaEditorPreferencePage_restrictedKeywords;
+ return JavaEditorMessages.SemanticHighlighting_restrictedIdentifiers;
}
@Override
@@ -2053,7 +2051,7 @@
new AnnotationHighlighting(), // before interfaces
new InterfaceHighlighting(),
new NumberHighlighting(),
- new RestrictedKeywordsHighlighting()
+ new RestrictedIdentifiersHighlighting()
};
return fgSemanticHighlightings;
}
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/ColorSettingPreviewCode.txt b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/ColorSettingPreviewCode.txt
index 4d5ef66..d513c36 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/ColorSettingPreviewCode.txt
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/ColorSettingPreviewCode.txt
@@ -6,6 +6,7 @@
*/
public class ClassName<E> extends AnyClass implements InterfaceName<String> {
enum Color { RED, GREEN, BLUE };
+ record Point(int x, int y) {};
/* This comment may span multiple lines. */
static Object staticField;
// This comment may span only this line
@@ -16,7 +17,8 @@
public int foo(Integer parameter) {
abstractMethod(inheritedField);
int local= 42*hashCode();
+ var varLocal= local;
staticMethod();
- return bar(local) + parameter;
+ return bar(varLocal) + parameter;
}
}
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/JavaEditorColoringConfigurationBlock.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/JavaEditorColoringConfigurationBlock.java
index e83be23..125583e 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/JavaEditorColoringConfigurationBlock.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/JavaEditorColoringConfigurationBlock.java
@@ -20,7 +20,6 @@
import java.io.IOException;
import java.io.InputStreamReader;
import java.util.ArrayList;
-import java.util.List;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.SelectionAdapter;
@@ -81,6 +80,7 @@
import org.eclipse.jdt.internal.ui.javaeditor.SemanticHighlightingManager;
import org.eclipse.jdt.internal.ui.javaeditor.SemanticHighlightingManager.HighlightedRange;
import org.eclipse.jdt.internal.ui.javaeditor.SemanticHighlightings;
+import org.eclipse.jdt.internal.ui.javaeditor.SemanticHighlightingsCore;
import org.eclipse.jdt.internal.ui.preferences.OverlayPreferenceStore.OverlayKey;
import org.eclipse.jdt.internal.ui.text.JavaColorManager;
import org.eclipse.jdt.internal.ui.text.PreferencesAdapter;
@@ -261,14 +261,7 @@
if (parentElement instanceof String) {
String entry= (String) parentElement;
if (fJavaCategory.equals(entry)) {
- List<HighlightingColorListItem> subList= fListModel.subList(7, fListModel.size());
- List<HighlightingColorListItem> visibleChildren= new ArrayList<>();
- for (HighlightingColorListItem listItem : subList) {
- if (!listItem.getDisplayName().equals(PreferencesMessages.JavaEditorPreferencePage_restrictedKeywords)) {
- visibleChildren.add(listItem);
- }
- }
- return visibleChildren.toArray();
+ return fListModel.subList(7, fListModel.size()).toArray();
}
if (fJavadocCategory.equals(entry))
return fListModel.subList(0, 4).toArray();
@@ -712,13 +705,6 @@
public void widgetSelected(SelectionEvent e) {
HighlightingColorListItem item= getHighlightingColorListItem();
PreferenceConverter.setValue(getPreferenceStore(), item.getColorKey(), fSyntaxForegroundColorEditor.getColorValue());
- if (item.getDisplayName().equals(PreferencesMessages.JavaEditorPreferencePage_keywords)) {
- for (HighlightingColorListItem listItem : fListModel) {
- if (listItem.getDisplayName().equals(PreferencesMessages.JavaEditorPreferencePage_restrictedKeywords)) {
- PreferenceConverter.setValue(getPreferenceStore(), listItem.getColorKey(), fSyntaxForegroundColorEditor.getColorValue());
- }
- }
- }
}
});
@@ -731,13 +717,6 @@
public void widgetSelected(SelectionEvent e) {
HighlightingColorListItem item= getHighlightingColorListItem();
getPreferenceStore().setValue(item.getBoldKey(), fBoldCheckBox.getSelection());
- if (item.getDisplayName().equals(PreferencesMessages.JavaEditorPreferencePage_keywords)) {
- for (HighlightingColorListItem listItem : fListModel) {
- if (listItem.getDisplayName().equals(PreferencesMessages.JavaEditorPreferencePage_restrictedKeywords)) {
- getPreferenceStore().setValue(listItem.getBoldKey(), fBoldCheckBox.getSelection());
- }
- }
- }
}
});
@@ -750,13 +729,6 @@
public void widgetSelected(SelectionEvent e) {
HighlightingColorListItem item= getHighlightingColorListItem();
getPreferenceStore().setValue(item.getItalicKey(), fItalicCheckBox.getSelection());
- if (item.getDisplayName().equals(PreferencesMessages.JavaEditorPreferencePage_keywords)) {
- for (HighlightingColorListItem listItem : fListModel) {
- if (listItem.getDisplayName().equals(PreferencesMessages.JavaEditorPreferencePage_restrictedKeywords)) {
- getPreferenceStore().setValue(listItem.getItalicKey(), fItalicCheckBox.getSelection());
- }
- }
- }
}
});
fStrikethroughCheckBox.addSelectionListener(new SelectionListener() {
@@ -768,13 +740,6 @@
public void widgetSelected(SelectionEvent e) {
HighlightingColorListItem item= getHighlightingColorListItem();
getPreferenceStore().setValue(item.getStrikethroughKey(), fStrikethroughCheckBox.getSelection());
- if (item.getDisplayName().equals(PreferencesMessages.JavaEditorPreferencePage_keywords)) {
- for (HighlightingColorListItem listItem : fListModel) {
- if (listItem.getDisplayName().equals(PreferencesMessages.JavaEditorPreferencePage_restrictedKeywords)) {
- getPreferenceStore().setValue(listItem.getStrikethroughKey(), fStrikethroughCheckBox.getSelection());
- }
- }
- }
}
});
@@ -787,13 +752,6 @@
public void widgetSelected(SelectionEvent e) {
HighlightingColorListItem item= getHighlightingColorListItem();
getPreferenceStore().setValue(item.getUnderlineKey(), fUnderlineCheckBox.getSelection());
- if (item.getDisplayName().equals(PreferencesMessages.JavaEditorPreferencePage_keywords)) {
- for (HighlightingColorListItem listItem : fListModel) {
- if (listItem.getDisplayName().equals(PreferencesMessages.JavaEditorPreferencePage_restrictedKeywords)) {
- getPreferenceStore().setValue(listItem.getUnderlineKey(), fUnderlineCheckBox.getSelection());
- }
- }
- }
}
});
@@ -957,26 +915,30 @@
{ createHighlightedRange( 7, 14, 3, SemanticHighlightings.STATIC_FINAL_FIELD), createHighlightedRange( 7, 14, 3, SemanticHighlightings.STATIC_FIELD), createHighlightedRange(7, 14, 3, SemanticHighlightings.FIELD) },
{ createHighlightedRange( 7, 19, 5, SemanticHighlightings.STATIC_FINAL_FIELD), createHighlightedRange( 7, 19, 5, SemanticHighlightings.STATIC_FIELD), createHighlightedRange(7, 19, 5, SemanticHighlightings.FIELD) },
{ createHighlightedRange( 7, 26, 4, SemanticHighlightings.STATIC_FINAL_FIELD), createHighlightedRange( 7, 26, 4, SemanticHighlightings.STATIC_FIELD), createHighlightedRange(7, 26, 4, SemanticHighlightings.FIELD) },
- { createHighlightedRange( 9, 8, 6, SemanticHighlightings.CLASS), },
- { createHighlightedRange( 9, 15, 11, SemanticHighlightings.STATIC_FIELD), createHighlightedRange( 9, 15, 11, SemanticHighlightings.FIELD) },
- { createHighlightedRange(11, 9, 1, SemanticHighlightings.TYPE_VARIABLE) },
- { createHighlightedRange(11, 11, 5, SemanticHighlightings.FIELD) },
- { createHighlightedRange(12, 9, 17, SemanticHighlightings.ABSTRACT_CLASS), createHighlightedRange(12, 9, 17, SemanticHighlightings.CLASS) },
- { createHighlightedRange(12, 27, 6, SemanticHighlightings.FIELD) },
- { createHighlightedRange(14, 2, 16, SemanticHighlightings.ANNOTATION) },
- { createHighlightedRange(14, 19, 5, SemanticHighlightings.ANNOTATION_ELEMENT_REFERENCE) },
- { createHighlightedRange(15, 12, 3, SemanticHighlightings.METHOD_DECLARATION), createHighlightedRange(15, 12, 3, SemanticHighlightings.METHOD) },
- { createHighlightedRange(15, 16, 7, SemanticHighlightings.CLASS) },
- { createHighlightedRange(15, 24, 9, SemanticHighlightings.PARAMETER_VARIABLE), createHighlightedRange(15, 24, 9, SemanticHighlightings.LOCAL_VARIABLE_DECLARATION), createHighlightedRange(15, 24, 9, SemanticHighlightings.LOCAL_VARIABLE) },
- { createHighlightedRange(16, 2, 14, SemanticHighlightings.ABSTRACT_METHOD_INVOCATION), createHighlightedRange(16, 2, 14, SemanticHighlightings.METHOD) },
- { createHighlightedRange(16, 17, 14, SemanticHighlightings.INHERITED_FIELD), createHighlightedRange(16, 17, 14, SemanticHighlightings.FIELD) },
- { createHighlightedRange(17, 6, 5, SemanticHighlightings.LOCAL_VARIABLE_DECLARATION), createHighlightedRange(17, 6, 5, SemanticHighlightings.LOCAL_VARIABLE) },
- { createHighlightedRange(17, 13, 2, SemanticHighlightings.NUMBER) },
- { createHighlightedRange(17, 16, 8, SemanticHighlightings.INHERITED_METHOD_INVOCATION), createHighlightedRange(17, 16, 8, SemanticHighlightings.METHOD) },
- { createHighlightedRange(18, 2, 12, SemanticHighlightings.STATIC_METHOD_INVOCATION), createHighlightedRange(18, 2, 12, SemanticHighlightings.METHOD) },
- { createHighlightedRange(19, 9, 3, SemanticHighlightings.METHOD) },
- { createHighlightedRange(19, 13, 5, SemanticHighlightings.LOCAL_VARIABLE) },
- { createHighlightedRange(19, 22, 9, SemanticHighlightings.AUTOBOXING), createHighlightedRange(19, 22, 9, SemanticHighlightings.PARAMETER_VARIABLE), createHighlightedRange(19, 22, 9, SemanticHighlightings.LOCAL_VARIABLE) },
+ { createHighlightedRange( 8, 1, 6, SemanticHighlightingsCore.RESTRICTED_KEYWORDS) },
+ { createHighlightedRange( 10, 8, 6, SemanticHighlightings.CLASS), },
+ { createHighlightedRange( 10, 15, 11, SemanticHighlightings.STATIC_FIELD), createHighlightedRange( 10, 15, 11, SemanticHighlightings.FIELD) },
+ { createHighlightedRange(12, 9, 1, SemanticHighlightings.TYPE_VARIABLE) },
+ { createHighlightedRange(12, 11, 5, SemanticHighlightings.FIELD) },
+ { createHighlightedRange(13, 9, 17, SemanticHighlightings.ABSTRACT_CLASS), createHighlightedRange(13, 9, 17, SemanticHighlightings.CLASS) },
+ { createHighlightedRange(13, 27, 6, SemanticHighlightings.FIELD) },
+ { createHighlightedRange(15, 2, 16, SemanticHighlightings.ANNOTATION) },
+ { createHighlightedRange(15, 19, 5, SemanticHighlightings.ANNOTATION_ELEMENT_REFERENCE) },
+ { createHighlightedRange(16, 12, 3, SemanticHighlightings.METHOD_DECLARATION), createHighlightedRange(16, 12, 3, SemanticHighlightings.METHOD) },
+ { createHighlightedRange(16, 16, 7, SemanticHighlightings.CLASS) },
+ { createHighlightedRange(16, 24, 9, SemanticHighlightings.PARAMETER_VARIABLE), createHighlightedRange(16, 24, 9, SemanticHighlightings.LOCAL_VARIABLE_DECLARATION), createHighlightedRange(16, 24, 9, SemanticHighlightings.LOCAL_VARIABLE) },
+ { createHighlightedRange(17, 2, 14, SemanticHighlightings.ABSTRACT_METHOD_INVOCATION), createHighlightedRange(17, 2, 14, SemanticHighlightings.METHOD) },
+ { createHighlightedRange(17, 17, 14, SemanticHighlightings.INHERITED_FIELD), createHighlightedRange(17, 17, 14, SemanticHighlightings.FIELD) },
+ { createHighlightedRange(18, 6, 5, SemanticHighlightings.LOCAL_VARIABLE_DECLARATION), createHighlightedRange(18, 6, 5, SemanticHighlightings.LOCAL_VARIABLE) },
+ { createHighlightedRange(18, 13, 2, SemanticHighlightings.NUMBER) },
+ { createHighlightedRange(18, 16, 8, SemanticHighlightings.INHERITED_METHOD_INVOCATION), createHighlightedRange(18, 16, 8, SemanticHighlightings.METHOD) },
+ { createHighlightedRange(19, 2, 3, SemanticHighlightingsCore.RESTRICTED_KEYWORDS) },
+ { createHighlightedRange(19, 6, 8, SemanticHighlightings.LOCAL_VARIABLE) },
+ { createHighlightedRange(19, 16, 5, SemanticHighlightings.LOCAL_VARIABLE) },
+ { createHighlightedRange(20, 2, 12, SemanticHighlightings.STATIC_METHOD_INVOCATION), createHighlightedRange(20, 2, 12, SemanticHighlightings.METHOD) },
+ { createHighlightedRange(21, 9, 3, SemanticHighlightings.METHOD) },
+ { createHighlightedRange(21, 13, 8, SemanticHighlightings.LOCAL_VARIABLE) },
+ { createHighlightedRange(21, 25, 9, SemanticHighlightings.AUTOBOXING), createHighlightedRange(21, 25, 9, SemanticHighlightings.PARAMETER_VARIABLE), createHighlightedRange(21, 25, 9, SemanticHighlightings.LOCAL_VARIABLE) },
};
}
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/PreferencesMessages.java b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/PreferencesMessages.java
index 52ec496..52946cc 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/PreferencesMessages.java
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/PreferencesMessages.java
@@ -148,7 +148,6 @@
public static String JavaEditorPreferencePage_singleLineComment;
public static String JavaEditorPreferencePage_returnKeyword;
public static String JavaEditorPreferencePage_keywords;
- public static String JavaEditorPreferencePage_restrictedKeywords;
public static String JavaEditorPreferencePage_strings;
public static String JavaEditorPreferencePage_others;
public static String JavaEditorPreferencePage_operators;
diff --git a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/PreferencesMessages.properties b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/PreferencesMessages.properties
index 240d85f..a8801fc 100644
--- a/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/PreferencesMessages.properties
+++ b/org.eclipse.jdt.ui/ui/org/eclipse/jdt/internal/ui/preferences/PreferencesMessages.properties
@@ -125,7 +125,6 @@
JavaEditorPreferencePage_singleLineComment=Single-line comment
JavaEditorPreferencePage_returnKeyword=Keyword 'return'
JavaEditorPreferencePage_keywords=Keywords excluding 'return'
-JavaEditorPreferencePage_restrictedKeywords=Restricted keywords
JavaEditorPreferencePage_strings=Strings
JavaEditorPreferencePage_others=Others
JavaEditorPreferencePage_operators=Operators
