Test text edits

autoload/go/fmt_test.vim

@@ -50,71 +50,6 @@ func! Test_goimports() abort
   call assert_equal(expected, actual)
 endfunc
 
-func! Test_run_fmt_gopls() abort
-  try
-    let g:go_fmt_command = 'gopls'
-
-    let actual_file = tempname()
-    call writefile(readfile("test-fixtures/fmt/hello.go"), actual_file)
-
-    let expected = join(readfile("test-fixtures/fmt/hello_golden.go"), "\n")
-
-    " run our code
-    call go#fmt#run("gofmt", actual_file, "test-fixtures/fmt/hello.go")
-
-    " this should now contain the formatted code
-    let actual = join(readfile(actual_file), "\n")
-
-    call assert_equal(expected, actual)
-  finally
-    unlet g:go_fmt_command
-  endtry
-endfunc
-
-func! Test_update_file_gopls() abort
-  try
-    let g:go_fmt_command = 'gopls'
-
-    let expected = join(readfile("test-fixtures/fmt/hello_golden.go"), "\n")
-    let source_file = tempname()
-    call writefile(readfile("test-fixtures/fmt/hello_golden.go"), source_file)
-
-    let target_file = tempname()
-    call writefile([""], target_file)
-
-    " update_file now
-    call go#fmt#update_file(source_file, target_file)
-
-    " this should now contain the formatted code
-    let actual = join(readfile(target_file), "\n")
-
-    call assert_equal(expected, actual)
-  finally
-    unlet g:go_fmt_command
-  endtry
-endfunc
-
-func! Test_goimports_gopls() abort
-  try
-    let g:go_fmt_command = 'gopls'
-
-    let $GOPATH = 'test-fixtures/fmt/'
-    let actual_file = tempname()
-    call writefile(readfile("test-fixtures/fmt/src/imports/goimports.go"), actual_file)
-
-    let expected = join(readfile("test-fixtures/fmt/src/imports/goimports_golden.go"), "\n")
-
-    " run our code
-    call go#fmt#run("goimports", actual_file, "test-fixtures/fmt/src/imports/goimports.go")
-
-    " this should now contain the formatted code
-    let actual = join(readfile(actual_file), "\n")
-
-    call assert_equal(expected, actual)
-  finally
-    unlet g:go_fmt_command
-  endtry
-endfunc
 " restore Vi compatibility settings
 let &cpo = s:cpo_save
 unlet s:cpo_save

autoload/go/lsp.vim

@@ -1428,9 +1428,9 @@ function s:applyTextEdits(msg) abort
     if l:msg.range.start.character > 0
       let l:preSliceEnd = go#lsp#lsp#PositionOf(l:startcontent, l:msg.range.start.character-1) - 1
       let l:startcontent = l:startcontent[:l:preSliceEnd]
-    elseif l:endline == l:startline && l:msg.range.end.character == 0
-      " l:startcontent should be the empty string when l:text is to be
-      " inserted at the beginning of the line.
+    elseif l:endline == l:startline && (l:msg.range.end.character == 0 || l:msg.range.start.character == 0)
+      " l:startcontent should be the empty string when l:text is a
+      " replacement at the beginning of the line.
       let l:startcontent = ''
     endif
 

autoload/go/lsp_test.vim

@@ -42,6 +42,38 @@ function! s:getinfo(str, name)
   endtry
 endfunction
 
+func! Test_Format() abort
+  try
+    let expected = join(readfile("test-fixtures/lsp/fmt/format_golden.go"), "\n")
+    let l:tmp = gotest#load_fixture('lsp/fmt/format.go')
+
+    call go#lsp#Format()
+
+    " this should now contain the formatted code
+    let actual = join(go#util#GetLines(), "\n")
+
+    call assert_equal(expected, actual)
+  finally
+    call delete(l:tmp, 'rf')
+  endtry
+endfunc
+
+func! Test_Imports() abort
+  try
+    let expected = join(readfile("test-fixtures/lsp/imports/imports_golden.go"), "\n")
+    let l:tmp = gotest#load_fixture('lsp/imports/imports.go')
+
+    call go#lsp#Imports()
+
+    " this should now contain the expected imports code
+    let actual = join(go#util#GetLines(), "\n")
+
+    call assert_equal(expected, actual)
+  finally
+    call delete(l:tmp, 'rf')
+  endtry
+endfunc
+
 " restore Vi compatibility settings
 let &cpo = s:cpo_save
 unlet s:cpo_save

autoload/go/test-fixtures/lsp/fmt/format.go

@@ -0,0 +1,7 @@
+package main
+
+import "fmt"
+
+  func main() {
+fmt.Println("vim-go")
+}

autoload/go/test-fixtures/lsp/fmt/format_golden.go

@@ -0,0 +1,7 @@
+package main
+
+import "fmt"
+
+func main() {
+	fmt.Println("vim-go")
+}

autoload/go/test-fixtures/lsp/imports/imports.go

@@ -0,0 +1,10 @@
+package main
+
+import (
+	"fmt"
+)
+
+func main() {
+	io.Copy(ioutil.Discard, os.Stdin)
+	fmt.Println("vim-go")
+}

autoload/go/test-fixtures/lsp/imports/imports_golden.go

@@ -0,0 +1,13 @@
+package main
+
+import (
+	"fmt"
+	"io"
+	"io/ioutil"
+	"os"
+)
+
+func main() {
+	io.Copy(ioutil.Discard, os.Stdin)
+	fmt.Println("vim-go")
+}