From 3d8ece8c8bfdc97087db4fd545c77c21bddf9e8d Mon Sep 17 00:00:00 2001 From: Benoit Blanchon Date: Fri, 14 Dec 2018 17:33:02 +0100 Subject: [PATCH] Improved syntax highlighting in Arduino IDE --- CHANGELOG.md | 1 + keywords.txt | 39 +++++++++++++++++++++++++++++---------- 2 files changed, 30 insertions(+), 10 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4c1b66c3..30bc909c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ HEAD ---- * Import functions in the ArduinoJson namespace to get clearer errors +* Improved syntax highlighting in Arduino IDE v6.7.0-beta (2018-12-07) ----------- diff --git a/keywords.txt b/keywords.txt index 43473a3f..7dc2b807 100644 --- a/keywords.txt +++ b/keywords.txt @@ -1,17 +1,36 @@ +# Macros +JSON_ARRAY_SIZE KEYWORD2 +JSON_OBJECT_SIZE KEYWORD2 +JSON_STRING_SIZE KEYWORD2 + +# Free functions +deserializeJson KEYWORD2 +deserializeMsgPack KEYWORD2 +serialized KEYWORD2 +serializeJson KEYWORD2 +serializeJsonPretty KEYWORD2 +serializeMsgPack KEYWORD2 + +# Methods add KEYWORD2 as KEYWORD2 createNestedArray KEYWORD2 createNestedObject KEYWORD2 -deserializeJson KEYWORD2 -deserializeMsgPack KEYWORD2 -DynamicJsonDocument KEYWORD1 get KEYWORD2 -JsonArray KEYWORD1 -JsonObject KEYWORD1 -JsonVariant KEYWORD1 -serializeMsgPack KEYWORD2 -serializeJson KEYWORD2 -serializeJsonPretty KEYWORD2 set KEYWORD2 -StaticJsonDocument KEYWORD1 to KEYWORD2 + +# Type names +DeserializationError KEYWORD1 DATA_TYPE +DynamicJsonDocument KEYWORD1 DATA_TYPE +JsonArray KEYWORD1 DATA_TYPE +JsonArrayConst KEYWORD1 DATA_TYPE +JsonFloat KEYWORD1 DATA_TYPE +JsonInteger KEYWORD1 DATA_TYPE +JsonObject KEYWORD1 DATA_TYPE +JsonObjectConst KEYWORD1 DATA_TYPE +JsonString KEYWORD1 DATA_TYPE +JsonUInt KEYWORD1 DATA_TYPE +JsonVariant KEYWORD1 DATA_TYPE +JsonVariantConst KEYWORD1 DATA_TYPE +StaticJsonDocument KEYWORD1 DATA_TYPE