diff --git a/src/main.cc b/src/main.cc index 9a4ea630..43930298 100644 --- a/src/main.cc +++ b/src/main.cc @@ -42,7 +42,7 @@ using namespace llvm; using namespace llvm::cl; namespace ccls { -std::string g_init_options; +std::vector g_init_options; } namespace { @@ -56,8 +56,8 @@ opt opt_test_index("test-index", ValueOptional, init("!"), opt opt_index("index", desc("standalone mode: index a project and exit"), value_desc("root"), cat(C)); -opt opt_init("init", desc("extra initialization options in JSON"), - cat(C)); +list opt_init("init", desc("extra initialization options in JSON"), + cat(C)); opt opt_log_file("log-file", desc("log"), value_desc("filename"), cat(C)); opt opt_log_file_append("log-file-append", desc("log"), @@ -118,23 +118,25 @@ int main(int argc, char **argv) { if (!opt_init.empty()) { // We check syntax error here but override client-side // initializationOptions in messages/initialize.cc - g_init_options = opt_init.getValue(); + g_init_options = opt_init; rapidjson::Document reader; - rapidjson::ParseResult ok = reader.Parse(g_init_options.c_str()); - if (!ok) { - fprintf(stderr, "Failed to parse --init as JSON: %s (%zd)\n", - rapidjson::GetParseError_En(ok.Code()), ok.Offset()); - return 1; - } - JsonReader json_reader{&reader}; - try { - Config config; - Reflect(json_reader, config); - } catch (std::invalid_argument &e) { - fprintf(stderr, "Failed to parse --init %s, expected %s\n", - static_cast(json_reader).GetPath().c_str(), - e.what()); - return 1; + for (const std::string &str : g_init_options) { + rapidjson::ParseResult ok = reader.Parse(str.c_str()); + if (!ok) { + fprintf(stderr, "Failed to parse --init as JSON: %s (%zd)\n", + rapidjson::GetParseError_En(ok.Code()), ok.Offset()); + return 1; + } + JsonReader json_reader{&reader}; + try { + Config config; + Reflect(json_reader, config); + } catch (std::invalid_argument &e) { + fprintf(stderr, "Failed to parse --init %s, expected %s\n", + static_cast(json_reader).GetPath().c_str(), + e.what()); + return 1; + } } } diff --git a/src/messages/initialize.cc b/src/messages/initialize.cc index 474f01ed..e80b09d8 100644 --- a/src/messages/initialize.cc +++ b/src/messages/initialize.cc @@ -36,8 +36,7 @@ limitations under the License. namespace ccls { using namespace llvm; -// TODO Cleanup global variables -extern std::string g_init_options; +extern std::vector g_init_options; namespace { enum class TextDocumentSyncKind { None = 0, Full = 1, Incremental = 2 }; @@ -255,14 +254,16 @@ void Initialize(MessageHandler *m, InitializeParam ¶m, ReplyOnce &reply) { { g_config = new Config(param.initializationOptions); rapidjson::Document reader; - reader.Parse(g_init_options.c_str()); - if (!reader.HasParseError()) { - JsonReader json_reader{&reader}; - try { - Reflect(json_reader, *g_config); - } catch (std::invalid_argument &) { - // This will not trigger because parse error is handled in - // MessageRegistry::Parse in lsp.cc + for (const std::string &str : g_init_options) { + reader.Parse(str.c_str()); + if (!reader.HasParseError()) { + JsonReader json_reader{&reader}; + try { + Reflect(json_reader, *g_config); + } catch (std::invalid_argument &) { + // This will not trigger because parse error is handled in + // MessageRegistry::Parse in lsp.cc + } } }