Skip to content

Commit 0d387ad

Browse files
authored
Merge pull request #4144 from puremourning/update-clang-16
Update to clang 16.0.1
2 parents b3e8838 + 3a052e6 commit 0d387ad

File tree

6 files changed

+21
-108
lines changed

6 files changed

+21
-108
lines changed

.github/workflows/ci.yml

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,12 @@ jobs:
4444
run: python3 -m pip install -r python/test_requirements.txt
4545
- name: Run tests
4646
run: python3 run_tests.py --quiet python/ycm/tests
47+
- name: summarise coverage
48+
run: coverage xml
4749
- name: Upload coverage data
48-
run: codecov --name "${{ runner.os }}-${{ matrix.python-version }}-${{ matrix.python-arch }}"
50+
uses: codecov/codecov-action@v3
51+
with:
52+
name: "${{ runner.os }}-${{ matrix.python-version }}-${{ matrix.python-arch }}"
4953

5054
vim-tests:
5155
strategy:
@@ -80,5 +84,9 @@ jobs:
8084
- name: Run tests in new vim
8185
if: matrix.vim == 'new'
8286
run: ./test/run_vim_tests
87+
- name: Combine and summarise coverage
88+
run: coverage combine && coverage xml
8389
- name: Upload coverage data
84-
run: codecov --name "vim-tests-${{ matrix.vim }}"
90+
uses: codecov/codecov-action@v3
91+
with:
92+
name: "vim-tests-${{ matrix.vim }}"

README.md

Lines changed: 2 additions & 99 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ Contents
4444
- [macOS](#macos)
4545
- [Linux 64-bit](#linux-64-bit)
4646
- [Windows](#windows)
47-
- [FreeBSD/OpenBSD](#freebsdopenbsd)
4847
- [Full Installation Guide](#full-installation-guide)
4948
- [Quick Feature Summary](#quick-feature-summary)
5049
- [User Guide](#user-guide)
@@ -642,102 +641,6 @@ YCM comes with sane defaults for its options, but you still may want to take a
642641
look at what's available for configuration. There are a few interesting options
643642
that are conservatively turned off by default that you may want to turn on.
644643

645-
### FreeBSD/OpenBSD
646-
647-
#### Quick start, installing all completers
648-
649-
- Install YCM plugin via [Vundle][]
650-
- Install CMake
651-
652-
```
653-
pkg install cmake
654-
```
655-
656-
- Install xbuild, go, node and npm
657-
- Compile YCM
658-
659-
```
660-
cd ~/.vim/bundle/YouCompleteMe
661-
python3 install.py --all
662-
```
663-
664-
- For plugging an arbitrary LSP server, check [the relevant section](#plugging-an-arbitrary-lsp-server)
665-
666-
#### Explanation for the quick start
667-
668-
These instructions (using `install.py`) are the quickest way to install
669-
YouCompleteMe, however they may not work for everyone. If the following
670-
instructions don't work for you, check out the [full installation
671-
guide](#full-installation-guide).
672-
673-
**NOTE:** OpenBSD / FreeBSD are not officially supported platforms by YCM.
674-
675-
Make sure you have a supported Vim version with Python 3 support, and a supported
676-
compiler and CMake, perhaps:
677-
678-
```
679-
pkg install cmake
680-
```
681-
682-
Install YouCompleteMe with [Vundle][].
683-
684-
**Remember:** YCM is a plugin with a compiled component. If you **update** YCM
685-
using Vundle and the `ycm_core` library APIs have changed (happens
686-
rarely), YCM will notify you to recompile it. You should then rerun the install
687-
process.
688-
689-
Compiling YCM **with** semantic support for C-family languages through
690-
**clangd**:
691-
692-
```
693-
cd ~/.vim/bundle/YouCompleteMe
694-
./install.py --clangd-completer
695-
```
696-
697-
Compiling YCM **without** semantic support for C-family languages:
698-
699-
```
700-
cd ~/.vim/bundle/YouCompleteMe
701-
./install.py
702-
```
703-
704-
If the `python` executable is not present, or the default `python` is not the
705-
one that should be compiled against, specify the python interpreter explicitly:
706-
707-
```
708-
python3 install.py --clangd-completer
709-
```
710-
711-
The following additional language support options are available:
712-
713-
- C# support: install Mono and add `--cs-completer` when calling
714-
`./install.py`.
715-
- Go support: install [Go][go-install] and add `--go-completer` when calling
716-
`./install.py`.
717-
- JavaScript and TypeScript support: install [Node.js and npm][npm-install] and
718-
add `--ts-completer` when calling `install.py`.
719-
- Rust support: add `--rust-completer` when calling `./install.py`.
720-
- Java support: install [JDK 17][jdk-install] and add
721-
`--java-completer` when calling `./install.py`.
722-
723-
To simply compile with everything enabled, there's a `--all` flag. So, to
724-
install with all language features, ensure `xbuild`, `go`, `node` and `npm`
725-
tools are installed and in your `PATH`, then simply run:
726-
727-
```
728-
cd ~/.vim/bundle/YouCompleteMe
729-
./install.py --all
730-
```
731-
732-
That's it. You're done. Refer to the _User Guide_ section on how to use YCM.
733-
Don't forget that if you want the C-family semantic completion engine to work,
734-
you will need to provide the compilation flags for your project to YCM. It's all
735-
in the User Guide.
736-
737-
YCM comes with sane defaults for its options, but you still may want to take a
738-
look at what's available for configuration. There are a few interesting options
739-
that are conservatively turned off by default that you may want to turn on.
740-
741644
### Full Installation Guide
742645

743646
The [full installation guide][wiki-full-install] has been moved to the wiki.
@@ -1181,7 +1084,7 @@ On supported architectures, the `install.py` script will download a suitable
11811084
clangd (`--clangd-completer`) or libclang (`--clang-completer`) for you.
11821085
Supported architectures are:
11831086

1184-
* Linux glibc >= 2.27 (Intel, armv7-a, aarch64) - built on ubuntu 18.04
1087+
* Linux glibc >= 2.31 (Intel, armv7-a, aarch64) - built on ubuntu 20.04
11851088
* MacOS >=10.15 (Intel, arm64)
11861089
- For Intel, compatibility per clang.llvm.org downloads
11871090
- For arm64, macOS 10.15+
@@ -1207,7 +1110,7 @@ $ EXTRA_CMAKE_ARGS='-DPATH_TO_LLVM_ROOT=/path/to/your/llvm' ./install.py --clang
12071110
```
12081111

12091112
Please note that if using custom `clangd` or `libclang` it _must_ match the
1210-
version that YCM requires. Currently YCM requires ***clang 15.0.1***.
1113+
version that YCM requires. Currently YCM requires ***clang 16.0.1***.
12111114

12121115
#### Compile flags
12131116

python/test_requirements.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ flake8 >= 3.0.0
22
flake8-comprehensions >= 1.4.1
33
flake8-ycm >= 0.1.0
44
PyHamcrest >= 1.10.1
5-
codecov >= 2.0.5
65
coverage <5.0
76
click <8.0.0
87
covimerage >= 0.2.0

run_tests.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,10 @@ def UnittestTests( parsed_args, extra_unittest_args ):
8686
unittest_args.append( test_directory )
8787

8888
if parsed_args.coverage:
89-
executable = [ sys.executable, '-We', '-m', 'coverage', 'run' ]
89+
executable = [ sys.executable,
90+
'-m',
91+
'coverage',
92+
'run' ]
9093
else:
9194
executable = [ sys.executable, '-We' ]
9295

test/completion.common.vim

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -339,16 +339,16 @@ function! Test_Completion_FixIt()
339339
function! Check1( id )
340340
call WaitForCompletion()
341341
call CheckCurrentLine( 'do_a' )
342-
call CheckCompletionItemsContainsExactly( [ 'do_a_thing(Thing thing)',
343-
\ 'do_another_thing()' ] )
342+
call CheckCompletionItemsHasItems( [ 'do_a_thing(Thing thing)',
343+
\ 'do_another_thing()' ] )
344344
call FeedAndCheckAgain( "\<Tab>" , funcref( 'Check2' ) )
345345
endfunction
346346

347347
function! Check2( id )
348348
call WaitForCompletion()
349349
call CheckCurrentLine( 'do_a_thing' )
350-
call CheckCompletionItemsContainsExactly( [ 'do_a_thing(Thing thing)',
351-
\ 'do_another_thing()' ] )
350+
call CheckCompletionItemsHasItems( [ 'do_a_thing(Thing thing)',
351+
\ 'do_another_thing()' ] )
352352
call FeedAndCheckAgain( '(' , funcref( 'Check3' ) )
353353
endfunction
354354

third_party/ycmd

Submodule ycmd updated 205 files

0 commit comments

Comments
 (0)