Highlight python docstrings as pythonDocstrings.

klen · klen · commit 84d1a41ba6e7 · 2013-12-01T21:13:45.000+07:00
diff --git a/AUTHORS b/AUTHORS
@@ -7,6 +7,7 @@ Contributors:
 
 * Alvin Francis (alvinfrancis);
 * Anler Hp (ikame);
+* Anton Parkhomenko
 * Benjamin Ruston (bruston);
 * Boris Filippov (frenzykryger);
 * David Vogt (winged);
diff --git a/autoload/pymode/rope.vim b/autoload/pymode/rope.vim
@@ -24,7 +24,7 @@ fun! pymode#rope#complete_on_dot() "{{{
         return ""
     end
     for group in map(synstack(line('.'), col('.') - 1), 'synIDattr(v:val, "name")')
-        for name in ['pythonString', 'pythonComment', 'pythonNumber']
+        for name in ['pythonString', 'pythonComment', 'pythonNumber', 'pythonDocstring']
             if group == name
                 return "" 
             endif
diff --git a/doc/pymode.txt b/doc/pymode.txt
@@ -579,6 +579,11 @@ Highlight exceptions (TypeError, ValueError, ...)
 >
     let g:pymode_syntax_highlight_exceptions = g:pymode_syntax_all
 
+Highlight docstrings as pythonDocstring (otherwise as pythonString)
+                                                  *'g:pymode_syntax_docstrings'*
+>
+    let g:pymode_syntax_docstrings = g:pymode_syntax_all
+
 
 ==============================================================================
 6. FAQ ~
diff --git a/syntax/python.vim b/syntax/python.vim
@@ -38,6 +38,9 @@ call pymode#default('g:pymode_syntax_string_format', g:pymode_syntax_all)
 call pymode#default('g:pymode_syntax_string_templates', g:pymode_syntax_all)
 call pymode#default('g:pymode_syntax_doctests', g:pymode_syntax_all)
 
+" Support docstrings in syntax highlighting
+call pymode#default('g:pymode_syntax_docstrings', 1)
+
 " Highlight builtin objects (True, False, ...)
 call pymode#default('g:pymode_syntax_builtin_objs', g:pymode_syntax_all)
 
@@ -225,7 +228,7 @@ endif
     endif
 
     " DocStrings
-    if !pymode#Default('g:pymode_syntax_docstrings', g:pymode_syntax_all) || g:pymode_syntax_docstrings
+    if g:pymode_syntax_docstrings
         syn region pythonDocstring  start=+^\s*[uU]\?[rR]\?"""+ end=+"""+ keepend excludenl contains=pythonEscape,@Spell,pythonDoctest,pythonDocTest2,pythonSpaceError
         syn region pythonDocstring  start=+^\s*[uU]\?[rR]\?'''+ end=+'''+ keepend excludenl contains=pythonEscape,@Spell,pythonDoctest,pythonDocTest2,pythonSpaceError
     endif
@@ -352,6 +355,7 @@ endif
     hi def link  pythonSpaceError   Error
 
     hi def link  pythonString       String
+    hi def link  pythonDocstring    String
     hi def link  pythonUniString    String
     hi def link  pythonRawString    String
     hi def link  pythonUniRawString String
