Remove WithFileContent & lex_utils.{cc,h}

FirstLoveLife · Jun 1, 2018 · 39a17a9 · 39a17a9
1 parent ec00f85
commit 39a17a9
Show file tree

Hide file tree

Showing 19 changed files with 100 additions and 254 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -202,7 +202,6 @@ target_sources(ccls PRIVATE
                src/indexer.cc
                src/method.cc
                src/language.cc
-               src/lex_utils.cc
                src/log.cc
                src/lsp.cc
                src/match.cc

diff --git a/src/indexer.cc b/src/indexer.cc
@@ -3,9 +3,11 @@
 #include "log.hh"
 #include "platform.h"
 #include "serializer.h"
-#include "timer.h"
 #include "type_printer.h"
 
+#include <llvm/Support/Timer.h>
+using namespace llvm;
+
 #include <assert.h>
 #include <inttypes.h>
 #include <limits.h>
@@ -2016,7 +2018,8 @@ std::vector<std::unique_ptr<IndexFile>> ClangIndexer::Index(
 
   file = NormalizePath(file);
 
-  Timer timer;
+  Timer timer("parse", "parse tu");
+  timer.startTimer();
 
   std::vector<CXUnsavedFile> unsaved_files;
   for (const FileContents& contents : file_contents) {
@@ -2034,7 +2037,7 @@ std::vector<std::unique_ptr<IndexFile>> ClangIndexer::Index(
   if (!tu)
     return {};
 
-  perf->index_parse = timer.ElapsedMicrosecondsAndReset();
+  timer.stopTimer();
 
   return ParseWithTu(vfs, perf, tu.get(), &index, file, args, unsaved_files);
 }
@@ -2048,6 +2051,7 @@ std::vector<std::unique_ptr<IndexFile>> ParseWithTu(
     const std::vector<std::string>& args,
     const std::vector<CXUnsavedFile>& file_contents) {
   Timer timer;
+  timer.startTimer();
 
   IndexerCallbacks callback = {0};
   // Available callbacks:
@@ -2085,13 +2089,12 @@ std::vector<std::unique_ptr<IndexFile>> ParseWithTu(
                  << " failed with errno=" << index_result;
     return {};
   }
-
   clang_IndexAction_dispose(index_action);
 
   ClangCursor(clang_getTranslationUnitCursor(tu->cx_tu))
       .VisitChildren(&VisitMacroDefinitionAndExpansions, &param);
 
-  perf->index_build = timer.ElapsedMicrosecondsAndReset();
+  timer.stopTimer();
 
   std::unordered_map<std::string, int> inc_to_line;
   // TODO

diff --git a/src/indexer.h b/src/indexer.h
@@ -27,8 +27,6 @@ struct IndexFunc;
 struct IndexVar;
 struct QueryFile;
 
-using RawId = uint32_t;
-
 struct SymbolIdx {
   Usr usr;
   SymbolKind kind;
@@ -153,19 +151,9 @@ struct TypeDef : NameMixin<TypeDef> {
   NtString hover;
   NtString comments;
 
-  // While a class/type can technically have a separate declaration/definition,
-  // it doesn't really happen in practice. The declaration never contains
-  // comments or insightful information. The user always wants to jump from
-  // the declaration to the definition - never the other way around like in
-  // functions and (less often) variables.
-  //
-  // It's also difficult to identify a `class Foo;` statement with the clang
-  // indexer API (it's doable using cursor AST traversal), so we don't bother
-  // supporting the feature.
   Maybe<Use> spell;
   Maybe<Use> extent;
 
-  // Immediate parent types.
   std::vector<Usr> bases;
 
   // Types, functions, and variables defined in this type.
@@ -221,8 +209,6 @@ struct VarDef : NameMixin<VarDef> {
   std::string detailed_name;
   NtString hover;
   NtString comments;
-  // TODO: definitions should be a list of ranges, since there can be more
-  //       than one - when??
   Maybe<Use> spell;
   Maybe<Use> extent;
 

diff --git a/src/lex_utils.cc b/src/lex_utils.cc
diff --git a/src/lex_utils.h b/src/lex_utils.h
diff --git a/src/main.cc b/src/main.cc
@@ -129,12 +129,10 @@ int main(int argc, char** argv) {
       }
     }
 
-    std::unordered_map<MethodType, Timer> request_times;
-
     // The thread that reads from stdin and dispatchs commands to the main thread.
-    pipeline::LaunchStdin(&request_times);
+    pipeline::LaunchStdin();
     // The thread that writes responses from the main thread to stdout.
-    pipeline::LaunchStdout(&request_times);
+    pipeline::LaunchStdout();
     // Main thread which also spawns indexer threads upon the "initialize" request.
     pipeline::MainLoop();
   }

diff --git a/src/message_handler.cc b/src/message_handler.cc
@@ -1,6 +1,5 @@
 #include "message_handler.h"
 
-#include "lex_utils.h"
 #include "log.hh"
 #include "project.h"
 #include "query_utils.h"

diff --git a/src/messages/text_document_completion.cc b/src/messages/text_document_completion.cc
@@ -7,8 +7,6 @@
 #include "working_files.h"
 using namespace ccls;
 
-#include "lex_utils.h"
-
 #include <regex>
 
 namespace {

diff --git a/src/messages/text_document_definition.cc b/src/messages/text_document_definition.cc
@@ -1,4 +1,3 @@
-#include "lex_utils.h"
 #include "message_handler.h"
 #include "pipeline.hh"
 #include "query_utils.h"

diff --git a/src/messages/text_document_range_formatting.cc b/src/messages/text_document_range_formatting.cc
diff --git a/src/messages/workspace_symbol.cc b/src/messages/workspace_symbol.cc
@@ -1,5 +1,4 @@
 #include "fuzzy_match.h"
-#include "lex_utils.h"
 #include "message_handler.h"
 #include "pipeline.hh"
 #include "query_utils.h"