Update integration tests to use rust-analyzer

Author: autozimu

ci/Dockerfile

@@ -12,6 +12,8 @@ RUN npm install -g [email protected]
 RUN rustup component add rustfmt rls rust-analysis rust-src \
         && rustc --version \
         && rls --version
+RUN curl -L https://github.com/rust-analyzer/rust-analyzer/releases/latest/download/rust-analyzer-linux -o /usr/local/bin/rust-analyzer \
+        && chmod +x /usr/local/bin/rust-analyzer
 
 ENV CARGO_TARGET_DIR=/tmp
 

rplugin/python3/denite/common.py

@@ -8,7 +8,7 @@
 
 sys.path.insert(0, dirname(__file__))
 
-from lsp.protocol import SymbolKind  # isort:skip  # noqa: I100
+from lsp.protocol import SymbolKind  # isort:skip  # noqa: I100 E402
 
 
 MAX_FNAME_LEN = 30

rplugin/python3/denite/source/documentSymbol.py

@@ -6,7 +6,7 @@
 
 sys.path.insert(0, dirname(dirname(__file__)))
 
-from common import (  # isort:skip  # noqa: I100
+from common import (  # isort:skip  # noqa: I100 E402
     convert_symbols_to_candidates,
     SYMBOL_CANDIDATE_HIGHLIGHT_SYNTAX,
     highlight_setup,

rplugin/python3/denite/source/workspaceSymbol.py

@@ -5,7 +5,7 @@
 
 sys.path.insert(0, path.dirname(path.dirname(__file__)))
 
-from common import (  # isort:skip  # noqa: I100
+from common import (  # isort:skip  # noqa: I100 E402
     convert_symbols_to_candidates,
     SYMBOL_CANDIDATE_HIGHLIGHT_SYNTAX,
     highlight_setup,

shell.nix

@@ -5,14 +5,19 @@ let
 in
 pkgs.mkShell {
   buildInputs = (with pkgs; [
+    curl
+    git
     mypy
+    neovim
+    # rustup    # error on Linux: /lib64/libc.so.6: version `GLIBC_2.14' not found
+    rust-analyzer
+    tmux
+    vim-vint
     (with python37Packages; [
       flake8
       pynvim
       pytest
     ])
-    rustup
-    vim-vint
   ])
   ++ stdenv.lib.optionals stdenv.isDarwin (with pkgs.darwin.apple_sdk.frameworks; [
     CoreServices

tests/LanguageClient_test.py

@@ -19,10 +19,10 @@ def join_path(path: str) -> str:
     return os.path.join(project_root, path)
 
 
-PATH_INDEXJS = join_path("data/sample-js/src/index.js")
-PATH_LIBSJS = join_path("data/sample-js/src/libs.js")
+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_INDEXJS)
+print(PATH_MAIN_RS)
 
 
 def assertRetry(predicate, retry_max=100):
@@ -38,72 +38,76 @@ def assertRetry(predicate, retry_max=100):
     assert predicate()
 
 
+def getLanguageClientBuffers(nvim):
+    return [b for b in nvim.buffers if b.name.endswith("__LanguageClient__")]
+
+
 @pytest.fixture(scope="module")
 def nvim() -> neovim.Nvim:
     nvim = neovim.attach("socket", path=NVIM_LISTEN_ADDRESS)
     time.sleep(1)
-    nvim.command("edit! {}".format(PATH_INDEXJS))
-    time.sleep(3)
     return nvim
 
 
-def test_fixture(nvim):
-    pass
+@pytest.fixture(autouse=True)
+def setup(nvim):
+    nvim.command("%bdelete!")
 
 
-def test_textDocument_hover(nvim):
-    nvim.command("edit! {}".format(PATH_INDEXJS))
-    time.sleep(1)
-    nvim.funcs.cursor(13, 19)
-    nvim.funcs.LanguageClient_textDocument_hover()
-    time.sleep(1)
-    b = next(b for b in nvim.buffers if b.name.endswith('__LanguageClient__'))
-    expect = "function greet(): number"
+def test_textDocument_definition(nvim):
+    nvim.command("edit! {}".format(PATH_MAIN_RS))
+    time.sleep(3)
+    nvim.funcs.cursor(3, 22)
+    nvim.funcs.LanguageClient_textDocument_definition()
+    time.sleep(3)
 
-    assert expect in b
+    assert nvim.current.window.cursor == [8, 3]
 
 
-def test_textDocument_definition(nvim):
-    nvim.command("edit! {}".format(PATH_INDEXJS))
+def test_textDocument_hover(nvim):
+    nvim.command("edit! {}".format(PATH_MAIN_RS))
     time.sleep(1)
-    nvim.funcs.cursor(13, 19)
-    nvim.funcs.LanguageClient_textDocument_definition()
+    nvim.funcs.cursor(3, 22)
+    nvim.funcs.LanguageClient_textDocument_hover()
     time.sleep(1)
+    buf = getLanguageClientBuffers(nvim)[0]
+    expect = "fn greet() -> i32"
 
-    assert nvim.current.window.cursor == [7, 9]
+    assert expect in "\n".join(buf)
 
 
 def test_textDocument_rename(nvim):
-    nvim.command("edit! {}".format(PATH_INDEXJS))
+    nvim.command("edit! {}".format(PATH_MAIN_RS))
     time.sleep(1)
     expect = [line.replace("greet", "hello") for line in nvim.current.buffer]
-    nvim.funcs.cursor(13, 19)
+    nvim.funcs.cursor(3, 22)
     nvim.funcs.LanguageClient_textDocument_rename({"newName": "hello"})
     time.sleep(1)
 
     assert nvim.current.buffer[:] == expect
 
-    nvim.command("edit! {}".format(PATH_INDEXJS))
+    nvim.command("edit! {}".format(PATH_MAIN_RS))
 
 
 def test_textDocument_rename_multiple_oneline(nvim):
-    nvim.command("edit! {}".format(PATH_LIBSJS))
+    nvim.command("edit! {}".format(PATH_LIBS_RS))
     time.sleep(1)
-    nvim.funcs.cursor(7, 11)
-    expect = [line.replace("a", "abc") for line in nvim.current.buffer]
-    nvim.funcs.LanguageClient_textDocument_rename({"newName": "abc"})
+    expect = [line.replace("a", "x") for line in nvim.current.buffer]
+    nvim.funcs.cursor(4, 13)
+    # TODO: Test case where new variable length is different.
+    nvim.funcs.LanguageClient_textDocument_rename({"newName": "x"})
     time.sleep(1)
 
     assert nvim.current.buffer[:] == expect
 
     nvim.command("bd!")
-    nvim.command("edit! {}".format(PATH_INDEXJS))
+    nvim.command("edit! {}".format(PATH_MAIN_RS))
 
 
 def test_textDocument_rename_multiple_files(nvim):
-    nvim.command("edit! {}".format(PATH_INDEXJS))
+    nvim.command("edit! {}".format(PATH_MAIN_RS))
     time.sleep(1)
-    nvim.funcs.cursor(20, 5)
+    nvim.funcs.cursor(17, 5)
     expect = [line.replace("yo", "hello") for line in nvim.current.buffer]
     nvim.funcs.LanguageClient_textDocument_rename({"newName": "hello"})
     time.sleep(1)
@@ -112,69 +116,70 @@ def test_textDocument_rename_multiple_files(nvim):
 
     nvim.command("bd!")
     nvim.command("bd!")
-    nvim.command("edit! {}".format(PATH_INDEXJS))
+    nvim.command("edit! {}".format(PATH_MAIN_RS))
 
 
 def test_textDocument_documentSymbol(nvim):
-    nvim.command("edit! {}".format(PATH_INDEXJS))
+    nvim.command("edit! {}".format(PATH_MAIN_RS))
     time.sleep(1)
     nvim.funcs.cursor(1, 1)
     nvim.funcs.LanguageClient_textDocument_documentSymbol()
     time.sleep(1)
 
     assert nvim.funcs.getloclist(0)
 
-    nvim.command("4lnext")
+    nvim.command("3lnext")
 
-    assert nvim.current.window.cursor == [19, 0]
+    assert nvim.current.window.cursor == [8, 0]
 
 
 def test_workspace_symbol(nvim):
-    nvim.command("edit! {}".format(PATH_LIBSJS))
+    nvim.command("edit! {}".format(PATH_LIBS_RS))
     time.sleep(1)
     nvim.funcs.cursor(1, 1)
     nvim.funcs.LanguageClient_workspace_symbol()
     time.sleep(1)
 
     assert nvim.funcs.getloclist(0)
 
-    nvim.command("5lnext")
+    nvim.command("1lnext")
 
-    assert nvim.current.window.cursor == [7, 0]
+    assert nvim.current.window.cursor == [8, 0]
 
 
 def test_textDocument_references(nvim):
-    nvim.command("edit! {}".format(PATH_INDEXJS))
+    nvim.command("edit! {}".format(PATH_MAIN_RS))
     time.sleep(1)
-    nvim.funcs.cursor(7, 12)
+    nvim.funcs.cursor(8, 6)
     nvim.funcs.LanguageClient_textDocument_references()
     time.sleep(1)
-    expect = ["function greet() {",
-              """console.log(greet());"""]
+    expect = ["fn greet() -> i32 {", """println!("{}", greet());"""]
 
-    assert [location["text"] for location in
-            nvim.funcs.getloclist(0)] == expect
+    assert [location["text"]
+            for location in nvim.funcs.getloclist(0)] == expect
 
     nvim.command("lnext")
 
-    assert nvim.current.window.cursor == [13, 16]
+    assert nvim.current.window.cursor == [3, 19]
 
 
 def test_textDocument_references_modified_buffer(nvim):
-    nvim.command("edit! {}".format(PATH_INDEXJS))
+    nvim.command("edit! {}".format(PATH_MAIN_RS))
     time.sleep(1)
-    nvim.funcs.cursor(7, 10)
+    nvim.funcs.cursor(8, 6)
     nvim.input("iabc")
     time.sleep(1)
     nvim.funcs.LanguageClient_textDocument_references()
     time.sleep(1)
 
-    assert nvim.current.window.cursor == [7, 9]
+    assert nvim.current.window.cursor == [8, 3]
 
-    nvim.command("edit! {}".format(PATH_INDEXJS))
+    nvim.command("edit! {}".format(PATH_MAIN_RS))
 
 
 def test_languageClient_registerServerCommands(nvim):
+    nvim.command("edit! {}".format(PATH_MAIN_RS))
+    time.sleep(1)
     nvim.command('let g:responses = []')
     nvim.command("call LanguageClient_registerServerCommands("
                  "{'bash': ['bash']}, g:responses)")
@@ -183,6 +188,8 @@ def test_languageClient_registerServerCommands(nvim):
 
 
 def test_languageClient_registerHandlers(nvim):
+    nvim.command("edit! {}".format(PATH_MAIN_RS))
+    time.sleep(1)
     nvim.command('let g:responses = []')
     nvim.command("call LanguageClient_registerHandlers("
                  "{'window/progress': 'HandleWindowProgress'}, g:responses)")
@@ -211,7 +218,7 @@ def test_languageClient_registerHandlers(nvim):
 
 
 def _open_float_window(nvim):
-    nvim.funcs.cursor(13, 19)
+    nvim.funcs.cursor(3, 22)
     pos = nvim.funcs.getpos('.')
     nvim.funcs.LanguageClient_textDocument_hover()
     time.sleep(1)
@@ -222,15 +229,14 @@ 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_INDEXJS))
+    nvim.command("edit! {}".format(PATH_MAIN_RS))
     time.sleep(1)
 
     buf = nvim.current.buffer
 
     pos = _open_float_window(nvim)
 
-    float_buf = next(
-        b for b in nvim.buffers if b.name.endswith("__LanguageClient__"))
+    float_buf = getLanguageClientBuffers(nvim)[0]
 
     # Check if float window is open
     float_winnr = nvim.funcs.bufwinnr(float_buf.number)
@@ -244,15 +250,14 @@ def test_textDocument_hover_float_window_closed_on_cursor_moved(nvim):
     nvim.funcs.cursor(13, 17)
 
     # Check float window buffer was closed by CursorMoved
-    assert all(
-        b for b in nvim.buffers if not b.name.endswith("__LanguageClient__"))
+    assert len(getLanguageClientBuffers(nvim)) == 0
 
 
 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_INDEXJS))
+    nvim.command("edit! {}".format(PATH_MAIN_RS))
     time.sleep(1)
 
     win_id = nvim.funcs.win_getid()
@@ -268,9 +273,7 @@ def test_textDocument_hover_float_window_closed_on_entering_window(nvim):
         assert win_id == nvim.funcs.win_getid()
 
         # Check float window buffer was closed by BufEnter
-        assert all(
-            b for b in nvim.buffers
-            if not b.name.endswith("__LanguageClient__"))
+        assert len(getLanguageClientBuffers(nvim)) == 0
     finally:
         nvim.command("close!")
 
@@ -285,15 +288,14 @@ def test_textDocument_hover_float_window_closed_on_switching_to_buffer(nvim):
     another_bufnr = nvim.current.buffer.number
 
     try:
-        nvim.command("edit! {}".format(PATH_INDEXJS))
+        nvim.command("edit! {}".format(PATH_MAIN_RS))
         time.sleep(1)
 
         source_bufnr = nvim.current.buffer.number
 
         _open_float_window(nvim)
 
-        float_buf = next(
-            b for b in nvim.buffers if b.name.endswith("__LanguageClient__"))
+        float_buf = getLanguageClientBuffers(nvim)[0]
         float_winnr = nvim.funcs.bufwinnr(float_buf.number)
         assert float_winnr > 0
 
@@ -304,9 +306,7 @@ def test_textDocument_hover_float_window_closed_on_switching_to_buffer(nvim):
         assert nvim.current.buffer.number == another_bufnr
 
         # Check float window buffer was closed by BufEnter
-        assert all(
-            b for b in nvim.buffers
-            if not b.name.endswith("__LanguageClient__"))
+        assert len(getLanguageClientBuffers(nvim)) == 0
     finally:
         nvim.command("bdelete! {}".format(another_bufnr))
 
@@ -315,7 +315,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_INDEXJS))
+    nvim.command("edit! {}".format(PATH_MAIN_RS))
     time.sleep(1)
 
     prev_bufnr = nvim.current.buffer.number
@@ -331,5 +331,4 @@ def test_textDocument_hover_float_window_move_cursor_into_window(nvim):
     assert nvim.current.buffer.number == prev_bufnr
 
     # Check float window buffer was closed by :close in the window
-    assert all(
-        b for b in nvim.buffers if not b.name.endswith("__LanguageClient__"))
+    assert len(getLanguageClientBuffers(nvim)) == 0

tests/data/vimrc

@@ -24,7 +24,7 @@ let g:LanguageClient_serverStderr = expand('~/.local/share/nvim/LanguageServer.l
 let g:LanguageClient_serverCommands = {
     \ 'javascript': ['javascript-typescript-stdio'],
     \ 'typescript': ['javascript-typescript-stdio'],
-    \ 'rust': ['rustup', 'run', 'stable', 'rls'],
+    \ 'rust': ['rust-analyzer'],
     \ }
 let g:LanguageClient_selectionUI = 'location-list'
 set formatexpr=LanguageClient#textDocument_rangeFormatting_sync()

tests/test.sh

@@ -15,12 +15,12 @@ rm -f /tmp/nvim-LanguageClient-IntegrationTest
 if [[ "$TMUX" ]]; then
     tmux split-window 'NVIM_LISTEN_ADDRESS=/tmp/nvim-LanguageClient-IntegrationTest nvim -n -u tests/data/vimrc'
 else
-    NVIM_LISTEN_ADDRESS=/tmp/nvim-LanguageClient-IntegrationTest nvim -n -u tests/data/vimrc --headless &
+    NVIM_LISTEN_ADDRESS=/tmp/nvim-LanguageClient-IntegrationTest nvim -n -u tests/data/vimrc --headless 2>/dev/null &
 fi
 PID=$!
 sleep 1s
 
-py.test-3 --capture=no --exitfirst -v $@
+$(command -v pytest-3 || echo pytest) --capture=no --exitfirst -v $@
 ret=$?
 
 if [[ $ret != 0 ]]; then