Add unqlite database option

.appveyor.yml

@@ -16,7 +16,7 @@ matrix:
   fast_finish: true # Immediately finish build if one of the jobs fails.
 
 before_build: 
-  - cmake -DCMAKE_INSTALL_PREFIX=install -DCMAKE_GENERATOR_PLATFORM=x64 .
+  - cmake -DCI=ON -DCMAKE_INSTALL_PREFIX=install -DCMAKE_GENERATOR_PLATFORM=x64 .
 
 build:
   project: cquery.sln

.travis.yml

@@ -70,7 +70,7 @@ before_install:
   - eval "${INSTALL}"
 
 script:
-  - cmake -DCMAKE_INSTALL_PREFIX=install -DCMAKE_BUILD_TYPE=Debug .
+  - cmake -DCI=ON -DCMAKE_INSTALL_PREFIX=install -DCMAKE_BUILD_TYPE=Debug .
   - cmake --build . -- -j 3
   - cmake --build . --target install
   - ./install/bin/cquery --ci --log-all-to-stderr --test-unit

CMakeLists.txt

@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 3.1)
-project(cquery LANGUAGES CXX)
+project(cquery LANGUAGES CXX C)
 
 list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/)
 include(DefaultCMakeBuildType)
@@ -11,6 +11,8 @@ set(CLANG_DOWNLOAD_LOCATION ${CMAKE_BINARY_DIR}
 option(SYSTEM_CLANG "Use system installation of Clang instead of \
        downloading Clang" OFF)
 option(ASAN "Compile with address sanitizers" OFF)
+option(ASSERTS "Compile with asserts enabled" OFF)
+option(CI "Add -Werror or equivalent" OFF) 
 
 # Sources for the executable are specified at end of CMakeLists.txt
 add_executable(cquery "")
@@ -39,6 +41,7 @@ if(MSVC)
   target_compile_options(cquery PRIVATE
                          /nologo
                          /EHsc
+                         /D_CRT_SECURE_NO_WARNINGS # don't try to use MSVC std replacements
                          /W3 # roughly -Wall
                          /wd4996 # disable loguru unsafe warnings
                          /wd4722 # ignores warning C4722
@@ -47,13 +50,17 @@ if(MSVC)
                                  # (conversion from 'size_t' to 'type'),
                                  # roughly -Wno-sign-compare
                          /wd4800
+                         /wd4068 # Disable unknown pragma warning
                          $<$<CONFIG:Debug>:/FS>
+                         $<$<BOOL:${CI}>:/WX> 
                          )
 else()
   # Common GCC/Clang(Linux) options
   target_compile_options(cquery PRIVATE
                          -Wall
                          -Wno-sign-compare
+                         -Wno-unknown-pragmas
+                         $<$<BOOL:${CI}>:-Werror>
                          )
 
   if(${CMAKE_CXX_COMPILER_ID} STREQUAL GNU)
@@ -72,6 +79,14 @@ else()
   endif()
 endif()
 
+
+# Enable asserts
+if(ASSERTS)
+  string(REPLACE "/DNDEBUG" "" CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE}")
+  string(REPLACE "-DNDEBUG" "" CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE}")
+endif()
+
+
 ### Download Clang if required
 
 if(NOT SYSTEM_CLANG)
@@ -87,6 +102,10 @@ endif()
 
 ### Libraries
 
+# unqlite
+add_subdirectory(third_party/unqlite)
+target_link_libraries(cquery PRIVATE unqlite)
+
 # See cmake/FindClang.cmake
 find_package(Clang ${CLANG_VERSION} REQUIRED)
 target_link_libraries(cquery PRIVATE Clang::Clang)
@@ -136,11 +155,11 @@ target_include_directories(cquery PRIVATE
 
 install(TARGETS cquery RUNTIME DESTINATION bin)
 
-# If downloaded Clang is used we have to bundle the required files from 
+# If downloaded Clang is used we have to bundle the required files from
 # the downloaded Clang along with the cquery executable
 if(NOT SYSTEM_CLANG)
 
-  # On Linux/FreeBSD/Darwin we set the rpath so cquery can find 
+  # On Linux/FreeBSD/Darwin we set the rpath so cquery can find
   # libclang.[so,dylib]. On Windows we install libclang.dll to the bin directory
   # to do the same.
 
@@ -151,7 +170,7 @@ if(NOT SYSTEM_CLANG)
     set_property(TARGET cquery APPEND PROPERTY
                  INSTALL_RPATH @loader_path/../lib)
   elseif(${CMAKE_SYSTEM_NAME} STREQUAL Windows)
-    install(FILES ${DOWNLOADED_CLANG_DIR}/bin/libclang.dll DESTINATION bin) 
+    install(FILES ${DOWNLOADED_CLANG_DIR}/bin/libclang.dll DESTINATION bin)
   endif()
 
   # Install libclang.[so,lib,dylib] to lib directory
@@ -194,15 +213,15 @@ if(NOT SYSTEM_CLANG)
   # prefix.
 
   file(GLOB CLANG_INCLUDE_DIR ${DOWNLOADED_CLANG_DIR}/lib/clang/*/include)
-  string(REPLACE ${DOWNLOADED_CLANG_DIR}/ "" 
+  string(REPLACE ${DOWNLOADED_CLANG_DIR}/ ""
          CLANG_INCLUDE_DIR ${CLANG_INCLUDE_DIR})
 
   # Add trailing slash to overwrite destination directory instead of putting the
   # directory inside the destination directory
   install(DIRECTORY ${DOWNLOADED_CLANG_DIR}/${CLANG_INCLUDE_DIR}/
           DESTINATION ${CLANG_INCLUDE_DIR})
-  
-  # include/c++/v1 is not included in every Clang download (Windows) so we check 
+
+  # include/c++/v1 is not included in every Clang download (Windows) so we check
   # if it exists first
   if(IS_DIRECTORY ${DOWNLOADED_CLANG_DIR}/include/c++/v1)
     install(DIRECTORY ${DOWNLOADED_CLANG_DIR}/include/c++/v1/
@@ -245,6 +264,7 @@ target_sources(cquery PRIVATE
                third_party/pugixml/src/pugixml.cpp)
 
 target_sources(cquery PRIVATE
+               src/c_cpp_properties.cc
                src/cache_manager.cc
                src/clang_complete.cc
                src/clang_cursor.cc
@@ -256,6 +276,7 @@ target_sources(cquery PRIVATE
                src/clang_utils.cc
                src/code_complete_cache.cc
                src/command_line.cc
+               src/compiler.cc
                src/diagnostics_engine.cc
                src/file_consumer.cc
                src/file_contents.cc
@@ -275,7 +296,6 @@ target_sources(cquery PRIVATE
                src/platform_posix.cc
                src/platform_win.cc
                src/platform.cc
-               src/port.cc
                src/position.cc
                src/project.cc
                src/query_utils.cc
@@ -288,6 +308,7 @@ target_sources(cquery PRIVATE
                src/task.cc
                src/test.cc
                src/third_party_impl.cc
+               src/threaded_queue.cc
                src/timer.cc
                src/timestamp_manager.cc
                src/type_printer.cc
@@ -299,14 +320,12 @@ target_sources(cquery PRIVATE
                src/messages/cquery_base.cc
                src/messages/cquery_call_hierarchy.cc
                src/messages/cquery_callers.cc
-               src/messages/cquery_derived.cc
                src/messages/cquery_did_view.cc
                src/messages/cquery_file_info.cc
                src/messages/cquery_freshen_index.cc
                src/messages/cquery_index_file.cc
                src/messages/cquery_inheritance_hierarchy.cc
                src/messages/cquery_member_hierarchy.cc
-               src/messages/cquery_random.cc
                src/messages/cquery_vars.cc
                src/messages/cquery_wait.cc
                src/messages/exit.cc
@@ -325,6 +344,7 @@ target_sources(cquery PRIVATE
                src/messages/text_document_document_symbol.cc
                src/messages/text_document_formatting.cc
                src/messages/text_document_hover.cc
+               src/messages/text_document_implementation.cc
                src/messages/text_document_range_formatting.cc
                src/messages/text_document_references.cc
                src/messages/text_document_rename.cc

LICENSE

@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2017-2018 Jacob Dufault
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

src/c_cpp_properties.cc

@@ -0,0 +1,141 @@
+#include "c_cpp_properties.h"
+
+#include <fstream>
+#include <iostream>
+#include <regex>
+
+#include <string_view.h>
+
+#include <rapidjson/document.h>
+#include <doctest/doctest.h>
+
+#ifdef _WIN32
+  #define CURRENT_PLATFORM "Win32"
+#elif defined(__APPLE__)
+  #define CURRENT_PLATFORM "Mac"
+#else
+  #define CURRENT_PLATFORM "Linux"
+#endif
+
+namespace {
+
+std::string_view kCurrentPlatform = CURRENT_PLATFORM;
+
+optional<CCppProperties> LoadCCppPropertiesFromStr(
+    const std::string_view filecontent,
+    const std::string& project_dir) {
+  CCppProperties res;
+  res.args.push_back("%clang");
+  rapidjson::Document document;
+  document.Parse(filecontent.data());
+  if (!document.IsObject())
+    return {};
+  auto conf_it = document.FindMember("configurations");
+  if (conf_it == document.MemberEnd())
+    return {};
+  if (!conf_it->value.IsArray())
+    return {};
+  for (auto& conf : conf_it->value.GetArray()) {
+    if (!conf.HasMember("name") || conf["name"].GetString() != kCurrentPlatform)
+      continue;
+    auto def_it = conf.FindMember("defines");
+    if (def_it != conf.MemberEnd() && def_it->value.IsArray()) {
+      for (auto& def : def_it->value.GetArray()) {
+        res.args.push_back(std::string("-D") + def.GetString());
+      }
+    }
+
+    auto inc_it = conf.FindMember("includePath");
+    if (inc_it != conf.MemberEnd() && inc_it->value.IsArray()) {
+      for (auto& inc : inc_it->value.GetArray()) {
+        // TODO maybe handle "path/**" ?
+        auto incpath = std::regex_replace(
+          std::string(inc.GetString()),
+          std::regex("\\$\\{workspaceFolder\\}"),
+          project_dir);
+        res.args.push_back("-I" + incpath);
+      }
+    }
+
+    if (res.cStandard.empty() && conf.HasMember("cStandard")) {
+      res.cStandard = conf["cStandard"].GetString();
+      res.args.push_back("%c -std=" + res.cStandard);
+    }
+    if (res.cppStandard.empty() && conf.HasMember("cppStandard")) {
+      res.cppStandard = conf["cppStandard"].GetString();
+      res.args.push_back("%cpp -std=" + res.cppStandard);
+    }
+  }
+
+  return res;
+}
+
+}  // namespace
+
+optional<CCppProperties> LoadCCppProperties(
+    const std::string& json_full_path,
+    const std::string& project_dir) {
+  std::ifstream fc_stream(json_full_path);
+  if (!fc_stream)
+    return {};
+  std::string filecontent{ std::istreambuf_iterator<char>(fc_stream),
+                           std::istreambuf_iterator<char>() };
+  return LoadCCppPropertiesFromStr(filecontent, project_dir);
+}
+
+
+TEST_SUITE("CCppProperties") {
+  TEST_CASE("basic") {
+    const char* testjson = R"(
+      {
+        "configurations": [
+          {
+            "name": ")" CURRENT_PLATFORM R"(",
+            "browse": {
+                "path": [
+                    "${workspaceFolder}"
+                ],
+                "limitSymbolsToIncludedHeaders": true
+            },
+            "includePath": [
+                "${workspaceFolder}",
+                "foo",
+                "${workspaceFolder}/bar"
+            ],
+            "defines": [
+              "FOO",
+              "BAR=1"
+            ],
+            "compilerPath": "/usr/bin/clang",
+            "cStandard": "c11",
+            "cppStandard": "c++17",
+            "intelliSenseMode": "clang-x64"
+          }
+        ],
+        "version": 4
+      })";
+    auto res = LoadCCppPropertiesFromStr(testjson, "/proj/");
+    REQUIRE(res.has_value());
+    CCppProperties& val = res.value();
+    REQUIRE_EQ(val.cStandard, "c11");
+    REQUIRE_EQ(val.cppStandard, "c++17");
+    std::vector<std::string> args{"%clang", "-DFOO", "-DBAR=1", "-I/proj/",
+        "-Ifoo", "-I/proj//bar", "%c -std=c11", "%cpp -std=c++17"};
+    bool args_equal = val.args == args;
+    if (!args_equal) {
+      if (val.args.size() != args.size()) {
+        std::cout << "\tval.args size " << val.args.size()
+          << " , args size " << args.size() << std::endl;
+      }
+      for(size_t i = 0; i < std::min(val.args.size(), args.size()); ++i) {
+        auto& a1 = val.args[i];
+        auto& a2 = args[i];
+        if (a1 != a2) {
+          std::cout << "\tArg " << a1 << " != " << a2 << std::endl;
+        }
+      }
+    }
+    REQUIRE(args_equal);
+  }
+}
+

src/c_cpp_properties.h

@@ -0,0 +1,16 @@
+#pragma once
+
+#include <string>
+#include <vector>
+
+#include "optional.h"
+
+struct CCppProperties {
+  std::string cStandard;
+  std::string cppStandard;
+  std::vector<std::string> args;
+};
+
+optional<CCppProperties> LoadCCppProperties(
+    const std::string& json_full_path,
+    const std::string& project_dir);