Merge pull request #3308 from bhcleek/syntax/import-spell

syntax: ignore misspellings in import paths

Author: bhcleek

autoload/go/highlight_test.vim

@@ -422,6 +422,51 @@ function! s:check_diagnostics(actual, expected, when)
 
   call assert_equal(a:expected, l:actual, a:when)
 endfunction
+
+function! Test_goStringHighlight() abort
+  syntax on
+
+  let l:dir = gotest#write_file('highlight/gostring.go', [
+        \ 'package highlight',
+        \ '',
+        \ 'import (',
+        \ printf("\t%s", '"fmt"'),
+        \ ')',
+        \ '',
+        \ printf('var s = "%s"', "gostring\x1f"),
+        \ ])
+
+  try
+    let l:pos = getcurpos()
+    let l:actual = synIDattr(synID(l:pos[1], l:pos[2], 1), 'name')
+    call assert_equal('goString', l:actual)
+  finally
+    call delete(l:dir, 'rf')
+  endtry
+endfunc
+
+function! Test_goImportStringHighlight() abort
+  syntax on
+
+  let l:dir = gotest#write_file('highlight/import.go', [
+        \ 'package highlight',
+        \ '',
+        \ 'import (',
+        \ printf('%s"%s"', "\t", "fmt\x1f"),
+        \ ')',
+        \ '',
+        \ 'var s = fmt.Sprint("gostring")',
+        \ ])
+
+  try
+    let l:pos = getcurpos()
+    let l:actual = synIDattr(synID(l:pos[1], l:pos[2], 1), 'name')
+    call assert_equal('goImportString', l:actual, getline('.'))
+  finally
+    call delete(l:dir, 'rf')
+  endtry
+endfunc
+
 " restore Vi compatibility settings
 let &cpo = s:cpo_save
 unlet s:cpo_save

syntax/go.vim

@@ -104,6 +104,8 @@ else
   syn region      goRawString         start=+`+ end=+`+
 endif
 
+syn match       goImportString      /^\%(\s\+\|import \)\zs"[^"]\+"$/ contained containedin=goImport
+
 if go#config#HighlightFormatStrings()
   " [n] notation is valid for specifying explicit argument indexes
   " 1. Match a literal % not preceded by a %.
@@ -121,6 +123,7 @@ if go#config#HighlightFormatStrings()
   hi def link     goFormatSpecifier   goSpecialString
 endif
 
+hi def link     goImportString      String
 hi def link     goString            String
 hi def link     goRawString         String
 
@@ -140,9 +143,9 @@ endif
 
 " import
 if go#config#FoldEnable('import')
-  syn region    goImport            start='import (' end=')' transparent fold contains=goImport,goString,goComment
+  syn region    goImport            start='import (' end=')' transparent fold contains=goImport,goImportString,goComment
 else
-  syn region    goImport            start='import (' end=')' transparent contains=goImport,goString,goComment
+  syn region    goImport            start='import (' end=')' transparent contains=goImport,goImportString,goComment
 endif
 
 " var, const