Merge pull request #3676 from masatake/ruby--skip-data-1

Ruby: skip if __DATA__ is found
universal-ctags · Mar 24, 2023 · a55d97f · a55d97f
2 parents af30abc + 73b2be6
commit a55d97f
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 3 deletions.
diff --git a/Units/parser-ruby.r/ruby-skip-data.d/args.ctags b/Units/parser-ruby.r/ruby-skip-data.d/args.ctags
@@ -0,0 +1 @@
+--sort=no
diff --git a/Units/parser-ruby.r/ruby-skip-data.d/expected.tags b/Units/parser-ruby.r/ruby-skip-data.d/expected.tags
@@ -0,0 +1 @@
+a	input.rb	/^def a()$/;"	f
diff --git a/Units/parser-ruby.r/ruby-skip-data.d/input.rb b/Units/parser-ruby.r/ruby-skip-data.d/input.rb
@@ -0,0 +1,5 @@
+def a()
+end
+__END__
+def b()
+end
diff --git a/parsers/ruby.c b/parsers/ruby.c
@@ -1011,10 +1011,16 @@ static void findRubyTags (void)
 		 * separators are "do", ";" or newline */
 		bool expect_separator = false;
 
-		if (found_rdoc == false && strncmp ((const char*)cp, "# =", 3) == 0)
+		if (found_rdoc == false)
 		{
-			found_rdoc = true;
-			makePromise ("RDoc", 0, 0, 0, 0, 0);
+			if (strncmp ((const char*)cp, "__END__", 7) == 0)
+				break;
+
+			if (strncmp ((const char*)cp, "# =", 3) == 0)
+			{
+				found_rdoc = true;
+				makePromise ("RDoc", 0, 0, 0, 0, 0);
+			}
 		}
 
 		if (canMatch (&cp, "=begin", isWhitespace))