Update submodules

.github/workflows/ci.yml

@@ -3,10 +3,10 @@ on: [push, pull_request]
 
 jobs:
   tests:
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-20.04
     steps:
       - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v2
         with:
           submodules: recursive
 
@@ -20,3 +20,44 @@ jobs:
 
       - name: Run tests
         run: 'make test'
+
+  code-quality:
+    runs-on: ubuntu-20.04
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+        with:
+          submodules: recursive
+
+      - name: Run tests
+        run: |
+          vim --version
+          make check
+
+  coverage:
+    runs-on: ubuntu-20.04
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+        with:
+          submodules: recursive
+
+      - name: Install dependencies
+        run: |
+          sudo add-apt-repository ppa:neovim-ppa/stable -y
+          sudo apt-get update -q
+          sudo apt-get install neovim -y
+
+          sudo pip install pynvim pytest-cov
+          sudo pip list
+          nvim --version
+
+      - name: Run tests
+        run: |
+            make --keep-going test_coverage BUILD_VIRTUAL_ENV=$VIRTUAL_ENV
+
+      - name: Upload coverage data
+        run: |
+          coverage xml
+          bash <(curl -s https://codecov.io/bash) -X fix -f coverage.xml -F py${TRAVIS_PYTHON_VERSION//./}

.gitmodules

@@ -1,6 +1,6 @@
 [submodule "jedi"]
 	path = pythonx/jedi
-	url = https://github.com/davidhalter/jedi.git
+	url = https://git.pick-up.group/VimPlug/jedi-fork.git
 [submodule "pythonx/parso"]
 	path = pythonx/parso
-	url = https://github.com/davidhalter/parso.git
+	url = https://git.pick-up.group/VimPlug/parso.git

README.rst

@@ -114,7 +114,7 @@ Installation with your distribution
 -----------------------------------
 
 On Arch Linux, you can also install jedi-vim from official repositories as
-`vim-jedi <https://archlinux.org/packages/extra/any/vim-jedi/>`__.
+`vim-jedi <https://www.archlinux.org/packages/community/any/vim-jedi/>`__.
 It is also available on
 `Debian (≥8) <https://packages.debian.org/vim-python-jedi>`__ and
 `Ubuntu (≥14.04) <http://packages.ubuntu.com/vim-python-jedi>`__ as

test/vspec/completions.vim

@@ -52,6 +52,19 @@ describe 'completions'
         Expect getline('.') == 'IndentationError().filename'
     end
 
+    it 'multi complete'
+        " NOTE: nvim results in "importErr()" here with completeopt+=longest,
+        " but Vim is fine.
+        " This is due to `pumvisible()` in jedi#complete_opened being true
+        " with nvim still, but it is 0 with Vim, i.e. Vim appears to close
+        " the pum already (with the tests).
+        "
+        " This might be a misunderstanding though, since the test might not
+        " expect the "import" keyword to be offered for completion?!
+        normal oImpXErrX()
+        Expect getline('.') == 'ImportError()'
+    end
+
     it 'cycling through entries popup_select_first=0'
         set completeopt+=longest
         let g:jedi#popup_select_first = 0

test/vspec/signatures.vim

@@ -41,7 +41,7 @@ describe 'signatures'
         doautocmd CursorHoldI
         noautocmd normal istaticmethod()
         doautocmd CursorHoldI
-        Expect getline(1) == '?!?jedi=0, ?!?            (*_*f: Callable[_P, _R_co]*_*) ?!?jedi?!?'
+        Expect getline(1) == '?!?jedi=0, ?!?            (*_*f: Callable[..., Any]*_*) ?!?jedi?!?'
     end
 
     it 'highlights correct argument'
@@ -51,11 +51,11 @@ describe 'signatures'
         " Move to x - highlights "x".
         noautocmd normal 2h
         doautocmd CursorHoldI
-        Expect getline(1) == '?!?jedi=0, ?!?      (value: object, *_*format_spec: str=""*_*) ?!?jedi?!?'
+        Expect getline(1) == '?!?jedi=0, ?!?      (value: object, *_*format_spec: str=...*_*) ?!?jedi?!?'
         " Move left to 42 - hightlights first argument ("value").
         noautocmd normal 4h
         doautocmd CursorHoldI
-        Expect getline(1) == '?!?jedi=0, ?!?      (*_*value: object*_*, format_spec: str="") ?!?jedi?!?'
+        Expect getline(1) == '?!?jedi=0, ?!?      (*_*value: object*_*, format_spec: str=...) ?!?jedi?!?'
     end
 
     it 'no signature'
@@ -82,7 +82,7 @@ describe 'signatures'
         redir => msg
         python3 jedi_vim.show_call_signatures()
         redir END
-        Expect msg == "\nstaticmethod(f: Callable[_P, _R_co])"
+        Expect msg == "\nstaticmethod(f: Callable[..., Any])"
 
         redir => msg
         doautocmd InsertLeave
@@ -98,11 +98,6 @@ describe 'signatures'
     end
 
     it 'command line truncation'
-        " Disable autoindent so `o` opens a new line at column 0; relying on
-        " `\<BS>` to strip the indent is not portable across vim/nvim defaults
-        " (with `bs=eol` it joins lines instead of just removing the indent).
-        setlocal noautoindent nosmartindent indentexpr=
-
         let g:jedi#show_call_signatures = 2
         call jedi#configure_call_signatures()
 
@@ -116,7 +111,7 @@ describe 'signatures'
         let funcname = repeat('a', &columns - (30 + (&ruler ? 18 : 0)))
         put = 'def '.funcname.'(arg1, arg2, arg3, a, b, c):'
         put = '    pass'
-        execute "normal o".funcname."( "
+        execute "normal o\<BS>".funcname."( "
         Expect Signature() == "\n".funcname."(arg1, …)"
 
         exe 'normal sarg1, '
@@ -131,7 +126,7 @@ describe 'signatures'
         g/^/d
         put = 'def '.funcname.'('.repeat('b', 20).', arg2):'
         put = '    pass'
-        execute "normal o".funcname."( "
+        execute "normal o\<BS>".funcname."( "
         Expect Signature() == "\n".funcname."(…)"
     end