HybridDog/geany
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Ruby: delete rspec related kinds

Browse Source 
Close universal-ctags/ctags#453.

(This is about a bug spotted in universal-ctags/ctags#453 by @mislav and
 in universal-ctags/ctags#11 by @NewAlexandria.)

Kinds C and d are for Rspec.

Parts of code related to above kinds assume a ruby string
comes after Rspec keywords (describe or context).

This is a wrong assumption. A class name can be used there.

It is nice if ctags can handle these rspec code well, but we
don't have enough resource to make it now.

So in this commit I delete rspec related code temporary. I
just reserve a kind letter 'd' for rspec for the future. 'C'
is completely deleted because (1) describe and context have
the same meaning in rspec, and (2) we would like to assign
'C' for Ruby constant as ripper-tags does.

Signed-off-by: Masatake YAMATO <yamato@redhat.com>
This commit is contained in:
Masatake YAMATO 2015-11-19 12:11:14 +09:00 committed by Colomban Wendling
parent 885b994ec2
commit e46093d1fc
1 changed files with 6 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
tagmanager/ctags/ruby.c
View File

@ -27,7 +27,7 @@
* DATA DECLARATIONS
*/
typedef enum {
K_UNDEFINED = -1, K_CLASS, K_METHOD, K_MODULE, K_SINGLETON, K_DESCRIBE, K_CONTEXT
K_UNDEFINED = -1, K_CLASS, K_METHOD, K_MODULE, K_SINGLETON,
} rubyKind;
/*
@ -38,8 +38,11 @@ static kindOption RubyKinds [] = {
{ TRUE, 'f', "method", "methods" },
{ TRUE, 'm', "namespace", "modules" },
{ TRUE, 'F', "member", "singleton methods" },
{ TRUE, 'd', "describe", "describes" },
{ TRUE, 'C', "context", "contexts" }
#if 0
/* Following two kinds are reserved. */
{ TRUE, 'd', "describe", "describes and contexts for Rspec" },
{ TRUE, 'C', "constant", "constants" },
#endif
};
static NestingLevels* nesting = NULL;
@ -263,10 +266,6 @@ static rubyKind parseIdentifier (
{
also_ok = "?!=";
}
else if (kind == K_DESCRIBE || kind == K_CONTEXT)
{
also_ok = " ,\".#?!='/-";
}
else
{
also_ok = "";
@ -479,14 +478,6 @@ static void findRubyTags (void)
readAndEmitTag (&cp, kind);
}
else if (canMatchKeyword (&cp, "describe"))
{
readAndEmitTag (&cp, K_DESCRIBE);
}
else if (canMatchKeyword (&cp, "context"))
{
readAndEmitTag (&cp, K_CONTEXT);
}
while (*cp != '\0')
{