feat(LEXER): support function names containing the at sign

.tool-versions

@@ -0,0 +1 @@
+ruby 3.2.2

lib/bashcov/lexer.rb

@@ -13,7 +13,7 @@ class Lexer
     IGNORE_END_WITH = %w[(].freeze
 
     # Lines containing only one of these keywords are irrelevant for coverage
-    IGNORE_IS = %w[esac if then else elif fi while do done { } ;;].freeze
+    IGNORE_IS = %w[esac if then else elif fi while do done { } ;; ( )].freeze
 
     # @param [String] filename File to analyze
     # @param [Hash] coverage Coverage with executed lines marked
@@ -104,7 +104,7 @@ def relevant?(line)
                       line.start_with?(*IGNORE_START_WITH) ||
                       line.end_with?(*IGNORE_END_WITH)
 
-      return false if line =~ /\A[a-zA-Z_][a-zA-Z0-9_\-:\.]*\(\)/ # function declared without the `function` keyword
+      return false if line =~ /\A[a-zA-Z_@][a-zA-Z0-9_@\-:\.]*\(\)/ # function declared without the `function` keyword
       return false if line =~ /\A[^)]+\)\Z/ # case statement selector, e.g. `--help)`
 
       true

spec/support/test_app.rb

@@ -20,7 +20,7 @@ def expected_coverage
     "#{test_app}/scripts/cd.sh" => [nil, nil, 1, 2, nil, 3, 1, 3, nil, 2, nil, nil, 1, nil, 3, nil, 6, nil, 1, nil, 1],
     "#{test_app}/scripts/comments.sh" => [nil, nil, 1, nil, 1, nil, nil, nil, 1, nil, 1],
     "#{test_app}/scripts/delete.sh" => [nil, nil, 1, 1, 1, 1, nil, 1, 1],
-    "#{test_app}/scripts/function.sh" => [nil, nil, nil, 2, nil, nil, nil, 1, 1, nil, nil, nil, nil, 1, nil, nil, nil, 0, nil, nil, nil, 1, nil, nil, 1, 1, 1, 1],
+    "#{test_app}/scripts/function.sh" => [nil, nil, nil, 2, nil, nil, nil, 1, 1, nil, nil, nil, nil, 1, nil, nil, nil, 0, nil, nil, nil, 0, nil, nil, 1, 1, 1, 1],
     "#{test_app}/scripts/long_line.sh" => [nil, nil, 1, 1, 1, 0],
     "#{test_app}/scripts/nested/simple.sh" => [nil, nil, nil, nil, 1, 1, nil, 0, nil, nil, 1],
     "#{test_app}/scripts/new\nline.sh" => [nil, nil, 1, nil, 2],
@@ -31,7 +31,7 @@ def expected_coverage
     "#{test_app}/scripts/source.sh" => [nil, nil, 1, nil, 2],
     "#{test_app}/scripts/sourced.txt" => [nil, nil, 1],
     "#{test_app}/scripts/unicode.sh" => [nil, nil, nil, 1, nil, 1],
-    "#{test_app}/scripts/multiline.sh" => [nil, nil, nil, 1, nil, 0, nil, 1, nil, 1, nil, 0, nil, nil, 1, 2, 1, 1, 0, nil, nil, 2, nil, nil, 1, 1, 1, 1, nil, 1, 1, 1, 1, 1, nil, 1, 1, 1, 1, nil, 1],
+    "#{test_app}/scripts/multiline.sh" => [nil, nil, nil, 1, nil, 0, nil, 1, nil, 1, nil, 0, nil, nil, 1, 2, 1, 1, 0, nil, nil, 2, nil, nil, 1, 1, 1, 1, nil, 1, 1, 1, 1, 1, nil, 1, 1, 1, 1, nil, nil, 1],
     "#{test_app}/scripts/multiline2.sh" => [nil, nil, 1, 1, 1, 1, nil, 1, 1, 1, 1, nil, 1, 1, 1, 1, 1, 1, nil, 1, 1, 1, 1, 1, 1, 1, 1, nil, 1, 1, 1, nil, 1, nil, nil, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, nil, nil, 1],
     "#{test_app}/scripts/multiline3.sh" => [nil, nil, 1, 1, 1, 1],
     "#{test_app}/scripts/multiline4.sh" => [nil, nil, 1, 1],

spec/test_app/scripts/function.sh

@@ -18,11 +18,11 @@ put-team-key() {
   echo put-team-key # 0
 }
 
-abc::def.fn() {
+abc::def.@fn() {
     echo "${FUNCNAME[0]}" # 1
 }
 
 f1 # 1
 f2 # 1
 __a-bc # 1
-abc::def.fn # 1
+abc::def.@fn # 1

spec/test_app/scripts/multiline.sh

@@ -38,4 +38,6 @@ hello
 there
 '
 # nil
-echo the end # 1
+( # nil
+  echo the end # 1
+) # nil