Skip to content

Commit bf0dbea

Browse files
authored
Merge pull request #4190 from bstaletic/new-ycmd
Update to new ycmd
2 parents 3367b9b + dd42e51 commit bf0dbea

File tree

7 files changed

+26
-17
lines changed

7 files changed

+26
-17
lines changed

README.md

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -391,7 +391,7 @@ The following additional language support options are available:
391391
and add `--cs-completer` when calling `install.py`.
392392
- Go support: install [Go][go-install] and add `--go-completer` when calling
393393
`install.py`.
394-
- JavaScript and TypeScript support: install [Node.js and npm][npm-install] and
394+
- JavaScript and TypeScript support: install [Node.js 18+ and npm][npm-install] and
395395
add `--ts-completer` when calling `install.py`.
396396
- Rust support: add `--rust-completer` when calling `install.py`.
397397
- Java support: install [JDK 17][jdk-install] and add
@@ -431,6 +431,9 @@ apt install build-essential cmake vim-nox python3-dev
431431
- Install mono-complete, go, node, java and npm
432432
433433
```
434+
sudo mkdir -p /etc/apt/keyrings
435+
curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | sudo gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg
436+
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
434437
apt install mono-complete golang nodejs openjdk-17-jdk openjdk-17-jre npm
435438
```
436439
@@ -499,7 +502,7 @@ The following additional language support options are available:
499502
when calling `install.py`.
500503
- Go support: install [Go][go-install] and add `--go-completer` when calling
501504
`install.py`.
502-
- JavaScript and TypeScript support: install [Node.js and npm][npm-install] and
505+
- JavaScript and TypeScript support: install [Node.js 18+ and npm][npm-install] and
503506
add `--ts-completer` when calling `install.py`.
504507
- Rust support: add `--rust-completer` when calling `install.py`.
505508
- Java support: install [JDK 17][jdk-install] and add
@@ -613,7 +616,7 @@ The following additional language support options are available:
613616
Be sure that [the build utility `msbuild` is in your PATH][add-msbuild-to-path].
614617
- Go support: install [Go][go-install] and add `--go-completer` when calling
615618
`install.py`.
616-
- JavaScript and TypeScript support: install [Node.js and npm][npm-install] and
619+
- JavaScript and TypeScript support: install [Node.js 18+ and npm][npm-install] and
617620
add `--ts-completer` when calling `install.py`.
618621
- Rust support: add `--rust-completer` when calling `install.py`.
619622
- Java support: install [JDK 17][jdk-install] and add
@@ -1111,7 +1114,7 @@ $ EXTRA_CMAKE_ARGS='-DPATH_TO_LLVM_ROOT=/path/to/your/llvm' ./install.py --clang
11111114
```
11121115

11131116
Please note that if using custom `clangd` or `libclang` it _must_ match the
1114-
version that YCM requires. Currently YCM requires ***clang 16.0.1***.
1117+
version that YCM requires. Currently YCM requires ***clang 17.0.1***.
11151118

11161119
#### Compile flags
11171120

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

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

15611564
[TSServer][] relies on [the `jsconfig.json` file][jsconfig.json] for JavaScript

doc/youcompleteme.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1333,7 +1333,7 @@ build or acquire 'libclang' for yourself and specify it when building, as:
13331333
$ EXTRA_CMAKE_ARGS='-DPATH_TO_LLVM_ROOT=/path/to/your/llvm' ./install.py --clang-completer --system-libclang
13341334
<
13351335
Please note that if using custom 'clangd' or 'libclang' it _must_ match the
1336-
version that YCM requires. Currently YCM requires **_clang 16.0.1_**.
1336+
version that YCM requires. Currently YCM requires **_clang 17.0.1_**.
13371337

13381338
-------------------------------------------------------------------------------
13391339
*youcompleteme-compile-flags*

test/docker/ci/image/Dockerfile

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,24 +5,30 @@ ENV LC_ALL C.UTF-8
55

66
ARG VIM_VERSION=v8.2.2735
77
ARG YCM_VIM_PYTHON=python3
8+
ARG NODE_MAJOR=18
89

910
RUN apt-get update && \
1011
apt-get -y dist-upgrade && \
1112
apt-get -y --no-install-recommends install ca-cacert \
13+
gnupg \
1214
locales \
1315
tzdata \
1416
language-pack-en \
15-
libncurses5-dev libncursesw5-dev \
17+
curl \
18+
sudo \
19+
libncurses5-dev libncursesw5-dev && \
20+
mkdir -p /etc/apt/keyrings && \
21+
curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg && \
22+
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 && \
23+
apt-get update && apt-get -y upgrade && apt-get -y --no-install-recommends install \
1624
git \
1725
build-essential \
1826
cmake \
19-
curl \
20-
sudo \
2127
python3-dev \
2228
python3-pip \
2329
python3-setuptools \
2430
openjdk-11-jdk-headless \
25-
npm \
31+
nodejs \
2632
vim-nox \
2733
zlib1g-dev && \
2834
apt-get -y autoremove

test/fixit.test.vim

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ function! Test_Ranged_Fixit_Works()
2424

2525
function! SelectEntry( id ) closure
2626
redraw
27-
call test_feedinput( "4\<CR>" )
27+
call test_feedinput( "3\<CR>" )
2828
endfunction
2929

3030
call timer_start( 5000, funcref( 'SelectEntry' ) )

test/hover.test.vim

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ let s:cpp_lifetime = {
7171
\ '',
7272
\ 'Type: char',
7373
\ 'Offset: 16 bytes',
74-
\ 'Size: 1 byte (+7 padding)',
74+
\ 'Size: 1 byte (+7 bytes padding)',
7575
\ 'nobody will live > 128 years',
7676
\ '',
7777
\ '// In PointInTime',

test/signature_help.test.vim

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -804,23 +804,23 @@ function! Test_Signature_Help_Manual_HideShow()
804804
function! Check( ... )
805805
call youcompleteme#test#popup#CheckPopupPosition(
806806
\ s:_GetSigHelpWinID(),
807-
\ { 'line': 9, 'col': 6, 'visible': 1 } )
807+
\ { 'line': 9, 'col': 8, 'visible': 1 } )
808808

809809
call FeedAndCheckAgain( 'kjkj', funcref( 'Check2' ) )
810810
endfunction
811811

812812
function! Check2( ... )
813813
call youcompleteme#test#popup#CheckPopupPosition(
814814
\ s:_GetSigHelpWinID(),
815-
\ { 'line': 9, 'col': 6, 'visible': 0 } )
815+
\ { 'line': 9, 'col': 8, 'visible': 0 } )
816816

817817
call FeedAndCheckAgain( 'kjkj', funcref( 'Check3' ) )
818818
endfunction
819819

820820
function! Check3( ... )
821821
call youcompleteme#test#popup#CheckPopupPosition(
822822
\ s:_GetSigHelpWinID(),
823-
\ { 'line': 9, 'col': 6, 'visible': 1 } )
823+
\ { 'line': 9, 'col': 8, 'visible': 1 } )
824824

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

863863
call FeedAndCheckAgain( ')', funcref( 'CheckSigsClosed' ) )
864864
endfunction

third_party/ycmd

Submodule ycmd updated 247 files

0 commit comments

Comments
 (0)