Zengtudor/ccls
1
0
Fork 0
mirror of https://github.com/MaskRay/ccls.git synced 2024-11-25 17:11:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

/.cquery file parsing fixes

Browse Source 
- relative path handling
- first line was being ignored if it was a flag (code assumed it was path to clang binary)
This commit is contained in:
Joel Hock 2017-12-18 23:25:25 -06:00 committed by Jacob Dufault
parent b9a2b68e93
commit bea5b38bc5
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/project.cc
View File

@ -121,6 +121,12 @@ Project::Entry GetCompilationEntryFromCompileCommandEntry(
// Include the compiler in the args. // Include the compiler in the args.
if (i > 0) if (i > 0)
result.args.push_back(entry.args[i - 1]); result.args.push_back(entry.args[i - 1]);
else {
// Args probably came from a /.cquery file, which likely has just flags.
// clang_parseTranslationUnit2FullArgv() expects the binary path as the
// first arg, so the first flag would end up being ignored. Add a dummy.
result.args.push_back("clang++");
}
bool next_flag_is_path = false; bool next_flag_is_path = false;
bool add_next_flag_to_quote_dirs = false; bool add_next_flag_to_quote_dirs = false;
@ -147,7 +153,6 @@ Project::Entry GetCompilationEntryFromCompileCommandEntry(
// Cleanup path for previous argument. // Cleanup path for previous argument.
if (next_flag_is_path) { if (next_flag_is_path) {
arg = cleanup_maybe_relative_path(arg); arg = cleanup_maybe_relative_path(arg);
if (add_next_flag_to_quote_dirs) if (add_next_flag_to_quote_dirs)
config->quote_dirs.insert(arg); config->quote_dirs.insert(arg);
if (add_next_flag_to_angle_dirs) if (add_next_flag_to_angle_dirs)
@ -239,6 +244,7 @@ std::vector<Project::Entry> LoadFromDirectoryListing(ProjectConfig* config) {
CompileCommandsEntry e; CompileCommandsEntry e;
e.file = NormalizePathWithTestOptOut(file); e.file = NormalizePathWithTestOptOut(file);
e.args = args; e.args = args;
e.directory = config->project_dir;
result.push_back(GetCompilationEntryFromCompileCommandEntry(config, e)); result.push_back(GetCompilationEntryFromCompileCommandEntry(config, e));
} }
} }