Merge query.hh and query_util.hh

itzuvid · Nov 10, 2019 · 880c515 · 880c515
1 parent d6dd932
commit 880c515
Show file tree

Hide file tree

Showing 21 changed files with 418 additions and 440 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -196,7 +196,6 @@ target_sources(ccls PRIVATE
   src/platform_win.cc
   src/position.cc
   src/project.cc
-  src/query_utils.cc
   src/query.cc
   src/serializer.cc
   src/test.cc

diff --git a/src/message_handler.cc b/src/message_handler.cc
@@ -6,7 +6,7 @@
 #include "log.hh"
 #include "pipeline.hh"
 #include "project.hh"
-#include "query_utils.hh"
+#include "query.hh"
 #include "serializers/json.hh"
 
 #include <algorithm>

diff --git a/src/messages/ccls_call.cc b/src/messages/ccls_call.cc
@@ -4,7 +4,7 @@
 #include "hierarchy.hh"
 #include "message_handler.hh"
 #include "pipeline.hh"
-#include "query_utils.hh"
+#include "query.hh"
 
 #include <unordered_set>
 

diff --git a/src/messages/ccls_info.cc b/src/messages/ccls_info.cc
@@ -4,7 +4,7 @@
 #include "message_handler.hh"
 #include "pipeline.hh"
 #include "project.hh"
-#include "query_utils.hh"
+#include "query.hh"
 
 namespace ccls {
 MAKE_REFLECT_STRUCT(QueryFile::Def, path, args, language, skipped_ranges,

diff --git a/src/messages/ccls_inheritance.cc b/src/messages/ccls_inheritance.cc
@@ -4,7 +4,7 @@
 #include "hierarchy.hh"
 #include "message_handler.hh"
 #include "pipeline.hh"
-#include "query_utils.hh"
+#include "query.hh"
 
 #include <unordered_set>
 

diff --git a/src/messages/ccls_member.cc b/src/messages/ccls_member.cc
@@ -5,7 +5,7 @@
 #include "hierarchy.hh"
 #include "message_handler.hh"
 #include "pipeline.hh"
-#include "query_utils.hh"
+#include "query.hh"
 
 #include <clang/AST/Type.h>
 #include <llvm/ADT/DenseSet.h>

diff --git a/src/messages/ccls_navigate.cc b/src/messages/ccls_navigate.cc
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 #include "message_handler.hh"
-#include "query_utils.hh"
+#include "query.hh"
 
 namespace ccls {
 namespace {

diff --git a/src/messages/ccls_vars.cc b/src/messages/ccls_vars.cc
@@ -3,7 +3,7 @@
 
 #include "message_handler.hh"
 #include "pipeline.hh"
-#include "query_utils.hh"
+#include "query.hh"
 
 namespace ccls {
 namespace {

diff --git a/src/messages/textDocument_code.cc b/src/messages/textDocument_code.cc
@@ -3,7 +3,7 @@
 
 #include "message_handler.hh"
 #include "pipeline.hh"
-#include "query_utils.hh"
+#include "query.hh"
 #include "serializers/json.hh"
 
 #include <llvm/Support/FormatVariadic.h>

diff --git a/src/messages/textDocument_definition.cc b/src/messages/textDocument_definition.cc
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 #include "message_handler.hh"
-#include "query_utils.hh"
+#include "query.hh"
 
 #include <ctype.h>
 #include <limits.h>

diff --git a/src/messages/textDocument_document.cc b/src/messages/textDocument_document.cc
@@ -3,7 +3,7 @@
 
 #include "message_handler.hh"
 #include "pipeline.hh"
-#include "query_utils.hh"
+#include "query.hh"
 
 #include <algorithm>
 

diff --git a/src/messages/textDocument_foldingRange.cc b/src/messages/textDocument_foldingRange.cc
@@ -4,7 +4,7 @@
 #include "message_handler.hh"
 #include "pipeline.hh"
 #include "project.hh"
-#include "query_utils.hh"
+#include "query.hh"
 #include "working_files.hh"
 
 namespace ccls {

diff --git a/src/messages/textDocument_hover.cc b/src/messages/textDocument_hover.cc
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 #include "message_handler.hh"
-#include "query_utils.hh"
+#include "query.hh"
 
 namespace ccls {
 namespace {

diff --git a/src/messages/textDocument_references.cc b/src/messages/textDocument_references.cc
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 #include "message_handler.hh"
-#include "query_utils.hh"
+#include "query.hh"
 
 #include <unordered_set>
 

diff --git a/src/messages/textDocument_rename.cc b/src/messages/textDocument_rename.cc
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 #include "message_handler.hh"
-#include "query_utils.hh"
+#include "query.hh"
 
 namespace ccls {
 namespace {

diff --git a/src/messages/workspace.cc b/src/messages/workspace.cc
@@ -7,7 +7,7 @@
 #include "message_handler.hh"
 #include "pipeline.hh"
 #include "project.hh"
-#include "query_utils.hh"
+#include "query.hh"
 
 #include <llvm/ADT/STLExtras.h>
 #include <llvm/ADT/StringRef.h>

diff --git a/src/pipeline.cc b/src/pipeline.cc
@@ -12,7 +12,7 @@
 #include "pipeline.hh"
 #include "platform.hh"
 #include "project.hh"
-#include "query_utils.hh"
+#include "query.hh"
 #include "serializers/json.hh"
 
 #include <rapidjson/document.h>