IEP-1587 Integrate esp-idf-kconfig 3.x changes with IDE (#1426)

* feat: adding support for kconfig 3.0

* fix: make reset UI version-aware; use server version

* feat: refactoring and moving UI rendering to separate class

* fix: replaced loop iteration with putAll

* feat: use constant and dynamic version for reset

* fix: don't clear all edits on server reset

* fix: do not show reset buttons if not supported

Author: sigmaaa

bundles/com.espressif.idf.sdk.config.core/src/com/espressif/idf/sdk/config/core/IJsonServerConfig.java

@@ -16,6 +16,7 @@ public interface IJsonServerConfig
 	String VISIBLE = "visible"; //$NON-NLS-1$
 	String RANGES = "ranges"; //$NON-NLS-1$
 	String VERSION = "version"; //$NON-NLS-1$
+	String DEFAULTS = "defaults"; //$NON-NLS-1$
 
 	// data types
 	String HEX_TYPE = "hex"; //$NON-NLS-1$
@@ -29,6 +30,7 @@ public interface IJsonServerConfig
 	String SET = "set"; //$NON-NLS-1$
 	String SAVE = "save"; //$NON-NLS-1$
 	String LOAD = "load"; //$NON-NLS-1$
+	String RESET = "reset"; //$NON-NLS-1$
 
 	String COMPONENT_CONFIG_TITLE = "Component config"; //$NON-NLS-1$
 

bundles/com.espressif.idf.sdk.config.core/src/com/espressif/idf/sdk/config/core/KConfigMenuItem.java

@@ -23,6 +23,7 @@ public class KConfigMenuItem
 	private String type;
 	private String id;
 	private boolean isMenuConfig;
+	private boolean isDefault;
 
 	public KConfigMenuItem(KConfigMenuItem parent)
 	{
@@ -173,5 +174,21 @@ private boolean isVisible(JSONObject visibleJsonMap, String configKey)
 		return visibleJsonMap.get(configKey) != null ? (boolean) visibleJsonMap.get(configKey) : false;
 	}
 
+	public boolean isDefault()
+	{
+		return isDefault;
+	}
+
+	public void setDefault(boolean isDefault)
+	{
+		this.isDefault = isDefault;
+	}
 
-}
+	public void updateDefaultState(JSONObject defaultsJsonMap)
+	{
+		if (defaultsJsonMap != null && defaultsJsonMap.containsKey(getId()))
+		{
+			this.isDefault = (boolean) defaultsJsonMap.get(getId());
+		}
+	}
+}

bundles/com.espressif.idf.sdk.config.core/src/com/espressif/idf/sdk/config/core/server/CommandType.java

@@ -29,6 +29,8 @@ public enum CommandType
 	 */
 	SET,
 
+	RESET,
+
 	/**
 	 * To represent server connection is closed
 	 */

bundles/com.espressif.idf.sdk.config.core/src/com/espressif/idf/sdk/config/core/server/IJsonConfigOutput.java

@@ -27,4 +27,8 @@ public interface IJsonConfigOutput
 	 */
 	public JSONObject getRangesJsonMap();
 
+	public JSONObject getDefaultsJsonMap();
+
+	public long getVersion();
+
 }

bundles/com.espressif.idf.sdk.config.core/src/com/espressif/idf/sdk/config/core/server/JsonConfigOutput.java

@@ -24,6 +24,14 @@ public class JsonConfigOutput implements IJsonConfigOutput
 	private JSONObject valuesJsonMap;
 	private JSONObject visibleJsonMap;
 	private JSONObject rangesJsonMap;
+	private JSONObject defaultsJsonMap;
+	private long version = 1;
+
+	@Override
+	public long getVersion()
+	{
+		return version;
+	}
 
 	@Override
 	public JSONObject getValuesJsonMap()
@@ -56,12 +64,18 @@ public void parse(String response, boolean isUpdate) throws ParseException
 		JSONObject jsonObj = (JSONObject) parser.parse(response);
 		if (jsonObj != null)
 		{
+			if (jsonObj.containsKey(IJsonServerConfig.VERSION))
+			{
+				version = (long) jsonObj.get(IJsonServerConfig.VERSION);
+			}
+
 			if (isUpdate)
 			{
 				// newly updated values and visible items
 				JSONObject visibleJson = (JSONObject) jsonObj.get(IJsonServerConfig.VISIBLE);
 				JSONObject valuesJson = (JSONObject) jsonObj.get(IJsonServerConfig.VALUES);
 				JSONObject rangesJson = (JSONObject) jsonObj.get(IJsonServerConfig.RANGES);
+				JSONObject defaultsJson = (JSONObject) jsonObj.get(IJsonServerConfig.DEFAULTS);
 
 				// Updated visible items
 				Set<String> newVisibleKeyset = visibleJson.keySet();
@@ -89,9 +103,15 @@ public void parse(String response, boolean isUpdate) throws ParseException
 				valuesJsonMap = (JSONObject) jsonObj.get(IJsonServerConfig.VALUES);
 				visibleJsonMap = (JSONObject) jsonObj.get(IJsonServerConfig.VISIBLE);
 				rangesJsonMap = (JSONObject) jsonObj.get(IJsonServerConfig.RANGES);
+				defaultsJsonMap = (JSONObject) jsonObj.get(IJsonServerConfig.DEFAULTS);
 			}
 		}
 
 	}
 
+	public JSONObject getDefaultsJsonMap()
+	{
+		return defaultsJsonMap;
+	}
+
 }

bundles/com.espressif.idf.sdk.config.core/src/com/espressif/idf/sdk/config/core/server/JsonConfigServer.java

@@ -53,6 +53,24 @@ public JsonConfigServer(IProject project, IFile file)
 		this.file = file;
 	}
 
+	public void resetElementById(String id)
+	{
+		String resetRequest = String.format("{\"version\": 3, \"reset\": [\"%s\"]}", id);
+		execute(resetRequest, CommandType.RESET);
+	}
+
+	public void resetElementChildren(List<String> children)
+	{
+		if (children == null || children.isEmpty())
+		{
+			return;
+		}
+
+		String joinedIds = String.join("\", \"", children);
+		String resetRequest = String.format("{\"version\": 3, \"reset\": [\"%s\"]}", joinedIds);
+		execute(resetRequest, CommandType.RESET);
+	}
+
 	@Override
 	public void addListener(IMessageHandlerListener listener)
 	{

bundles/com.espressif.idf.sdk.config.core/src/com/espressif/idf/sdk/config/core/server/JsonConfigServerRunnable.java

@@ -200,26 +200,20 @@ protected boolean isValidJson(String output)
 	{
 		String jsonOutput = new JsonConfigProcessor().getInitialOutput(output);
 		if (StringUtil.isEmpty(jsonOutput))
-		{
 			return false;
-		}
+
 		try
 		{
 			JSONObject jsonObj = (JSONObject) new JSONParser().parse(jsonOutput);
 			if (jsonObj != null)
 			{
-				if (jsonObj.get(IJsonServerConfig.VISIBLE) != null && jsonObj.get(IJsonServerConfig.VALUES) != null
-						&& jsonObj.get(IJsonServerConfig.RANGES) != null)
-				{
-					return true;
-				}
+				return jsonObj.containsKey(IJsonServerConfig.VERSION) && jsonObj.containsKey(IJsonServerConfig.VALUES);
 			}
 		}
 		catch (ParseException e)
 		{
 			return false;
 		}
-
 		return false;
 	}
 

bundles/com.espressif.idf.sdk.config.ui/icons/reset.png

@@ -0,0 +1,16 @@
+package com.espressif.idf.sdk.config.ui;
+
+import org.json.simple.JSONObject;
+
+import com.espressif.idf.sdk.config.core.KConfigMenuItem;
+
+public interface ConfigActionHandler
+{
+	void onCommandExecuted(JSONObject jsonMap);
+
+	void onTextModified(String key, Object value);
+
+	void onResetRequested(String key);
+
+	void onMenuResetRequested(KConfigMenuItem menu);
+}