From 593ecd8f53ea04ac9ea86189f247381dae8b1e97 Mon Sep 17 00:00:00 2001
From: Jacob Dufault <jacobdufault@gmail.com>
Date: Sun, 11 Feb 2018 13:56:34 -0800
Subject: [PATCH] Rename Maybe::has_value to Maybe::HasValue to follow naming
 conventions

---
 src/maybe.h                             | 6 +++---
 src/messages/cquery_member_hierarchy.cc | 2 +-
 src/messages/text_document_rename.cc    | 2 +-
 src/query.cc                            | 6 +++---
 src/query_utils.cc                      | 4 ++--
 src/serializer.h                        | 2 +-
 6 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/maybe.h b/src/maybe.h
index 60942f1d..32df3651 100644
--- a/src/maybe.h
+++ b/src/maybe.h
@@ -28,12 +28,12 @@ public:
   const T& operator*() const { return storage; }
   T& operator*() { return storage; }
 
-  bool has_value() const {
+  bool HasValue() const {
     return storage.HasValueForMaybe_();
   }
-  explicit operator bool() const { return has_value(); }
+  explicit operator bool() const { return HasValue(); }
   operator optional<T>() const {
-    if (has_value())
+    if (HasValue())
       return storage;
     return nullopt;
   }
diff --git a/src/messages/cquery_member_hierarchy.cc b/src/messages/cquery_member_hierarchy.cc
index 804fcb2b..0f0322e0 100644
--- a/src/messages/cquery_member_hierarchy.cc
+++ b/src/messages/cquery_member_hierarchy.cc
@@ -114,7 +114,7 @@ struct CqueryMemberHierarchyExpandHandler
     Out_CqueryMemberHierarchy out;
     out.id = request->id;
     // |ExpandNode| uses -1 to indicate invalid |type_id|.
-    if (request->params.type_id.has_value())
+    if (request->params.type_id)
       out.result = ExpandNode(db, working_files, *request->params.type_id);
 
     QueueManager::WriteStdout(IpcId::CqueryMemberHierarchyExpand, out);
diff --git a/src/messages/text_document_rename.cc b/src/messages/text_document_rename.cc
index f0a9e2a1..711985a3 100644
--- a/src/messages/text_document_rename.cc
+++ b/src/messages/text_document_rename.cc
@@ -17,7 +17,7 @@ lsWorkspaceEdit BuildWorkspaceEdit(QueryDatabase* db,
       continue;
 
     Maybe<QueryFileId> file_id = db->GetFileId(use);
-    if (!file_id.has_value())
+    if (!file_id)
       continue;
     if (path_to_edit.find(*file_id) == path_to_edit.end()) {
       path_to_edit[*file_id] = lsTextDocumentEdit();
diff --git a/src/query.cc b/src/query.cc
index 028b1a8d..dd9bc4d0 100644
--- a/src/query.cc
+++ b/src/query.cc
@@ -255,9 +255,9 @@ QueryFile::DefUpdate BuildFileDefUpdate(const IdMap& id_map, const IndexFile& in
   }
   for (const IndexFunc& func : indexed.funcs) {
     QueryFuncId id = id_map.ToQuery(func.id);
-    if (func.def.spell.has_value())
+    if (func.def.spell)
       add_all_symbols_use(*func.def.spell, id, SymbolKind::Func);
-    if (func.def.extent.has_value())
+    if (func.def.extent)
       add_outline_use(*func.def.extent, id, SymbolKind::Func);
     for (const IndexFunc::Declaration& decl : func.declarations) {
       add_all_symbols(decl.spelling, id, SymbolKind::Func,
@@ -926,7 +926,7 @@ void QueryDatabase::ImportOrUpdate(std::vector<QueryVar::DefUpdate>&& updates) {
 void QueryDatabase::UpdateSymbols(Maybe<Id<void>>* symbol_idx,
                                   SymbolKind kind,
                                   Id<void> idx) {
-  if (!symbol_idx->has_value()) {
+  if (!symbol_idx->HasValue()) {
     *symbol_idx = Id<void>(symbols.size());
     symbols.push_back(SymbolIdx{idx, kind});
   }
diff --git a/src/query_utils.cc b/src/query_utils.cc
index 59fe3c45..af68a5f5 100644
--- a/src/query_utils.cc
+++ b/src/query_utils.cc
@@ -380,7 +380,7 @@ optional<lsLocation> GetLsLocation(QueryDatabase* db,
                                    Reference ref) {
   std::string path;
   Maybe<QueryFileId> file_id = db->GetFileId(ref);
-  if (!file_id.has_value())
+  if (!file_id)
     return nullopt;
   lsDocumentUri uri = GetLsDocumentUri(db, *file_id, &path);
   optional<lsRange> range =
@@ -496,7 +496,7 @@ optional<lsSymbolInformation> GetSymbolInfo(QueryDatabase* db,
       info.containerName = func.def->detailed_name;
       info.kind = lsSymbolKind::Function;
 
-      if (func.def->declaring_type.has_value()) {
+      if (func.def->declaring_type) {
         QueryType& container = db->types[func.def->declaring_type->id];
         if (container.def)
           info.kind = lsSymbolKind::Method;
diff --git a/src/serializer.h b/src/serializer.h
index 1d66a74b..7c494b5a 100644
--- a/src/serializer.h
+++ b/src/serializer.h
@@ -229,7 +229,7 @@ void ReflectMember(Writer& visitor, const char* name, optional<T>& value) {
 // The same as std::optional
 template <typename T>
 void ReflectMember(Writer& visitor, const char* name, Maybe<T>& value) {
-  if (value.has_value() || visitor.Format() != SerializeFormat::Json) {
+  if (value.HasValue() || visitor.Format() != SerializeFormat::Json) {
     visitor.Key(name);
     Reflect(visitor, value);
   }