Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add parent settings in Java Code Style #319

Closed
wants to merge 0 commits into from
Closed

Add parent settings in Java Code Style #319

wants to merge 0 commits into from

Conversation

GauthierPLM
Copy link
Contributor

Deprecate CodeInsightColors and remove SyntaxHighlighterColors
Cf : https://youtrack.jetbrains.com/issue/IDEA-146984
Cf : https://devnet.jetbrains.com/message/5561711

The pull request impact the Android plugin too. This is the patch:

Index: android/android/src/com/android/tools/idea/lang/rs/RenderscriptSyntaxHighlighter.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- android/android/src/com/android/tools/idea/lang/rs/RenderscriptSyntaxHighlighter.java   (revision 43bdc14e07a13b4aa0ca3d64de1d552d95e08b4b)
+++ android/android/src/com/android/tools/idea/lang/rs/RenderscriptSyntaxHighlighter.java   (revision c56d4040daf98b60b2f55c85f32a9e71ed1f7a9e)
@@ -45,9 +45,9 @@
   static {
     fillMap(sAttributes, ourKeywords, JavaHighlightingColors.KEYWORD);
     fillMap(sAttributes, ourBraces, JavaHighlightingColors.BRACES);
-    fillMap(sAttributes, ourSeparators, JavaHighlightingColors.JAVA_SEMICOLON);
+    fillMap(sAttributes, ourSeparators, JavaHighlightingColors.SEMICOLON);
     fillMap(sAttributes, ourOperators, JavaHighlightingColors.OPERATION_SIGN);
-    fillMap(sAttributes, ourComments, JavaHighlightingColors.JAVA_BLOCK_COMMENT);
+    fillMap(sAttributes, ourComments, JavaHighlightingColors.BLOCK_COMMENT);
     fillMap(sAttributes, ourString, JavaHighlightingColors.STRING);
     fillMap(sAttributes, ourCharacter, JavaHighlightingColors.NUMBER);
     fillMap(sAttributes, ourError, CodeInsightColors.ERRORS_ATTRIBUTES);

@GauthierPLM GauthierPLM changed the title Deprecate CodeInsightColors and remove SyntaxHighlighterColors Add parent settings in Java Code Style Nov 10, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
1 participant