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

Check --init and remove --wait-for-input

Browse Source
This commit is contained in:
Fangrui Song 2018-01-28 14:05:54 -08:00
parent 1e7727f75a
commit 640d72f85c
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/command_line.cc
View File

@ -100,7 +100,6 @@ Other command line options:
Print stdin (requests) and stdout (responses) to stderr Print stdin (requests) and stdout (responses) to stderr
--log-file <path> Logging file for diagnostics --log-file <path> Logging file for diagnostics
--log-all-to-stderr Write all log messages to STDERR. --log-all-to-stderr Write all log messages to STDERR.
--wait-for-input Wait for an '[Enter]' before exiting
--help Print this help information. --help Print this help information.
--ci Prevents tests from prompting the user for input. Used for --ci Prevents tests from prompting the user for input. Used for
continuous integration so it can fail faster instead of timing continuous integration so it can fail faster instead of timing
@ -502,8 +501,14 @@ int main(int argc, char** argv) {
<< ")\n"; << ")\n";
return 1; return 1;
} }
if (!reader.IsObject()) { JsonReader json_reader{&reader};
std::cerr << "--init must be a JSON object\n"; try {
Config config;
Reflect(json_reader, config);
} catch (std::invalid_argument& e) {
std::cerr << "Fail to parse --init "
<< static_cast<JsonReader&>(json_reader).GetPath()
<< ", expected " << e.what() << "\n";
return 1; return 1;
} }
} }
@ -514,10 +519,5 @@ int main(int argc, char** argv) {
&stdout_waiter); &stdout_waiter);
} }
if (HasOption(options, "--wait-for-input")) {
std::cerr << std::endl << "[Enter] to exit" << std::endl;
getchar();
}
return 0; return 0;
} }

1
src/messages/initialize.cc
View File

@ -14,7 +14,6 @@
// TODO Cleanup global variables // TODO Cleanup global variables
extern std::string g_init_options; extern std::string g_init_options;
extern bool g_index_builtin_types;
extern int g_enable_comments; extern int g_enable_comments;
namespace { namespace {