Fix tests and update toolchain to latest release (#1203)

Author: martskins

.github/workflows/ci.yml

@@ -18,6 +18,11 @@ jobs:
         ref: ${{ github.event.pull_request.head.sha }}
         fetch-depth: 20
 
+    - name: Install Go
+      uses: actions/setup-go@v2
+      with:
+        go-version: 1.16.x
+
     - name: Install Rust toolchain
       uses: actions-rs/toolchain@v1
       with:
@@ -29,12 +34,11 @@ jobs:
     - name: Install other dependencies
       run: |
         sudo apt-get update
-        sudo apt-get install --yes --no-install-recommends neovim curl git python3-pip python3-pytest mypy flake8 libnode-dev node-gyp libssl1.0 npm make
+        sudo apt-get install --yes --no-install-recommends neovim curl git python3-pip python3-pytest make
         sudo apt-get clean
         sudo rm -rf /var/lib/apt/lists/*
         python3 -m pip install neovim vim-vint
-        sudo curl -L https://github.com/rust-analyzer/rust-analyzer/releases/latest/download/rust-analyzer-linux -o /usr/local/bin/rust-analyzer
-        sudo chmod +x /usr/local/bin/rust-analyzer
+        go install golang.org/x/tools/gopls@v0.6.6
 
     - name: Test
       run: make integration-test

Makefile

@@ -47,6 +47,11 @@ integration-test: build
 
 integration-test-docker:
 	docker run --volume ${CURDIR}:/root/.config/nvim autozimu/languageclientneovim bash -c "\
+		curl -O -L https://golang.org/dl/go1.16.2.linux-amd64.tar.gz && \
+		rm -rf /usr/local/go && tar -C /usr/local -xzf go1.16.2.linux-amd64.tar.gz && \
+		export PATH=$$PATH:/usr/local/go/bin:/usr/local/cargo/bin && \
+		export GOPATH=/usr/local/go && \
+		go install golang.org/x/tools/gopls@v0.6.6 && \
 		export CARGO_TARGET_DIR=/tmp && \
 		cd /root/.config/nvim && \
 		make integration-test"
@@ -58,7 +63,7 @@ clean:
 	cargo clean
 	rm -rf bin/languageclient
 
-DATE := $(shell date --utc +%F)
+DATE := $(shell date -u +%F)
 
 build-docker-image: ci/Dockerfile
 	docker build \

rust-toolchain

@@ -1 +1 @@
-1.46.0
+1.50.0

tests/LanguageClient_test.py

@@ -19,10 +19,8 @@ def join_path(path: str) -> str:
     return os.path.join(project_root, path)
 
 
-PATH_MAIN_RS = join_path("data/sample-rs/src/main.rs")
-PATH_LIBS_RS = join_path("data/sample-rs/src/libs.rs")
-PATH_CODEACTION = join_path("data/sample-ts/src/codeAction.ts")
-print(PATH_MAIN_RS)
+PATH_MAIN_GO = join_path("data/sample-go/main.go")
+print(PATH_MAIN_GO)
 
 
 def assertRetry(predicate, retry_max=100):
@@ -55,130 +53,135 @@ def setup(nvim):
 
 
 def test_textDocument_definition(nvim):
-    nvim.command("edit! {}".format(PATH_MAIN_RS))
-    time.sleep(10)
-    nvim.funcs.cursor(3, 22)
+    nvim.command("edit! {}".format(PATH_MAIN_GO))
+    time.sleep(2)
+    nvim.funcs.cursor(10, 16)
     nvim.funcs.LanguageClient_textDocument_definition()
     time.sleep(3)
 
-    assert nvim.current.window.cursor == [8, 3]
+    assert nvim.current.window.cursor == [13, 5]
 
 
 def test_textDocument_hover(nvim):
-    nvim.command("edit! {}".format(PATH_MAIN_RS))
+    nvim.command("edit! {}".format(PATH_MAIN_GO))
     time.sleep(1)
-    nvim.funcs.cursor(3, 22)
+    nvim.funcs.cursor(10, 16)
     nvim.funcs.LanguageClient_textDocument_hover()
     time.sleep(1)
     buf = getLanguageClientBuffers(nvim)[0]
-    expect = "fn greet() -> i32"
+    expect = "func greet() int32"
 
     assert expect in "\n".join(buf)
 
 
 def test_textDocument_rename(nvim):
-    nvim.command("edit! {}".format(PATH_MAIN_RS))
+    nvim.command("edit! {}".format(PATH_MAIN_GO))
     time.sleep(1)
     expect = [line.replace("greet", "hello") for line in nvim.current.buffer]
-    nvim.funcs.cursor(3, 22)
+    nvim.funcs.cursor(10, 16)
     nvim.funcs.LanguageClient_textDocument_rename({"newName": "hello"})
     time.sleep(1)
 
     assert nvim.current.buffer[:] == expect
 
-    nvim.command("edit! {}".format(PATH_MAIN_RS))
+    nvim.command("edit! {}".format(PATH_MAIN_GO))
 
 
 def test_textDocument_rename_multiple_oneline(nvim):
-    nvim.command("edit! {}".format(PATH_LIBS_RS))
+    nvim.command("edit! {}".format(PATH_MAIN_GO))
     time.sleep(1)
-    expect = [line.replace("a", "x") for line in nvim.current.buffer]
-    nvim.funcs.cursor(2, 9)
+    expect = [line.replace("someVar", "newVarName")
+              for line in nvim.current.buffer]
+    nvim.funcs.cursor(18, 2)
     # TODO: Test case where new variable length is different.
-    nvim.funcs.LanguageClient_textDocument_rename({"newName": "x"})
-    time.sleep(3)
+    nvim.funcs.LanguageClient_textDocument_rename({"newName": "newVarName"})
+    time.sleep(1)
 
     assert nvim.current.buffer[:] == expect
 
     nvim.command("bd!")
-    nvim.command("edit! {}".format(PATH_MAIN_RS))
+    nvim.command("edit! {}".format(PATH_MAIN_GO))
 
 
 def test_textDocument_rename_multiple_files(nvim):
-    nvim.command("edit! {}".format(PATH_MAIN_RS))
+    nvim.command("edit! {}".format(PATH_MAIN_GO))
     time.sleep(1)
-    nvim.funcs.cursor(17, 5)
-    expect = [line.replace("yo", "hello") for line in nvim.current.buffer]
+    nvim.funcs.cursor(21, 15)
+    expect = [line.replace("otherYo", "hello") for line in nvim.current.buffer]
     nvim.funcs.LanguageClient_textDocument_rename({"newName": "hello"})
     time.sleep(1)
 
     assert nvim.current.buffer[:] == expect
 
     nvim.command("bd!")
     nvim.command("bd!")
-    nvim.command("edit! {}".format(PATH_MAIN_RS))
+    nvim.command("edit! {}".format(PATH_MAIN_GO))
 
 
 def test_textDocument_documentSymbol(nvim):
-    nvim.command("edit! {}".format(PATH_MAIN_RS))
+    nvim.command("edit! {}".format(PATH_MAIN_GO))
     time.sleep(1)
     nvim.funcs.cursor(1, 1)
     nvim.funcs.LanguageClient_textDocument_documentSymbol()
     time.sleep(1)
 
     assert nvim.funcs.getloclist(0)
 
-    nvim.command("3lnext")
+    nvim.command("1lnext")
 
     assert nvim.current.window.cursor != [1, 1]
 
 
 def test_workspace_symbol(nvim):
-    nvim.command("edit! {}".format(PATH_LIBS_RS))
+    nvim.command("edit! {}".format(PATH_MAIN_GO))
     time.sleep(1)
     nvim.funcs.cursor(1, 1)
     nvim.funcs.LanguageClient_workspace_symbol()
     time.sleep(1)
 
     assert nvim.funcs.getloclist(0)
 
-    nvim.command("1lnext")
+    nvim.command("3lnext")
 
-    assert nvim.current.window.cursor == [8, 0]
+    assert nvim.current.window.cursor == [17, 0]
 
 
 def test_textDocument_references(nvim):
-    nvim.command("edit! {}".format(PATH_MAIN_RS))
+    nvim.command("edit! {}".format(PATH_MAIN_GO))
     time.sleep(1)
-    nvim.funcs.cursor(8, 6)
+    nvim.funcs.cursor(13, 6)
     nvim.funcs.LanguageClient_textDocument_references()
-    time.sleep(1)
-    expect = ["fn greet() -> i32 {", """println!("{}", greet());"""]
+    time.sleep(2)
+    expect = ["func greet() int32 {", "log.Println(greet())",
+              "log.Println(greet())"]
 
     assert [location["text"]
             for location in nvim.funcs.getloclist(0)] == expect
 
     nvim.command("lnext")
 
-    assert nvim.current.window.cursor == [3, 19]
+    assert nvim.current.window.cursor == [10, 13]
 
 
 def test_textDocument_references_modified_buffer(nvim):
-    nvim.command("edit! {}".format(PATH_MAIN_RS))
+    nvim.command("edit! {}".format(PATH_MAIN_GO))
     time.sleep(1)
-    nvim.funcs.cursor(8, 6)
+    nvim.funcs.cursor(13, 6)
     nvim.input("iabc")
     time.sleep(1)
     nvim.funcs.LanguageClient_textDocument_references()
     time.sleep(1)
 
-    assert nvim.current.window.cursor == [8, 3]
+    nvim.command("lnext")
+
+    # first call to greet in sample-go/other.go
+    assert nvim.current.window.cursor == [6, 13]
 
-    nvim.command("edit! {}".format(PATH_MAIN_RS))
+    nvim.command("edit! {}".format(PATH_MAIN_GO))
 
 
 def test_languageClient_registerServerCommands(nvim):
-    nvim.command("edit! {}".format(PATH_MAIN_RS))
+    nvim.command("edit! {}".format(PATH_MAIN_GO))
     time.sleep(1)
     nvim.command('let g:responses = []')
     nvim.command("call LanguageClient_registerServerCommands("
@@ -188,7 +191,7 @@ def test_languageClient_registerServerCommands(nvim):
 
 
 def test_languageClient_registerHandlers(nvim):
-    nvim.command("edit! {}".format(PATH_MAIN_RS))
+    nvim.command("edit! {}".format(PATH_MAIN_GO))
     time.sleep(1)
     nvim.command('let g:responses = []')
     nvim.command("call LanguageClient_registerHandlers("
@@ -218,7 +221,7 @@ def test_languageClient_registerHandlers(nvim):
 
 
 def _open_float_window(nvim):
-    nvim.funcs.cursor(3, 22)
+    nvim.funcs.cursor(10, 15)
     pos = nvim.funcs.getpos('.')
     nvim.funcs.LanguageClient_textDocument_hover()
     time.sleep(1)
@@ -229,7 +232,7 @@ def test_textDocument_hover_float_window_closed_on_cursor_moved(nvim):
     if not nvim.funcs.exists("*nvim_open_win"):
         pytest.skip("Neovim 0.3.0 or earlier does not support floating window")
 
-    nvim.command("edit! {}".format(PATH_MAIN_RS))
+    nvim.command("edit! {}".format(PATH_MAIN_GO))
     time.sleep(1)
 
     buf = nvim.current.buffer
@@ -247,7 +250,7 @@ def test_textDocument_hover_float_window_closed_on_cursor_moved(nvim):
     assert pos == nvim.funcs.getpos(".")
 
     # Move cursor to left
-    nvim.funcs.cursor(13, 17)
+    nvim.funcs.cursor(10, 14)
 
     # Check float window buffer was closed by CursorMoved
     assert len(getLanguageClientBuffers(nvim)) == 0
@@ -257,7 +260,7 @@ def test_textDocument_hover_float_window_closed_on_entering_window(nvim):
     if not nvim.funcs.exists("*nvim_open_win"):
         pytest.skip("Neovim 0.3.0 or earlier does not support floating window")
 
-    nvim.command("edit! {}".format(PATH_MAIN_RS))
+    nvim.command("edit! {}".format(PATH_MAIN_GO))
     time.sleep(1)
 
     win_id = nvim.funcs.win_getid()
@@ -288,7 +291,7 @@ def test_textDocument_hover_float_window_closed_on_switching_to_buffer(nvim):
     another_bufnr = nvim.current.buffer.number
 
     try:
-        nvim.command("edit! {}".format(PATH_MAIN_RS))
+        nvim.command("edit! {}".format(PATH_MAIN_GO))
         time.sleep(1)
 
         source_bufnr = nvim.current.buffer.number
@@ -315,7 +318,7 @@ def test_textDocument_hover_float_window_move_cursor_into_window(nvim):
     if not nvim.funcs.exists("*nvim_open_win"):
         pytest.skip("Neovim 0.3.0 or earlier does not support floating window")
 
-    nvim.command("edit! {}".format(PATH_MAIN_RS))
+    nvim.command("edit! {}".format(PATH_MAIN_GO))
     time.sleep(1)
 
     prev_bufnr = nvim.current.buffer.number

tests/data/sample-go/go.mod

@@ -0,0 +1,3 @@
+module sameple-go
+
+go 1.15

tests/data/sample-go/main.go

@@ -0,0 +1,22 @@
+package main
+
+import (
+	"fmt"
+	"log"
+)
+
+func main() {
+	fmt.Println("Hello, 世界")
+	log.Println(greet())
+}
+
+func greet() int32 {
+	return 42
+}
+
+func yo() {
+	someVar := 3
+	b := someVar + someVar
+	log.Println(b)
+	log.Println(otherYo())
+}

tests/data/sample-go/other.go

@@ -0,0 +1,8 @@
+package main
+
+import "log"
+
+func otherYo() string {
+	log.Println(greet())
+	return "yo"
+}

tests/data/sample-go/simple.go

@@ -25,6 +25,7 @@ let g:LanguageClient_serverCommands = {
     \ 'javascript': ['javascript-typescript-stdio'],
     \ 'typescript': ['javascript-typescript-stdio'],
     \ 'rust': ['rust-analyzer'],
+    \ 'go': ['gopls'],
     \ }
 let g:LanguageClient_selectionUI = 'location-list'
 set formatexpr=LanguageClient#textDocument_rangeFormatting_sync()