Merge pull request #355 from mhinz/fix-pattern-search

spec_helper: detect failed searches

Author: jbodah

spec/spec_helper.rb

@@ -39,9 +39,20 @@ def type(content)
 
  def syntax(content, pattern)
  with_file content
- # move cursor the pattern
- @vim.search pattern
- # get a list of the syntax element
+
+ # Using this function with a `pattern` that is not in `content` is pointless.
+ #
+ # @vim.search() silently fails if a pattern is not found and the cursor
+ # won't move. So, if the current cursor position happens to sport the
+ # expected syntax group already, this can lead to false positive tests.
+ #
+ # We work around this by using Vim's search() function, which returns 0 if
+ # there is no match.
+ if @vim.echo("search(#{pattern.inspect})") == '0'
+ return []
+ end
+
+ # Return the syntax groups in a list.
  @vim.echo <<~EOF
  map(synstack(line('.'), col('.')), 'synIDattr(v:val, "name")')
  EOF
@@ -55,6 +66,7 @@ def with_file(content = nil)
  yield if block_given?
 
  @vim.write
+ @vim.command 'redraw'
  IO.read(@file)
  end
 

spec/syntax/doc_spec.rb

@@ -80,7 +80,7 @@
  EOF
  expect(ex).to include_elixir_syntax('elixirDocString', 'doctest')
  expect(ex).to include_elixir_syntax('elixirDocTest', 'map')
- expect(ex).to include_elixir_syntax('elixirDocTest', 'x * 2')
+ expect(ex).to include_elixir_syntax('elixirDocTest', 'x \* 2')
  expect(ex).to include_elixir_syntax('elixirDocTest', '2, 4, 6')
  end
 

spec/syntax/sigil_spec.rb

@@ -13,7 +13,7 @@
  describe 'upper case' do
  it 'string' do
  expect('~S(string)').to include_elixir_syntax('elixirSigilDelimiter', 'S')
- expect('~S(string)').to include_elixir_syntax('elixirSigil', 'foo')
+ expect('~S(string)').to include_elixir_syntax('elixirSigil', 'string')
  end
 
  it 'character list' do
@@ -47,7 +47,7 @@
  end
 
  it 'escapes double quotes unless only preceded by whitespace' do
- expect(<<~EOF).to include_elixir_syntax('elixirSigilDelimiter', %q(^\s*\zs'"'))
+ expect(<<~EOF).to include_elixir_syntax('elixirSigilDelimiter', %q(^\s*\zs"""))
  ~r"""
  foo """
  """
@@ -78,7 +78,7 @@
  describe 'lower case' do
  it 'string' do
  expect('~s(string)').to include_elixir_syntax('elixirSigilDelimiter', 's')
- expect('~s(string)').to include_elixir_syntax('elixirSigil', 'foo')
+ expect('~s(string)').to include_elixir_syntax('elixirSigil', 'string')
  end
 
  it 'character list' do