Skip to content

Commit 1f12d1f

Browse files
authored
Merge pull request #3694 from bhcleek/lint/uncomment-tests
lint: uncomment tests
2 parents 742e004 + 2231573 commit 1f12d1f

File tree

2 files changed

+18
-19
lines changed

2 files changed

+18
-19
lines changed

autoload/go/complete.vim

-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ function! go#complete#Complete(findstart, base) abort
4343
let s:completions = l:state.matches
4444

4545
return go#lsp#lsp#PositionOf(getline(l:line+1), l:state.start-1)
46-
4746
else "findstart = 0 when we need to return the list of completions
4847
return s:completions
4948
endif

autoload/go/lint_test.vim

+18-18
Original file line numberDiff line numberDiff line change
@@ -512,25 +512,25 @@ func! Test_Lint() abort
512512
call s:testLint()
513513
endfunc
514514

515-
"func! Test_Lint_GOPATH() abort
516-
" let g:go_gopls_enabled = 0
517-
" let RestoreGO111MODULE = go#util#SetEnv('GO111MODULE', 'off')
518-
" let RestoreGOPATH = go#util#SetEnv('GOPATH', fnameescape(fnamemodify(getcwd(), ':p')) . 'test-fixtures/lint')
519-
"
520-
" call s:testLint()
521-
"
522-
" call call(RestoreGOPATH, [])
523-
" call call(RestoreGO111MODULE, [])
524-
"endfunc
515+
func! Test_Lint_GOPATH() abort
516+
let g:go_gopls_enabled = 0
517+
let RestoreGO111MODULE = go#util#SetEnv('GO111MODULE', 'off')
518+
let RestoreGOPATH = go#util#SetEnv('GOPATH', fnameescape(fnamemodify(getcwd(), ':p')) . 'test-fixtures/lint')
525519

526-
"func! Test_Lint_NullModule() abort
527-
" let g:go_gopls_enabled = 0
528-
" let RestoreGO111MODULE = go#util#SetEnv('GO111MODULE', 'off')
529-
"
530-
" call s:testLint()
531-
"
532-
" call call(RestoreGO111MODULE, [])
533-
"endfunc
520+
call s:testLint()
521+
522+
call call(RestoreGOPATH, [])
523+
call call(RestoreGO111MODULE, [])
524+
endfunc
525+
526+
func! Test_Lint_NullModule() abort
527+
let g:go_gopls_enabled = 0
528+
let RestoreGO111MODULE = go#util#SetEnv('GO111MODULE', 'off')
529+
530+
call s:testLint()
531+
532+
call call(RestoreGO111MODULE, [])
533+
endfunc
534534

535535
func! Test_Errcheck() abort
536536
let g:go_gopls_enabled = 0

0 commit comments

Comments
 (0)