Zengtudor/ccls
1
0
Fork 0
mirror of https://github.com/MaskRay/ccls.git synced 2025-04-03 07:22:08 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Make missing clientVersion skip check

Browse Source
This commit is contained in:
Jacob Dufault 2017-12-04 00:29:38 -08:00
parent 670c925204
commit 0f3680866e
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/command_line.cc
View File

@ -1511,13 +1511,13 @@ bool QueryDbMainLoop(Config* config,
*config = *request->params.initializationOptions; *config = *request->params.initializationOptions;
// Check client version. // Check client version.
if (config->clientVersion != kExpectedClientVersion && if (config->clientVersion.has_value() &&
config->clientVersion != -1 /*disable check*/) { *config->clientVersion != kExpectedClientVersion) {
Out_ShowLogMessage out; Out_ShowLogMessage out;
out.display_type = Out_ShowLogMessage::DisplayType::Show; out.display_type = Out_ShowLogMessage::DisplayType::Show;
out.params.type = lsMessageType::Error; out.params.type = lsMessageType::Error;
out.params.message = out.params.message =
"cquery client (v" + std::to_string(config->clientVersion) + "cquery client (v" + std::to_string(*config->clientVersion) +
") and server (v" + std::to_string(kExpectedClientVersion) + ") and server (v" + std::to_string(kExpectedClientVersion) +
") version mismatch. Please update "; ") version mismatch. Please update ";
if (config->clientVersion > kExpectedClientVersion) if (config->clientVersion > kExpectedClientVersion)

5
src/config.h
View File

@ -67,8 +67,9 @@ struct Config {
// Enables code lens on parameter and function variables. // Enables code lens on parameter and function variables.
bool codeLensOnLocalVariables = true; bool codeLensOnLocalVariables = true;
// Version of the client. // Version of the client. If undefined the version check is skipped. Used to
int clientVersion = 0; // inform users their vscode client is too old and needs to be updated.
optional<int> clientVersion;
// If true parameter declarations are included in code completion when calling // If true parameter declarations are included in code completion when calling
// a function or method // a function or method