diff --git a/lib/puppet-lint/lexer.rb b/lib/puppet-lint/lexer.rb index 504103ff..32ef92ea 100644 --- a/lib/puppet-lint/lexer.rb +++ b/lib/puppet-lint/lexer.rb @@ -123,7 +123,7 @@ def heredoc_queue [:WHITESPACE, %r{\A(#{WHITESPACE_RE}+)}], # FIXME: Future breaking change, the following :TYPE tokens conflict with # the :TYPE keyword token. - [:TYPE, %r{\A(Any|Array|Boolean|Callable|CatalogEntry|Class|Collection|Data|Default|Enum|Error|Float|Hash|Integer|NotUndef|Numeric|Optional|Pattern|Regexp|Resource|Runtime|Scalar|Sensitive|String|Struct|Tuple|Type|Undef|Variant)\b}], # rubocop:disable Layout/LineLength + [:TYPE, %r{\A(Any|Array|Binary|Boolean|Callable|CatalogEntry|Class|Collection|Data|Default|Enum|Error|Float|Hash|Integer|NotUndef|Numeric|Optional|Pattern|Regexp|Resource|Runtime|Scalar|Sensitive|String|Struct|Tuple|Type|Undef|Variant)\b}], # rubocop:disable Layout/LineLength [:CLASSREF, %r{\A(((::){0,1}[A-Z][-\w]*)+)}], [:NUMBER, %r{\A\b((?:0[xX][0-9A-Fa-f]+|0?\d+(?:\.\d+)?(?:[eE]-?\d+)?))\b}], [:FUNCTION_NAME, %r{#{NAME_RE}(?=\()}], diff --git a/spec/unit/puppet-lint/lexer_spec.rb b/spec/unit/puppet-lint/lexer_spec.rb index 54832b2d..5b6e92df 100644 --- a/spec/unit/puppet-lint/lexer_spec.rb +++ b/spec/unit/puppet-lint/lexer_spec.rb @@ -1359,6 +1359,14 @@ end context ':TYPE' do + shared_examples 'a type matcher' do |type| + it "matches #{type}" do + token = lexer.tokenise(type).first + expect(token.type).to eq(:TYPE) + expect(token.value).to eq(type) + end + end + it 'matches Data Types' do token = lexer.tokenise('Integer').first expect(token.type).to eq(:TYPE) @@ -1378,24 +1386,12 @@ end describe 'Platform Types' do - it 'matches Callable' do - token = lexer.tokenise('Callable').first - expect(token.type).to eq(:TYPE) - expect(token.value).to eq('Callable') - end - - it 'matches Sensitive' do - token = lexer.tokenise('Sensitive').first - expect(token.type).to eq(:TYPE) - expect(token.value).to eq('Sensitive') - end + it_behaves_like 'a type matcher', 'Callable' + it_behaves_like 'a type matcher', 'Sensitive' end - it 'matches Error type' do - token = lexer.tokenise('Error').first - expect(token.type).to eq(:TYPE) - expect(token.value).to eq('Error') - end + it_behaves_like 'a type matcher', 'Error' + it_behaves_like 'a type matcher', 'Binary' end context ':HEREDOC without interpolation' do