From 00a7f7173cfc3c00700925832dd76bd6d608b7cb Mon Sep 17 00:00:00 2001
From: LiiNen <kjeonghoon065@gmail.com>
Date: Fri, 23 Feb 2024 12:45:01 +0900
Subject: [PATCH] Fix commands syntax hint

---
 src/commands.def           | 15 ++++++++++-----
 src/commands/bitcount.json | 33 ++++++++++++++++++++-------------
 2 files changed, 30 insertions(+), 18 deletions(-)

diff --git a/src/commands.def b/src/commands.def
index c8413e4f6..f1794abf7 100644
--- a/src/commands.def
+++ b/src/commands.def
@@ -51,23 +51,28 @@ keySpec BITCOUNT_Keyspecs[1] = {
 };
 #endif
 
-/* BITCOUNT range unit argument table */
-struct COMMAND_ARG BITCOUNT_range_unit_Subargs[] = {
+/* BITCOUNT range end_unit_block unit argument table */
+struct COMMAND_ARG BITCOUNT_range_end_unit_block_unit_Subargs[] = {
 {MAKE_ARG("byte",ARG_TYPE_PURE_TOKEN,-1,"BYTE",NULL,NULL,CMD_ARG_NONE,0,NULL)},
 {MAKE_ARG("bit",ARG_TYPE_PURE_TOKEN,-1,"BIT",NULL,NULL,CMD_ARG_NONE,0,NULL)},
 };
 
+/* BITCOUNT range end_unit_block argument table */
+struct COMMAND_ARG BITCOUNT_range_end_unit_block_Subargs[] = {
+{MAKE_ARG("end",ARG_TYPE_INTEGER,-1,NULL,NULL,NULL,CMD_ARG_NONE,0,NULL)},
+{MAKE_ARG("unit",ARG_TYPE_ONEOF,-1,NULL,NULL,"7.0.0",CMD_ARG_OPTIONAL,2,NULL),.subargs=BITCOUNT_range_end_unit_block_unit_Subargs},
+};
+
 /* BITCOUNT range argument table */
 struct COMMAND_ARG BITCOUNT_range_Subargs[] = {
 {MAKE_ARG("start",ARG_TYPE_INTEGER,-1,NULL,NULL,NULL,CMD_ARG_NONE,0,NULL)},
-{MAKE_ARG("end",ARG_TYPE_INTEGER,-1,NULL,NULL,NULL,CMD_ARG_NONE,0,NULL)},
-{MAKE_ARG("unit",ARG_TYPE_ONEOF,-1,NULL,NULL,"7.0.0",CMD_ARG_OPTIONAL,2,NULL),.subargs=BITCOUNT_range_unit_Subargs},
+{MAKE_ARG("end-unit-block",ARG_TYPE_BLOCK,-1,NULL,NULL,NULL,CMD_ARG_OPTIONAL,2,NULL),.subargs=BITCOUNT_range_end_unit_block_Subargs},
 };
 
 /* BITCOUNT argument table */
 struct COMMAND_ARG BITCOUNT_Args[] = {
 {MAKE_ARG("key",ARG_TYPE_KEY,0,NULL,NULL,NULL,CMD_ARG_NONE,0,NULL)},
-{MAKE_ARG("range",ARG_TYPE_BLOCK,-1,NULL,NULL,NULL,CMD_ARG_OPTIONAL,3,NULL),.subargs=BITCOUNT_range_Subargs},
+{MAKE_ARG("range",ARG_TYPE_BLOCK,-1,NULL,NULL,NULL,CMD_ARG_OPTIONAL,2,NULL),.subargs=BITCOUNT_range_Subargs},
 };
 
 /********** BITFIELD ********************/
diff --git a/src/commands/bitcount.json b/src/commands/bitcount.json
index 2d277a855..616e9fa02 100644
--- a/src/commands/bitcount.json
+++ b/src/commands/bitcount.json
@@ -54,24 +54,31 @@
                         "type": "integer"
                     },
                     {
-                        "name": "end",
-                        "type": "integer"
-                    },
-                    {
-                        "name": "unit",
-                        "type": "oneof",
+                        "name": "end-unit-block",
+                        "type": "block",
                         "optional": true,
-                        "since": "7.0.0",
                         "arguments": [
                             {
-                                "name": "byte",
-                                "type": "pure-token",
-                                "token": "BYTE"
+                                "name": "end",
+                                "type": "integer"
                             },
                             {
-                                "name": "bit",
-                                "type": "pure-token",
-                                "token": "BIT"
+                                "name": "unit",
+                                "type": "oneof",
+                                "optional": true,
+                                "since": "7.0.0",
+                                "arguments": [
+                                    {
+                                        "name": "byte",
+                                        "type": "pure-token",
+                                        "token": "BYTE"
+                                    },
+                                    {
+                                        "name": "bit",
+                                        "type": "pure-token",
+                                        "token": "BIT"
+                                    }
+                                ]
                             }
                         ]
                     }