From 88650b65a699dcddbe0ac58bbabd9b19cf882c1e Mon Sep 17 00:00:00 2001 From: agdl <a.guadalupi@arduino.cc> Date: Fri, 19 Feb 2016 10:22:59 +0100 Subject: [PATCH] Modified colors highlight according to Create --- build/shared/lib/keywords.txt | 83 +++++++++++++++++++++++++------- build/shared/lib/theme/theme.txt | 5 +- 2 files changed, 67 insertions(+), 21 deletions(-) diff --git a/build/shared/lib/keywords.txt b/build/shared/lib/keywords.txt index a7bc003d2..c7a2b6337 100644 --- a/build/shared/lib/keywords.txt +++ b/build/shared/lib/keywords.txt @@ -1,6 +1,6 @@ #FUNCTIONS COLOR #D35400 - ORANGE KEYWORD1 #FUNCTIONS COLOR #D35400 - ORANGE KEYWORD2 -#STRUCTURE COLORS #5E6D03 - GREEN KEYWORD3 +#STRUCTURE COLORS #728E00 - GREEN KEYWORD3 #VARIABLES COLOR #00979C - BLUE LITERAL2 # LITERAL2 specifies constants @@ -31,12 +31,16 @@ LED_BUILTIN LITERAL2 RESERVED_WORD_2 LED_BUILTIN_RX LITERAL2 RESERVED_WORD_2 LED_BUILTIN_TX LITERAL2 RESERVED_WORD_2 -auto LITERAL2 RESERVED_WORD_2 -constexpr LITERAL2 RESERVED_WORD_2 -decltype LITERAL2 RESERVED_WORD_2 -nullptr LITERAL2 RESERVED_WORD_2 -wchar_t LITERAL2 RESERVED_WORD_2 +DIGITAL_MESSAGE LITERAL2 +FIRMATA_STRING LITERAL2 +ANALOG_MESSAGE LITERAL2 +REPORT_DIGITAL LITERAL2 +REPORT_ANALOG LITERAL2 +SET_PIN_MODE LITERAL2 +SYSTEM_RESET LITERAL2 +SYSEX_START LITERAL2 +auto LITERAL2 RESERVED_WORD_2 int8_t LITERAL2 RESERVED_WORD_2 int16_t LITERAL2 RESERVED_WORD_2 int32_t LITERAL2 RESERVED_WORD_2 @@ -48,7 +52,6 @@ uint64_t LITERAL2 RESERVED_WORD_2 char16_t LITERAL2 RESERVED_WORD_2 char32_t LITERAL2 RESERVED_WORD_2 -static_assert LITERAL2 RESERVED_WORD_2 operator LITERAL2 RESERVED_WORD_2 enum LITERAL2 RESERVED_WORD_2 delete LITERAL2 RESERVED_WORD_2 @@ -71,12 +74,45 @@ public LITERAL2 RESERVED_WORD_2 short LITERAL2 RESERVED_WORD_2 signed LITERAL2 RESERVED_WORD_2 static LITERAL2 Static RESERVED_WORD_2 -goto LITERAL2 RESERVED_WORD_2 +volatile LITERAL2 Volatile RESERVED_WORD_2 String LITERAL2 String RESERVED_WORD_2 +string LITERAL2 string RESERVED_WORD_2 void LITERAL2 Void RESERVED_WORD_2 true LITERAL2 LITERAL_BOOLEAN unsigned LITERAL2 RESERVED_WORD_2 word LITERAL2 RESERVED_WORD_2 +array LITERAL2 RESERVED_WORD_2 +sizeof LITERAL2 +dynamic_cast LITERAL2 +typedef LITERAL2 +const_cast LITERAL2 +struct LITERAL2 +static_cast LITERAL2 +union LITERAL2 +friend LITERAL2 +extern LITERAL2 +class LITERAL2 RESERVED_WORD +reinterpret_cast LITERAL2 +register LITERAL2 RESERVED_WORD +explicit LITERAL2 +inline LITERAL2 +_Bool LITERAL2 +complex LITERAL2 +_Complex LITERAL2 +_Imaginary LITERAL2 +atomic_bool LITERAL2 +atomic_char LITERAL2 +atomic_schar LITERAL2 +atomic_uchar LITERAL2 +atomic_short LITERAL2 +atomic_ushort LITERAL2 +atomic_int LITERAL2 +atomic_uint LITERAL2 +atomic_long LITERAL2 +atomic_ulong LITERAL2 +atomic_llong LITERAL2 +atomic_ullong LITERAL2 +PROGMEM LITERAL2 # KEYWORD2 specifies methods and functions @@ -138,6 +174,7 @@ shiftOut KEYWORD2 ShiftOut tone KEYWORD2 Tone yield KEYWORD2 Yield +Stream KEYWORD2 Serial KEYWORD1 Serial DATA_TYPE Serial1 KEYWORD1 Serial DATA_TYPE Serial2 KEYWORD1 Serial DATA_TYPE @@ -191,11 +228,24 @@ click KEYWORD2 move KEYWORD2 isPressed KEYWORD2 +isAlphaNumeric KEYWORD2 +isAlpha KEYWORD2 +isAscii KEYWORD2 +isWhitespace KEYWORD2 +isControl KEYWORD2 +isDigit KEYWORD2 +isGraph KEYWORD2 +isLowerCase KEYWORD2 +isPrintable KEYWORD2 +isPunct KEYWORD2 +isSpace KEYWORD2 +isUpperCase KEYWORD2 +isHexadecimalDigit KEYWORD2 + # KEYWORD3 specifies structures break KEYWORD3 Break RESERVED_WORD case KEYWORD3 SwitchCase RESERVED_WORD -class KEYWORD3 RESERVED_WORD override KEYWORD3 RESERVED_WORD final KEYWORD3 RESERVED_WORD continue KEYWORD3 Continue RESERVED_WORD @@ -204,25 +254,22 @@ do KEYWORD3 DoWhile RESERVED_WORD else KEYWORD3 Else RESERVED_WORD for KEYWORD3 For RESERVED_WORD if KEYWORD3 If RESERVED_WORD -register KEYWORD3 RESERVED_WORD return KEYWORD3 Return RESERVED_WORD +goto KEYWORD3 RESERVED_WORD switch KEYWORD3 SwitchCase RESERVED_WORD -this KEYWORD3 RESERVED_WORD throw KEYWORD3 RESERVED_WORD try KEYWORD3 RESERVED_WORD while KEYWORD3 While RESERVED_WORD setup KEYWORD3 Setup RESERVED_WORD loop KEYWORD3 Loop RESERVED_WORD +export KEYWORD3 RESERVED_WORD -alignas KEYWORD3 RESERVED_WORD -alignof KEYWORD3 RESERVED_WORD -asm KEYWORD3 RESERVED_WORD -export KEYWORD3 RESERVED_WORD -thread_local KEYWORD3 RESERVED_WORD -noexcept KEYWORD3 RESERVED_WORD -export KEYWORD3 RESERVED_WORD +not KEYWORD3 +or KEYWORD3 +and KEYWORD3 +xor KEYWORD3 # operators aren't highlighted, but may have documentation diff --git a/build/shared/lib/theme/theme.txt b/build/shared/lib/theme/theme.txt index 678926b0f..e5a015894 100644 --- a/build/shared/lib/theme/theme.txt +++ b/build/shared/lib/theme/theme.txt @@ -1,7 +1,7 @@ #FUNCTIONS COLOR #D35400 - ORANGE KEYWORD1 #FUNCTIONS COLOR #D35400 - ORANGE KEYWORD2 -#STRUCTURE COLORS #5E6D03 - GREEN KEYWORD3 -#VARIABLES COLOR #00979C - BLUE LITERAL1 +#STRUCTURE COLORS #728E00 - GREEN KEYWORD3 +#VARIABLES COLOR #00979C - BLUE LITERAL2 #ERROR COLOR #A61717 - RED #COMMENTS // COLOR #95A5A6 - LIGHT GREY @@ -17,7 +17,6 @@ status.edit.bgcolor = #F1B500 status.font = SansSerif,plain,12 # GUI - TABS -# settings for the tabs at the top # (tab images are stored in the lib/theme folder) header.bgcolor = #17A1A5 header.text.selected.color = #005B5B