[EXPERIMENTAL] Sh: extract variables in variable assignments

Signed-off-by: Masatake YAMATO <[email protected]>
universal-ctags · Nov 22, 2022 · e730033 · e730033
1 parent 816e0c8
commit e730033
Show file tree

Hide file tree

Showing 3 changed files with 46 additions and 3 deletions.
diff --git a/Units/parser-sh.r/sh-comments.d/expected.tags b/Units/parser-sh.r/sh-comments.d/expected.tags
@@ -2,3 +2,7 @@ afterpound1	input.sh	/^foo="#"; afterpound1() {}$/;"	f
 afterpound2	input.sh	/^foo="#\\""; afterpound2() {}$/;"	f
 afterpound3	input.sh	/^foo='#'; afterpound3() {}$/;"	f
 afterpound4	input.sh	/^foo='#'''; afterpound4() {}$/;"	f
+foo	input.sh	/^foo="#"; afterpound1() {}$/;"	v
+foo	input.sh	/^foo="#\\""; afterpound2() {}$/;"	v
+foo	input.sh	/^foo='#'''; afterpound4() {}$/;"	v
+foo	input.sh	/^foo='#'; afterpound3() {}$/;"	v
diff --git a/Units/parser-sh.r/sh-quotes.d/expected.tags b/Units/parser-sh.r/sh-quotes.d/expected.tags
@@ -2,3 +2,8 @@ afterpound1	input.sh	/^foo="#"; afterpound1() {}$/;"	f
 afterpound2	input.sh	/^foo="#\\""; afterpound2() {}$/;"	f
 afterpound3	input.sh	/^foo='#'; afterpound3() {}$/;"	f
 afterpound4	input.sh	/^foo='#'''; afterpound4() {}$/;"	f
+foo	input.sh	/^foo="#"; afterpound1() {}$/;"	v
+foo	input.sh	/^foo="#\\""; afterpound2() {}$/;"	v
+foo	input.sh	/^foo="nofunction()"$/;"	v
+foo	input.sh	/^foo='#'''; afterpound4() {}$/;"	v
+foo	input.sh	/^foo='#'; afterpound3() {}$/;"	v
diff --git a/parsers/sh.c b/parsers/sh.c
@@ -38,6 +38,7 @@ typedef enum {
 	K_FUNCTION,
 	K_SCRIPT,
 	K_HEREDOCLABEL,
+	K_VARIABLE,
 } shKind;
 
 typedef enum {
@@ -86,8 +87,9 @@ static roleDefinition ZshFunctionRoles [] = {
 	  .referenceOnly = false, FUNCTION_ROLES_SPEC },			\
 	{ true, 's', "script", "script files",						\
 	  .referenceOnly = true, ATTACH_ROLES (SCRIPT_ROLES) },		\
-	  .referenceOnly = false, ATTACH_ROLES (HEREDOC_ROLES) }
 	{ true, 'h', "heredoc", "labels for here document",			\
+	  .referenceOnly = false, ATTACH_ROLES (HEREDOC_ROLES) },   \
+	{ true, 'v', "variable", "variables assigment (experimental)" }
 
 static kindDefinition ShKinds [] = {
 	SH_KINDS_COMMON(ShScriptRoles, ShHeredocRoles,),
@@ -456,6 +458,34 @@ static size_t handleZshKeyword (int keyword,
 	return vStringLength(token);
 }
 
+static bool handleVariableAssignment (vString *input)
+{
+	const char *base = vStringValue (input);
+	const char *cp = base;
+
+	while (*cp != '\0')
+	{
+		if (*cp == '=')
+		{
+			size_t len = cp - base;
+			/* Ignore VAR in if [[ \
+			   VAR == ... ]] */
+			if (*(cp + 1) != '=' && len > 0)
+			{
+				vStringTruncate (input, len);
+				return true;
+			}
+			break;
+		}
+		else if ( ((cp == base)?
+				   isIdentChar0: isIdentChar) ((unsigned char)*cp) )
+			cp++;
+		else
+			break;
+	}
+	return false;
+}
+
 typedef bool (* checkCharFunc) (int);
 static void findShTagsCommon (size_t (* keyword_handler) (int,
 														  vString *,
@@ -653,8 +683,9 @@ static void findShTagsCommon (size_t (* keyword_handler) (int,
 			while (isspace ((int) *cp))
 				++cp;
 
-			if ((found_kind != K_SCRIPT)
-			    && *cp == '(')
+			if (found_kind == K_SCRIPT)
+				;				/* Do NOTHING */
+			else if (*cp == '(')
 			{
 				++cp;
 				while (isspace ((int) *cp))
@@ -680,6 +711,9 @@ static void findShTagsCommon (size_t (* keyword_handler) (int,
 					++cp;
 				}
 			}
+			else if (found_kind == K_NOTHING
+					 && handleVariableAssignment (name))
+				found_kind = K_VARIABLE;
 
 			if (found_kind != K_NOTHING)
 			{