# HG changeset patch
# User Alexander Simon <alexvsimon@netbeans.org>
# Date 1479987633 -10800
#      Thu Nov 24 14:40:33 2016 +0300
# Branch release82
# Node ID 4eb1e732e4263d6eaa54dd529bfd5414a73703cf
# Parent  7e83db06f0aaa9559c739f82cb9c0cf4ac1c22d3
fixed Bug #269079 In color profile, C/C++ Syntax->Fields color == autocomplete popup window text color

diff --git a/cnd.completion/src/org/netbeans/modules/cnd/completion/keywords/CsmKeywordCompletionItem.java b/cnd.completion/src/org/netbeans/modules/cnd/completion/keywords/CsmKeywordCompletionItem.java
--- a/cnd.completion/src/org/netbeans/modules/cnd/completion/keywords/CsmKeywordCompletionItem.java
+++ b/cnd.completion/src/org/netbeans/modules/cnd/completion/keywords/CsmKeywordCompletionItem.java
@@ -96,8 +96,10 @@
         if (CndUtils.isUnitTestMode()) {
             coloredItemText = sortItemText;
         } else {
-            AttributeSet keywordsColor = MimeLookup.getLookup(MimePath.get(MIMENames.CPLUSPLUS_MIME_TYPE)).lookup(FontColorSettings.class).getTokenFontColors("keyword"); //NOI18N
-            coloredItemText = CsmDisplayUtilities.addHTMLColor(sortItemText, keywordsColor);
+            //AttributeSet keywordsColor = MimeLookup.getLookup(MimePath.get(MIMENames.CPLUSPLUS_MIME_TYPE)).lookup(FontColorSettings.class).getTokenFontColors("keyword"); //NOI18N
+            //coloredItemText = CsmDisplayUtilities.addHTMLColor(sortItemText, keywordsColor);
+            coloredItemText = CsmDisplayUtilities.addHTMLColor(sortItemText, new Color(0,0,230), true);
+            
         }
         return new CsmKeywordCompletionItem(substitutionOffset, NbCsmCompletionQuery.KEYWORDS_PRIORITY, sortItemText, appendItemText, coloredItemText, true, firstCompletion);
     }
diff --git a/cnd.completion/src/org/netbeans/modules/cnd/completion/preprocessor/CsmPreprocessorDirectiveCompletionItem.java b/cnd.completion/src/org/netbeans/modules/cnd/completion/preprocessor/CsmPreprocessorDirectiveCompletionItem.java
--- a/cnd.completion/src/org/netbeans/modules/cnd/completion/preprocessor/CsmPreprocessorDirectiveCompletionItem.java
+++ b/cnd.completion/src/org/netbeans/modules/cnd/completion/preprocessor/CsmPreprocessorDirectiveCompletionItem.java
@@ -35,6 +35,7 @@
 import java.awt.Graphics;
 import java.awt.event.KeyEvent;
 import javax.swing.ImageIcon;
+import javax.swing.text.AttributeSet;
 import javax.swing.text.BadLocationException;
 import javax.swing.text.JTextComponent;
 import org.netbeans.api.editor.completion.Completion;
@@ -86,7 +87,8 @@
             if (CndUtils.isUnitTestMode()) {
                 coloredItemText = noNewLine;
             } else {
-                coloredItemText = CsmDisplayUtilities.addHTMLColor(noNewLine, CsmFontColorManager.instance().getColorAttributes(MIMENames.CPLUSPLUS_MIME_TYPE, FontColorProvider.Entity.PREPROCESSOR_DIRECTIVE));
+                //coloredItemText = CsmDisplayUtilities.addHTMLColor(noNewLine, CsmFontColorManager.instance().getColorAttributes(MIMENames.CPLUSPLUS_MIME_TYPE, FontColorProvider.Entity.PREPROCESSOR_DIRECTIVE));
+                coloredItemText = CsmDisplayUtilities.addHTMLColor(noNewLine, new Color(0,155,0), true);
             }
         } else {
             appendItemText = "";
@@ -94,7 +96,8 @@
             if (CndUtils.isUnitTestMode()) {
                 coloredItemText = sortItemText;
             } else {
-                coloredItemText = CsmDisplayUtilities.addHTMLColor(sortItemText, CsmFontColorManager.instance().getColorAttributes(MIMENames.CPLUSPLUS_MIME_TYPE, FontColorProvider.Entity.PREPROCESSOR_DIRECTIVE));
+                //coloredItemText = CsmDisplayUtilities.addHTMLColor(sortItemText, CsmFontColorManager.instance().getColorAttributes(MIMENames.CPLUSPLUS_MIME_TYPE, FontColorProvider.Entity.PREPROCESSOR_DIRECTIVE));
+                coloredItemText = CsmDisplayUtilities.addHTMLColor(sortItemText, new Color(0,155,0), true);
             }
         }
         return new CsmPreprocessorDirectiveCompletionItem(substitutionOffset, PRIORITY, sortItemText, appendItemText, coloredItemText, true);
diff --git a/cnd.modelutil/src/org/netbeans/modules/cnd/modelutil/CsmDisplayUtilities.java b/cnd.modelutil/src/org/netbeans/modules/cnd/modelutil/CsmDisplayUtilities.java
--- a/cnd.modelutil/src/org/netbeans/modules/cnd/modelutil/CsmDisplayUtilities.java
+++ b/cnd.modelutil/src/org/netbeans/modules/cnd/modelutil/CsmDisplayUtilities.java
@@ -233,6 +233,23 @@
         return buf.toString();
     }
 
+    public static String addHTMLColor(String string, Color color, boolean bold) {
+        if (color == null) {
+            return string;
+        }
+        if (string.trim().length() == 0) {
+            return string.replace(" ", "&nbsp;").replace("\n", "<br>"); //NOI18N
+        }
+        StringBuilder buf = new StringBuilder(string);
+        if (bold) {
+            buf.insert(0, "<b>"); //NOI18N
+            buf.append("</b>"); //NOI18N
+        }
+        buf.insert(0, "<font color=" + getHTMLColor(color) + ">"); //NOI18N
+        buf.append("</font>"); //NOI18N
+        return buf.toString();
+    }
+
     public static String getHTMLColor(Color c) {
         String colorR = "0" + Integer.toHexString(c.getRed()); //NOI18N
         colorR = colorR.substring(colorR.length() - 2);
diff --git a/cnd.modelutil/src/org/netbeans/modules/cnd/modelutil/CsmPaintComponent.java b/cnd.modelutil/src/org/netbeans/modules/cnd/modelutil/CsmPaintComponent.java
--- a/cnd.modelutil/src/org/netbeans/modules/cnd/modelutil/CsmPaintComponent.java
+++ b/cnd.modelutil/src/org/netbeans/modules/cnd/modelutil/CsmPaintComponent.java
@@ -562,7 +562,7 @@
     public static class TypedefPaintComponent extends CsmPaintComponent{
 
         String formatTypedefName;
-        private final Color TYPEDEF_COLOR = CsmFontColorManager.instance().getColor(FontColorProvider.Entity.TYPEDEF); //new Color(64,64,255).darker().darker().darker();
+        private final Color TYPEDEF_COLOR = new Color(46,146,199);//CsmFontColorManager.instance().getColor(FontColorProvider.Entity.TYPEDEF); //new Color(64,64,255).darker().darker().darker();
         //private boolean displayFQN;
 
         public void setFormatTypedefName(String formatTypedefName){
@@ -622,7 +622,7 @@
     }
 
     public static class FieldPaintComponent extends CsmPaintComponent{
-        private Color FIELD_COLOR = CsmFontColorManager.instance().getColor(FontColorProvider.Entity.CLASS_FIELD);//new Color(64,64,255).darker();
+        private Color FIELD_COLOR = new Color(64, 198, 88);//CsmFontColorManager.instance().getColor(FontColorProvider.Entity.CLASS_FIELD);//new Color(64,64,255).darker();
         protected String typeName;
         protected Color typeColor;
         protected String fldName;
@@ -751,7 +751,7 @@
     }
 
     public static class MacroPaintComponent extends CsmPaintComponent{
-        private Color MACRO_NAME_COLOR = CsmFontColorManager.instance().getColor(FontColorProvider.Entity.DEFINED_MACRO);//new Color(64,255,64).darker().darker();
+        private Color MACRO_NAME_COLOR = new Color(46,146,199);//CsmFontColorManager.instance().getColor(FontColorProvider.Entity.DEFINED_MACRO);//new Color(64,255,64).darker().darker();
         private Color MACRO_PARAMETER_NAME_COLOR = LFCustoms.shiftColor(new Color(227, 166, 74));//Color.magenta.darker();
         private List<CharSequence> params = null;
         private String name;