Fix some clang-tidy warnings

Incorporated some fixes by Daniel Chabrowski (#467)

src/clang_tu.cc

@@ -36,8 +36,8 @@ std::string pathFromFileEntry(const FileEntry &file) {
 
 static Pos decomposed2LineAndCol(const SourceManager &sm,
                                  std::pair<FileID, unsigned> i) {
-  int l = sm.getLineNumber(i.first, i.second) - 1,
+  int l = (int)sm.getLineNumber(i.first, i.second) - 1,
-      c = sm.getColumnNumber(i.first, i.second) - 1;
+      c = (int)sm.getColumnNumber(i.first, i.second) - 1;
   bool invalid = false;
   StringRef buf = sm.getBufferData(i.first, &invalid);
   if (!invalid) {
@@ -114,7 +114,6 @@ const char *clangBuiltinTypeName(int kind) {
   case BuiltinType::Bool:
     return "bool";
   case BuiltinType::Char_S:
-    return "char";
   case BuiltinType::Char_U:
     return "char";
   case BuiltinType::SChar:

src/fuzzy_match.cc

@@ -101,7 +101,7 @@ FuzzyMatcher::FuzzyMatcher(std::string_view pattern, int sensitivity) {
   for (size_t i = 0; i < pattern.size(); i++)
     if (pattern[i] != ' ') {
       pat += pattern[i];
-      low_pat[n] = ::tolower(pattern[i]);
+      low_pat[n] = (char)::tolower(pattern[i]);
       pat_role[n] = pat_role[i];
       n++;
     }
@@ -115,7 +115,7 @@ int FuzzyMatcher::match(std::string_view text, bool strict) {
     return kMinScore + 1;
   this->text = text;
   for (int i = 0; i < n; i++)
-    low_text[i] = ::tolower(text[i]);
+    low_text[i] = (char)::tolower(text[i]);
   calculateRoles(text, text_role, &text_set);
   if (strict && n && !!pat_role[0] != !!text_role[0])
     return kMinScore;

src/indexer.cc

@@ -461,9 +461,7 @@ public:
     }
     while (ret.size() && isspace(ret.back()))
       ret.pop_back();
-    if (StringRef(ret).endswith("*/"))
+    if (StringRef(ret).endswith("*/") || StringRef(ret).endswith("\n/"))
-      ret.resize(ret.size() - 2);
-    else if (StringRef(ret).endswith("\n/"))
       ret.resize(ret.size() - 2);
     while (ret.size() && isspace(ret.back()))
       ret.pop_back();
@@ -676,7 +674,7 @@ public:
           rd->isInvalidDecl() || !validateRecord(rd))
         offset = -1;
       for (FieldDecl *fd : rd->fields()) {
-        int offset1 = offset < 0 ? -1 : offset + ctx->getFieldOffset(fd);
+        int offset1 = offset < 0 ? -1 : int(offset + ctx->getFieldOffset(fd));
         if (fd->getIdentifier())
           type.def.vars.emplace_back(getUsr(fd), offset1);
         else if (const auto *rt1 = fd->getType()->getAs<RecordType>()) {

src/lsp.cc

@@ -45,7 +45,7 @@ void reflect(JsonWriter &visitor, RequestId &value) {
     visitor.null_();
     break;
   case RequestId::kInt:
-    visitor.int_(atoll(value.value.c_str()));
+    visitor.int64(atoll(value.value.c_str()));
     break;
   case RequestId::kString:
     visitor.string(value.value.c_str(), value.value.size());
@@ -63,7 +63,7 @@ void DocumentUri::setPath(const std::string &path) {
   // file:///c%3A/Users/jacob/Desktop/superindex/indexer/full_tests
   raw_uri = path;
 
-  size_t index = raw_uri.find(":");
+  size_t index = raw_uri.find(':');
   if (index == 1) { // widows drive letters must always be 1 char
     raw_uri.replace(raw_uri.begin() + index, raw_uri.begin() + index + 1,
                     "%3A");

src/message_handler.cc

@@ -121,10 +121,8 @@ void ReplyOnce::replyLocationLink(std::vector<LocationLink> &result) {
   if (g_config->client.linkSupport) {
     (*this)(result);
   } else {
-    std::vector<Location> result1;
+    (*this)(std::vector<Location>(std::make_move_iterator(result.begin()),
-    for (auto &loc : result)
+                                  std::make_move_iterator(result.end())));
-      result1.emplace_back(std::move(loc));
-    (*this)(result1);
   }
 }
 

src/message_handler.hh

@@ -32,8 +32,9 @@ struct WorkingFile;
 struct WorkingFiles;
 
 namespace pipeline {
-void reply(RequestId id, const std::function<void(JsonWriter &)> &fn);
+void reply(const RequestId &id, const std::function<void(JsonWriter &)> &fn);
-void replyError(RequestId id, const std::function<void(JsonWriter &)> &fn);
+void replyError(const RequestId &id,
+                const std::function<void(JsonWriter &)> &fn);
 } // namespace pipeline
 
 struct CodeActionParam {

src/messages/initialize.cc

@@ -382,7 +382,7 @@ void do_initialize(MessageHandler *m, InitializeParam &param,
   // may take a long time. Indexer threads will emit status/progress
   // reports.
   if (g_config->index.threads == 0)
-    g_config->index.threads = std::thread::hardware_concurrency();
+    g_config->index.threads = (int)std::thread::hardware_concurrency();
 
   LOG_S(INFO) << "start " << g_config->index.threads << " indexers";
   for (int i = 0; i < g_config->index.threads; i++)

src/messages/textDocument_formatting.cc

@@ -44,8 +44,8 @@ std::vector<TextEdit> replacementsToEdits(std::string_view code,
                                           const tooling::Replacements &repls) {
   std::vector<TextEdit> ret;
   int i = 0, line = 0, col = 0;
-  auto move = [&](int p) {
+  auto move = [&](unsigned p) {
-    for (; i < p; i++)
+    for (; i < (int)p; i++)
       if (code[i] == '\n')
         line++, col = 0;
       else {

src/messages/workspace.cc

@@ -101,7 +101,7 @@ void MessageHandler::workspace_didChangeWorkspaceFolders(
     if (folder == real)
       real.clear();
     LOG_S(INFO) << "add workspace folder " << wf.name << ": "
-                << (real.empty() ? folder : folder + " -> " + real);
+                << (real.empty() ? folder : (folder + " -> ").append(real));
     workspaceFolders.emplace_back();
     auto it = workspaceFolders.end() - 1;
     for (; it != workspaceFolders.begin() && folder < it[-1].first; --it)

src/pipeline.cc

@@ -616,13 +616,13 @@ void mainLoop() {
 
   SemaManager manager(
       &project, &wfiles,
-      [&](std::string path, std::vector<Diagnostic> diagnostics) {
+      [](const std::string &path, std::vector<Diagnostic> diagnostics) {
         PublishDiagnosticParam params;
         params.uri = DocumentUri::fromPath(path);
-        params.diagnostics = diagnostics;
+        params.diagnostics = std::move(diagnostics);
         notify("textDocument/publishDiagnostics", params);
       },
-      [](RequestId id) {
+      [](const RequestId &id) {
         if (id.valid()) {
           ResponseError err;
           err.code = ErrorCode::InternalError;
@@ -717,8 +717,9 @@ void standalone(const std::string &root) {
   WorkingFiles wfiles;
   VFS vfs;
   SemaManager manager(
-      nullptr, nullptr, [&](std::string, std::vector<Diagnostic>) {},
+      nullptr, nullptr,
-      [](RequestId id) {});
+      [](const std::string &, const std::vector<Diagnostic> &) {},
+      [](const RequestId &id) {});
   IncludeComplete complete(&project);
 
   MessageHandler handler;
@@ -756,7 +757,7 @@ void standalone(const std::string &root) {
 void index(const std::string &path, const std::vector<const char *> &args,
            IndexMode mode, bool must_exist, RequestId id) {
   pending_index_requests++;
-  index_request->pushBack({path, args, mode, must_exist, id},
+  index_request->pushBack({path, args, mode, must_exist, std::move(id)},
                           mode != IndexMode::Background);
 }
 
@@ -800,7 +801,7 @@ void notifyOrRequest(const char *method, bool request,
   for_stdout->pushBack(output.GetString());
 }
 
-static void reply(RequestId id, const char *key,
+static void reply(const RequestId &id, const char *key,
                   const std::function<void(JsonWriter &)> &fn) {
   rapidjson::StringBuffer output;
   rapidjson::Writer<rapidjson::StringBuffer> w(output);
@@ -813,7 +814,7 @@ static void reply(RequestId id, const char *key,
     w.Null();
     break;
   case RequestId::kInt:
-    w.Int(atoll(id.value.c_str()));
+    w.Int64(atoll(id.value.c_str()));
     break;
   case RequestId::kString:
     w.String(id.value.c_str(), id.value.size());
@@ -828,11 +829,12 @@ static void reply(RequestId id, const char *key,
   for_stdout->pushBack(output.GetString());
 }
 
-void reply(RequestId id, const std::function<void(JsonWriter &)> &fn) {
+void reply(const RequestId &id, const std::function<void(JsonWriter &)> &fn) {
   reply(id, "result", fn);
 }
 
-void replyError(RequestId id, const std::function<void(JsonWriter &)> &fn) {
+void replyError(const RequestId &id,
+                const std::function<void(JsonWriter &)> &fn) {
   reply(id, "error", fn);
 }
 } // namespace pipeline

src/pipeline.hh

@@ -65,10 +65,11 @@ template <typename T> void request(const char *method, T &result) {
   notifyOrRequest(method, true, [&](JsonWriter &w) { reflect(w, result); });
 }
 
-void reply(RequestId id, const std::function<void(JsonWriter &)> &fn);
+void reply(const RequestId &id, const std::function<void(JsonWriter &)> &fn);
 
-void replyError(RequestId id, const std::function<void(JsonWriter &)> &fn);
+void replyError(const RequestId &id,
-template <typename T> void replyError(RequestId id, T &result) {
+                const std::function<void(JsonWriter &)> &fn);
+template <typename T> void replyError(const RequestId &id, T &result) {
   replyError(id, [&](JsonWriter &w) { reflect(w, result); });
 }
 } // namespace pipeline

src/project.cc

@@ -249,7 +249,7 @@ bool appendToCDB(const std::vector<const char *> &args) {
   return args.size() && StringRef("%compile_commands.json") == args[0];
 }
 
-std::vector<const char *> getFallback(const std::string path) {
+std::vector<const char *> getFallback(const std::string &path) {
   std::vector<const char *> argv{"clang"};
   if (sys::path::extension(path) == ".h")
     argv.push_back("-xobjective-c++-header");
@@ -607,7 +607,7 @@ Project::Entry Project::findEntry(const std::string &path, bool can_redirect,
   return ret;
 }
 
-void Project::index(WorkingFiles *wfiles, RequestId id) {
+void Project::index(WorkingFiles *wfiles, const RequestId &id) {
   auto &gi = g_config->index;
   GroupMatch match(gi.whitelist, gi.blacklist),
       match_i(gi.initialWhitelist, gi.initialBlacklist);

src/project.hh

@@ -76,7 +76,7 @@ struct Project {
   void setArgsForFile(const std::vector<const char *> &args,
                       const std::string &path);
 
-  void index(WorkingFiles *wfiles, RequestId id);
+  void index(WorkingFiles *wfiles, const RequestId &id);
   void indexRelated(const std::string &path);
 };
 } // namespace ccls

src/query.cc

@@ -135,7 +135,7 @@ IndexUpdate IndexUpdate::createDelta(IndexFile *previous, IndexFile *current) {
     previous = ∅
   r.lid2path = std::move(current->lid2path);
 
-  r.funcs_hint = current->usr2func.size() - previous->usr2func.size();
+  r.funcs_hint = int(current->usr2func.size() - previous->usr2func.size());
   for (auto &it : previous->usr2func) {
     auto &func = it.second;
     if (func.def.detailed_name[0])
@@ -153,7 +153,7 @@ IndexUpdate IndexUpdate::createDelta(IndexFile *previous, IndexFile *current) {
     r.funcs_derived[func.usr].second = std::move(func.derived);
   }
 
-  r.types_hint = current->usr2type.size() - previous->usr2type.size();
+  r.types_hint = int(current->usr2type.size() - previous->usr2type.size());
   for (auto &it : previous->usr2type) {
     auto &type = it.second;
     if (type.def.detailed_name[0])
@@ -173,7 +173,7 @@ IndexUpdate IndexUpdate::createDelta(IndexFile *previous, IndexFile *current) {
     r.types_instances[type.usr].second = std::move(type.instances);
   };
 
-  r.vars_hint = current->usr2var.size() - previous->usr2var.size();
+  r.vars_hint = int(current->usr2var.size() - previous->usr2var.size());
   for (auto &it : previous->usr2var) {
     auto &var = it.second;
     if (var.def.detailed_name[0])

src/sema_manager.cc

@@ -231,7 +231,7 @@ class StoreDiags : public DiagnosticConsumer {
   }
 
 public:
-  StoreDiags(std::string path) : path(path) {}
+  StoreDiags(std::string path) : path(std::move(path)) {}
   std::vector<Diag> take() { return std::move(output); }
   bool isConcerned(const SourceManager &sm, SourceLocation l) {
     FileID fid = sm.getFileID(l);
@@ -615,7 +615,7 @@ void *diagnosticMain(void *manager_) {
         ret.severity = 1;
         break;
       }
-      ret.code = d.category;
+      ret.code = (int)d.category;
       return ret;
     };
 
@@ -683,8 +683,10 @@ std::shared_ptr<PreambleData> Session::getPreamble() {
 
 SemaManager::SemaManager(Project *project, WorkingFiles *wfiles,
                          OnDiagnostic on_diagnostic, OnDropped on_dropped)
-    : project_(project), wfiles(wfiles), on_diagnostic_(on_diagnostic),
+    : project_(project), wfiles(wfiles),
-      on_dropped_(on_dropped), pch(std::make_shared<PCHContainerOperations>()) {
+      on_diagnostic_(std::move(on_diagnostic)),
+      on_dropped_(std::move(on_dropped)),
+      pch(std::make_shared<PCHContainerOperations>()) {
   spawnThread(ccls::preambleMain, this);
   spawnThread(ccls::completionMain, this);
   spawnThread(ccls::diagnosticMain, this);

src/serializer.cc

@@ -25,6 +25,7 @@ limitations under the License.
 
 #include <llvm/ADT/CachedHashString.h>
 #include <llvm/ADT/DenseSet.h>
+#include <llvm/ADT/STLExtras.h>
 
 #include <mutex>
 #include <stdexcept>
@@ -35,7 +36,7 @@ bool gTestOutputMode = false;
 
 namespace ccls {
 
-void JsonReader::iterArray(std::function<void()> fn) {
+void JsonReader::iterArray(llvm::function_ref<void()> fn) {
   if (!m->IsArray())
     throw std::invalid_argument("array");
   // Use "0" to indicate any element for now.
@@ -48,7 +49,7 @@ void JsonReader::iterArray(std::function<void()> fn) {
   }
   path_.pop_back();
 }
-void JsonReader::member(const char *name, std::function<void()> fn) {
+void JsonReader::member(const char *name, llvm::function_ref<void()> fn) {
   path_.push_back(name);
   auto it = m->FindMember(name);
   if (it != m->MemberEnd()) {
@@ -81,7 +82,7 @@ void JsonWriter::startObject() { m->StartObject(); }
 void JsonWriter::endObject() { m->EndObject(); }
 void JsonWriter::key(const char *name) { m->Key(name); }
 void JsonWriter::null_() { m->Null(); }
-void JsonWriter::int_(int v) { m->Int(v); }
+void JsonWriter::int64(int64_t v) { m->Int64(v); }
 void JsonWriter::string(const char *s) { m->String(s); }
 void JsonWriter::string(const char *s, size_t len) { m->String(s, len); }
 

src/serializer.hh

@@ -34,6 +34,7 @@ limitations under the License.
 namespace llvm {
 class CachedHashStringRef;
 class StringRef;
+template <typename Fn> class function_ref;
 } // namespace llvm
 
 namespace ccls {
@@ -48,8 +49,8 @@ struct JsonReader {
   JsonReader(rapidjson::Value *m) : m(m) {}
   void startObject() {}
   void endObject() {}
-  void iterArray(std::function<void()> fn);
+  void iterArray(llvm::function_ref<void()> fn);
-  void member(const char *name, std::function<void()> fn);
+  void member(const char *name, llvm::function_ref<void()> fn);
   bool isNull();
   std::string getString();
   std::string getPath() const;
@@ -69,7 +70,7 @@ struct JsonWriter {
   void endObject();
   void key(const char *name);
   void null_();
-  void int_(int v);
+  void int64(int64_t v);
   void string(const char *s);
   void string(const char *s, size_t len);
 };

src/working_files.cc

@@ -143,7 +143,7 @@ int alignColumn(const std::string &a, int column, std::string b, bool is_end) {
   if (column < head)
     return column;
   if ((int)a.size() - tail < column)
-    return column + b.size() - a.size();
+    return column + (int)b.size() - (int)a.size();
   if (std::max(a.size(), b.size()) - head - tail >= kMaxColumnAlignSize)
     return std::min(column, (int)b.size());