Skip to content

Commit

Permalink
Merge pull request #4190 from bstaletic/new-ycmd
Browse files Browse the repository at this point in the history
Update to new ycmd
  • Loading branch information
mergify[bot] committed Oct 3, 2023
2 parents 3367b9b + dd42e51 commit bf0dbea
Show file tree
Hide file tree
Showing 7 changed files with 26 additions and 17 deletions.
13 changes: 8 additions & 5 deletions README.md
Expand Up @@ -391,7 +391,7 @@ The following additional language support options are available:
and add `--cs-completer` when calling `install.py`.
- Go support: install [Go][go-install] and add `--go-completer` when calling
`install.py`.
- JavaScript and TypeScript support: install [Node.js and npm][npm-install] and
- JavaScript and TypeScript support: install [Node.js 18+ and npm][npm-install] and
add `--ts-completer` when calling `install.py`.
- Rust support: add `--rust-completer` when calling `install.py`.
- Java support: install [JDK 17][jdk-install] and add
Expand Down Expand Up @@ -431,6 +431,9 @@ apt install build-essential cmake vim-nox python3-dev
- Install mono-complete, go, node, java and npm

```
sudo mkdir -p /etc/apt/keyrings
curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | sudo gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg
echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_current.x nodistro main" | sudo tee /etc/apt/sources.list.d/nodesource.list
apt install mono-complete golang nodejs openjdk-17-jdk openjdk-17-jre npm
```

Expand Down Expand Up @@ -499,7 +502,7 @@ The following additional language support options are available:
when calling `install.py`.
- Go support: install [Go][go-install] and add `--go-completer` when calling
`install.py`.
- JavaScript and TypeScript support: install [Node.js and npm][npm-install] and
- JavaScript and TypeScript support: install [Node.js 18+ and npm][npm-install] and
add `--ts-completer` when calling `install.py`.
- Rust support: add `--rust-completer` when calling `install.py`.
- Java support: install [JDK 17][jdk-install] and add
Expand Down Expand Up @@ -613,7 +616,7 @@ The following additional language support options are available:
Be sure that [the build utility `msbuild` is in your PATH][add-msbuild-to-path].
- Go support: install [Go][go-install] and add `--go-completer` when calling
`install.py`.
- JavaScript and TypeScript support: install [Node.js and npm][npm-install] and
- JavaScript and TypeScript support: install [Node.js 18+ and npm][npm-install] and
add `--ts-completer` when calling `install.py`.
- Rust support: add `--rust-completer` when calling `install.py`.
- Java support: install [JDK 17][jdk-install] and add
Expand Down Expand Up @@ -1111,7 +1114,7 @@ $ EXTRA_CMAKE_ARGS='-DPATH_TO_LLVM_ROOT=/path/to/your/llvm' ./install.py --clang
```

Please note that if using custom `clangd` or `libclang` it _must_ match the
version that YCM requires. Currently YCM requires ***clang 16.0.1***.
version that YCM requires. Currently YCM requires ***clang 17.0.1***.

#### Compile flags

Expand Down Expand Up @@ -1555,7 +1558,7 @@ available on [the wiki][tern-instructions].

All JavaScript and TypeScript features are provided by the [TSServer][] engine,
which is included in the TypeScript SDK. To enable these features, install
[Node.js and npm][npm-install] and call the `install.py` script with the
[Node.js 18+ and npm][npm-install] and call the `install.py` script with the
`--ts-completer` flag.

[TSServer][] relies on [the `jsconfig.json` file][jsconfig.json] for JavaScript
Expand Down
2 changes: 1 addition & 1 deletion doc/youcompleteme.txt
Expand Up @@ -1333,7 +1333,7 @@ build or acquire 'libclang' for yourself and specify it when building, as:
$ EXTRA_CMAKE_ARGS='-DPATH_TO_LLVM_ROOT=/path/to/your/llvm' ./install.py --clang-completer --system-libclang
<
Please note that if using custom 'clangd' or 'libclang' it _must_ match the
version that YCM requires. Currently YCM requires **_clang 16.0.1_**.
version that YCM requires. Currently YCM requires **_clang 17.0.1_**.

-------------------------------------------------------------------------------
*youcompleteme-compile-flags*
Expand Down
14 changes: 10 additions & 4 deletions test/docker/ci/image/Dockerfile
Expand Up @@ -5,24 +5,30 @@ ENV LC_ALL C.UTF-8

ARG VIM_VERSION=v8.2.2735
ARG YCM_VIM_PYTHON=python3
ARG NODE_MAJOR=18

RUN apt-get update && \
apt-get -y dist-upgrade && \
apt-get -y --no-install-recommends install ca-cacert \
gnupg \
locales \
tzdata \
language-pack-en \
libncurses5-dev libncursesw5-dev \
curl \
sudo \
libncurses5-dev libncursesw5-dev && \
mkdir -p /etc/apt/keyrings && \
curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg && \
echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_$NODE_MAJOR.x nodistro main" > /etc/apt/sources.list.d/nodesource.list && \
apt-get update && apt-get -y upgrade && apt-get -y --no-install-recommends install \
git \
build-essential \
cmake \
curl \
sudo \
python3-dev \
python3-pip \
python3-setuptools \
openjdk-11-jdk-headless \
npm \
nodejs \
vim-nox \
zlib1g-dev && \
apt-get -y autoremove
Expand Down
2 changes: 1 addition & 1 deletion test/fixit.test.vim
Expand Up @@ -24,7 +24,7 @@ function! Test_Ranged_Fixit_Works()

function! SelectEntry( id ) closure
redraw
call test_feedinput( "4\<CR>" )
call test_feedinput( "3\<CR>" )
endfunction

call timer_start( 5000, funcref( 'SelectEntry' ) )
Expand Down
2 changes: 1 addition & 1 deletion test/hover.test.vim
Expand Up @@ -71,7 +71,7 @@ let s:cpp_lifetime = {
\ '',
\ 'Type: char',
\ 'Offset: 16 bytes',
\ 'Size: 1 byte (+7 padding)',
\ 'Size: 1 byte (+7 bytes padding)',
\ 'nobody will live > 128 years',
\ '',
\ '// In PointInTime',
Expand Down
8 changes: 4 additions & 4 deletions test/signature_help.test.vim
Expand Up @@ -804,23 +804,23 @@ function! Test_Signature_Help_Manual_HideShow()
function! Check( ... )
call youcompleteme#test#popup#CheckPopupPosition(
\ s:_GetSigHelpWinID(),
\ { 'line': 9, 'col': 6, 'visible': 1 } )
\ { 'line': 9, 'col': 8, 'visible': 1 } )

call FeedAndCheckAgain( 'kjkj', funcref( 'Check2' ) )
endfunction

function! Check2( ... )
call youcompleteme#test#popup#CheckPopupPosition(
\ s:_GetSigHelpWinID(),
\ { 'line': 9, 'col': 6, 'visible': 0 } )
\ { 'line': 9, 'col': 8, 'visible': 0 } )

call FeedAndCheckAgain( 'kjkj', funcref( 'Check3' ) )
endfunction

function! Check3( ... )
call youcompleteme#test#popup#CheckPopupPosition(
\ s:_GetSigHelpWinID(),
\ { 'line': 9, 'col': 6, 'visible': 1 } )
\ { 'line': 9, 'col': 8, 'visible': 1 } )

call feedkeys( "\<Esc>" )
endfunction
Expand Down Expand Up @@ -858,7 +858,7 @@ function! Test_Signature_Help_Manual_NoSigs()
let popup_id = s:_GetSigHelpWinID()
call youcompleteme#test#popup#CheckPopupPosition(
\ s:_GetSigHelpWinID(),
\ { 'line': 9, 'col': 6, 'visible': 1 } )
\ { 'line': 9, 'col': 8, 'visible': 1 } )

call FeedAndCheckAgain( ')', funcref( 'CheckSigsClosed' ) )
endfunction
Expand Down
2 changes: 1 addition & 1 deletion third_party/ycmd
Submodule ycmd updated 247 files

0 comments on commit bf0dbea

Please sign in to comment.