cucumber-cucumber-expressions 17.0.1 → 17.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cf1302afcc82ce4965f46efebeeea9315e680395bc915142f572ee1f025eecb0
-  data.tar.gz: 06d986ddaaaed001bd00e82059eb685cbb6507241b64b6081905c4373d620e96
+  metadata.gz: 6b49e9f64d889645dcee283e717f9b6c268293166219700c1e95435ce318e6f6
+  data.tar.gz: eda9b64c55c72304d1fa7d8509f16a9f5eb9c347cbf38125c41a3bbbf8d61f1f
 SHA512:
-  metadata.gz: 4ca20260b78e485d7d5f3d085529843c7195a53c0289464b9d02f782bcd1431153dbfc5df1e58ea7c02432d04a9df8d7a60b648f31f4736632697efa1f9addd6
-  data.tar.gz: a66a69755c51e1d1e154ac51230e9f8b784b86a3336ba4b6f87c04c4fc445081bef66c733954ed76d908433ef8648fcff8e5805c5ea01a22d5e2ca1490f4ce21
+  metadata.gz: 38a2e12bed97250bb03688aef8fcb596d78be09229ba5c33c7aee2957596b35f92abecd8a2fa6cc7b946ea7f05b9a9cd585dd4168898a38d3bc4aeb500ae8df1
+  data.tar.gz: a75778aa75c97f1e110e5d03725ae0a447429f2b1aac28bb5c7d947803ef95b4a38e23730f6d98459050bcd7c4cbae80e08a8c10b1a215d77ef537ca2319ff90

data/.rubocop.yml

@@ -1,3 +1,8 @@
+require:
+  - rubocop-performance
+  - rubocop-rake
+  - rubocop-rspec
+
 inherit_from: .rubocop_todo.yml
 
 inherit_mode:
@@ -15,6 +20,12 @@ Gemspec/RequireMFA:
 Layout/LineLength:
   Max: 200
 
+# This is documented in this spec to showcase why it's not working and people shouldn't use it
+# cf:
+Lint/MixedRegexpCaptureTypes:
+  Exclude:
+    - 'spec/cucumber/cucumber_expressions/tree_regexp_spec.rb'
+
 Style/Documentation:
   Enabled: false
 
@@ -22,6 +33,5 @@ Style/RegexpLiteral:
   EnforcedStyle: slashes
   AllowInnerSlashes: true
 
-# Once we enable rubocop-rspec
-#RSpec/MessageSpies:
-#  EnforcedStyle: receive
+RSpec/MessageSpies:
+  EnforcedStyle: receive

data/.rubocop_todo.yml

@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2023-10-06 11:04:10 UTC using RuboCop version 1.27.0.
+# on 2023-11-27 17:52:56 UTC using RuboCop version 1.27.0.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
@@ -8,90 +8,14 @@
 
 # TODO: Oct '23 -> 33 files inspected, 1004 offenses detected, 859 offenses auto-correctable
 # TODO: Oct '23 (later) -> 33 files inspected, 344 offenses detected, 205 offenses auto-correctable
-
-# Offense count: 1
-# This cop supports safe auto-correction (--auto-correct).
-# Configuration parameters: EnforcedStyle, IndentationWidth.
-# SupportedStyles: outdent, indent
-Layout/AccessModifierIndentation:
-  Exclude:
-    - 'lib/cucumber/cucumber_expressions/cucumber_expression_generator.rb'
+# TODO: Nov '23 -> 33 files inspected, 399 offenses detected, 192 offenses auto-correctable
 
 # Offense count: 2
 # This cop supports safe auto-correction (--auto-correct).
-# Configuration parameters: EnforcedStyle, IndentationWidth.
+# Configuration parameters: IndentationWidth.
 # SupportedStyles: special_inside_parentheses, consistent, align_brackets
 Layout/FirstArrayElementIndentation:
-  Exclude:
-    - 'spec/cucumber/cucumber_expressions/combinatorial_generated_expression_factory_test.rb'
-
-# Offense count: 2
-# This cop supports safe auto-correction (--auto-correct).
-# Configuration parameters: EnforcedStyle, IndentationWidth.
-# SupportedStyles: special_inside_parentheses, consistent, align_braces
-Layout/FirstHashElementIndentation:
-  Exclude:
-    - 'cucumber-cucumber-expressions.gemspec'
-
-# Offense count: 4
-# This cop supports safe auto-correction (--auto-correct).
-# Configuration parameters: AllowMultipleStyles, EnforcedHashRocketStyle, EnforcedColonStyle, EnforcedLastArgumentHashStyle.
-# SupportedHashRocketStyles: key, separator, table
-# SupportedColonStyles: key, separator, table
-# SupportedLastArgumentHashStyles: always_inspect, always_ignore, ignore_implicit, ignore_explicit
-Layout/HashAlignment:
-  Exclude:
-    - 'cucumber-cucumber-expressions.gemspec'
-
-# Offense count: 2
-# This cop supports safe auto-correction (--auto-correct).
-# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
-# URISchemes: http, https
-Layout/LineLength:
-  Max: 252
-
-# Offense count: 1
-# This cop supports safe auto-correction (--auto-correct).
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: symmetrical, new_line, same_line
-Layout/MultilineMethodCallBraceLayout:
-  Exclude:
-    - 'spec/cucumber/cucumber_expressions/parameter_type_spec.rb'
-
-# Offense count: 3
-# This cop supports safe auto-correction (--auto-correct).
-# Configuration parameters: EnforcedStyle, IndentationWidth.
-# SupportedStyles: aligned, indented, indented_relative_to_receiver
-Layout/MultilineMethodCallIndentation:
-  Exclude:
-    - 'lib/cucumber/cucumber_expressions/cucumber_expression_generator.rb'
-
-# Offense count: 4
-# This cop supports safe auto-correction (--auto-correct).
-# Configuration parameters: AllowForAlignment, EnforcedStyleForExponentOperator.
-# SupportedStylesForExponentOperator: space, no_space
-Layout/SpaceAroundOperators:
-  Exclude:
-    - 'lib/cucumber/cucumber_expressions/tree_regexp.rb'
-
-# Offense count: 57
-# This cop supports safe auto-correction (--auto-correct).
-# Configuration parameters: EnforcedStyle, EnforcedStyleForEmptyBraces, SpaceBeforeBlockParameters.
-# SupportedStyles: space, no_space
-# SupportedStylesForEmptyBraces: space, no_space
-Layout/SpaceInsideBlockBraces:
-  Exclude:
-    - 'cucumber-cucumber-expressions.gemspec'
-    - 'lib/cucumber/cucumber_expressions/group_builder.rb'
-    - 'lib/cucumber/cucumber_expressions/parameter_type_registry.rb'
-    - 'lib/cucumber/cucumber_expressions/regular_expression.rb'
-    - 'spec/cucumber/cucumber_expressions/combinatorial_generated_expression_factory_test.rb'
-    - 'spec/cucumber/cucumber_expressions/cucumber_expression_generator_spec.rb'
-    - 'spec/cucumber/cucumber_expressions/cucumber_expression_tokenizer_spec.rb'
-    - 'spec/cucumber/cucumber_expressions/custom_parameter_type_spec.rb'
-    - 'spec/cucumber/cucumber_expressions/parameter_type_registry_spec.rb'
-    - 'spec/cucumber/cucumber_expressions/parameter_type_spec.rb'
-    - 'spec/cucumber/cucumber_expressions/tree_regexp_spec.rb'
+  EnforcedStyle: consistent
 
 # Offense count: 1
 # This cop supports safe auto-correction (--auto-correct).
@@ -114,47 +38,27 @@ Lint/DuplicateBranch:
     - 'lib/cucumber/cucumber_expressions/ast.rb'
     - 'lib/cucumber/cucumber_expressions/cucumber_expression_parser.rb'
 
-# Offense count: 10
+# Offense count: 5
 # Configuration parameters: AllowComments.
 Lint/EmptyClass:
   Exclude:
-    - 'spec/cucumber/cucumber_expressions/combinatorial_generated_expression_factory_test.rb'
     - 'spec/cucumber/cucumber_expressions/cucumber_expression_generator_spec.rb'
     - 'spec/cucumber/cucumber_expressions/cucumber_expression_spec.rb'
     - 'spec/cucumber/cucumber_expressions/parameter_type_registry_spec.rb'
 
-# Offense count: 1
-Lint/MixedRegexpCaptureTypes:
-  Exclude:
-    - 'spec/cucumber/cucumber_expressions/tree_regexp_spec.rb'
-
 # Offense count: 1
 # This cop supports unsafe auto-correction (--auto-correct-all).
 Lint/NonDeterministicRequireOrder:
   Exclude:
     - 'Rakefile'
 
-# Offense count: 1
-Lint/NonLocalExitFromIterator:
-  Exclude:
-    - 'lib/cucumber/cucumber_expressions/combinatorial_generated_expression_factory.rb'
-
-# Offense count: 7
+# Offense count: 5
 # Configuration parameters: AllowKeywordBlockArguments.
 Lint/UnderscorePrefixedVariableName:
   Exclude:
-    - 'lib/cucumber/cucumber_expressions/ast.rb'
     - 'lib/cucumber/cucumber_expressions/cucumber_expression_parser.rb'
     - 'lib/cucumber/cucumber_expressions/group.rb'
 
-# Offense count: 14
-# This cop supports safe auto-correction (--auto-correct).
-# Configuration parameters: IgnoreEmptyBlocks, AllowUnusedKeywordArguments.
-Lint/UnusedBlockArgument:
-  Exclude:
-    - 'spec/cucumber/cucumber_expressions/combinatorial_generated_expression_factory_test.rb'
-    - 'spec/cucumber/cucumber_expressions/parameter_type_registry_spec.rb'
-
 # Offense count: 10
 # Configuration parameters: IgnoredMethods, CountRepeatedAttributes.
 Metrics/AbcSize:
@@ -201,21 +105,6 @@ Metrics/ParameterLists:
 Metrics/PerceivedComplexity:
   Max: 17
 
-# Offense count: 10
-# Configuration parameters: MinNameLength, AllowNamesEndingInNumbers, AllowedNames, ForbiddenNames.
-Naming/BlockParameterName:
-  Exclude:
-    - 'lib/cucumber/cucumber_expressions/cucumber_expression.rb'
-    - 'lib/cucumber/cucumber_expressions/cucumber_expression_parser.rb'
-    - 'lib/cucumber/cucumber_expressions/parameter_type_matcher.rb'
-
-# Offense count: 2
-# Configuration parameters: ForbiddenDelimiters.
-# ForbiddenDelimiters: (?-mix:(^|\s)(EO[A-Z]{1}|END)(\s|$))
-Naming/HeredocDelimiterNaming:
-  Exclude:
-    - 'lib/cucumber/cucumber_expressions/errors.rb'
-
 # Offense count: 7
 # Configuration parameters: MinNameLength, AllowNamesEndingInNumbers, AllowedNames, ForbiddenNames.
 # AllowedNames: at, by, db, id, in, io, ip, of, on, os, pp, to
@@ -238,14 +127,59 @@ Naming/PredicateName:
     - 'lib/cucumber/cucumber_expressions/parameter_type.rb'
     - 'lib/cucumber/cucumber_expressions/tree_regexp.rb'
 
-# Offense count: 20
-# Configuration parameters: EnforcedStyle, AllowedIdentifiers.
-# SupportedStyles: snake_case, camelCase
-Naming/VariableName:
+# Offense count: 3
+# This cop supports safe auto-correction (--auto-correct).
+Performance/RedundantBlockCall:
   Exclude:
     - 'lib/cucumber/cucumber_expressions/cucumber_expression.rb'
-    - 'lib/cucumber/cucumber_expressions/cucumber_expression_parser.rb'
-    - 'lib/cucumber/cucumber_expressions/parameter_type_matcher.rb'
+
+# Offense count: 2
+# Configuration parameters: Prefixes.
+# Prefixes: when, with, without
+RSpec/ContextWording:
+  Exclude:
+    - 'spec/cucumber/cucumber_expressions/cucumber_expression_generator_spec.rb'
+
+# Offense count: 29
+# Configuration parameters: Max.
+RSpec/ExampleLength:
+  Exclude:
+    - 'spec/cucumber/cucumber_expressions/combinatorial_generated_expression_factory_spec.rb'
+    - 'spec/cucumber/cucumber_expressions/cucumber_expression_generator_spec.rb'
+    - 'spec/cucumber/cucumber_expressions/cucumber_expression_parser_spec.rb'
+    - 'spec/cucumber/cucumber_expressions/cucumber_expression_spec.rb'
+    - 'spec/cucumber/cucumber_expressions/cucumber_expression_tokenizer_spec.rb'
+    - 'spec/cucumber/cucumber_expressions/cucumber_expression_transformation_spec.rb'
+    - 'spec/cucumber/cucumber_expressions/custom_parameter_type_spec.rb'
+    - 'spec/cucumber/cucumber_expressions/parameter_type_registry_spec.rb'
+    - 'spec/cucumber/cucumber_expressions/parameter_type_spec.rb'
+    - 'spec/cucumber/cucumber_expressions/regular_expression_spec.rb'
+    - 'spec/cucumber/cucumber_expressions/tree_regexp_spec.rb'
+
+# Offense count: 3
+RSpec/LeakyConstantDeclaration:
+  Exclude:
+    - 'spec/cucumber/cucumber_expressions/cucumber_expression_generator_spec.rb'
+    - 'spec/cucumber/cucumber_expressions/cucumber_expression_spec.rb'
+
+# Offense count: 34
+RSpec/MultipleExpectations:
+  Max: 30
+
+# Offense count: 1
+# Configuration parameters: AllowSubject.
+RSpec/MultipleMemoizedHelpers:
+  Max: 6
+
+# Offense count: 2
+RSpec/RepeatedDescription:
+  Exclude:
+    - 'spec/cucumber/cucumber_expressions/tree_regexp_spec.rb'
+
+# Offense count: 2
+RSpec/RepeatedExample:
+  Exclude:
+    - 'spec/cucumber/cucumber_expressions/tree_regexp_spec.rb'
 
 # Offense count: 2
 # Configuration parameters: EnforcedStyle, AllowModifiersOnSymbols.
@@ -254,7 +188,7 @@ Style/AccessModifierDeclarations:
   Exclude:
     - 'lib/cucumber/cucumber_expressions/tree_regexp.rb'
 
-# Offense count: 5
+# Offense count: 4
 # This cop supports safe auto-correction (--auto-correct).
 # Configuration parameters: EnforcedStyle, ProceduralMethods, FunctionalMethods, IgnoredMethods, AllowBracesOnProceduralOneLiners, BracesRequiredMethods.
 # SupportedStyles: line_count_based, semantic, braces_for_chaining, always_braces
@@ -267,7 +201,6 @@ Style/BlockDelimiters:
     - 'spec/cucumber/cucumber_expressions/cucumber_expression_spec.rb'
     - 'spec/cucumber/cucumber_expressions/cucumber_expression_transformation_spec.rb'
     - 'spec/cucumber/cucumber_expressions/custom_parameter_type_spec.rb'
-    - 'spec/cucumber/cucumber_expressions/tree_regexp_spec.rb'
 
 # Offense count: 1
 # This cop supports unsafe auto-correction (--auto-correct-all).
@@ -378,12 +311,6 @@ Style/ParallelAssignment:
     - 'lib/cucumber/cucumber_expressions/parameter_type_matcher.rb'
     - 'spec/cucumber/cucumber_expressions/custom_parameter_type_spec.rb'
 
-# Offense count: 1
-# This cop supports safe auto-correction (--auto-correct).
-Style/PerlBackrefs:
-  Exclude:
-    - 'lib/cucumber/cucumber_expressions/parameter_type.rb'
-
 # Offense count: 1
 # This cop supports unsafe auto-correction (--auto-correct-all).
 # Configuration parameters: EnforcedStyle.
@@ -473,7 +400,7 @@ Style/SymbolProc:
     - 'lib/cucumber/cucumber_expressions/ast.rb'
     - 'lib/cucumber/cucumber_expressions/cucumber_expression_parser.rb'
     - 'lib/cucumber/cucumber_expressions/errors.rb'
-    - 'spec/cucumber/cucumber_expressions/combinatorial_generated_expression_factory_test.rb'
+    - 'spec/cucumber/cucumber_expressions/combinatorial_generated_expression_factory_spec.rb'
     - 'spec/cucumber/cucumber_expressions/cucumber_expression_tokenizer_spec.rb'
     - 'spec/cucumber/cucumber_expressions/tree_regexp_spec.rb'
 
@@ -484,7 +411,7 @@ Style/SymbolProc:
 Style/TrailingCommaInArrayLiteral:
   Exclude:
     - 'lib/cucumber/cucumber_expressions/cucumber_expression_parser.rb'
-    - 'spec/cucumber/cucumber_expressions/combinatorial_generated_expression_factory_test.rb'
+    - 'spec/cucumber/cucumber_expressions/combinatorial_generated_expression_factory_spec.rb'
 
 # Offense count: 1
 # This cop supports safe auto-correction (--auto-correct).
@@ -494,14 +421,6 @@ Style/TrailingCommaInHashLiteral:
   Exclude:
     - 'cucumber-cucumber-expressions.gemspec'
 
-# Offense count: 9
-# This cop supports safe auto-correction (--auto-correct).
-# Configuration parameters: ExactNameMatch, AllowPredicates, AllowDSLWriters, IgnoreClassMethods, AllowedMethods.
-# AllowedMethods: to_ary, to_a, to_c, to_enum, to_h, to_hash, to_i, to_int, to_io, to_open, to_path, to_proc, to_r, to_regexp, to_str, to_s, to_sym
-Style/TrivialAccessors:
-  Exclude:
-    - 'lib/cucumber/cucumber_expressions/ast.rb'
-
 # Offense count: 1
 # This cop supports safe auto-correction (--auto-correct).
 Style/WhileUntilDo:

data/VERSION

@@ -1 +1 @@
-17.0.1
+17.0.2

data/cucumber-cucumber-expressions.gemspec

@@ -10,22 +10,27 @@ Gem::Specification.new do |s|
   s.description = 'Cucumber Expressions - a simpler alternative to Regular Expressions'
   s.summary     = "cucumber-expressions-#{s.version}"
   s.email       = 'cukes@googlegroups.com'
-  s.homepage    = 'https://github.com/cucumber/cucumber-expressions-ruby#readme'
+  s.homepage    = 'https://github.com/cucumber/cucumber-expressions'
   s.platform    = Gem::Platform::RUBY
   s.license     = 'MIT'
   s.required_ruby_version = '>= 2.5'
 
   s.metadata = {
     'bug_tracker_uri' => 'https://github.com/cucumber/cucumber/issues',
-    'changelog_uri'     => 'https://github.com/cucumber/common/blob/main/cucumber-expressions/CHANGELOG.md',
+    'changelog_uri' => 'https://github.com/cucumber/common/blob/main/cucumber-expressions/CHANGELOG.md',
     'documentation_uri' => 'https://cucumber.io/docs/cucumber/cucumber-expressions/',
-    'mailing_list_uri'  => 'https://groups.google.com/forum/#!forum/cukes',
-    'source_code_uri'   => 'https://github.com/cucumber/common/blob/main/cucumber-expressions/ruby',
+    'mailing_list_uri' => 'https://groups.google.com/forum/#!forum/cukes',
+    'source_code_uri' => 'https://github.com/cucumber/common/blob/main/cucumber-expressions/ruby',
   }
 
+  s.add_runtime_dependency 'bigdecimal'
+
   s.add_development_dependency 'rake', '~> 13.0', '>= 13.0.6'
   s.add_development_dependency 'rspec', '~> 3.11', '>= 3.11.0'
   s.add_development_dependency 'rubocop', '~> 1.27.0'
+  s.add_development_dependency 'rubocop-performance', '~> 1.7.0'
+  s.add_development_dependency 'rubocop-rake', '~> 0.5.0'
+  s.add_development_dependency 'rubocop-rspec', '~> 2.0.0'
 
   s.files            = `git ls-files`.split("\n").reject { |path| path =~ /\.gitignore$/ }
   s.rdoc_options     = ['--charset=UTF-8']

data/lib/cucumber/cucumber_expressions/combinatorial_generated_expression_factory.rb

@@ -30,7 +30,7 @@ module Cucumber
 
         (0...@parameter_type_combinations[depth].length).each do |i|
           # Avoid recursion if no elements can be added.
-          return if generated_expressions.length >= MAX_EXPRESSIONS
+          break if generated_expressions.length >= MAX_EXPRESSIONS
 
           new_current_parameter_types = current_parameter_types.dup # clone
           new_current_parameter_types.push(@parameter_type_combinations[depth][i])

data/lib/cucumber/cucumber_expressions/cucumber_expression.rb

@@ -63,9 +63,9 @@ module Cucumber
       end
 
       def rewrite_optional(node)
-        assert_no_parameters(node) { |astNode| raise ParameterIsNotAllowedInOptional.new(astNode, @expression) }
-        assert_no_optionals(node) { |astNode| raise OptionalIsNotAllowedInOptional.new(astNode, @expression) }
-        assert_not_empty(node) { |astNode| raise OptionalMayNotBeEmpty.new(astNode, @expression) }
+        assert_no_parameters(node) { |ast_node| raise ParameterIsNotAllowedInOptional.new(ast_node, @expression) }
+        assert_no_optionals(node) { |ast_node| raise OptionalIsNotAllowedInOptional.new(ast_node, @expression) }
+        assert_not_empty(node) { |ast_node| raise OptionalMayNotBeEmpty.new(ast_node, @expression) }
         regex = node.nodes.map { |n| rewrite_to_regex(n) }.join('')
         "(?:#{regex})?"
       end
@@ -75,14 +75,14 @@ module Cucumber
         node.nodes.each { |alternative|
           raise AlternativeMayNotBeEmpty.new(alternative, @expression) if alternative.nodes.length == 0
 
-          assert_not_empty(alternative) { |astNode| raise AlternativeMayNotExclusivelyContainOptionals.new(astNode, @expression) }
+          assert_not_empty(alternative) { |ast_node| raise AlternativeMayNotExclusivelyContainOptionals.new(ast_node, @expression) }
         }
         regex = node.nodes.map { |n| rewrite_to_regex(n) }.join('|')
         "(?:#{regex})"
       end
 
       def rewrite_alternative(node)
-        node.nodes.map { |lastNode| rewrite_to_regex(lastNode) }.join('')
+        node.nodes.map { |last_node| rewrite_to_regex(last_node) }.join('')
       end
 
       def rewrite_parameter(node)
@@ -103,17 +103,17 @@ module Cucumber
       end
 
       def assert_not_empty(node, &raise_error)
-        text_nodes = node.nodes.select { |astNode| NodeType::TEXT == astNode.type }
+        text_nodes = node.nodes.select { |ast_node| NodeType::TEXT == ast_node.type }
         raise_error.call(node) if text_nodes.length == 0
       end
 
       def assert_no_parameters(node, &raise_error)
-        nodes = node.nodes.select { |astNode| NodeType::PARAMETER == astNode.type }
+        nodes = node.nodes.select { |ast_node| NodeType::PARAMETER == ast_node.type }
         raise_error.call(nodes[0]) if nodes.length > 0
       end
 
       def assert_no_optionals(node, &raise_error)
-        nodes = node.nodes.select { |astNode| NodeType::OPTIONAL == astNode.type }
+        nodes = node.nodes.select { |ast_node| NodeType::OPTIONAL == ast_node.type }
         raise_error.call(nodes[0]) if nodes.length > 0
       end
     end

data/lib/cucumber/cucumber_expressions/cucumber_expression_parser.rb

@@ -76,7 +76,7 @@ module Cucumber
 
           consumed, ast = parse_tokens_until(expr, alternative_parsers, tokens, current, [TokenType::WHITE_SPACE, TokenType::END_OF_LINE, TokenType::BEGIN_PARAMETER])
           sub_current = current + consumed
-          return [0, nil] unless ast.map { |astNode| astNode.type }.include? NodeType::ALTERNATIVE
+          return [0, nil] unless ast.map { |ast_node| ast_node.type }.include? NodeType::ALTERNATIVE
 
           start = tokens[current].start
           _end = tokens[sub_current].start

data/lib/cucumber/cucumber_expressions/errors.rb

@@ -6,14 +6,14 @@ module Cucumber
   module CucumberExpressions
     class CucumberExpressionError < StandardError
       def build_message(index, expression, pointer, problem, solution)
-        m = <<~EOF
+        m = <<~ERROR
           This Cucumber Expression has a problem at column #{index + 1}:
 
           #{expression}
           #{pointer}
           #{problem}.
           #{solution}
-        EOF
+        ERROR
         m.strip
       end
 
@@ -41,7 +41,7 @@ module Cucumber
             expression,
             point_at_located(node),
             'An alternative may not exclusively contain optionals',
-            "If you did not mean to use an optional you can use '\\(' to escape the the '('"
+            "If you did not mean to use an optional you can use '\\(' to escape the '('"
           )
         )
       end
@@ -55,7 +55,7 @@ module Cucumber
             expression,
             point_at_located(node),
             'Alternative may not be empty',
-            "If you did not mean to use an alternative you can use '\\/' to escape the the '/'"
+            "If you did not mean to use an alternative you can use '\\/' to escape the '/'"
           )
         )
       end
@@ -83,7 +83,7 @@ module Cucumber
             expression,
             point_at_located(node),
             'An optional must contain some text',
-            "If you did not mean to use an optional you can use '\\(' to escape the the '('"
+            "If you did not mean to use an optional you can use '\\(' to escape the '('"
           )
         )
       end
@@ -97,7 +97,7 @@ module Cucumber
             expression,
             point_at_located(node),
             'An optional may not contain a parameter type',
-            "If you did not mean to use an parameter type you can use '\\{' to escape the the '{'"
+            "If you did not mean to use an parameter type you can use '\\{' to escape the '{'"
           )
         )
       end
@@ -111,7 +111,7 @@ module Cucumber
             expression,
             point_at_located(node),
             'An optional may not contain an other optional',
-            "If you did not mean to use an optional type you can use '\\(' to escape the the '('. For more complicated expressions consider using a regular expression instead."
+            "If you did not mean to use an optional type you can use '\\(' to escape the '('. For more complicated expressions consider using a regular expression instead."
           )
         )
       end
@@ -126,7 +126,7 @@ module Cucumber
             expression,
             point_at(index),
             'The end of line can not be escaped',
-            "You can use '\\\\' to escape the the '\\'"
+            "You can use '\\\\' to escape the '\\'"
           )
         )
       end
@@ -158,7 +158,7 @@ module Cucumber
             expression,
             point_at_located(current),
             'An alternation can not be used inside an optional',
-            "You can use '\\/' to escape the the '/'"
+            "If you did not mean to use an alternation you can use '\\/' to escape the '/'. Otherwise rephrase your expression or consider using a regular expression instead."
           )
         )
       end
@@ -203,7 +203,7 @@ module Cucumber
 
     class AmbiguousParameterTypeError < CucumberExpressionError
       def initialize(parameter_type_regexp, expression_regexp, parameter_types, generated_expressions)
-        super(<<~EOM)
+        super(<<~ERROR)
           Your Regular Expression /#{expression_regexp.source}/
           matches multiple parameter types with regexp /#{parameter_type_regexp}/:
              #{parameter_type_names(parameter_types)}
@@ -215,7 +215,7 @@ module Cucumber
 
           2) Make one of the parameter types preferential and continue to use a Regular Expression.
 
-        EOM
+        ERROR
       end
 
       private

data/lib/cucumber/cucumber_expressions/parameter_type.rb

@@ -15,9 +15,7 @@ module Cucumber
       end
 
       def self.is_valid_parameter_type_name(type_name)
-        unescaped_type_name = type_name.gsub(UNESCAPE_PATTERN) do
-          $2
-        end
+        unescaped_type_name = type_name.gsub(UNESCAPE_PATTERN) { Regexp.last_match(2) }
         !(ILLEGAL_PARAMETER_NAME_PATTERN =~ unescaped_type_name)
       end
 

data/lib/cucumber/cucumber_expressions/parameter_type_matcher.rb

@@ -11,8 +11,8 @@ module Cucumber
       end
 
       def advance_to(new_match_position)
-        (new_match_position...@text.length).each do |advancedPos|
-          matcher = self.class.new(parameter_type, @regexp, @text, advancedPos)
+        (new_match_position...@text.length).each do |advanced_position|
+          matcher = self.class.new(parameter_type, @regexp, @text, advanced_position)
           return matcher if matcher.find && matcher.full_word?
         end
 

data/spec/cucumber/cucumber_expressions/argument_spec.rb

@@ -10,7 +10,7 @@ module Cucumber
       it 'exposes parameter_type' do
         tree_regexp = TreeRegexp.new(/three (.*) mice/)
         parameter_type_registry = ParameterTypeRegistry.new
-        arguments = Argument.build(tree_regexp, 'three blind mice', [parameter_type_registry.lookup_by_type_name('string')])
+        arguments = described_class.build(tree_regexp, 'three blind mice', [parameter_type_registry.lookup_by_type_name('string')])
         argument = arguments[0]
         expect(argument.parameter_type.name).to eq('string')
       end

data/spec/cucumber/cucumber_expressions/combinatorial_generated_expression_factory_spec.rb

@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+require 'cucumber/cucumber_expressions/parameter_type'
+require 'cucumber/cucumber_expressions/combinatorial_generated_expression_factory'
+
+describe Cucumber::CucumberExpressions::CombinatorialGeneratedExpressionFactory do
+  let(:klazz) { Class.new }
+  let(:color_parameter_type) do
+    Cucumber::CucumberExpressions::ParameterType.new('color', /red|blue|yellow/, klazz, ->(_) { klazz.new }, true, false)
+  end
+  let(:css_color_parameter_type) do
+    Cucumber::CucumberExpressions::ParameterType.new('csscolor', /red|blue|yellow/, klazz, ->(_) { klazz.new }, true, false)
+  end
+  let(:date_parameter_type) do
+    Cucumber::CucumberExpressions::ParameterType.new('date', /\d{4}-\d{2}-\d{2}/, klazz, ->(_) { klazz.new }, true, false)
+  end
+  let(:date_time_parameter_type) do
+    Cucumber::CucumberExpressions::ParameterType.new('datetime', /\d{4}-\d{2}-\d{2}/, klazz, ->(_) { klazz.new }, true, false)
+  end
+  let(:timestamp_parameter_type) do
+    Cucumber::CucumberExpressions::ParameterType.new('timestamp', /\d{4}-\d{2}-\d{2}/, klazz, ->(_) { klazz.new }, true, false)
+  end
+
+  it 'generates multiple expressions' do
+    parameter_type_combinations = [
+      [color_parameter_type, css_color_parameter_type],
+      [date_parameter_type, date_time_parameter_type, timestamp_parameter_type]
+    ]
+
+    factory = described_class.new('I bought a {%s} ball on {%s}', parameter_type_combinations)
+    expressions = factory.generate_expressions.map { |generated_expression| generated_expression.source }
+    expect(expressions).to eq([
+      'I bought a {color} ball on {date}',
+      'I bought a {color} ball on {datetime}',
+      'I bought a {color} ball on {timestamp}',
+      'I bought a {csscolor} ball on {date}',
+      'I bought a {csscolor} ball on {datetime}',
+      'I bought a {csscolor} ball on {timestamp}',
+    ])
+  end
+end