Fix handling of pythonBytesEscape from vim-python/python-syntax (#115)

Fixes https://github.com/Vimjas/vim-python-pep8-indent/issues/114

diff --git a/indent/python.vim b/indent/python.vim
index 8fb5a9b03d8bb0267220bf5b2f7f5592ffa63d42..55b2b1bca6729af7ff2b9d8d791e2c552aef581b 100644 (file)
--- a/indent/python.vim
+++ b/indent/python.vim
@@ -61,7 +61,7 @@ let s:stop_statement = '^\s*\(break\|continue\|raise\|return\|pass\)\>'
 " jedi* refers to syntax definitions from jedi-vim for call signatures, which
 " are inserted temporarily into the buffer.
 let s:skip_special_chars = 'synIDattr(synID(line("."), col("."), 0), "name") ' .
 " jedi* refers to syntax definitions from jedi-vim for call signatures, which
 " are inserted temporarily into the buffer.
 let s:skip_special_chars = 'synIDattr(synID(line("."), col("."), 0), "name") ' .

-            \ '=~? "\\vstring|comment|pythonbytes|jedi\\S"'
+            \ '=~? "\\vstring|comment|^pythonbytes%(contents)=$|jedi\\S"'

 
 let s:skip_after_opening_paren = 'synIDattr(synID(line("."), col("."), 0), "name") ' .
             \ '=~? "\\vcomment|jedi\\S"'
 
 let s:skip_after_opening_paren = 'synIDattr(synID(line("."), col("."), 0), "name") ' .
             \ '=~? "\\vcomment|jedi\\S"'

diff --git a/spec/indent/bytes_spec.rb b/spec/indent/bytes_spec.rb
index 260a2ab619d34c2c7d48ebc8e87b4797b8908ac7..3d6744e8f299b73b0f16560bd48a9f1b4a98da9e 100644 (file)
--- a/spec/indent/bytes_spec.rb
+++ b/spec/indent/bytes_spec.rb
@@ -3,6 +3,7 @@ require "spec_helper"
 describe "handles byte strings" do
   before(:all) {
       vim.command 'syn region pythonBytes start=+[bB]"+ skip=+\\\\\|\\"\|\\$+ excludenl end=+"+ end=+$+ keepend contains=pythonBytesError,pythonBytesContent,@Spell'
 describe "handles byte strings" do
   before(:all) {
       vim.command 'syn region pythonBytes start=+[bB]"+ skip=+\\\\\|\\"\|\\$+ excludenl end=+"+ end=+$+ keepend contains=pythonBytesError,pythonBytesContent,@Spell'

+      vim.command "syn match pythonBytesEscape       '\\\\$'"

   }
 
   before(:each) {
   }
 
   before(:each) {


@@ -23,4 +24,13 @@ describe "handles byte strings" do
     vim.feedkeys 'o'
     indent.should == 0
   end
     vim.feedkeys 'o'
     indent.should == 0
   end

+
+  it "it indents backslash continuation correctly" do
+    vim.feedkeys 'iwith foo, \<Bslash>\<Esc>'
+    vim.echo('getline(".")').should == "with foo, \\"
+    vim.echo('map(synstack(line("."), col(".")), "synIDattr(v:val, \"name\")")'
+            ).should == "['pythonBytesEscape']"
+    vim.feedkeys 'o'
+    indent.should == 8
+  end

 end
 end