Merge pull request #3318 from masatake/rspec-it

Rspec: handle "it"

Author: masatake

Tmain/ruby-scope-loop-oom.d/stdout-expected.txt

@@ -1,3 +1,4 @@
 A	a.rb	/^RSpec.describe "A" do$/;"	d	end:12
 B	b.rb	/^RSpec.describe "B" do$/;"	d	end:2
 a	a.rb	/^  describe "a" do$/;"	d	describe:A	end:11
+hangs	a.rb	/^    it "hangs" do$/;"	i	describe:A.a	end:10

Units/parser-rspec.r/simple-rspec.d/expected.tags

@@ -1,9 +1,13 @@
 Order	input.rb	/^RSpec.describe Order do$/;"	describe	line:6	language:RSpec	end:18
 with no items	input.rb	/^  context "with no items" do$/;"	context	line:7	language:RSpec	describe:Order	end:11
+behaves one way	input.rb	/^    it "behaves one way" do$/;"	it	line:8	language:RSpec	context:Order.with no items	end:10
 with one item	input.rb	/^  context "with one item" do$/;"	context	line:13	language:RSpec	describe:Order	end:17
+behaves another way	input.rb	/^    it "behaves another way" do$/;"	it	line:14	language:RSpec	context:Order.with one item	end:16
 Calculator	input.rb	/^RSpec.describe Calculator do$/;"	describe	line:20	language:RSpec	end:26
 #add	input.rb	/^  describe '#add' do$/;"	describe	line:21	language:RSpec	describe:Calculator	end:25
+returns the sum of its arguments	input.rb	/^    it 'returns the sum of its arguments' do$/;"	it	line:22	language:RSpec	describe:Calculator.#add	end:24
 Core	input.rb	/^module RSpec::Core$/;"	module	line:29	language:Ruby	module:RSpec	end:48
 ExampleGroup	input.rb	/^  RSpec.describe ExampleGroup do$/;"	describe	line:30	language:RSpec	end:47
 when calling `#{method}`, an example group API, from within an example	input.rb	/^      context "when calling `#{method}`, an example group API, from within an example" do$/;"	context	line:32	language:RSpec	describe:ExampleGroup	end:42
+tells the user they are in the wrong scope for that API	input.rb	/^        it "tells the user they are in the wrong scope for that API" do$/;"	it	line:33	language:RSpec	context:ExampleGroup.when calling `#{method}`, an example group API, from within an example	end:41
 Object describing nested example_groups	input.rb	/^    describe Object, "describing nested example_groups", :little_less_nested => 'yep' do$/;"	describe	line:45	language:RSpec	describe:ExampleGroup	end:46

parsers/rspec.c

@@ -61,11 +61,13 @@ struct sRSpecSubparser {
 typedef enum {
 	K_DESCRIBE,
 	K_CONTEXT,
+	K_IT,
 } rspecKind;
 
 static kindDefinition RSpecKinds [] = {
 	{ true, 'd', "describe", "describes" },
 	{ true, 'c', "context", "contexts" },
+	{ true, 'i', "it", "things described with \"it\"" },
 };
 
 /*
@@ -141,33 +143,36 @@ static vString *readRest (const unsigned char **cp)
 	return vstr;
 }
 
+struct caseType {
+	const char *keyword;
+	rspecKind    kind;
+};
+
 static int lineNotify (rubySubparser *s, const unsigned char **cp)
 {
-	if (rubyCanMatchKeywordWithAssign (cp, "describe")
-		|| rubyCanMatchKeywordWithAssign (cp, "RSpec.describe"))
-	{
-		vString *vstr = NULL;
-		rubySkipWhitespace (cp);
-		vstr = readRest (cp);
-		if (vstr)
-		{
-			int r = makeSimpleRSpecTag (vstr, K_DESCRIBE, s);
-			vStringDelete (vstr);
-			return r;
-		}
-	}
-	else if (rubyCanMatchKeywordWithAssign (cp, "context"))
+	struct caseType caseTypes [] = {
+		{ "describe", K_DESCRIBE },
+		{ "RSpec.describe", K_DESCRIBE },
+		{ "context", K_CONTEXT },
+		{ "it", K_IT },
+	};
+
+	for (int i = 0; i < ARRAY_SIZE(caseTypes); i++)
 	{
-		vString *vstr = NULL;
-		rubySkipWhitespace (cp);
-		vstr = readRest (cp);
-		if (vstr)
+		if (rubyCanMatchKeywordWithAssign(cp, caseTypes[i].keyword))
 		{
-			int r = makeSimpleRSpecTag (vstr, K_CONTEXT, s);
-			vStringDelete (vstr);
-			return r;
+			vString *vstr = NULL;
+			rubySkipWhitespace (cp);
+			vstr = readRest (cp);
+			if (vstr)
+			{
+				int r = makeSimpleRSpecTag (vstr, caseTypes[i].kind, s);
+				vStringDelete (vstr);
+				return r;
+			}
 		}
 	}
+
 	return CORK_NIL;
 }