浏览代码

Merge branch 'master' into master

mergify[bot] 4 年之前
父节点
当前提交
c3687be6bf
共有 3 个文件被更改,包括 23 次插入12 次删除
  1. 2 2
      .mergify.yml
  2. 18 5
      README.md
  3. 3 5
      doc/youcompleteme.txt

+ 2 - 2
.mergify.yml

@@ -7,7 +7,7 @@ pull_request_rules:
     actions:
       merge:
         method: merge
-        strict: smart
+        strict: true
       comment:
         message: Thanks for sending a PR!
   - name: Manual merge on Azure Pipelines and Maintainer Override
@@ -22,6 +22,6 @@ pull_request_rules:
     actions:
       merge:
         method: merge
-        strict: smart
+        strict: true
       comment:
         message: Thanks for sending a PR!

+ 18 - 5
README.md

@@ -11,6 +11,21 @@ NOTE: Minimum Requirements Have Changed
 Our policy is to support the Vim version that's in the latest LTS of Ubuntu.
 That's currently Ubuntu 20.04 which contains `vim-nox` at `v8.1.2269`.
 
+For neovim users, 0.4.4 is required.
+
+NOTE: Minimum compiler versions will soon be increased
+----------------------------------------
+
+In order to provide the best possible performance and stability, ycmd will
+soon update its code to C++17. This will require a version bump of the minimum
+supported compilers. The new requirements will be:
+
+| Compiler | Current Min | Upcoming |
+|-|-|-|
+| GCC | 4.8 | 8 |
+| Clang | 4 | 7 |
+| MSVC | 14 (VS 2015) | 15.7 (VS 2017) |
+
 Help, Advice, Support
 ---------------------
 
@@ -738,7 +753,6 @@ Quick Feature Summary
 * Type information for identifiers (`GetType`)
 * Renaming symbols (`RefactorRename <new name>`)
 * Code formatting (`Format`)
-* Execute custom server command (`ExecuteCommand <args>`)
 * Management of `rust-analyzer` server instance
 
 ### Java
@@ -1985,10 +1999,9 @@ flags.
 
 #### The `ExecuteCommand <args>` subcommand
 
-Some LSP completers (currently Rust and Java completers) support executing
-server specific commands. Consult the [rust-analyzer][] and [jdt.ls][] respective
-documentations to find out what commands are supported and which arguments are
-expected.
+Some LSP completers (currently only Java completers) support executing
+server specific commands. Consult the [jdt.ls][] documentation to find out
+what commands are supported and which arguments are expected.
 
 The support for `ExecuteCommand` was implemented to support plugins like
 [vimspector][] to debug java, but isn't limited to that specific use case.

+ 3 - 5
doc/youcompleteme.txt

@@ -923,7 +923,6 @@ Rust ~
 - Type information for identifiers (|GetType|)
 - Renaming symbols ('RefactorRename <new name>')
 - Code formatting (|Format|)
-- Execute custom server command ('ExecuteCommand <args>')
 - Management of 'rust-analyzer' server instance
 
 -------------------------------------------------------------------------------
@@ -2220,10 +2219,9 @@ flags.
                                                           *ExecuteCommand-args*
 The 'ExecuteCommand <args>' subcommand ~
 
-Some LSP completers (currently Rust and Java completers) support executing
-server specific commands. Consult the rust-analyzer [15] and jdt.ls [16]
-respective documentations to find out what commands are supported and which
-arguments are expected.
+Some LSP completers (currently only Java completers) support executing
+server specific commands. Consult the jdt.ls [16] documentation to find out
+what commands are supported and which arguments are expected.
 
 The support for 'ExecuteCommand' was implemented to support plugins like
 vimspector [73] to debug java, but isn't limited to that specific use case.