.appveyor.yml

@@ -15,7 +15,7 @@ install:
   - 7z x llvm.tar
   - git submodule update --init --recursive
 build_script:
-  - cmake -G"Visual Studio 15 2017 Win64" -H. -Bbuild -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH=C:\projects\ccls\llvm+clang-7.0.0-win64-msvc-release
+  - cmake -G"Visual Studio 15 2017 Win64" -H. -Bbuild -DCMAKE_BUILD_TYPE=Release -DSYSTEM_CLANG=ON -DCLANG_ROOT=C:\projects\ccls\llvm+clang-7.0.0-win64-msvc-release
   - cmake --build build --target ccls --config Release
 
 artifacts:

.clang-format

@@ -1,2 +1 @@
 BasedOnStyle: LLVM
-ColumnLimit: 120

.github/ISSUE_TEMPLATE

@@ -1,36 +0,0 @@
-Here are some things you should try before filing a bug report:
-
-+ For client issues related to [emacs-ccls](https://github.com/MaskRay/emacs-ccls) or [vscode-ccls](https://github.com/MaskRay/vscode-ccls), report in their own repository.
-+ For build problems, check https://github.com/MaskRay/ccls/wiki/Build
-+ Check https://github.com/MaskRay/ccls/wiki/Debugging
-+ Check [the FAQ](https://github.com/MaskRay/ccls/wiki/FAQ) to see if your issue is mentioned.
-
-If none of those help, remove this section and fill out the four sections in the template below.
-
----
-
-### Observed behavior
-
-Describe what happened. Any aids you can include (that you think could be relevant) are a tremendous help.
-
-* `compile_commands.json` or `.ccls` ([wiki/Project-Setup](https://github.com/MaskRay/ccls/wiki/Project-Setup))
-* Reduce to A minimal set of `.c` `.cc` `.h` `.hh` files that can still demonstrate the issue.
-* Consider a screencast gif.
-
-### Expected behavior
-
-Describe what you expected to happen.
-
-### Steps to reproduce
-
-1. Select these example steps,
-2. Delete them,
-3. And replace them with precise steps to reproduce your issue.
-
-### System information
-
-* ccls version (`git describe --tags --long`): 
-* clang version: 
-* OS: 
-* Editor: 
-* Language client (and version): 

.gitignore

@@ -1,11 +1,5 @@
-/*
+.*
-!/.github/
+build
-!/index_tests/
+debug
-!/src/
+release
-!/third_party/
+/compile_commands.json
-!/.appveyor.yml
-!/.clang-format
-!/CMakeLists.txt
-!/LICENSE
-!/README.md
-!/meow/

CMakeLists.txt

@@ -1,34 +1,46 @@
-cmake_minimum_required(VERSION 3.8)
+cmake_minimum_required(VERSION 3.1)
-project(ccls LANGUAGES CXX C)
+project(ccls LANGUAGES CXX)
 
-option(USE_SYSTEM_RAPIDJSON "Use system RapidJSON instead of the git submodule if exists" ON)
+list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/)
+include(DefaultCMakeBuildType)
+
+# Required Clang version
+set(CLANG_DOWNLOAD_LOCATION ${CMAKE_BINARY_DIR}
+    CACHE STRING "Downloaded Clang location")
+option(SYSTEM_CLANG "Use system installation of Clang instead of \
+       downloading Clang" OFF)
+option(ASAN "Compile with address sanitizers" OFF)
+option(LLVM_ENABLE_RTTI "-fno-rtti if OFF. This should match LLVM libraries" OFF)
+option(CLANG_USE_BUNDLED_LIBC++ "Let Clang use bundled libc++" OFF)
+option(USE_SHARED_LLVM "Link against libLLVM.so instead separate LLVM{Option,Support,...}" OFF)
 
 # Sources for the executable are specified at end of CMakeLists.txt
 add_executable(ccls "")
 
-### Default build type
-
-set(DEFAULT_CMAKE_BUILD_TYPE Release)
-
-# CMAKE_BUILD_TYPE is not available if a multi-configuration generator is used
-# (eg Visual Studio generators)
-if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
-  message(STATUS "Setting build type to '${DEFAULT_CMAKE_BUILD_TYPE}' as none \
-was specified.")
-  set(CMAKE_BUILD_TYPE ${DEFAULT_CMAKE_BUILD_TYPE}
-      CACHE STRING "Choose the type of build." FORCE)
-
-  # Set the possible values of build type for cmake-gui
-  set_property(CACHE CMAKE_BUILD_TYPE
-               PROPERTY STRINGS Debug Release MinSizeRel RelWithDebInfo)
-endif()
-
 ### Compile options
 
+# CMake default compile flags:
+# MSVC + Clang(Windows):
+#   debug: /MDd /Zi /Ob0 /Od /RTC1
+#   release: /MD /O2 /Ob2 /DNDEBUG
+# GCC + Clang(Linux):
+#   debug: -g
+#   release: -O3 -DNDEBUG
+
 # Enable C++17 (Required)
 set_property(TARGET ccls PROPERTY CXX_STANDARD 17)
 set_property(TARGET ccls PROPERTY CXX_STANDARD_REQUIRED ON)
+# Disable gnu extensions except for Cygwin which needs them to build properly
+if(NOT CYGWIN)
   set_property(TARGET ccls PROPERTY CXX_EXTENSIONS OFF)
+endif()
+
+if(NOT LLVM_ENABLE_RTTI)
+  # releases.llvm.org libraries are compiled with -fno-rtti
+  # The mismatch between lib{clang,LLVM}* and ccls can make libstdc++ std::make_shared return nullptr
+  # _Sp_counted_ptr_inplace::_M_get_deleter
+  target_compile_options(ccls PRIVATE -fno-rtti)
+endif()
 
 # CMake sets MSVC for both MSVC and Clang(Windows)
 if(MSVC)
@@ -45,7 +57,6 @@ if(MSVC)
     /wd4800
     /wd4068 # Disable unknown pragma warning
     /std:c++17
-    /Zc:__cplusplus
     $<$<CONFIG:Debug>:/FS>
   )
   # relink system libs
@@ -65,51 +76,44 @@ else()
     target_compile_options(ccls PRIVATE
                            $<$<CONFIG:Debug>:-fno-limit-debug-info>)
   endif()
+
+  if(ASAN)
+    target_compile_options(ccls PRIVATE -fsanitize=address,undefined)
+    # target_link_libraries also takes linker flags
+    target_link_libraries(ccls PRIVATE -fsanitize=address,undefined)
+  endif()
+endif()
+
+### Download Clang if required
+
+if(NOT SYSTEM_CLANG)
+  message(STATUS "Using downloaded Clang")
+
+  include(DownloadAndExtractClang)
+  download_and_extract_clang(${CLANG_DOWNLOAD_LOCATION})
+  # Used by FindClang
+  set(CLANG_ROOT ${DOWNLOADED_CLANG_DIR})
+
+  if(${CMAKE_CXX_COMPILER_ID} STREQUAL Clang AND CLANG_USE_BUNDLED_LIBC++)
+    message(STATUS "Using bundled libc++")
+    target_compile_options(ccls PRIVATE -nostdinc++ -cxx-isystem ${CLANG_ROOT}/include/c++/v1)
+    if(${CMAKE_SYSTEM_NAME} STREQUAL Linux)
+      # Don't use -stdlib=libc++ because while ccls is linked with libc++, bundled clang+llvm require libstdc++
+      target_link_libraries(ccls PRIVATE -L${CLANG_ROOT}/lib c++ c++abi)
+
+      # FreeBSD defaults to -stdlib=libc++ and uses system libcxxrt.a
+    endif()
+  endif()
+
+else()
+  message(STATUS "Using system Clang")
 endif()
 
 ### Libraries
 
-find_package(Clang REQUIRED)
+# See cmake/FindClang.cmake
-
+find_package(Clang 6.0.0)
-if(CLANG_LINK_CLANG_DYLIB)
+target_link_libraries(ccls PRIVATE Clang::Clang)
-  target_link_libraries(ccls PRIVATE clang-cpp)
-else()
-  target_link_libraries(ccls PRIVATE
-    clangIndex
-    clangFormat
-    clangTooling
-    clangToolingInclusions
-    clangToolingCore
-    clangFrontend
-    clangParse
-    clangSerialization
-    clangSema
-    clangAST
-    clangLex
-    clangDriver
-    clangBasic
-  )
-endif()
-
-if(LLVM_LINK_LLVM_DYLIB)
-  target_link_libraries(ccls PRIVATE LLVM)
-else()
-  target_link_libraries(ccls PRIVATE LLVMOption LLVMSupport)
-  if(LLVM_VERSION_MAJOR GREATER_EQUAL 16) # llvmorg-16-init-15123-gf09cf34d0062
-    target_link_libraries(ccls PRIVATE LLVMTargetParser)
-  endif()
-endif()
-
-if(NOT LLVM_ENABLE_RTTI)
-  # releases.llvm.org libraries are compiled with -fno-rtti
-  # The mismatch between lib{clang,LLVM}* and ccls can make libstdc++ std::make_shared return nullptr
-  # _Sp_counted_ptr_inplace::_M_get_deleter
-  if(MSVC)
-    target_compile_options(ccls PRIVATE /GR-)
-  else()
-    target_compile_options(ccls PRIVATE -fno-rtti)
-  endif()
-endif()
 
 # Enable threading support
 set(THREADS_PREFER_PTHREAD_FLAG ON)
@@ -123,95 +127,78 @@ if(${CMAKE_SYSTEM_NAME} STREQUAL FreeBSD)
   target_link_libraries(ccls PRIVATE thr)
 endif()
 
-if(LLVM_ENABLE_ZLIB)
-  find_package(ZLIB)
-endif()
-
 ### Definitions
 
-# Find Clang resource directory with Clang executable.
+target_compile_definitions(ccls PRIVATE
-
+                           DEFAULT_RESOURCE_DIRECTORY=R"\(${Clang_RESOURCE_DIR}\)")
-if(NOT CLANG_RESOURCE_DIR)
-  find_program(CLANG_EXECUTABLE clang)
-  if(NOT CLANG_EXECUTABLE)
-    message(FATAL_ERROR "clang executable not found.")
-  endif()
-
-  execute_process(
-    COMMAND ${CLANG_EXECUTABLE} -print-resource-dir
-    RESULT_VARIABLE CLANG_FIND_RESOURCE_DIR_RESULT
-    OUTPUT_VARIABLE CLANG_RESOURCE_DIR
-    ERROR_VARIABLE CLANG_FIND_RESOURCE_DIR_ERROR
-    OUTPUT_STRIP_TRAILING_WHITESPACE
-  )
-
-  if(CLANG_FIND_RESOURCE_DIR_RESULT)
-    message(FATAL_ERROR "Error retrieving Clang resource directory with Clang \
-            executable. Output:\n ${CLANG_FIND_RESOURCE_DIR_ERROR}")
-  endif()
-endif()
-
-set_property(SOURCE src/utils.cc APPEND PROPERTY COMPILE_DEFINITIONS
-             CLANG_RESOURCE_DIRECTORY=R"\(${CLANG_RESOURCE_DIR}\)")
 
 ### Includes
 
-if(USE_SYSTEM_RAPIDJSON)
-  set(RapidJSON_MIN_VERSION "1.1.0")
-  find_package(RapidJSON ${RapidJSON_MIN_VERSION} QUIET)
-  if(NOT DEFINED RapidJSON_INCLUDE_DIRS AND DEFINED RAPIDJSON_INCLUDE_DIRS)
-    set(RapidJSON_INCLUDE_DIRS "${RAPIDJSON_INCLUDE_DIRS}")
-  endif()
-endif()
-if(NOT RapidJSON_FOUND)
-  if(EXISTS "${CMAKE_SOURCE_DIR}/third_party/rapidjson/include")
-    message(STATUS "Using local RapidJSON")
-    set(RapidJSON_INCLUDE_DIRS third_party/rapidjson/include)
-  else()
-    message(STATUS "Plase initialize rapidJSON git submodule as currently installed version is to old:")
-    message(STATUS "git submodule init && git submodule update")
-    message(FATAL_ERROR "RapidJSON version is likely too old. See https://github.com/MaskRay/ccls/issues/455")
-  endif()
-endif()
-
 target_include_directories(ccls PRIVATE src)
-
+target_include_directories(ccls SYSTEM PRIVATE
-foreach(include_dir third_party
+                           third_party
-    ${LLVM_INCLUDE_DIRS} ${CLANG_INCLUDE_DIRS} ${RapidJSON_INCLUDE_DIRS})
+                           third_party/rapidjson/include)
-  get_filename_component(include_dir_realpath ${include_dir} REALPATH)
-  # Don't add as SYSTEM if they are in CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES.
-  # It would reorder the system search paths and cause issues with libstdc++'s
-  # use of #include_next. See https://github.com/MaskRay/ccls/pull/417
-  if(NOT "${include_dir_realpath}" IN_LIST CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES)
-    target_include_directories(ccls SYSTEM PRIVATE ${include_dir})
-  endif()
-endforeach()
 
 ### Install
 
 install(TARGETS ccls RUNTIME DESTINATION bin)
 
+if(NOT SYSTEM_CLANG AND NOT ${CMAKE_SYSTEM_NAME} STREQUAL Windows)
+
+  if(${CMAKE_SYSTEM_NAME} MATCHES Linux|FreeBSD)
+    set_property(TARGET ccls APPEND PROPERTY
+                 INSTALL_RPATH $ORIGIN/../lib)
+  elseif(${CMAKE_SYSTEM_NAME} STREQUAL Darwin)
+    set_property(TARGET ccls APPEND PROPERTY
+                 INSTALL_RPATH @loader_path/../lib)
+  endif()
+
+  file(GLOB LIBCLANG_PLUS_SYMLINKS
+       ${DOWNLOADED_CLANG_DIR}/lib/libclang.[so,dylib]*)
+  install(FILES ${LIBCLANG_PLUS_SYMLINKS} DESTINATION lib)
+endif()
+
+# Allow running from build Windows by copying libclang.dll to build directory
+if(NOT SYSTEM_CLANG AND ${CMAKE_SYSTEM_NAME} STREQUAL Windows)
+  add_custom_command(TARGET ccls
+                     POST_BUILD
+                     COMMAND ${CMAKE_COMMAND} -E copy
+                     ${DOWNLOADED_CLANG_DIR}/bin/libclang.dll
+                     $<TARGET_FILE_DIR:ccls>
+                     COMMENT "Copying libclang.dll to build directory ...")
+endif()
+
+### Tools
+
+# We use glob here since source files are already manually added with
+# target_sources further down
+file(GLOB SOURCES src/*.cc src/*.h src/serializers/*.cc src/serializers/*.h
+                  src/messages/*.h src/messages/*.cc)
+
 ### Sources
 
 target_sources(ccls PRIVATE third_party/siphash.cc)
 
 target_sources(ccls PRIVATE
+  src/clang_complete.cc
   src/clang_tu.cc
   src/config.cc
   src/filesystem.cc
   src/fuzzy_match.cc
   src/main.cc
+  src/include_complete.cc
   src/indexer.cc
   src/log.cc
   src/lsp.cc
+  src/match.cc
   src/message_handler.cc
   src/pipeline.cc
   src/platform_posix.cc
   src/platform_win.cc
   src/position.cc
   src/project.cc
+  src/query_utils.cc
   src/query.cc
-  src/sema_manager.cc
   src/serializer.cc
   src/test.cc
   src/utils.cc
@@ -240,22 +227,3 @@ target_sources(ccls PRIVATE
   src/messages/textDocument_signatureHelp.cc
   src/messages/workspace.cc
 )
-
-### Obtain CCLS version information from Git
-### This only happens when cmake is re-run!
-
-if(NOT CCLS_VERSION)
-  execute_process(COMMAND git describe --tag --long HEAD
-    OUTPUT_VARIABLE CCLS_VERSION
-    OUTPUT_STRIP_TRAILING_WHITESPACE
-    WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}")
-
-  if(NOT CCLS_VERSION)
-    set(CCLS_VERSION "<unknown>")
-  endif()
-endif()
-
-set_property(SOURCE src/main.cc APPEND PROPERTY
-             COMPILE_DEFINITIONS CCLS_VERSION=\"${CCLS_VERSION}\")
-set_property(SOURCE src/messages/initialize.cc APPEND PROPERTY
-             COMPILE_DEFINITIONS CCLS_VERSION=\"${CCLS_VERSION}\")

README.md

@@ -1,6 +1,6 @@
 # ccls
 
-[![Telegram](https://img.shields.io/badge/telegram-@cclsp-blue.svg)](https://telegram.me/ccls_lsp)
+[![Telegram](https://img.shields.io/badge/telegram-@cclsp-blue.svg)](https://telegram.me/cclsp)
 [![Gitter](https://img.shields.io/badge/gitter-ccls--project-blue.svg?logo=gitter-white)](https://gitter.im/ccls-project/ccls)
 
 ccls, which originates from [cquery](https://github.com/cquery-project/cquery), is a C/C++/Objective-C language server.
@@ -11,7 +11,7 @@ ccls, which originates from [cquery](https://github.com/cquery-project/cquery),
   * formatting
   * hierarchies: [call (caller/callee) hierarchy](src/messages/ccls_call.cc), [inheritance (base/derived) hierarchy](src/messages/ccls_inheritance.cc), [member hierarchy](src/messages/ccls_member.cc)
   * [symbol rename](src/messages/textDocument_rename.cc)
-  * [document symbols](src/messages/textDocument_document.cc) and approximate search of [workspace symbol](src/messages/workspace.cc)
+  * [document symbols](src/messages/textDocument_documentSymbol.cc) and approximate search of [workspace symbol](src/messages/workspace_symbol.cc)
   * [hover information](src/messages/textDocument_hover.cc)
   * diagnostics and code actions (clang FixIts)
   * semantic highlighting and preprocessor skipped regions
@@ -21,9 +21,28 @@ It has a global view of the code base and support a lot of cross reference featu
 It starts indexing the whole project (including subprojects if exist) parallelly when you open the first file, while the main thread can serve requests before the indexing is complete.
 Saving files will incrementally update the index.
 
-# >>> [Getting started](../../wiki/Home) (CLICK HERE) <<<
+Compared with cquery, it makes use of C++17 features, has less third-party dependencies and slimmed-down code base.
+It leverages Clang C++ API as [clangd](https://clang.llvm.org/extra/clangd.html) does, which provides better support for code completion and diagnostics.
+Refactoring is a non-goal as it can be provided by clang-include-fixer and other Clang based tools.
+
+The comparison with cquery as noted on 2018-07-15:
+
+|             | cquery                         | ccls                         |
+|------------ |--------------------------------|------------------------------|
+| third_party | more                           | fewer                        |
+| C++         | C++14                          | C++17                        |
+| clang API   | libclang (C)                   | clang/llvm C++               |
+| Filesystem  | AbsolutePath + custom routines | llvm/Support                 |
+| index       | libclang                       | clangIndex, some enhancement |
+| pipeline    | index merge+id remapping       | simpler and more robust      |
+
+cquery has system include path detection (through running the compiler driver) while ccls uses clangDriver.
+
+# >>> [Getting started](../../wiki/Getting-started) (CLICK HERE) <<<
 
 * [Build](../../wiki/Build)
+* [Emacs](../../wiki/Emacs)
+* [LanguageClient-neovim](../../wiki/LanguageClient-neovim)
 * [FAQ](../../wiki/FAQ)
 
-ccls can index itself (~180MiB RSS when idle, noted on 2018-09-01), FreeBSD, glibc, Linux, LLVM (~1800MiB RSS), musl (~60MiB RSS), ... with decent memory footprint. See [wiki/Project-Setup](../../wiki/Project-Setup) for examples.
+ccls can index itself (~180MiB RSS when ide, noted on 2018-09-01), FreeBSD, glibc, Linux, LLVM (~1800MiB RSS), musl (~60MiB RSS), ... with decent memory footprint. See [wiki/compile_commands.json](../../wiki/compile_commands.json) for examples.

ci/before_deploy.sh

@@ -0,0 +1,45 @@
+#!/usr/bin/env bash
+root=$(cd "$(dirname "$0")/.."; pwd)
+version=$(TZ=UTC date +v%Y%m%d)
+cd "$root/build/release"
+
+case $(uname -s) in
+  Darwin)
+    libclang=(lib/clang+llvm-*/lib/libclang.dylib)
+    strip_option="-x"
+    name=ccls-$version-x86_64-apple-darwin ;;
+  FreeBSD)
+    libclang=(lib/clang+llvm-*/lib/libclang.so.?)
+    strip_option="-s"
+    name=ccls-$version-x86_64-unknown-freebsd10 ;;
+  Linux)
+    libclang=(lib/clang+llvm-*/lib/libclang.so.?)
+    strip_option="-s"
+    name=ccls-$version-x86_64-unknown-linux-gnu ;;
+  *)
+    echo Unsupported >&2
+    exit 1 ;;
+esac
+
+pkg=$(mktemp -d)
+mkdir "$pkg/$name"
+rsync -rtLR bin "./${libclang[-1]}" ./lib/clang+llvm-*/lib/clang/*/include "$pkg/$name"
+
+cd "$pkg"
+strip "$strip_option" "$name/bin/ccls" "$name/${libclang[-1]}"
+case $(uname -s) in
+  Darwin)
+    # https://developer.apple.com/legacy/library/documentation/Darwin/Reference/ManPages/man1/tar.1.html
+    # macOS's bsdtar is lack of flags to set uid/gid.
+    # First, we generate a list of file in mtree format.
+    tar -cf filelist --format=mtree --options="!all,time,mode,type" "$name"
+    # Then add a line "/set uid=0 gid=0" after the first line "#mtree".
+    awk '/#mtree/{print;print "/set uid=0 gid=0";next}1' filelist > newflielist
+    # Finally, use the list to generate the tarball.
+    tar -zcf "$root/build/$name.tar.gz" @newflielist ;;
+  Linux)
+    tar -Jcf "$root/build/$name.tar.xz" --owner 0 --group 0 $name ;;
+  *)
+    tar -Jcf "$root/build/$name.tar.xz" --uid 0 --gid 0 $name ;;
+esac
+rm -r "$pkg"

clang_archive_hashes/LLVM-7.0.0-win64.exe.SHA256

@@ -0,0 +1 @@
+74b197a3959b0408adf0824be01db8dddfa2f9a967f4085af3fad900ed5fdbf6

clang_archive_hashes/clang+llvm-7.0.0-amd64-unknown-freebsd11.tar.xz.SHA256

@@ -0,0 +1 @@
+95ceb933ccf76e3ddaa536f41ab82c442bbac07cdea6f9fbf6e3b13cc1711255

clang_archive_hashes/clang+llvm-7.0.0-x86_64-apple-darwin.tar.xz.SHA256

@@ -0,0 +1 @@
+b3ad93c3d69dfd528df9c5bb1a434367babb8f3baea47fbb99bf49f1b03c94ca

clang_archive_hashes/clang+llvm-7.0.0-x86_64-linux-gnu-ubuntu-14.04.tar.xz.SHA256

@@ -0,0 +1 @@
+5c90e61b06d37270bc26edb305d7e498e2c7be22d99e0afd9f2274ef5458575a

clang_archive_hashes/clang+llvm-7.0.0-x86_64-linux-gnu-ubuntu-16.04.tar.xz.SHA256

@@ -0,0 +1 @@
+69b85c833cd28ea04ce34002464f10a6ad9656dd2bba0f7133536a9927c660d2

cmake/DefaultCMakeBuildType.cmake

@@ -0,0 +1,14 @@
+set(DEFAULT_CMAKE_BUILD_TYPE Release)
+
+# CMAKE_BUILD_TYPE is not available if a multi-configuration generator is used
+# (eg Visual Studio generators)
+if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
+  message(STATUS "Setting build type to '${DEFAULT_CMAKE_BUILD_TYPE}' as none \
+was specified.")
+  set(CMAKE_BUILD_TYPE ${DEFAULT_CMAKE_BUILD_TYPE}
+      CACHE STRING "Choose the type of build." FORCE)
+
+  # Set the possible values of build type for cmake-gui
+  set_property(CACHE CMAKE_BUILD_TYPE
+               PROPERTY STRINGS Debug Release MinSizeRel RelWithDebInfo)
+endif()

cmake/DownloadAndExtract7zip.cmake

@@ -0,0 +1,52 @@
+# Downloads and extracts the 7-Zip MSI installer from https://www.7-zip.org/. 
+# 
+# Returns the extracted 7-Zip directory in DOWNLOADED_7ZIP_DIR
+function(download_and_extract_7zip 7ZIP_DOWNLOAD_LOCATION)
+
+set(7ZIP_VERSION 1801)
+set(7ZIP_EXT .msi)
+set(7ZIP_NAME 7z${7ZIP_VERSION}-x64)
+set(7ZIP_FULL_NAME ${7ZIP_NAME}${7ZIP_EXT})
+
+set(7ZIP_FILE ${7ZIP_DOWNLOAD_LOCATION}/${7ZIP_FULL_NAME})
+set(7ZIP_EXTRACT_DIR ${7ZIP_DOWNLOAD_LOCATION}/${7ZIP_NAME})
+set(7ZIP_URL https://www.7-zip.org/a/${7ZIP_FULL_NAME})
+
+# Exit if 7-Zip is already downloaded and extracted
+find_program(7ZIP_EXECUTABLE 7z NO_DEFAULT_PATH
+             PATHS ${7ZIP_EXTRACT_DIR}/Files/7-Zip)
+if(7ZIP_EXECUTABLE)
+  message(STATUS "7-Zip already downloaded")
+  return()
+endif()
+
+message(STATUS "Downloading 7-Zip ${7ZIP_VERSION} (${7ZIP_URL}) ...")
+file(DOWNLOAD ${7ZIP_URL} ${7ZIP_FILE})
+
+find_program(MSIEXEC_EXECUTABLE msiexec)
+if(NOT MSIEXEC_EXECUTABLE)
+  message(FATAL_ERROR "Unable to find msiexec (required to extract 7-Zip msi \
+installer). Install 7-Zip yourself and make sure it is available in the path")    
+endif()
+
+message(STATUS "Extracting downloaded 7-Zip ...")
+
+# msiexec requires Windows path separators (\)
+file(TO_NATIVE_PATH ${7ZIP_FILE} 7ZIP_FILE)
+file(TO_NATIVE_PATH ${7ZIP_EXTRACT_DIR} 7ZIP_EXTRACT_DIR) 
+
+# msiexec with /a option allows extraction of msi installers without requiring
+# admin privileges. We use this to extract the 7-Zip installer without
+# requiring any actions from the user
+execute_process(COMMAND ${MSIEXEC_EXECUTABLE} /a ${7ZIP_FILE} /qn
+                        TARGETDIR=${7ZIP_EXTRACT_DIR}
+                WORKING_DIRECTORY ${7ZIP_DOWNLOAD_LOCATION}
+                OUTPUT_QUIET)     
+
+# Convert back to CMake separators (/) before returning
+file(TO_CMAKE_PATH ${7ZIP_EXTRACT_DIR} 7ZIP_EXTRACT_DIR)
+
+# Actual 7-Zip directory is nested inside the extract directory.
+set(DOWNLOADED_7ZIP_DIR ${7ZIP_EXTRACT_DIR}/Files/7-Zip PARENT_SCOPE)
+
+endfunction()

cmake/DownloadAndExtractClang.cmake

@@ -0,0 +1,129 @@
+# Downloads and extracts the Clang archive for the current system from
+# https://releases.llvm.org
+#
+# Returns the extracted Clang archive directory in DOWNLOADED_CLANG_DIR
+#
+# Downloads 7-Zip to extract Clang if it isn't available in the PATH
+function(download_and_extract_clang CLANG_DOWNLOAD_LOCATION)
+
+set(CLANG_VERSION 7.0.0)
+set(CLANG_ARCHIVE_EXT .tar.xz)
+
+if(${CMAKE_SYSTEM_NAME} STREQUAL Linux)
+
+  # Default to Ubuntu 16.04
+  set(CLANG_ARCHIVE_NAME
+      clang+llvm-${CLANG_VERSION}-x86_64-linux-gnu-ubuntu-16.04)
+
+elseif(${CMAKE_SYSTEM_NAME} STREQUAL Darwin)
+
+  set(CLANG_ARCHIVE_NAME clang+llvm-${CLANG_VERSION}-x86_64-apple-darwin)
+
+elseif(${CMAKE_SYSTEM_NAME} STREQUAL Windows)
+
+  set(CLANG_ARCHIVE_NAME LLVM-${CLANG_VERSION}-win64)
+  set(CLANG_ARCHIVE_EXT .exe)
+
+elseif(${CMAKE_SYSTEM_NAME} STREQUAL FreeBSD)
+
+  set(CLANG_ARCHIVE_NAME clang+llvm-${CLANG_VERSION}-amd64-unknown-freebsd11)
+
+endif()
+
+set(CLANG_ARCHIVE_FULL_NAME ${CLANG_ARCHIVE_NAME}${CLANG_ARCHIVE_EXT})
+set(CLANG_ARCHIVE_FILE ${CLANG_DOWNLOAD_LOCATION}/${CLANG_ARCHIVE_FULL_NAME})
+set(CLANG_ARCHIVE_EXTRACT_DIR ${CLANG_DOWNLOAD_LOCATION}/${CLANG_ARCHIVE_NAME})
+set(CLANG_ARCHIVE_URL
+    https://releases.llvm.org/${CLANG_VERSION}/${CLANG_ARCHIVE_FULL_NAME})
+set(CLANG_ARCHIVE_HASH_FILE
+    ${CMAKE_SOURCE_DIR}/clang_archive_hashes/${CLANG_ARCHIVE_FULL_NAME}.SHA256)
+
+# Exit if Clang is already downloaded and extracted
+set(CLANG_ROOT ${CLANG_ARCHIVE_EXTRACT_DIR})
+find_package(Clang ${CLANG_VERSION} QUIET)
+if(Clang_FOUND)
+  message(STATUS "Clang already downloaded")
+  set(DOWNLOADED_CLANG_DIR ${CLANG_ARCHIVE_EXTRACT_DIR} PARENT_SCOPE)
+  return()
+endif()
+
+if(NOT CLANG_ARCHIVE_NAME)
+  message(FATAL_ERROR "No Clang archive url specified for current platform \
+(${CMAKE_SYSTEM_NAME}). Please file an issue to get it added.")
+endif()
+
+if(NOT EXISTS ${CLANG_ARCHIVE_HASH_FILE})
+  message(FATAL_ERROR "No SHA256 hash available for the current platform \
+(${CMAKE_SYSTEM_NAME}) + clang version (${CLANG_VERSION}) combination. Please \
+file an issue to get it added.")
+endif()
+
+# Download Clang archive
+message(STATUS "Downloading Clang ${CLANG_VERSION} (${CLANG_ARCHIVE_URL}) ...")
+file(DOWNLOAD ${CLANG_ARCHIVE_URL} ${CLANG_ARCHIVE_FILE}
+     STATUS CLANG_ARCHIVE_DOWNLOAD_RESULT)
+
+# Abort if download failed
+list(GET ${CLANG_ARCHIVE_DOWNLOAD_RESULT} 0 ERROR_CODE)
+if(${ERROR_CODE})
+  list(GET ${CLANG_ARCHIVE_DOWNLOAD_RESULT} 1 ERROR_STRING)
+  message(FATAL_ERROR ${ERROR_STRING})
+endif()
+
+# Retrieve expected hash from file and strip newline
+file(READ ${CLANG_ARCHIVE_HASH_FILE} CLANG_ARCHIVE_EXPECTED_HASH)
+string(STRIP ${CLANG_ARCHIVE_EXPECTED_HASH} CLANG_ARCHIVE_EXPECTED_HASH)
+# Calculate actual hash
+file(SHA256 ${CLANG_ARCHIVE_FILE} CLANG_ARCHIVE_HASH)
+# Abort if hashes do not match
+if(NOT ${CLANG_ARCHIVE_EXPECTED_HASH} STREQUAL ${CLANG_ARCHIVE_HASH})
+  message(FATAL_ERROR "SHA256 hash of downloaded Clang does not match \
+expected hash. Remove the build directory and try running CMake again. If this \
+keeps happening, file an issue to report the problem.")
+endif()
+
+if(${CLANG_ARCHIVE_EXT} STREQUAL .exe)
+  # Download and extract 7-zip if not found in PATH
+  find_program(7ZIP_EXECUTABLE 7z)
+  if(NOT 7ZIP_EXECUTABLE)
+    message(STATUS "7-Zip not found in PATH")
+
+    include(DownloadAndExtract7zip)
+    download_and_extract_7zip(${CLANG_DOWNLOAD_LOCATION})
+    find_program(7ZIP_EXECUTABLE
+      NAMES 7z
+      NO_DEFAULT_PATH
+      PATHS ${DOWNLOADED_7ZIP_DIR}
+    )
+  else()
+    message(STATUS "7-Zip found in PATH")
+  endif()
+
+  message(STATUS "Extracting downloaded Clang with 7-Zip ...")
+
+  # Avoid running the Clang installer by extracting the exe with 7-Zip
+  execute_process(
+    COMMAND ${7ZIP_EXECUTABLE} x 
+            -o${CLANG_ARCHIVE_EXTRACT_DIR} 
+            -xr!$PLUGINSDIR ${CLANG_ARCHIVE_FILE}
+    WORKING_DIRECTORY ${CLANG_DOWNLOAD_LOCATION}
+    OUTPUT_QUIET
+  )
+
+elseif(${CLANG_ARCHIVE_EXT} STREQUAL .tar.xz)
+  message(STATUS "Extracting downloaded Clang with CMake built-in tar ...")
+
+  # CMake has builtin support for tar via the -E flag
+  execute_process(
+    COMMAND ${CMAKE_COMMAND} -E tar -xf ${CLANG_ARCHIVE_FILE}
+    # Specify working directory to allow running cmake from 
+    # everywhere
+    # (example: cmake -H"$HOME/cquery" -B"$home/cquery/build")
+    WORKING_DIRECTORY ${CLANG_DOWNLOAD_LOCATION}
+    OUTPUT_QUIET
+  )
+endif()
+
+set(DOWNLOADED_CLANG_DIR ${CLANG_ARCHIVE_EXTRACT_DIR} PARENT_SCOPE)
+
+endfunction()

cmake/FindClang.cmake

@@ -0,0 +1,154 @@
+#.rst
+# FindClang
+# ---------
+#
+# Find Clang and LLVM libraries required by ccls
+#
+# Results are reported in the following variables::
+#
+#   Clang_FOUND         - True if headers and requested libraries were found
+#   Clang_EXECUTABLE    - Clang executable
+#   Clang_RESOURCE_DIR  - Clang resource directory
+#   Clang_VERSION       - Clang version as reported by Clang executable
+#
+# The following :prop_tgt:`IMPORTED` targets are also defined::
+#
+#   Clang::Clang        - Target for all required Clang libraries and headers
+#
+# This module reads hints about which libraries to look for and where to find
+# them from the following variables::
+#
+#   CLANG_ROOT          - If set, only look for Clang components in CLANG_ROOT
+#
+# Example to link against Clang target::
+#
+#   target_link_libraries(<target> PRIVATE Clang::Clang)
+
+### Definitions
+
+# Wrapper macro's around the find_* macro's from CMake that only search in
+# CLANG_ROOT if it is defined
+
+macro(_Clang_find_library VAR NAME)
+  # Windows needs lib prefix
+  if (CLANG_ROOT)
+    find_library(${VAR} NAMES ${NAME} lib${NAME}
+                 NO_DEFAULT_PATH PATHS ${CLANG_ROOT} PATH_SUFFIXES lib)
+  else()
+    find_library(${VAR} NAMES ${NAME} lib${NAME})
+  endif()
+endmacro()
+
+macro(_Clang_find_add_library NAME)
+  _Clang_find_library(${NAME}_LIBRARY ${NAME})
+  list(APPEND _Clang_LIBRARIES ${${NAME}_LIBRARY})
+endmacro()
+
+macro(_Clang_find_path VAR INCLUDE_FILE)
+  if (CLANG_ROOT)
+    find_path(${VAR} ${INCLUDE_FILE}
+              NO_DEFAULT_PATH PATHS ${CLANG_ROOT} PATH_SUFFIXES include)
+  else()
+    find_path(${VAR} ${INCLUDE_FILE})
+  endif()
+endmacro()
+
+macro(_Clang_find_program VAR NAME)
+  if (CLANG_ROOT)
+    find_program(${VAR} ${NAME}
+                 NO_DEFAULT_PATH PATHS ${CLANG_ROOT} PATH_SUFFIXES bin)
+  else()
+    find_program(${VAR} ${NAME})
+  endif()
+endmacro()
+
+### Start
+
+set(_Clang_REQUIRED_VARS Clang_LIBRARY Clang_INCLUDE_DIR Clang_EXECUTABLE
+                         Clang_RESOURCE_DIR Clang_VERSION
+                         LLVM_INCLUDE_DIR LLVM_BUILD_INCLUDE_DIR)
+
+_Clang_find_library(Clang_LIBRARY clangIndex)
+_Clang_find_add_library(clangFormat)
+_Clang_find_add_library(clangTooling)
+
+# TODO Remove after dropping clang 6
+_Clang_find_library(clangToolingInclusions_LIBRARY clangToolingInclusions)
+if (clangToolingInclusions_LIBRARY)
+  list(APPEND _Clang_LIBRARIES ${clangToolingInclusions_LIBRARY})
+endif()
+
+_Clang_find_add_library(clangToolingCore)
+_Clang_find_add_library(clangRewrite)
+_Clang_find_add_library(clangFrontend)
+_Clang_find_add_library(clangParse)
+_Clang_find_add_library(clangSerialization)
+_Clang_find_add_library(clangSema)
+_Clang_find_add_library(clangAnalysis)
+_Clang_find_add_library(clangEdit)
+_Clang_find_add_library(clangAST)
+_Clang_find_add_library(clangLex)
+_Clang_find_add_library(clangDriver)
+_Clang_find_add_library(clangBasic)
+if(USE_SHARED_LLVM)
+  _Clang_find_add_library(LLVM)
+else()
+  _Clang_find_add_library(LLVMMCParser)
+  _Clang_find_add_library(LLVMMC)
+  _Clang_find_add_library(LLVMBitReader)
+  _Clang_find_add_library(LLVMOption)
+  _Clang_find_add_library(LLVMProfileData)
+  _Clang_find_add_library(LLVMCore)
+  _Clang_find_add_library(LLVMBinaryFormat)
+  _Clang_find_add_library(LLVMSupport)
+  _Clang_find_add_library(LLVMDemangle)
+endif()
+_Clang_find_path(Clang_INCLUDE_DIR clang-c/Index.h)
+_Clang_find_path(Clang_BUILD_INCLUDE_DIR clang/Driver/Options.inc)
+_Clang_find_path(LLVM_INCLUDE_DIR llvm/PassInfo.h)
+_Clang_find_path(LLVM_BUILD_INCLUDE_DIR llvm/Config/llvm-config.h)
+
+_Clang_find_program(Clang_EXECUTABLE clang)
+if(Clang_EXECUTABLE)
+  # Find Clang resource directory with Clang executable
+  execute_process(COMMAND ${Clang_EXECUTABLE} -print-resource-dir
+                  RESULT_VARIABLE _Clang_FIND_RESOURCE_DIR_RESULT
+                  OUTPUT_VARIABLE Clang_RESOURCE_DIR
+                  ERROR_VARIABLE _Clang_FIND_RESOURCE_DIR_ERROR
+                  OUTPUT_STRIP_TRAILING_WHITESPACE)
+
+  if(_Clang_FIND_RESOURCE_DIR_RESULT)
+    message(FATAL_ERROR "Error retrieving Clang resource directory with Clang \
+executable. Output:\n ${_Clang_FIND_RESOURCE_DIR_ERROR}")
+  endif()
+
+  # Find Clang version
+  set(_Clang_VERSION_REGEX "([0-9]+)\\.([0-9]+)\\.([0-9]+)")
+  execute_process(
+    COMMAND ${Clang_EXECUTABLE} --version
+    OUTPUT_VARIABLE Clang_VERSION
+  )
+  string(REGEX MATCH ${_Clang_VERSION_REGEX} Clang_VERSION ${Clang_VERSION})
+endif()
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(Clang
+  FOUND_VAR Clang_FOUND
+  REQUIRED_VARS ${_Clang_REQUIRED_VARS}
+  VERSION_VAR Clang_VERSION
+)
+
+if(Clang_FOUND AND NOT TARGET Clang::Clang)
+  add_library(Clang::Clang UNKNOWN IMPORTED)
+  set_target_properties(Clang::Clang PROPERTIES
+    IMPORTED_LOCATION ${Clang_LIBRARY}
+    INTERFACE_INCLUDE_DIRECTORIES "${Clang_INCLUDE_DIR};${Clang_BUILD_INCLUDE_DIR};${LLVM_INCLUDE_DIR};${LLVM_BUILD_INCLUDE_DIR}")
+  if(NOT MSVC)
+    find_package(Curses REQUIRED)
+    find_package(ZLIB REQUIRED)
+  endif()
+  set_property(TARGET Clang::Clang PROPERTY IMPORTED_LINK_INTERFACE_LIBRARIES "${_Clang_LIBRARIES};${CURSES_LIBRARIES};${ZLIB_LIBRARIES}")
+  if(MINGW)
+    set_property(TARGET Clang::Clang APPEND_STRING PROPERTY IMPORTED_LINK_INTERFACE_LIBRARIES ";version")
+  endif()
+endif()

index_tests/_empty_test.cc

@@ -1,10 +1,4 @@
 /*
 OUTPUT:
-{
+{}
-  "includes": [],
-  "skipped_ranges": [],
-  "usr2func": [],
-  "usr2type": [],
-  "usr2var": []
-}
 */

index_tests/class_forward_declaration.cc

@@ -11,7 +11,7 @@ OUTPUT:
   "usr2func": [],
   "usr2type": [{
       "usr": 15041163540773201510,
-      "detailed_name": "class Foo {}",
+      "detailed_name": "class Foo",
       "qual_name_offset": 6,
       "short_name": "Foo",
       "spell": "3:7-3:10|3:1-3:13|2|-1",
@@ -21,7 +21,7 @@ OUTPUT:
       "vars": [],
       "alias_of": 0,
       "kind": 5,
-      "parent_kind": 1,
+      "parent_kind": 0,
       "declarations": ["1:7-1:10|1:1-1:10|1|-1", "2:7-2:10|2:1-2:10|1|-1", "4:7-4:10|4:1-4:10|1|-1"],
       "derived": [],
       "instances": [],

index_tests/constructors/constructor.cc

@@ -36,8 +36,9 @@ OUTPUT:
       "spell": "6:6-6:9|6:1-9:2|2|-1",
       "bases": [],
       "vars": [10983126130596230582, 17165811951126099095],
-      "callees": ["7:7-7:8|3385168158331140247|3|16676", "7:7-7:8|3385168158331140247|3|16676",
+      "callees": ["7:7-7:8|3385168158331140247|3|16676", "7:7-7:8|3385168158331140247|3|16676", "8:17-8:20|3385168158331140247|3|16676", "8:17-8:20|3385168158331140247|3|16676"],
-"8:17-8:20|3385168158331140247|3|16676", "8:17-8:20|3385168158331140247|3|16676"], "kind": 12, "parent_kind": 1,
+      "kind": 12,
+      "parent_kind": 0,
       "storage": 0,
       "declarations": [],
       "derived": [],
@@ -55,7 +56,7 @@ OUTPUT:
       "vars": [],
       "alias_of": 0,
       "kind": 5,
-      "parent_kind": 1,
+      "parent_kind": 0,
       "declarations": [],
       "derived": [],
       "instances": [10983126130596230582, 17165811951126099095],

index_tests/constructors/destructor.cc

@@ -43,7 +43,7 @@ OUTPUT:
       "vars": [1893354193220338759],
       "callees": ["8:7-8:8|3385168158331140247|3|16676", "8:7-8:8|3385168158331140247|3|16676"],
       "kind": 12,
-      "parent_kind": 1,
+      "parent_kind": 0,
       "storage": 0,
       "declarations": [],
       "derived": [],
@@ -76,7 +76,7 @@ OUTPUT:
       "vars": [],
       "alias_of": 0,
       "kind": 5,
-      "parent_kind": 1,
+      "parent_kind": 0,
       "declarations": [],
       "derived": [],
       "instances": [1893354193220338759],

index_tests/constructors/implicit_constructor.cc

@@ -20,8 +20,9 @@ OUTPUT:
       "spell": "5:6-5:10|5:1-8:2|2|-1",
       "bases": [],
       "vars": [449111627548814328, 17097499197730163115],
-      "callees": ["6:8-6:12|10530961286677896857|3|16676", "6:8-6:12|10530961286677896857|3|16676",
+      "callees": ["6:8-6:12|10530961286677896857|3|16676", "6:8-6:12|10530961286677896857|3|16676", "7:15-7:19|10530961286677896857|3|16676", "7:15-7:19|10530961286677896857|3|16676"],
-"7:15-7:19|10530961286677896857|3|16676", "7:15-7:19|10530961286677896857|3|16676"], "kind": 12, "parent_kind": 1,
+      "kind": 12,
+      "parent_kind": 0,
       "storage": 0,
       "declarations": [],
       "derived": [],
@@ -54,7 +55,7 @@ OUTPUT:
       "vars": [],
       "alias_of": 0,
       "kind": 23,
-      "parent_kind": 1,
+      "parent_kind": 0,
       "declarations": [],
       "derived": [],
       "instances": [449111627548814328, 17097499197730163115],

index_tests/constructors/invalid_reference.cc

@@ -29,22 +29,6 @@ OUTPUT:
       "uses": []
     }],
   "usr2type": [{
-      "usr": 9174142900507230378,
-      "detailed_name": "T",
-      "qual_name_offset": 0,
-      "short_name": "",
-      "bases": [],
-      "funcs": [],
-      "types": [],
-      "vars": [],
-      "alias_of": 0,
-      "kind": 26,
-      "parent_kind": 0,
-      "declarations": ["3:16-3:17|3:10-3:17|1|-1"],
-      "derived": [],
-      "instances": [],
-      "uses": []
-    }, {
       "usr": 15041163540773201510,
       "detailed_name": "struct Foo {}",
       "qual_name_offset": 7,
@@ -56,7 +40,7 @@ OUTPUT:
       "vars": [],
       "alias_of": 0,
       "kind": 23,
-      "parent_kind": 1,
+      "parent_kind": 0,
       "declarations": [],
       "derived": [],
       "instances": [],

index_tests/constructors/make_functions.cc

@@ -101,7 +101,7 @@ OUTPUT: make_functions.h
       "vars": [],
       "alias_of": 0,
       "kind": 23,
-      "parent_kind": 1,
+      "parent_kind": 0,
       "declarations": [],
       "derived": [],
       "instances": [],
@@ -118,7 +118,7 @@ OUTPUT: make_functions.h
       "vars": [],
       "alias_of": 0,
       "kind": 5,
-      "parent_kind": 1,
+      "parent_kind": 0,
       "declarations": [],
       "derived": [],
       "instances": [],
@@ -157,7 +157,7 @@ OUTPUT: make_functions.cc
       "vars": [3908732770590594660],
       "callees": [],
       "kind": 12,
-      "parent_kind": 1,
+      "parent_kind": 0,
       "storage": 0,
       "declarations": [],
       "derived": [],
@@ -170,8 +170,9 @@ OUTPUT: make_functions.cc
       "spell": "13:6-13:14|13:1-18:2|2|-1",
       "bases": [],
       "vars": [],
-      "callees": ["14:3-14:13|15793662558620604611|3|16420", "15:3-15:13|15793662558620604611|3|16420",
+      "callees": ["14:3-14:13|15793662558620604611|3|16420", "15:3-15:13|15793662558620604611|3|16420", "16:3-16:13|15793662558620604611|3|16420", "17:3-17:14|2532818908869373467|3|16420"],
-"16:3-16:13|15793662558620604611|3|16420", "17:3-17:14|2532818908869373467|3|16420"], "kind": 12, "parent_kind": 1,
+      "kind": 12,
+      "parent_kind": 0,
       "storage": 0,
       "declarations": [],
       "derived": [],
@@ -214,14 +215,14 @@ OUTPUT: make_functions.cc
       "vars": [8463700030555379526],
       "callees": [],
       "kind": 12,
-      "parent_kind": 1,
+      "parent_kind": 0,
       "storage": 0,
       "declarations": [],
       "derived": [],
       "uses": ["14:3-14:13|16420|-1", "15:3-15:13|16420|-1", "16:3-16:13|16420|-1"]
     }],
   "usr2type": [{
-      "usr": 452,
+      "usr": 53,
       "detailed_name": "",
       "qual_name_offset": 0,
       "short_name": "",
@@ -237,7 +238,7 @@ OUTPUT: make_functions.cc
       "instances": [180270746871803062],
       "uses": []
     }, {
-      "usr": 488,
+      "usr": 87,
       "detailed_name": "",
       "qual_name_offset": 0,
       "short_name": "",
@@ -252,70 +253,6 @@ OUTPUT: make_functions.cc
       "derived": [],
       "instances": [180270746871803062],
       "uses": []
-    }, {
-      "usr": 3337128087216004141,
-      "detailed_name": "Args",
-      "qual_name_offset": 0,
-      "short_name": "",
-      "bases": [],
-      "funcs": [],
-      "types": [],
-      "vars": [],
-      "alias_of": 0,
-      "kind": 26,
-      "parent_kind": 0,
-      "declarations": ["8:35-8:39|8:23-8:39|1|-1"],
-      "derived": [],
-      "instances": [],
-      "uses": ["9:16-9:20|4|-1"]
-    }, {
-      "usr": 9281343527065946499,
-      "detailed_name": "T",
-      "qual_name_offset": 0,
-      "short_name": "",
-      "bases": [],
-      "funcs": [],
-      "types": [],
-      "vars": [],
-      "alias_of": 0,
-      "kind": 26,
-      "parent_kind": 0,
-      "declarations": ["3:20-3:21|3:11-3:21|1|-1"],
-      "derived": [],
-      "instances": [],
-      "uses": ["4:1-4:2|4|-1"]
-    }, {
-      "usr": 10771590811355716928,
-      "detailed_name": "Args",
-      "qual_name_offset": 0,
-      "short_name": "",
-      "bases": [],
-      "funcs": [],
-      "types": [],
-      "vars": [],
-      "alias_of": 0,
-      "kind": 26,
-      "parent_kind": 0,
-      "declarations": ["3:35-3:39|3:23-3:39|1|-1"],
-      "derived": [],
-      "instances": [],
-      "uses": ["4:15-4:19|4|-1"]
-    }, {
-      "usr": 11897454629873246477,
-      "detailed_name": "T",
-      "qual_name_offset": 0,
-      "short_name": "",
-      "bases": [],
-      "funcs": [],
-      "types": [],
-      "vars": [],
-      "alias_of": 0,
-      "kind": 26,
-      "parent_kind": 0,
-      "declarations": ["8:20-8:21|8:11-8:21|1|-1"],
-      "derived": [],
-      "instances": [],
-      "uses": ["9:1-9:2|4|-1"]
     }, {
       "usr": 12993848456528750350,
       "detailed_name": "struct Bar {}",
@@ -355,7 +292,7 @@ OUTPUT: make_functions.cc
       "qual_name_offset": 4,
       "short_name": "args",
       "spell": "9:24-9:28|9:16-9:28|1026|-1",
-      "type": 488,
+      "type": 87,
       "kind": 253,
       "parent_kind": 12,
       "storage": 0,

index_tests/declaration_vs_definition/class.cc

@@ -13,7 +13,7 @@ OUTPUT:
   "usr2func": [],
   "usr2type": [{
       "usr": 15041163540773201510,
-      "detailed_name": "class Foo {}",
+      "detailed_name": "class Foo",
       "qual_name_offset": 6,
       "short_name": "Foo",
       "spell": "3:7-3:10|3:1-3:13|2|-1",
@@ -23,7 +23,7 @@ OUTPUT:
       "vars": [],
       "alias_of": 0,
       "kind": 5,
-      "parent_kind": 1,
+      "parent_kind": 0,
       "declarations": ["1:7-1:10|1:1-1:10|1|-1", "2:7-2:10|2:1-2:10|1|-1", "4:7-4:10|4:1-4:10|1|-1"],
       "derived": [],
       "instances": [],

index_tests/declaration_vs_definition/class_member.cc

@@ -9,7 +9,7 @@ OUTPUT:
   "skipped_ranges": [],
   "usr2func": [],
   "usr2type": [{
-      "usr": 452,
+      "usr": 53,
       "detailed_name": "",
       "qual_name_offset": 0,
       "short_name": "",
@@ -39,7 +39,7 @@ OUTPUT:
         }],
       "alias_of": 0,
       "kind": 5,
-      "parent_kind": 1,
+      "parent_kind": 0,
       "declarations": [],
       "derived": [],
       "instances": [],
@@ -51,7 +51,7 @@ OUTPUT:
       "qual_name_offset": 4,
       "short_name": "foo",
       "spell": "2:7-2:10|2:3-2:10|1026|-1",
-      "type": 452,
+      "type": 53,
       "kind": 8,
       "parent_kind": 5,
       "storage": 0,

index_tests/declaration_vs_definition/class_member_static.cc

@@ -11,7 +11,7 @@ OUTPUT:
   "skipped_ranges": [],
   "usr2func": [],
   "usr2type": [{
-      "usr": 452,
+      "usr": 53,
       "detailed_name": "",
       "qual_name_offset": 0,
       "short_name": "",
@@ -38,7 +38,7 @@ OUTPUT:
       "vars": [],
       "alias_of": 0,
       "kind": 5,
-      "parent_kind": 1,
+      "parent_kind": 0,
       "declarations": [],
       "derived": [],
       "instances": [],
@@ -50,8 +50,8 @@ OUTPUT:
       "qual_name_offset": 11,
       "short_name": "foo",
       "spell": "5:10-5:13|5:1-5:13|1026|-1",
-      "type": 452,
+      "type": 53,
-      "kind": 8,
+      "kind": 13,
       "parent_kind": 5,
       "storage": 2,
       "declarations": ["2:14-2:17|2:3-2:17|1025|-1"],

index_tests/declaration_vs_definition/func.cc

@@ -19,7 +19,7 @@ OUTPUT:
       "vars": [],
       "callees": [],
       "kind": 12,
-      "parent_kind": 1,
+      "parent_kind": 0,
       "storage": 0,
       "declarations": ["1:6-1:9|1:1-1:11|1|-1", "2:6-2:9|2:1-2:11|1|-1", "4:6-4:9|4:1-4:11|1|-1"],
       "derived": [],

index_tests/declaration_vs_definition/func_associated_function_params.cc

@@ -16,12 +16,17 @@ OUTPUT:
       "short_name": "foo",
       "spell": "5:5-5:8|5:1-5:36|2|-1",
       "bases": [],
-      "vars": [7892962471424670909, 17130001153697799035, 16879535361702603834, 10198518325066875844,
+      "vars": [14555488990109936920, 10963664335057337329],
-14555488990109936920, 10963664335057337329], "callees": [], "kind": 12, "parent_kind": 1, "storage": 0, "declarations":
+      "callees": [],
-["1:5-1:8|1:1-1:18|1|-1", "2:5-2:8|2:1-3:16|1|-1", "4:5-4:8|4:1-4:26|1|-1"], "derived": [], "uses": []
+      "kind": 12,
+      "parent_kind": 0,
+      "storage": 0,
+      "declarations": ["1:5-1:8|1:1-1:18|1|-1", "2:5-2:8|2:1-3:16|1|-1", "4:5-4:8|4:1-4:26|1|-1"],
+      "derived": [],
+      "uses": []
     }],
   "usr2type": [{
-      "usr": 452,
+      "usr": 53,
       "detailed_name": "",
       "qual_name_offset": 0,
       "short_name": "",
@@ -34,40 +39,16 @@ OUTPUT:
       "parent_kind": 0,
       "declarations": [],
       "derived": [],
-      "instances": [7892962471424670909, 17130001153697799035, 16879535361702603834, 10198518325066875844,
+      "instances": [14555488990109936920, 10963664335057337329],
-14555488990109936920, 10963664335057337329], "uses": []
+      "uses": []
     }],
   "usr2var": [{
-      "usr": 7892962471424670909,
-      "detailed_name": "int aa",
-      "qual_name_offset": 4,
-      "short_name": "aa",
-      "spell": "2:13-2:15|2:9-2:15|1026|-1",
-      "type": 452,
-      "kind": 253,
-      "parent_kind": 12,
-      "storage": 0,
-      "declarations": [],
-      "uses": []
-    }, {
-      "usr": 10198518325066875844,
-      "detailed_name": "int bbb",
-      "qual_name_offset": 4,
-      "short_name": "bbb",
-      "spell": "4:22-4:25|4:18-4:25|1026|-1",
-      "type": 452,
-      "kind": 253,
-      "parent_kind": 12,
-      "storage": 0,
-      "declarations": [],
-      "uses": []
-    }, {
       "usr": 10963664335057337329,
       "detailed_name": "int b",
       "qual_name_offset": 4,
       "short_name": "b",
       "spell": "5:20-5:21|5:16-5:21|1026|-1",
-      "type": 452,
+      "type": 53,
       "kind": 253,
       "parent_kind": 12,
       "storage": 0,
@@ -79,31 +60,7 @@ OUTPUT:
       "qual_name_offset": 4,
       "short_name": "a",
       "spell": "5:13-5:14|5:9-5:14|1026|-1",
-      "type": 452,
+      "type": 53,
-      "kind": 253,
-      "parent_kind": 12,
-      "storage": 0,
-      "declarations": [],
-      "uses": []
-    }, {
-      "usr": 16879535361702603834,
-      "detailed_name": "int aaa",
-      "qual_name_offset": 4,
-      "short_name": "aaa",
-      "spell": "4:13-4:16|4:9-4:16|1026|-1",
-      "type": 452,
-      "kind": 253,
-      "parent_kind": 12,
-      "storage": 0,
-      "declarations": [],
-      "uses": []
-    }, {
-      "usr": 17130001153697799035,
-      "detailed_name": "int bb",
-      "qual_name_offset": 4,
-      "short_name": "bb",
-      "spell": "3:13-3:15|3:9-3:15|1026|-1",
-      "type": 452,
       "kind": 253,
       "parent_kind": 12,
       "storage": 0,

index_tests/declaration_vs_definition/method.cc

@@ -67,7 +67,7 @@ OUTPUT:
       "vars": [],
       "alias_of": 0,
       "kind": 5,
-      "parent_kind": 1,
+      "parent_kind": 0,
       "declarations": [],
       "derived": [],
       "instances": [],

index_tests/enums/enum_class_decl.cc

@@ -22,11 +22,11 @@ OUTPUT:
       "vars": [],
       "alias_of": 0,
       "kind": 252,
-      "parent_kind": 1,
+      "parent_kind": 0,
       "declarations": [],
       "derived": [],
       "instances": [],
-      "uses": ["2:18-2:25|4|-1"]
+      "uses": []
     }, {
       "usr": 16985894625255407295,
       "detailed_name": "enum class Foo : uint8_t {}",
@@ -45,7 +45,7 @@ OUTPUT:
         }],
       "alias_of": 0,
       "kind": 10,
-      "parent_kind": 1,
+      "parent_kind": 0,
       "declarations": [],
       "derived": [],
       "instances": [],

index_tests/enums/enum_decl.cc

@@ -21,7 +21,7 @@ OUTPUT:
       "vars": [],
       "alias_of": 0,
       "kind": 10,
-      "parent_kind": 1,
+      "parent_kind": 0,
       "declarations": [],
       "derived": [],
       "instances": [],
@@ -36,7 +36,7 @@ OUTPUT:
       "spell": "2:3-2:4|2:3-2:4|1026|-1",
       "type": 16985894625255407295,
       "kind": 22,
-      "parent_kind": 1,
+      "parent_kind": 0,
       "storage": 0,
       "declarations": [],
       "uses": []
@@ -48,7 +48,7 @@ OUTPUT:
       "spell": "3:3-3:4|3:3-3:9|1026|-1",
       "type": 16985894625255407295,
       "kind": 22,
-      "parent_kind": 1,
+      "parent_kind": 0,
       "storage": 0,
       "declarations": [],
       "uses": []

index_tests/enums/enum_inherit.cc

@@ -34,7 +34,7 @@ OUTPUT:
         }],
       "alias_of": 0,
       "kind": 10,
-      "parent_kind": 1,
+      "parent_kind": 0,
       "declarations": [],
       "derived": [],
       "instances": [],
@@ -51,11 +51,11 @@ OUTPUT:
       "vars": [],
       "alias_of": 0,
       "kind": 252,
-      "parent_kind": 1,
+      "parent_kind": 0,
       "declarations": [],
       "derived": [],
       "instances": [],
-      "uses": ["8:16-8:23|4|-1"]
+      "uses": []
     }, {
       "usr": 16985894625255407295,
       "detailed_name": "enum Foo : int {}",
@@ -68,7 +68,7 @@ OUTPUT:
       "vars": [],
       "alias_of": 0,
       "kind": 10,
-      "parent_kind": 1,
+      "parent_kind": 0,
       "declarations": [],
       "derived": [],
       "instances": [],
@@ -83,7 +83,7 @@ OUTPUT:
       "spell": "2:3-2:4|2:3-2:4|1026|-1",
       "type": 16985894625255407295,
       "kind": 22,
-      "parent_kind": 1,
+      "parent_kind": 0,
       "storage": 0,
       "declarations": [],
       "uses": []
@@ -95,7 +95,7 @@ OUTPUT:
       "spell": "3:3-3:4|3:3-3:9|1026|-1",
       "type": 16985894625255407295,
       "kind": 22,
-      "parent_kind": 1,
+      "parent_kind": 0,
       "storage": 0,
       "declarations": [],
       "uses": []

index_tests/enums/enum_usage.cc

@@ -29,7 +29,7 @@ OUTPUT:
         }],
       "alias_of": 0,
       "kind": 10,
-      "parent_kind": 1,
+      "parent_kind": 0,
       "declarations": [],
       "derived": [],
       "instances": [10677751717622394455],
@@ -57,7 +57,7 @@ OUTPUT:
       "spell": "6:5-6:6|6:1-6:15|2|-1",
       "type": 16985894625255407295,
       "kind": 13,
-      "parent_kind": 1,
+      "parent_kind": 0,
       "storage": 0,
       "declarations": [],
       "uses": []

index_tests/foobar.cc

@@ -26,7 +26,7 @@ OUTPUT:
       "vars": [],
       "alias_of": 0,
       "kind": 10,
-      "parent_kind": 1,
+      "parent_kind": 0,
       "declarations": [],
       "derived": [],
       "instances": [],
@@ -39,11 +39,11 @@ OUTPUT:
       "spell": "5:8-5:11|5:1-7:2|2|-1",
       "bases": [],
       "funcs": [],
-      "types": [14891869080606636243, 13938528237873543349],
+      "types": [13938528237873543349],
       "vars": [],
       "alias_of": 0,
       "kind": 23,
-      "parent_kind": 1,
+      "parent_kind": 0,
       "declarations": [],
       "derived": [],
       "instances": [12028309045033782423],
@@ -60,7 +60,7 @@ OUTPUT:
       "vars": [],
       "alias_of": 0,
       "kind": 10,
-      "parent_kind": 1,
+      "parent_kind": 0,
       "declarations": [],
       "derived": [],
       "instances": [],
@@ -82,22 +82,6 @@ OUTPUT:
       "derived": [],
       "instances": [16721564935990383768],
       "uses": ["9:9-9:14|4|-1"]
-    }, {
-      "usr": 14891869080606636243,
-      "detailed_name": "T",
-      "qual_name_offset": 0,
-      "short_name": "",
-      "bases": [],
-      "funcs": [],
-      "types": [],
-      "vars": [],
-      "alias_of": 0,
-      "kind": 26,
-      "parent_kind": 0,
-      "declarations": ["4:19-4:20|4:10-4:20|1025|-1"],
-      "derived": [],
-      "instances": [],
-      "uses": []
     }],
   "usr2var": [{
       "usr": 12028309045033782423,
@@ -107,7 +91,7 @@ OUTPUT:
       "spell": "10:8-10:9|10:1-10:9|2|-1",
       "type": 10528472276654770367,
       "kind": 13,
-      "parent_kind": 1,
+      "parent_kind": 0,
       "storage": 0,
       "declarations": [],
       "uses": []
@@ -119,7 +103,7 @@ OUTPUT:
       "spell": "9:15-9:16|9:1-9:16|2|-1",
       "type": 13938528237873543349,
       "kind": 13,
-      "parent_kind": 1,
+      "parent_kind": 0,
       "storage": 0,
       "declarations": [],
       "uses": []

index_tests/function_declaration.cc

@@ -11,7 +11,7 @@ OUTPUT:
       "qual_name_offset": 5,
       "short_name": "foo",
       "bases": [],
-      "vars": [8158338140950637730, 17005964293310927058],
+      "vars": [],
       "callees": [],
       "kind": 12,
       "parent_kind": 0,
@@ -20,47 +20,7 @@ OUTPUT:
       "derived": [],
       "uses": []
     }],
-  "usr2type": [{
+  "usr2type": [],
-      "usr": 452,
+  "usr2var": []
-      "detailed_name": "",
-      "qual_name_offset": 0,
-      "short_name": "",
-      "bases": [],
-      "funcs": [],
-      "types": [],
-      "vars": [],
-      "alias_of": 0,
-      "kind": 0,
-      "parent_kind": 0,
-      "declarations": [],
-      "derived": [],
-      "instances": [8158338140950637730, 17005964293310927058],
-      "uses": []
-    }],
-  "usr2var": [{
-      "usr": 8158338140950637730,
-      "detailed_name": "int a",
-      "qual_name_offset": 4,
-      "short_name": "a",
-      "spell": "1:14-1:15|1:10-1:15|1026|-1",
-      "type": 452,
-      "kind": 253,
-      "parent_kind": 12,
-      "storage": 0,
-      "declarations": [],
-      "uses": []
-    }, {
-      "usr": 17005964293310927058,
-      "detailed_name": "int b",
-      "qual_name_offset": 4,
-      "short_name": "b",
-      "spell": "1:21-1:22|1:17-1:22|1026|-1",
-      "type": 452,
-      "kind": 253,
-      "parent_kind": 12,
-      "storage": 0,
-      "declarations": [],
-      "uses": []
-    }]
 }
 */

index_tests/function_declaration_definition.cc

@@ -17,7 +17,7 @@ OUTPUT:
       "vars": [],
       "callees": [],
       "kind": 12,
-      "parent_kind": 1,
+      "parent_kind": 0,
       "storage": 0,
       "declarations": ["1:6-1:9|1:1-1:11|1|-1"],
       "derived": [],

index_tests/function_definition.cc

@@ -15,7 +15,7 @@ OUTPUT:
       "vars": [],
       "callees": [],
       "kind": 12,
-      "parent_kind": 1,
+      "parent_kind": 0,
       "storage": 0,
       "declarations": [],
       "derived": [],

index_tests/inheritance/class_inherit.cc

@@ -19,7 +19,7 @@ OUTPUT:
       "vars": [],
       "alias_of": 0,
       "kind": 5,
-      "parent_kind": 1,
+      "parent_kind": 0,
       "declarations": [],
       "derived": [10963370434658308541],
       "instances": [],
@@ -36,7 +36,7 @@ OUTPUT:
       "vars": [],
       "alias_of": 0,
       "kind": 5,
-      "parent_kind": 1,
+      "parent_kind": 0,
       "declarations": [],
       "derived": [],
       "instances": [],

index_tests/inheritance/class_inherit_templated_parent.cc

@@ -19,22 +19,6 @@ OUTPUT:
   "skipped_ranges": [],
   "usr2func": [],
   "usr2type": [{
-      "usr": 444,
-      "detailed_name": "",
-      "qual_name_offset": 0,
-      "short_name": "",
-      "bases": [],
-      "funcs": [],
-      "types": [],
-      "vars": [],
-      "alias_of": 0,
-      "kind": 0,
-      "parent_kind": 0,
-      "declarations": [],
-      "derived": [],
-      "instances": [2713508113307684499, 12990052348105569112],
-      "uses": []
-    }, {
       "usr": 5863733211528032190,
       "detailed_name": "class Derived1 : Base1<T> {}",
       "qual_name_offset": 6,
@@ -46,27 +30,11 @@ OUTPUT:
       "vars": [],
       "alias_of": 0,
       "kind": 5,
-      "parent_kind": 1,
+      "parent_kind": 0,
       "declarations": [],
       "derived": [10963370434658308541],
       "instances": [],
       "uses": ["13:43-13:51|2052|-1"]
-    }, {
-      "usr": 7916588271848318236,
-      "detailed_name": "T",
-      "qual_name_offset": 0,
-      "short_name": "",
-      "bases": [],
-      "funcs": [],
-      "types": [],
-      "vars": [],
-      "alias_of": 0,
-      "kind": 26,
-      "parent_kind": 0,
-      "declarations": ["10:19-10:20|10:10-10:20|1025|-1"],
-      "derived": [],
-      "instances": [],
-      "uses": ["11:24-11:25|4|-1"]
     }, {
       "usr": 10651399730831737929,
       "detailed_name": "class Derived2 : Base2<T> {}",
@@ -75,11 +43,11 @@ OUTPUT:
       "spell": "11:7-11:15|11:1-11:29|2|-1",
       "bases": [11118288764693061434],
       "funcs": [],
-      "types": [7916588271848318236],
+      "types": [],
       "vars": [],
       "alias_of": 0,
       "kind": 5,
-      "parent_kind": 1,
+      "parent_kind": 0,
       "declarations": [],
       "derived": [10963370434658308541],
       "instances": [],
@@ -96,11 +64,11 @@ OUTPUT:
       "vars": [],
       "alias_of": 0,
       "kind": 5,
-      "parent_kind": 1,
+      "parent_kind": 0,
       "declarations": [],
       "derived": [],
       "instances": [],
-      "uses": ["13:33-13:40|4|-1", "13:65-13:72|4|-1"]
+      "uses": ["13:33-13:40|2052|-1", "13:65-13:72|2052|-1"]
     }, {
       "usr": 11118288764693061434,
       "detailed_name": "class Base2 {}",
@@ -109,11 +77,11 @@ OUTPUT:
       "spell": "5:7-5:12|5:1-5:15|2|-1",
       "bases": [],
       "funcs": [],
-      "types": [11972372958367790157],
+      "types": [],
       "vars": [],
       "alias_of": 0,
       "kind": 5,
-      "parent_kind": 1,
+      "parent_kind": 0,
       "declarations": [],
       "derived": [10651399730831737929, 10963370434658308541],
       "instances": [],
@@ -130,50 +98,12 @@ OUTPUT:
       "vars": [],
       "alias_of": 0,
       "kind": 5,
-      "parent_kind": 1,
+      "parent_kind": 0,
       "declarations": [],
       "derived": [5863733211528032190, 10963370434658308541],
       "instances": [],
       "uses": ["8:18-8:23|2052|-1", "13:17-13:22|2052|-1"]
-    }, {
-      "usr": 11972372958367790157,
-      "detailed_name": "C",
-      "qual_name_offset": 0,
-      "short_name": "",
-      "bases": [],
-      "funcs": [],
-      "types": [],
-      "vars": [],
-      "alias_of": 0,
-      "kind": 26,
-      "parent_kind": 0,
-      "declarations": ["4:19-4:20|4:10-4:20|1025|-1"],
-      "derived": [],
-      "instances": [],
-      "uses": []
     }],
-  "usr2var": [{
+  "usr2var": []
-      "usr": 2713508113307684499,
-      "detailed_name": "unsigned int Base1::C",
-      "qual_name_offset": 13,
-      "short_name": "C",
-      "type": 444,
-      "kind": 253,
-      "parent_kind": 5,
-      "storage": 0,
-      "declarations": ["1:23-1:24|1:10-1:24|1025|-1"],
-      "uses": []
-    }, {
-      "usr": 12990052348105569112,
-      "detailed_name": "unsigned int Derived1::T",
-      "qual_name_offset": 13,
-      "short_name": "T",
-      "type": 444,
-      "kind": 253,
-      "parent_kind": 5,
-      "storage": 0,
-      "declarations": ["7:23-7:24|7:10-7:24|1025|-1"],
-      "uses": ["8:24-8:25|4|-1"]
-    }]
 }
 */

index_tests/inheritance/class_multiple_inherit.cc

@@ -21,7 +21,7 @@ OUTPUT:
       "vars": [],
       "alias_of": 0,
       "kind": 5,
-      "parent_kind": 1,
+      "parent_kind": 0,
       "declarations": [],
       "derived": [11863524815063131483, 14022569716337624303],
       "instances": [],
@@ -38,7 +38,7 @@ OUTPUT:
       "vars": [],
       "alias_of": 0,
       "kind": 5,
-      "parent_kind": 1,
+      "parent_kind": 0,
       "declarations": [],
       "derived": [],
       "instances": [],
@@ -55,7 +55,7 @@ OUTPUT:
       "vars": [],
       "alias_of": 0,
       "kind": 5,
-      "parent_kind": 1,
+      "parent_kind": 0,
       "declarations": [],
       "derived": [10963370434658308541],
       "instances": [],
@@ -72,7 +72,7 @@ OUTPUT:
       "vars": [],
       "alias_of": 0,
       "kind": 5,
-      "parent_kind": 1,
+      "parent_kind": 0,
       "declarations": [],
       "derived": [10963370434658308541],
       "instances": [],

index_tests/inheritance/function_override.cc

@@ -12,7 +12,7 @@ OUTPUT:
   "skipped_ranges": [],
   "usr2func": [{
       "usr": 6666242542855173890,
-      "detailed_name": "void Derived::foo() override",
+      "detailed_name": "void Derived::foo()",
       "qual_name_offset": 5,
       "short_name": "foo",
       "spell": "5:8-5:11|5:3-5:25|5186|-1",
@@ -52,7 +52,7 @@ OUTPUT:
       "vars": [],
       "alias_of": 0,
       "kind": 5,
-      "parent_kind": 1,
+      "parent_kind": 0,
       "declarations": [],
       "derived": [10963370434658308541],
       "instances": [],
@@ -69,7 +69,7 @@ OUTPUT:
       "vars": [],
       "alias_of": 0,
       "kind": 5,
-      "parent_kind": 1,
+      "parent_kind": 0,
       "declarations": [],
       "derived": [],
       "instances": [],

index_tests/inheritance/interface_pure_virtual.cc

@@ -34,7 +34,7 @@ OUTPUT:
       "vars": [],
       "alias_of": 0,
       "kind": 5,
-      "parent_kind": 1,
+      "parent_kind": 0,
       "declarations": [],
       "derived": [],
       "instances": [],

index_tests/inheritance/multiple_base_functions.cc

@@ -30,7 +30,7 @@ OUTPUT:
       "uses": []
     }, {
       "usr": 13164726294460837993,
-      "detailed_name": "Derived::~Derived() noexcept override",
+      "detailed_name": "Derived::~Derived() noexcept",
       "qual_name_offset": 0,
       "short_name": "~Derived",
       "spell": "8:3-8:11|8:3-8:26|5186|-1",
@@ -71,7 +71,7 @@ OUTPUT:
       "vars": [],
       "alias_of": 0,
       "kind": 23,
-      "parent_kind": 1,
+      "parent_kind": 0,
       "declarations": [],
       "derived": [],
       "instances": [],
@@ -88,7 +88,7 @@ OUTPUT:
       "vars": [],
       "alias_of": 0,
       "kind": 23,
-      "parent_kind": 1,
+      "parent_kind": 0,
       "declarations": [],
       "derived": [10963370434658308541],
       "instances": [],
@@ -105,7 +105,7 @@ OUTPUT:
       "vars": [],
       "alias_of": 0,
       "kind": 23,
-      "parent_kind": 1,
+      "parent_kind": 0,
       "declarations": [],
       "derived": [10963370434658308541],
       "instances": [],

index_tests/lambdas/lambda.cc

@@ -24,16 +24,20 @@ OUTPUT:
       "spell": "1:6-1:9|1:1-12:2|2|-1",
       "bases": [],
       "vars": [12666114896600231317, 2981279427664991319],
-      "callees": ["9:14-9:15|17926497908620168464|3|16420", "10:14-10:15|17926497908620168464|3|16420",
+      "callees": ["9:14-9:15|17926497908620168464|3|16420", "10:14-10:15|17926497908620168464|3|16420", "11:14-11:15|17926497908620168464|3|16420"],
-"11:14-11:15|17926497908620168464|3|16420"], "kind": 12, "parent_kind": 1, "storage": 0, "declarations": [], "derived":
+      "kind": 12,
-[], "uses": []
+      "parent_kind": 0,
+      "storage": 0,
+      "declarations": [],
+      "derived": [],
+      "uses": []
     }, {
       "usr": 17926497908620168464,
-      "detailed_name": "inline constexpr void foo()::(anon class)::operator()(int y) const",
+      "detailed_name": "inline void foo()::(anon class)::operator()(int y) const",
-      "qual_name_offset": 22,
+      "qual_name_offset": 12,
       "short_name": "operator()",
       "bases": [],
-      "vars": [12879188959314906706, 12879188959314906706],
+      "vars": [],
       "callees": [],
       "kind": 6,
       "parent_kind": 0,
@@ -43,7 +47,7 @@ OUTPUT:
       "uses": ["9:14-9:15|16420|-1", "10:14-10:15|16420|-1", "11:14-11:15|16420|-1"]
     }],
   "usr2type": [{
-      "usr": 452,
+      "usr": 53,
       "detailed_name": "",
       "qual_name_offset": 0,
       "short_name": "",
@@ -56,7 +60,7 @@ OUTPUT:
       "parent_kind": 0,
       "declarations": [],
       "derived": [],
-      "instances": [12666114896600231317, 12879188959314906706, 12879188959314906706],
+      "instances": [12666114896600231317],
       "uses": []
     }, {
       "usr": 14635009347499519042,
@@ -80,7 +84,7 @@ OUTPUT:
       "detailed_name": "(lambda) dosomething",
       "qual_name_offset": 9,
       "short_name": "dosomething",
-      "hover": "(lambda) dosomething = [&x](int y) {\n    ++x;\n    ++y;\n  }",
+      "hover": "(lambda) dosomething",
       "spell": "4:8-4:19|4:3-7:4|2|-1",
       "type": 14635009347499519042,
       "kind": 13,
@@ -94,7 +98,7 @@ OUTPUT:
       "qual_name_offset": 4,
       "short_name": "x",
       "spell": "2:7-2:8|2:3-2:8|2|-1",
-      "type": 452,
+      "type": 53,
       "kind": 13,
       "parent_kind": 12,
       "storage": 0,
@@ -105,8 +109,8 @@ OUTPUT:
       "detailed_name": "int y",
       "qual_name_offset": 4,
       "short_name": "y",
-      "spell": "4:31-4:32|4:27-4:32|1026|-1",
+      "spell": "4:31-4:32|4:27-4:32|2|-1",
-      "type": 452,
+      "type": 0,
       "kind": 253,
       "parent_kind": 6,
       "storage": 0,

index_tests/macros/complex.cc

@@ -26,7 +26,7 @@ OUTPUT:
       "vars": [],
       "callees": ["12:5-12:10|14400399977994209582|3|16420"],
       "kind": 12,
-      "parent_kind": 1,
+      "parent_kind": 0,
       "storage": 0,
       "declarations": ["12:1-12:20|12:1-12:4|1|-1"],
       "derived": [],
@@ -41,14 +41,14 @@ OUTPUT:
       "vars": [],
       "callees": [],
       "kind": 12,
-      "parent_kind": 1,
+      "parent_kind": 0,
       "storage": 0,
       "declarations": [],
       "derived": [],
       "uses": ["12:5-12:10|16420|-1", "12:5-12:10|64|0"]
     }],
   "usr2type": [{
-      "usr": 452,
+      "usr": 53,
       "detailed_name": "",
       "qual_name_offset": 0,
       "short_name": "",
@@ -71,9 +71,9 @@ OUTPUT:
       "short_name": "make2",
       "hover": "const int make2 = 5",
       "spell": "9:11-9:16|9:1-9:20|2|-1",
-      "type": 452,
+      "type": 53,
       "kind": 13,
-      "parent_kind": 1,
+      "parent_kind": 0,
       "storage": 0,
       "declarations": [],
       "uses": ["12:14-12:19|12|-1", "12:14-12:19|64|0"]

index_tests/macros/foo.cc

@@ -29,7 +29,7 @@ OUTPUT:
       "uses": ["5:12-5:15|64|0"]
     }],
   "usr2type": [{
-      "usr": 452,
+      "usr": 53,
       "detailed_name": "",
       "qual_name_offset": 0,
       "short_name": "",
@@ -56,7 +56,7 @@ OUTPUT:
       "vars": [],
       "alias_of": 0,
       "kind": 23,
-      "parent_kind": 1,
+      "parent_kind": 0,
       "declarations": [],
       "derived": [],
       "instances": [],
@@ -95,9 +95,9 @@ OUTPUT:
       "short_name": "x",
       "hover": "int x = A",
       "spell": "8:5-8:6|8:1-8:10|2|-1",
-      "type": 452,
+      "type": 53,
       "kind": 13,
-      "parent_kind": 1,
+      "parent_kind": 0,
       "storage": 0,
       "declarations": [],
       "uses": []

index_tests/method_declaration.cc

@@ -38,7 +38,7 @@ OUTPUT:
       "vars": [],
       "alias_of": 0,
       "kind": 5,
-      "parent_kind": 1,
+      "parent_kind": 0,
       "declarations": [],
       "derived": [],
       "instances": [],

index_tests/method_definition.cc

@@ -37,7 +37,7 @@ OUTPUT:
       "vars": [],
       "alias_of": 0,
       "kind": 5,
-      "parent_kind": 1,
+      "parent_kind": 0,
       "declarations": [],
       "derived": [],
       "instances": [],

index_tests/method_inline_declaration.cc

@@ -35,7 +35,7 @@ OUTPUT:
       "vars": [],
       "alias_of": 0,
       "kind": 5,
-      "parent_kind": 1,
+      "parent_kind": 0,
       "declarations": [],
       "derived": [],
       "instances": [],

index_tests/multi_file/funky_enum.cc

@@ -22,7 +22,7 @@ OUTPUT: funky_enum.h
       "spell": "4:1-4:2|4:1-4:2|1026|-1",
       "type": 16985894625255407295,
       "kind": 22,
-      "parent_kind": 1,
+      "parent_kind": 0,
       "storage": 0,
       "declarations": [],
       "uses": []
@@ -36,7 +36,7 @@ OUTPUT: funky_enum.h
       "spell": "6:1-6:2|6:1-6:2|1026|-1",
       "type": 16985894625255407295,
       "kind": 22,
-      "parent_kind": 1,
+      "parent_kind": 0,
       "storage": 0,
       "declarations": [],
       "uses": []
@@ -50,7 +50,7 @@ OUTPUT: funky_enum.h
       "spell": "5:1-5:2|5:1-5:2|1026|-1",
       "type": 16985894625255407295,
       "kind": 22,
-      "parent_kind": 1,
+      "parent_kind": 0,
       "storage": 0,
       "declarations": [],
       "uses": []
@@ -76,7 +76,7 @@ OUTPUT: funky_enum.cc
       "vars": [],
       "alias_of": 0,
       "kind": 10,
-      "parent_kind": 1,
+      "parent_kind": 0,
       "declarations": [],
       "derived": [],
       "instances": [],

index_tests/multi_file/impl.cc

@@ -19,14 +19,14 @@ OUTPUT: header.h
       "vars": [],
       "callees": [],
       "kind": 12,
-      "parent_kind": 1,
+      "parent_kind": 0,
       "storage": 0,
       "declarations": [],
       "derived": [],
       "uses": []
     }],
   "usr2type": [{
-      "usr": 452,
+      "usr": 53,
       "detailed_name": "",
       "qual_name_offset": 0,
       "short_name": "",
@@ -49,11 +49,11 @@ OUTPUT: header.h
       "spell": "13:8-13:12|13:1-13:15|2|-1",
       "bases": [],
       "funcs": [],
-      "types": [873975420211778410],
+      "types": [],
       "vars": [],
       "alias_of": 0,
       "kind": 23,
-      "parent_kind": 1,
+      "parent_kind": 0,
       "declarations": [],
       "derived": [],
       "instances": [],
@@ -70,24 +70,8 @@ OUTPUT: header.h
       "vars": [],
       "alias_of": 16750616846959666305,
       "kind": 252,
-      "parent_kind": 1,
-      "declarations": [],
-      "derived": [],
-      "instances": [],
-      "uses": []
-    }, {
-      "usr": 873975420211778410,
-      "detailed_name": "T",
-      "qual_name_offset": 0,
-      "short_name": "",
-      "bases": [],
-      "funcs": [],
-      "types": [],
-      "vars": [],
-      "alias_of": 0,
-      "kind": 26,
       "parent_kind": 0,
-      "declarations": ["12:20-12:21|12:11-12:21|1025|-1"],
+      "declarations": [],
       "derived": [],
       "instances": [],
       "uses": []
@@ -103,7 +87,7 @@ OUTPUT: header.h
       "vars": [],
       "alias_of": 0,
       "kind": 10,
-      "parent_kind": 1,
+      "parent_kind": 0,
       "declarations": [],
       "derived": [],
       "instances": [],
@@ -120,27 +104,11 @@ OUTPUT: header.h
       "vars": [],
       "alias_of": 0,
       "kind": 23,
-      "parent_kind": 1,
+      "parent_kind": 0,
       "declarations": [],
       "derived": [16750616846959666305],
       "instances": [],
       "uses": ["5:26-5:30|2052|-1"]
-    }, {
-      "usr": 11499613911650781751,
-      "detailed_name": "T",
-      "qual_name_offset": 0,
-      "short_name": "",
-      "bases": [],
-      "funcs": [],
-      "types": [],
-      "vars": [],
-      "alias_of": 0,
-      "kind": 26,
-      "parent_kind": 0,
-      "declarations": ["9:20-9:21|9:11-9:21|1|-1"],
-      "derived": [],
-      "instances": [],
-      "uses": []
     }, {
       "usr": 16750616846959666305,
       "detailed_name": "struct SameFileDerived : Base {}",
@@ -153,7 +121,7 @@ OUTPUT: header.h
       "vars": [],
       "alias_of": 0,
       "kind": 23,
-      "parent_kind": 1,
+      "parent_kind": 0,
       "declarations": [],
       "derived": [],
       "instances": [],
@@ -165,9 +133,9 @@ OUTPUT: header.h
       "qual_name_offset": 4,
       "short_name": "Foo4",
       "spell": "17:5-17:9|17:1-17:9|2|-1",
-      "type": 452,
+      "type": 53,
       "kind": 13,
-      "parent_kind": 1,
+      "parent_kind": 0,
       "storage": 0,
       "declarations": [],
       "uses": []
@@ -180,7 +148,7 @@ OUTPUT: header.h
       "spell": "15:13-15:14|15:13-15:14|1026|-1",
       "type": 4481210672785600703,
       "kind": 22,
-      "parent_kind": 1,
+      "parent_kind": 0,
       "storage": 0,
       "declarations": [],
       "uses": []
@@ -193,7 +161,7 @@ OUTPUT: header.h
       "spell": "15:19-15:20|15:19-15:20|1026|-1",
       "type": 4481210672785600703,
       "kind": 22,
-      "parent_kind": 1,
+      "parent_kind": 0,
       "storage": 0,
       "declarations": [],
       "uses": []
@@ -203,9 +171,9 @@ OUTPUT: header.h
       "qual_name_offset": 11,
       "short_name": "Foo5",
       "spell": "18:12-18:16|18:1-18:16|2|-1",
-      "type": 452,
+      "type": 53,
       "kind": 13,
-      "parent_kind": 1,
+      "parent_kind": 0,
       "storage": 2,
       "declarations": [],
       "uses": []
@@ -218,7 +186,7 @@ OUTPUT: header.h
       "spell": "15:16-15:17|15:16-15:17|1026|-1",
       "type": 4481210672785600703,
       "kind": 22,
-      "parent_kind": 1,
+      "parent_kind": 0,
       "storage": 0,
       "declarations": [],
       "uses": []
@@ -241,7 +209,7 @@ OUTPUT: impl.cc
       "vars": [],
       "callees": ["4:3-4:7|11650481237659640387|3|16420"],
       "kind": 12,
-      "parent_kind": 1,
+      "parent_kind": 0,
       "storage": 0,
       "declarations": [],
       "derived": [],

index_tests/multi_file/simple_impl.cc

@@ -44,7 +44,7 @@ OUTPUT: simple_impl.cc
       "vars": [],
       "callees": ["4:3-4:9|16236105532929924676|3|16420"],
       "kind": 12,
-      "parent_kind": 1,
+      "parent_kind": 0,
       "storage": 0,
       "declarations": [],
       "derived": [],

index_tests/multi_file/static.cc

@@ -34,7 +34,7 @@ OUTPUT: static.h
       "vars": [],
       "alias_of": 0,
       "kind": 23,
-      "parent_kind": 1,
+      "parent_kind": 0,
       "declarations": [],
       "derived": [],
       "instances": [],

index_tests/namespaces/function_declaration.cc

@@ -13,7 +13,7 @@ OUTPUT:
       "qual_name_offset": 5,
       "short_name": "foo",
       "bases": [],
-      "vars": [11261617957951052010, 6927976078246688450],
+      "vars": [],
       "callees": [],
       "kind": 12,
       "parent_kind": 0,
@@ -23,22 +23,6 @@ OUTPUT:
       "uses": []
     }],
   "usr2type": [{
-      "usr": 452,
-      "detailed_name": "",
-      "qual_name_offset": 0,
-      "short_name": "",
-      "bases": [],
-      "funcs": [],
-      "types": [],
-      "vars": [],
-      "alias_of": 0,
-      "kind": 0,
-      "parent_kind": 0,
-      "declarations": [],
-      "derived": [],
-      "instances": [11261617957951052010, 6927976078246688450],
-      "uses": []
-    }, {
       "usr": 2029211996748007610,
       "detailed_name": "namespace hello {}",
       "qual_name_offset": 10,
@@ -55,30 +39,6 @@ OUTPUT:
       "instances": [],
       "uses": []
     }],
-  "usr2var": [{
+  "usr2var": []
-      "usr": 6927976078246688450,
-      "detailed_name": "int b",
-      "qual_name_offset": 4,
-      "short_name": "b",
-      "spell": "2:21-2:22|2:17-2:22|1026|-1",
-      "type": 452,
-      "kind": 253,
-      "parent_kind": 12,
-      "storage": 0,
-      "declarations": [],
-      "uses": []
-    }, {
-      "usr": 11261617957951052010,
-      "detailed_name": "int a",
-      "qual_name_offset": 4,
-      "short_name": "a",
-      "spell": "2:14-2:15|2:10-2:15|1026|-1",
-      "type": 452,
-      "kind": 253,
-      "parent_kind": 12,
-      "storage": 0,
-      "declarations": [],
-      "uses": []
-    }]
 }
 */

index_tests/namespaces/namespace_alias.cc

@@ -28,14 +28,14 @@ OUTPUT:
       "vars": [6030927277961448585, 7657277353101371136],
       "callees": [],
       "kind": 12,
-      "parent_kind": 1,
+      "parent_kind": 0,
       "storage": 0,
       "declarations": [],
       "derived": [],
       "uses": []
     }],
   "usr2type": [{
-      "usr": 452,
+      "usr": 53,
       "detailed_name": "",
       "qual_name_offset": 0,
       "short_name": "",
@@ -76,7 +76,7 @@ OUTPUT:
       "types": [],
       "vars": [],
       "alias_of": 14450849931009540802,
-      "kind": 3,
+      "kind": 252,
       "parent_kind": 0,
       "declarations": ["9:11-9:14|9:1-9:30|1|-1"],
       "derived": [],
@@ -125,7 +125,7 @@ OUTPUT:
       "short_name": "a",
       "hover": "int a = foo::bar::baz::qux",
       "spell": "12:7-12:8|12:3-12:29|2|-1",
-      "type": 452,
+      "type": 53,
       "kind": 13,
       "parent_kind": 12,
       "storage": 0,
@@ -138,7 +138,7 @@ OUTPUT:
       "short_name": "b",
       "hover": "int b = fbz::qux",
       "spell": "13:7-13:8|13:3-13:19|2|-1",
-      "type": 452,
+      "type": 53,
       "kind": 13,
       "parent_kind": 12,
       "storage": 0,
@@ -151,7 +151,7 @@ OUTPUT:
       "short_name": "qux",
       "hover": "int foo::bar::baz::qux = 42",
       "spell": "4:18-4:21|4:14-4:26|1026|-1",
-      "type": 452,
+      "type": 53,
       "kind": 13,
       "parent_kind": 3,
       "storage": 0,

index_tests/namespaces/namespace_reference.cc

@@ -24,7 +24,7 @@ OUTPUT:
       "vars": [],
       "callees": ["7:7-7:13|17328473273923617489|3|16420", "9:3-9:9|17328473273923617489|3|16420"],
       "kind": 12,
-      "parent_kind": 1,
+      "parent_kind": 0,
       "storage": 0,
       "declarations": [],
       "derived": [],
@@ -46,7 +46,7 @@ OUTPUT:
       "uses": ["7:7-7:13|16420|-1", "9:3-9:9|16420|-1"]
     }],
   "usr2type": [{
-      "usr": 452,
+      "usr": 53,
       "detailed_name": "",
       "qual_name_offset": 0,
       "short_name": "",
@@ -87,7 +87,7 @@ OUTPUT:
       "qual_name_offset": 4,
       "short_name": "a",
       "spell": "3:19-3:20|3:15-3:20|1026|-1",
-      "type": 452,
+      "type": 53,
       "kind": 253,
       "parent_kind": 12,
       "storage": 0,
@@ -99,7 +99,7 @@ OUTPUT:
       "qual_name_offset": 4,
       "short_name": "Foo",
       "spell": "2:7-2:10|2:3-2:10|1026|-1",
-      "type": 452,
+      "type": 53,
       "kind": 13,
       "parent_kind": 3,
       "storage": 0,
@@ -108,3 +108,6 @@ OUTPUT:
     }]
 }
 */
+
+
+

index_tests/objective-c/class.m

@@ -20,128 +20,165 @@ int main(void)
 OUTPUT:
 {
   "includes": [],
-  "skipped_ranges": [],
+  "skipped_by_preprocessor": [],
-  "usr2func": [{
+  "types": [{
-      "usr": 4096877434426330804,
+      "id": 0,
-      "detailed_name": "- (void)AClass::anInstanceMethod;",
-      "qual_name_offset": 2,
-      "short_name": "anInstanceMethod",
-      "spell": "9:9-9:25|9:1-9:28|1090|-1",
-      "bases": [],
-      "vars": [],
-      "callees": [],
-      "kind": 6,
-      "parent_kind": 11,
-      "storage": 0,
-      "declarations": ["3:11-3:27|3:3-3:28|1089|-1"],
-      "derived": [],
-      "uses": ["15:13-15:29|24676|-1"]
-    }, {
-      "usr": 7924728095432766067,
-      "detailed_name": "int main(void)",
-      "qual_name_offset": 4,
-      "short_name": "main",
-      "spell": "12:5-12:9|12:1-17:2|2|-1",
-      "bases": [],
-      "vars": [11068172662702654556],
-      "callees": ["15:13-15:29|4096877434426330804|3|24676", "16:12-16:17|17992064398538597892|3|24932"],
-      "kind": 12,
-      "parent_kind": 1,
-      "storage": 0,
-      "declarations": [],
-      "derived": [],
-      "uses": []
-    }, {
-      "usr": 12774569141855220778,
-      "detailed_name": "- (int)AClass::aProp;",
-      "qual_name_offset": 2,
-      "short_name": "aProp",
-      "bases": [],
-      "vars": [],
-      "callees": [],
-      "kind": 6,
-      "parent_kind": 0,
-      "storage": 0,
-      "declarations": ["4:29-4:34|4:29-4:34|1345|-1"],
-      "derived": [],
-      "uses": []
-    }, {
-      "usr": 12775970426728664910,
-      "detailed_name": "+ (void)AClass::test;",
-      "qual_name_offset": 2,
-      "short_name": "test",
-      "spell": "8:9-8:13|8:1-8:16|1090|-1",
-      "bases": [],
-      "vars": [],
-      "callees": [],
-      "kind": 6,
-      "parent_kind": 11,
-      "storage": 0,
-      "declarations": ["2:11-2:15|2:3-2:16|1089|-1"],
-      "derived": [],
-      "uses": []
-    }, {
-      "usr": 17992064398538597892,
-      "detailed_name": "- (void)AClass::setAProp:(int)aProp;",
-      "qual_name_offset": 2,
-      "short_name": "setAProp:",
-      "bases": [],
-      "vars": [],
-      "callees": [],
-      "kind": 6,
-      "parent_kind": 0,
-      "storage": 0,
-      "declarations": ["4:29-4:34|4:29-4:34|1345|-1"],
-      "derived": [],
-      "uses": ["16:12-16:17|24932|-1"]
-    }],
-  "usr2type": [{
       "usr": 11832280568361305387,
-      "detailed_name": "@implementation AClass\n@end",
+      "detailed_name": "AClass",
-      "qual_name_offset": 16,
       "short_name": "AClass",
-      "spell": "7:17-7:23|7:1-10:2|2|-1",
-      "bases": [],
-      "funcs": [12775970426728664910, 4096877434426330804, 12774569141855220778, 17992064398538597892],
-      "types": [14842397373703114213],
-      "vars": [],
-      "alias_of": 0,
-      "kind": 11,
-      "parent_kind": 1,
-      "declarations": ["1:12-1:18|1:1-5:5|1|-1"],
-      "derived": [],
-      "instances": [],
-      "uses": ["14:3-14:9|4|-1", "14:23-14:29|4|-1"]
-    }, {
-      "usr": 14842397373703114213,
-      "detailed_name": "@property(nonatomic, assign, unsafe_unretained, readwrite) int AClass::aProp;",
-      "qual_name_offset": 63,
-      "short_name": "aProp",
-      "bases": [],
-      "funcs": [],
-      "types": [],
-      "vars": [],
-      "alias_of": 0,
       "kind": 7,
-      "parent_kind": 0,
+      "spell": "7:17-7:23|-1|1|2",
-      "declarations": ["4:29-4:34|4:3-4:34|1025|-1"],
+      "extent": "7:1-10:2|-1|1|0",
+      "parents": [],
       "derived": [],
-      "instances": [],
+      "types": [],
-      "uses": ["16:12-16:17|20|-1"]
+      "funcs": [],
+      "vars": [],
+      "instances": [2],
+      "uses": ["14:3-14:9|-1|1|4", "14:23-14:29|-1|1|4"]
+    }, {
+      "id": 1,
+      "usr": 17,
+      "detailed_name": "",
+      "short_name": "",
+      "kind": 0,
+      "parents": [],
+      "derived": [],
+      "types": [],
+      "funcs": [],
+      "vars": [],
+      "instances": [0, 1],
+      "uses": []
     }],
-  "usr2var": [{
+  "funcs": [{
-      "usr": 11068172662702654556,
+      "id": 0,
+      "usr": 12775970426728664910,
+      "detailed_name": "AClass::test",
+      "short_name": "test",
+      "kind": 17,
+      "storage": 0,
+      "declarations": [{
+          "spelling": "2:11-2:15",
+          "extent": "2:3-2:16",
+          "content": "+ (void)test;",
+          "param_spellings": []
+        }],
+      "spell": "8:9-8:13|-1|1|2",
+      "extent": "8:1-8:16|-1|1|0",
+      "base": [],
+      "derived": [],
+      "locals": [],
+      "uses": [],
+      "callees": []
+    }, {
+      "id": 1,
+      "usr": 4096877434426330804,
+      "detailed_name": "AClass::anInstanceMethod",
+      "short_name": "anInstanceMethod",
+      "kind": 16,
+      "storage": 0,
+      "declarations": [{
+          "spelling": "3:11-3:27",
+          "extent": "3:3-3:28",
+          "content": "- (void)anInstanceMethod;",
+          "param_spellings": []
+        }],
+      "spell": "9:9-9:25|-1|1|2",
+      "extent": "9:1-9:28|-1|1|0",
+      "base": [],
+      "derived": [],
+      "locals": [],
+      "uses": ["15:13-15:29|4|3|64"],
+      "callees": []
+    }, {
+      "id": 2,
+      "usr": 12774569141855220778,
+      "detailed_name": "AClass::aProp",
+      "short_name": "aProp",
+      "kind": 16,
+      "storage": 0,
+      "declarations": [{
+          "spelling": "0:0-0:0",
+          "extent": "4:29-4:34",
+          "content": "aProp",
+          "param_spellings": []
+        }],
+      "extent": "4:29-4:34|-1|1|0",
+      "base": [],
+      "derived": [],
+      "locals": [],
+      "uses": [],
+      "callees": []
+    }, {
+      "id": 3,
+      "usr": 17992064398538597892,
+      "detailed_name": "AClass::setAProp:",
+      "short_name": "setAProp:",
+      "kind": 16,
+      "storage": 0,
+      "declarations": [{
+          "spelling": "0:0-0:0",
+          "extent": "4:29-4:34",
+          "content": "aProp",
+          "param_spellings": ["4:29-4:34"]
+        }],
+      "extent": "4:29-4:34|-1|1|0",
+      "base": [],
+      "derived": [],
+      "locals": [],
+      "uses": ["0:0-0:0|4|3|64"],
+      "callees": []
+    }, {
+      "id": 4,
+      "usr": 7033269674615638282,
+      "detailed_name": "int main()",
+      "short_name": "main",
+      "kind": 12,
+      "storage": 1,
+      "declarations": [],
+      "spell": "12:5-12:9|-1|1|2",
+      "extent": "12:1-17:2|-1|1|0",
+      "base": [],
+      "derived": [],
+      "locals": [],
+      "uses": [],
+      "callees": ["15:13-15:29|1|3|64", "0:0-0:0|3|3|64"]
+    }],
+  "vars": [{
+      "id": 0,
+      "usr": 14842397373703114213,
+      "detailed_name": "int AClass::aProp",
+      "short_name": "aProp",
+      "declarations": ["4:29-4:34|-1|1|1"],
+      "type": 1,
+      "uses": ["16:12-16:17|4|3|4"],
+      "kind": 19,
+      "storage": 0
+    }, {
+      "id": 1,
+      "usr": 17112602610366149042,
+      "detailed_name": "int AClass::_aProp",
+      "short_name": "_aProp",
+      "declarations": [],
+      "spell": "4:29-4:34|-1|1|2",
+      "extent": "4:29-4:34|-1|1|0",
+      "type": 1,
+      "uses": [],
+      "kind": 14,
+      "storage": 0
+    }, {
+      "id": 2,
+      "usr": 6849095699869081177,
       "detailed_name": "AClass *instance",
-      "qual_name_offset": 8,
       "short_name": "instance",
       "hover": "AClass *instance = [AClass init]",
-      "spell": "14:11-14:19|14:3-14:35|2|-1",
-      "type": 0,
-      "kind": 13,
-      "parent_kind": 12,
-      "storage": 0,
       "declarations": [],
-      "uses": ["15:4-15:12|12|-1", "16:3-16:11|12|-1"]
+      "spell": "14:11-14:19|4|3|2",
+      "extent": "14:3-14:35|4|3|2",
+      "type": 0,
+      "uses": ["15:4-15:12|4|3|4", "16:3-16:11|4|3|4"],
+      "kind": 13,
+      "storage": 1
     }]
 }
 */

index_tests/operators/operator.cc

@@ -31,7 +31,7 @@ OUTPUT:
       "qual_name_offset": 4,
       "short_name": "operator()",
       "bases": [],
-      "vars": [18194802024223591994, 3165816734756776484],
+      "vars": [],
       "callees": [],
       "kind": 6,
       "parent_kind": 0,
@@ -70,22 +70,6 @@ OUTPUT:
       "uses": []
     }],
   "usr2type": [{
-      "usr": 452,
-      "detailed_name": "",
-      "qual_name_offset": 0,
-      "short_name": "",
-      "bases": [],
-      "funcs": [],
-      "types": [],
-      "vars": [],
-      "alias_of": 0,
-      "kind": 0,
-      "parent_kind": 0,
-      "declarations": [],
-      "derived": [],
-      "instances": [18194802024223591994, 3165816734756776484],
-      "uses": []
-    }, {
       "usr": 15041163540773201510,
       "detailed_name": "class Foo {}",
       "qual_name_offset": 6,
@@ -97,36 +81,12 @@ OUTPUT:
       "vars": [],
       "alias_of": 0,
       "kind": 5,
-      "parent_kind": 1,
+      "parent_kind": 0,
       "declarations": [],
       "derived": [],
       "instances": [],
       "uses": ["7:1-7:4|4|-1", "7:25-7:28|4|-1"]
     }],
-  "usr2var": [{
+  "usr2var": []
-      "usr": 3165816734756776484,
-      "detailed_name": "int b",
-      "qual_name_offset": 4,
-      "short_name": "b",
-      "spell": "4:29-4:30|4:25-4:30|1026|-1",
-      "type": 452,
-      "kind": 253,
-      "parent_kind": 6,
-      "storage": 0,
-      "declarations": [],
-      "uses": []
-    }, {
-      "usr": 18194802024223591994,
-      "detailed_name": "int a",
-      "qual_name_offset": 4,
-      "short_name": "a",
-      "spell": "4:22-4:23|4:18-4:23|1026|-1",
-      "type": 452,
-      "kind": 253,
-      "parent_kind": 6,
-      "storage": 0,
-      "declarations": [],
-      "uses": []
-    }]
 }
 */

index_tests/outline/static_function_in_type.cc

@@ -13,7 +13,7 @@ OUTPUT: static_function_in_type.h
   "skipped_ranges": [],
   "usr2func": [{
       "usr": 17019747379608639279,
-      "detailed_name": "static void ns::Foo::Register(Manager *)",
+      "detailed_name": "static void ns::Foo::Register(ns::Manager *)",
       "qual_name_offset": 12,
       "short_name": "Register",
       "bases": [],
@@ -87,7 +87,7 @@ OUTPUT: static_function_in_type.cc
   "skipped_ranges": [],
   "usr2func": [{
       "usr": 17019747379608639279,
-      "detailed_name": "static void ns::Foo::Register(Manager *)",
+      "detailed_name": "static void ns::Foo::Register(ns::Manager *)",
       "qual_name_offset": 12,
       "short_name": "Register",
       "spell": "5:11-5:19|5:1-6:2|1026|-1",
@@ -153,8 +153,8 @@ OUTPUT: static_function_in_type.cc
     }],
   "usr2var": [{
       "usr": 13569879755236306838,
-      "detailed_name": "Manager *m",
+      "detailed_name": "ns::Manager *m",
-      "qual_name_offset": 9,
+      "qual_name_offset": 13,
       "short_name": "m",
       "spell": "5:29-5:30|5:20-5:30|1026|-1",
       "type": 1972401196751872203,

index_tests/preprocessor/skipped.cc

@@ -17,7 +17,7 @@ void hello();
 OUTPUT:
 {
   "includes": [],
-  "skipped_ranges": ["2:1-4:7", "6:1-10:7", "12:1-14:7"],
+  "skipped_ranges": ["2:1-5:1", "6:1-11:1", "12:1-15:1"],
   "usr2func": [],
   "usr2type": [],
   "usr2var": []

index_tests/templates/concept.cc

@@ -1,307 +0,0 @@
-
-template <class T> struct type_trait {
-  const static bool value = false;
-};
-
-template <> struct type_trait<int> {
-  const static bool value = true;
-};
-
-template <class T>
-concept Con1 = type_trait<T>::value;
-
-constexpr int sizeFunc() { return 4; }
-
-template <class T>
-concept ConWithLogicalAnd = Con1<T> && sizeof(T) > sizeFunc();
-
-namespace ns {
-template <class T>
-concept ConInNamespace = sizeof(T) > 4;
-}
-
-template <class T1, class T2>
-concept ConTwoTemplateParams = ns::ConInNamespace<T1> && ConWithLogicalAnd<T2>;
-
-/*
-OUTPUT:
-{
-  "includes": [],
-  "skipped_ranges": [],
-  "usr2func": [{
-      "usr": 3226866773869731400,
-      "detailed_name": "constexpr int sizeFunc()",
-      "qual_name_offset": 14,
-      "short_name": "sizeFunc",
-      "spell": "13:15-13:23|13:1-13:39|2|-1",
-      "bases": [],
-      "vars": [],
-      "callees": [],
-      "kind": 12,
-      "parent_kind": 1,
-      "storage": 0,
-      "declarations": [],
-      "derived": [],
-      "uses": ["16:52-16:60|36|-1"]
-    }],
-  "usr2type": [{
-      "usr": 436,
-      "detailed_name": "",
-      "qual_name_offset": 0,
-      "short_name": "",
-      "bases": [],
-      "funcs": [],
-      "types": [],
-      "vars": [],
-      "alias_of": 0,
-      "kind": 0,
-      "parent_kind": 0,
-      "declarations": [],
-      "derived": [],
-      "instances": [3643386974125063532, 4683419091429829178],
-      "uses": []
-    }, {
-      "usr": 452,
-      "detailed_name": "",
-      "qual_name_offset": 0,
-      "short_name": "",
-      "bases": [],
-      "funcs": [],
-      "types": [],
-      "vars": [],
-      "alias_of": 0,
-      "kind": 0,
-      "parent_kind": 0,
-      "declarations": [],
-      "derived": [],
-      "instances": [15611304989063975809, 15197037962155352994, 7075924720131397743, 8419381068906673567],
-      "uses": []
-    }, {
-      "usr": 368613743269466510,
-      "detailed_name": "T",
-      "qual_name_offset": 0,
-      "short_name": "",
-      "bases": [],
-      "funcs": [],
-      "types": [],
-      "vars": [],
-      "alias_of": 0,
-      "kind": 26,
-      "parent_kind": 0,
-      "declarations": ["19:17-19:18|19:11-19:18|1025|-1"],
-      "derived": [],
-      "instances": [],
-      "uses": ["20:33-20:34|4|-1"]
-    }, {
-      "usr": 1341599025369786548,
-      "detailed_name": "T1",
-      "qual_name_offset": 0,
-      "short_name": "",
-      "bases": [],
-      "funcs": [],
-      "types": [],
-      "vars": [],
-      "alias_of": 0,
-      "kind": 26,
-      "parent_kind": 0,
-      "declarations": ["23:17-23:19|23:11-23:19|1|-1"],
-      "derived": [],
-      "instances": [],
-      "uses": ["24:51-24:53|4|-1"]
-    }, {
-      "usr": 1789177110200181456,
-      "detailed_name": "T",
-      "qual_name_offset": 0,
-      "short_name": "",
-      "bases": [],
-      "funcs": [],
-      "types": [],
-      "vars": [],
-      "alias_of": 0,
-      "kind": 26,
-      "parent_kind": 0,
-      "declarations": ["15:17-15:18|15:11-15:18|1|-1"],
-      "derived": [],
-      "instances": [],
-      "uses": ["16:34-16:35|4|-1", "16:47-16:48|4|-1"]
-    }, {
-      "usr": 4001289545226345448,
-      "detailed_name": "struct type_trait {}",
-      "qual_name_offset": 7,
-      "short_name": "type_trait",
-      "spell": "2:27-2:37|2:20-4:2|2|-1",
-      "bases": [],
-      "funcs": [],
-      "types": [13813325012676356715],
-      "vars": [],
-      "alias_of": 0,
-      "kind": 23,
-      "parent_kind": 1,
-      "declarations": [],
-      "derived": [10139416838611429657],
-      "instances": [],
-      "uses": ["11:16-11:26|4|-1"]
-    }, {
-      "usr": 8987540007709901036,
-      "detailed_name": "T",
-      "qual_name_offset": 0,
-      "short_name": "",
-      "bases": [],
-      "funcs": [],
-      "types": [],
-      "vars": [],
-      "alias_of": 0,
-      "kind": 26,
-      "parent_kind": 0,
-      "declarations": ["10:17-10:18|10:11-10:18|1|-1"],
-      "derived": [],
-      "instances": [],
-      "uses": ["11:27-11:28|4|-1"]
-    }, {
-      "usr": 10139416838611429657,
-      "detailed_name": "template<> struct type_trait<int> {}",
-      "qual_name_offset": 18,
-      "short_name": "type_trait",
-      "spell": "6:20-6:30|6:1-8:2|2|-1",
-      "bases": [4001289545226345448],
-      "funcs": [],
-      "types": [],
-      "vars": [],
-      "alias_of": 0,
-      "kind": 5,
-      "parent_kind": 1,
-      "declarations": [],
-      "derived": [],
-      "instances": [],
-      "uses": []
-    }, {
-      "usr": 10306412732558468540,
-      "detailed_name": "T2",
-      "qual_name_offset": 0,
-      "short_name": "",
-      "bases": [],
-      "funcs": [],
-      "types": [],
-      "vars": [],
-      "alias_of": 0,
-      "kind": 26,
-      "parent_kind": 0,
-      "declarations": ["23:27-23:29|23:21-23:29|1|-1"],
-      "derived": [],
-      "instances": [],
-      "uses": ["24:76-24:78|4|-1"]
-    }, {
-      "usr": 11072669167287398027,
-      "detailed_name": "namespace ns {}",
-      "qual_name_offset": 10,
-      "short_name": "ns",
-      "bases": [],
-      "funcs": [],
-      "types": [368613743269466510],
-      "vars": [{
-          "L": 7075924720131397743,
-          "R": -1
-        }],
-      "alias_of": 0,
-      "kind": 3,
-      "parent_kind": 0,
-      "declarations": ["18:11-18:13|18:1-21:2|1|-1"],
-      "derived": [],
-      "instances": [],
-      "uses": ["24:32-24:34|4|-1"]
-    }, {
-      "usr": 13813325012676356715,
-      "detailed_name": "T",
-      "qual_name_offset": 0,
-      "short_name": "",
-      "bases": [],
-      "funcs": [],
-      "types": [],
-      "vars": [],
-      "alias_of": 0,
-      "kind": 26,
-      "parent_kind": 0,
-      "declarations": ["2:17-2:18|2:11-2:18|1025|-1"],
-      "derived": [],
-      "instances": [],
-      "uses": []
-    }],
-  "usr2var": [{
-      "usr": 3643386974125063532,
-      "detailed_name": "static const bool type_trait::value",
-      "qual_name_offset": 18,
-      "short_name": "value",
-      "hover": "static const bool type_trait::value = false",
-      "type": 436,
-      "kind": 8,
-      "parent_kind": 23,
-      "storage": 2,
-      "declarations": ["3:21-3:26|3:3-3:34|1025|-1"],
-      "uses": ["11:31-11:36|4|-1"]
-    }, {
-      "usr": 4683419091429829178,
-      "detailed_name": "static const bool type_trait<int>::value",
-      "qual_name_offset": 18,
-      "short_name": "value",
-      "hover": "static const bool type_trait<int>::value = true",
-      "type": 436,
-      "kind": 8,
-      "parent_kind": 5,
-      "storage": 2,
-      "declarations": ["7:21-7:26|7:3-7:33|1025|-1"],
-      "uses": []
-    }, {
-      "usr": 7075924720131397743,
-      "detailed_name": "int ns::ConInNamespace",
-      "qual_name_offset": 4,
-      "short_name": "ConInNamespace",
-      "hover": "int ns::ConInNamespace = sizeof(T) > 4",
-      "spell": "20:9-20:23|20:1-20:39|1026|-1",
-      "type": 452,
-      "kind": 13,
-      "parent_kind": 3,
-      "storage": 0,
-      "declarations": [],
-      "uses": ["24:36-24:50|4|-1"]
-    }, {
-      "usr": 8419381068906673567,
-      "detailed_name": "int ConTwoTemplateParams",
-      "qual_name_offset": 4,
-      "short_name": "ConTwoTemplateParams",
-      "hover": "int ConTwoTemplateParams = ns::ConInNamespace<T1> && ConWithLogicalAnd<T2>",
-      "spell": "24:9-24:29|24:1-24:79|2|-1",
-      "type": 452,
-      "kind": 13,
-      "parent_kind": 1,
-      "storage": 0,
-      "declarations": [],
-      "uses": []
-    }, {
-      "usr": 15197037962155352994,
-      "detailed_name": "int ConWithLogicalAnd",
-      "qual_name_offset": 4,
-      "short_name": "ConWithLogicalAnd",
-      "hover": "int ConWithLogicalAnd = Con1<T> && sizeof(T) > sizeFunc()",
-      "spell": "16:9-16:26|16:1-16:62|2|-1",
-      "type": 452,
-      "kind": 13,
-      "parent_kind": 1,
-      "storage": 0,
-      "declarations": [],
-      "uses": ["24:58-24:75|4|-1"]
-    }, {
-      "usr": 15611304989063975809,
-      "detailed_name": "int Con1",
-      "qual_name_offset": 4,
-      "short_name": "Con1",
-      "hover": "int Con1 = type_trait<T>::value",
-      "spell": "11:9-11:13|11:1-11:36|2|-1",
-      "type": 452,
-      "kind": 13,
-      "parent_kind": 1,
-      "storage": 0,
-      "declarations": [],
-      "uses": ["16:29-16:33|4|-1"]
-    }]
-}
-*/

index_tests/templates/func_specialized_template_param.cc

@@ -29,22 +29,6 @@ OUTPUT:
       "uses": []
     }],
   "usr2type": [{
-      "usr": 3122724794825267268,
-      "detailed_name": "T",
-      "qual_name_offset": 0,
-      "short_name": "",
-      "bases": [],
-      "funcs": [],
-      "types": [],
-      "vars": [],
-      "alias_of": 0,
-      "kind": 26,
-      "parent_kind": 0,
-      "declarations": ["1:16-1:17|1:10-1:17|1025|-1"],
-      "derived": [],
-      "instances": [],
-      "uses": []
-    }, {
       "usr": 15041163540773201510,
       "detailed_name": "struct Foo {}",
       "qual_name_offset": 7,
@@ -56,7 +40,7 @@ OUTPUT:
       "vars": [],
       "alias_of": 0,
       "kind": 23,
-      "parent_kind": 1,
+      "parent_kind": 0,
       "declarations": [],
       "derived": [],
       "instances": [],
@@ -69,11 +53,11 @@ OUTPUT:
       "spell": "2:7-2:15|2:1-2:18|2|-1",
       "bases": [],
       "funcs": [],
-      "types": [3122724794825267268],
+      "types": [],
       "vars": [],
       "alias_of": 0,
       "kind": 5,
-      "parent_kind": 1,
+      "parent_kind": 0,
       "declarations": [],
       "derived": [],
       "instances": [],

index_tests/templates/implicit_variable_instantiation.cc

@@ -21,7 +21,7 @@ OUTPUT:
   "skipped_ranges": [],
   "usr2func": [],
   "usr2type": [{
-      "usr": 452,
+      "usr": 53,
       "detailed_name": "",
       "qual_name_offset": 0,
       "short_name": "",
@@ -53,38 +53,6 @@ OUTPUT:
       "derived": [],
       "instances": [4731849186641714451, 4731849186641714451],
       "uses": ["6:22-6:29|4|-1", "6:44-6:51|4|-1", "10:18-10:25|4|-1"]
-    }, {
-      "usr": 2205716167465743256,
-      "detailed_name": "_",
-      "qual_name_offset": 0,
-      "short_name": "",
-      "bases": [],
-      "funcs": [],
-      "types": [],
-      "vars": [],
-      "alias_of": 0,
-      "kind": 26,
-      "parent_kind": 0,
-      "declarations": [],
-      "derived": [],
-      "instances": [],
-      "uses": ["10:33-10:34|4|-1"]
-    }, {
-      "usr": 2743282246975181395,
-      "detailed_name": "_",
-      "qual_name_offset": 0,
-      "short_name": "",
-      "bases": [],
-      "funcs": [],
-      "types": [],
-      "vars": [],
-      "alias_of": 0,
-      "kind": 26,
-      "parent_kind": 0,
-      "declarations": ["4:21-4:22|4:12-4:22|1025|-1"],
-      "derived": [],
-      "instances": [],
-      "uses": []
     }, {
       "usr": 11072669167287398027,
       "detailed_name": "namespace ns {}",
@@ -115,7 +83,7 @@ OUTPUT:
       "spell": "5:10-5:16|5:3-7:4|1026|-1",
       "bases": [],
       "funcs": [],
-      "types": [2743282246975181395],
+      "types": [],
       "vars": [],
       "alias_of": 0,
       "kind": 23,
@@ -127,16 +95,16 @@ OUTPUT:
     }],
   "usr2var": [{
       "usr": 4731849186641714451,
-      "detailed_name": "static constexpr VarType ns::Holder::static_var",
+      "detailed_name": "static constexpr ns::VarType ns::Holder::static_var",
-      "qual_name_offset": 25,
+      "qual_name_offset": 29,
       "short_name": "static_var",
-      "hover": "static constexpr VarType ns::Holder::static_var = (VarType)0x0",
+      "hover": "static constexpr ns::VarType ns::Holder::static_var = (VarType)0x0",
-      "spell": "6:30-6:40|6:5-6:55|1026|-1",
+      "spell": "10:37-10:47|9:3-10:47|1026|-1",
       "type": 1532099849728741556,
-      "kind": 8,
+      "kind": 13,
       "parent_kind": 23,
       "storage": 2,
-      "declarations": ["10:37-10:47|9:3-10:47|1025|-1"],
+      "declarations": ["6:30-6:40|6:5-6:55|1025|-1"],
       "uses": ["13:26-13:36|12|-1", "14:27-14:37|12|-1"]
     }, {
       "usr": 9008550860229740818,
@@ -145,7 +113,7 @@ OUTPUT:
       "short_name": "Foo2",
       "hover": "int ns::Foo2 = Holder<int>::static_var",
       "spell": "14:7-14:11|14:3-14:37|1026|-1",
-      "type": 452,
+      "type": 53,
       "kind": 13,
       "parent_kind": 3,
       "storage": 0,
@@ -158,7 +126,7 @@ OUTPUT:
       "short_name": "Foo",
       "hover": "int ns::Foo = Holder<int>::static_var",
       "spell": "13:7-13:10|13:3-13:36|1026|-1",
-      "type": 452,
+      "type": 53,
       "kind": 13,
       "parent_kind": 3,
       "storage": 0,

index_tests/templates/member_ref_in_template.cc

@@ -35,7 +35,7 @@ OUTPUT:
       "vars": [],
       "callees": [],
       "kind": 12,
-      "parent_kind": 1,
+      "parent_kind": 0,
       "storage": 0,
       "declarations": [],
       "derived": [],
@@ -63,14 +63,14 @@ OUTPUT:
       "spell": "2:8-2:9|2:1-5:2|2|-1",
       "bases": [],
       "funcs": [8905286151237717330],
-      "types": [14750650276757822712],
+      "types": [],
       "vars": [{
           "L": 5866801090710377175,
           "R": -1
         }],
       "alias_of": 0,
       "kind": 23,
-      "parent_kind": 1,
+      "parent_kind": 0,
       "declarations": [],
       "derived": [],
       "instances": [],
@@ -79,33 +79,18 @@ OUTPUT:
       "usr": 14750650276757822712,
       "detailed_name": "T",
       "qual_name_offset": 0,
-      "short_name": "",
+      "short_name": "T",
+      "spell": "1:17-1:18|1:11-1:18|2|-1",
       "bases": [],
       "funcs": [],
       "types": [],
       "vars": [],
       "alias_of": 0,
       "kind": 26,
-      "parent_kind": 0,
+      "parent_kind": 5,
-      "declarations": ["1:17-1:18|1:11-1:18|1025|-1"],
+      "declarations": [],
       "derived": [],
       "instances": [5866801090710377175],
-      "uses": ["3:3-3:4|4|-1"]
-    }, {
-      "usr": 14756043565860085104,
-      "detailed_name": "T",
-      "qual_name_offset": 0,
-      "short_name": "",
-      "bases": [],
-      "funcs": [],
-      "types": [],
-      "vars": [],
-      "alias_of": 0,
-      "kind": 26,
-      "parent_kind": 0,
-      "declarations": ["7:17-7:18|7:11-7:18|1|-1"],
-      "derived": [],
-      "instances": [],
       "uses": []
     }],
   "usr2var": [{

index_tests/templates/namespace_template_class_template_func_usage_folded_into_one.cc

@@ -33,7 +33,7 @@ OUTPUT:
       "uses": ["10:21-10:24|36|-1", "11:22-11:25|36|-1"]
     }],
   "usr2type": [{
-      "usr": 452,
+      "usr": 53,
       "detailed_name": "",
       "qual_name_offset": 0,
       "short_name": "",
@@ -48,22 +48,6 @@ OUTPUT:
       "derived": [],
       "instances": [15768138241775955040, 3182917058194750998],
       "uses": []
-    }, {
-      "usr": 404962309137154484,
-      "detailed_name": "R",
-      "qual_name_offset": 0,
-      "short_name": "",
-      "bases": [],
-      "funcs": [],
-      "types": [],
-      "vars": [],
-      "alias_of": 0,
-      "kind": 26,
-      "parent_kind": 0,
-      "declarations": ["4:23-4:24|4:14-4:24|1|-1"],
-      "derived": [],
-      "instances": [],
-      "uses": []
     }, {
       "usr": 11072669167287398027,
       "detailed_name": "namespace ns {}",
@@ -86,22 +70,6 @@ OUTPUT:
       "derived": [],
       "instances": [],
       "uses": []
-    }, {
-      "usr": 14005287469305211602,
-      "detailed_name": "T",
-      "qual_name_offset": 0,
-      "short_name": "",
-      "bases": [],
-      "funcs": [],
-      "types": [],
-      "vars": [],
-      "alias_of": 0,
-      "kind": 26,
-      "parent_kind": 0,
-      "declarations": ["2:21-2:22|2:12-2:22|1025|-1"],
-      "derived": [],
-      "instances": [],
-      "uses": []
     }, {
       "usr": 14042997404480181958,
       "detailed_name": "struct ns::Foo {}",
@@ -110,7 +78,7 @@ OUTPUT:
       "spell": "3:10-3:13|3:3-8:4|1026|-1",
       "bases": [],
       "funcs": [8221803074608342407],
-      "types": [14005287469305211602],
+      "types": [],
       "vars": [],
       "alias_of": 0,
       "kind": 23,
@@ -127,7 +95,7 @@ OUTPUT:
       "short_name": "b",
       "hover": "int ns::b = Foo<bool>::foo<double>()",
       "spell": "11:7-11:8|11:3-11:35|1026|-1",
-      "type": 452,
+      "type": 53,
       "kind": 13,
       "parent_kind": 3,
       "storage": 0,
@@ -140,7 +108,7 @@ OUTPUT:
       "short_name": "a",
       "hover": "int ns::a = Foo<int>::foo<float>()",
       "spell": "10:7-10:8|10:3-10:33|1026|-1",
-      "type": 452,
+      "type": 53,
       "kind": 13,
       "parent_kind": 3,
       "storage": 0,

index_tests/templates/namespace_template_type_usage_folded_into_one.cc

@@ -42,7 +42,7 @@ OUTPUT:
       "spell": "3:9-3:12|3:3-3:15|1026|-1",
       "bases": [],
       "funcs": [],
-      "types": [17234941064111183681],
+      "types": [],
       "vars": [],
       "alias_of": 0,
       "kind": 5,
@@ -51,22 +51,6 @@ OUTPUT:
       "derived": [],
       "instances": [15768138241775955040, 3182917058194750998],
       "uses": ["5:3-5:6|4|-1", "6:3-6:6|4|-1"]
-    }, {
-      "usr": 17234941064111183681,
-      "detailed_name": "T",
-      "qual_name_offset": 0,
-      "short_name": "",
-      "bases": [],
-      "funcs": [],
-      "types": [],
-      "vars": [],
-      "alias_of": 0,
-      "kind": 26,
-      "parent_kind": 0,
-      "declarations": ["2:21-2:22|2:12-2:22|1025|-1"],
-      "derived": [],
-      "instances": [],
-      "uses": []
     }],
   "usr2var": [{
       "usr": 3182917058194750998,

index_tests/templates/specialization.cc

@@ -53,7 +53,7 @@ OUTPUT:
       "qual_name_offset": 16,
       "short_name": "foo",
       "bases": [],
-      "vars": [12904523933304867124],
+      "vars": [],
       "callees": [],
       "kind": 12,
       "parent_kind": 0,
@@ -63,7 +63,7 @@ OUTPUT:
       "uses": []
     }, {
       "usr": 6113470698424012876,
-      "detailed_name": "void vector<Z2>::clear()",
+      "detailed_name": "void vector<Z2, allocator<Z2> >::clear()",
       "qual_name_offset": 5,
       "short_name": "clear",
       "bases": [],
@@ -82,10 +82,10 @@ OUTPUT:
       "short_name": "foo",
       "spell": "39:6-39:9|39:1-39:21|2|-1",
       "bases": [],
-      "vars": [9217877221147056536, 3621126593459656452, 17826688417349629938],
+      "vars": [17826688417349629938],
       "callees": [],
       "kind": 12,
-      "parent_kind": 1,
+      "parent_kind": 0,
       "storage": 0,
       "declarations": [],
       "derived": [],
@@ -106,7 +106,7 @@ OUTPUT:
       "uses": []
     }],
   "usr2type": [{
-      "usr": 452,
+      "usr": 53,
       "detailed_name": "",
       "qual_name_offset": 0,
       "short_name": "",
@@ -119,27 +119,11 @@ OUTPUT:
       "parent_kind": 0,
       "declarations": [],
       "derived": [],
-      "instances": [9217877221147056536, 3621126593459656452, 13914496963221806870],
+      "instances": [13914496963221806870],
-      "uses": []
-    }, {
-      "usr": 481,
-      "detailed_name": "",
-      "qual_name_offset": 0,
-      "short_name": "",
-      "bases": [],
-      "funcs": [],
-      "types": [],
-      "vars": [],
-      "alias_of": 0,
-      "kind": 0,
-      "parent_kind": 0,
-      "declarations": [],
-      "derived": [],
-      "instances": [12904523933304867124],
       "uses": []
     }, {
       "usr": 218068462278884837,
-      "detailed_name": "template <typename T, typename ...Args> class function<T (Args...)> {}",
+      "detailed_name": "template <typename T, typename ...Args> class function<type-parameter-0-0 (type-parameter-0-1...)> {}",
       "qual_name_offset": 46,
       "short_name": "function",
       "spell": "5:7-5:15|4:1-5:30|2|-1",
@@ -149,14 +133,14 @@ OUTPUT:
       "vars": [],
       "alias_of": 0,
       "kind": 5,
-      "parent_kind": 1,
+      "parent_kind": 0,
       "declarations": [],
       "derived": [],
       "instances": [2933643612409209903],
       "uses": ["7:1-7:9|4|-1"]
     }, {
       "usr": 1663022413889915338,
-      "detailed_name": "template<> class vector<Z2> {}",
+      "detailed_name": "template<> class vector<Z2, allocator<Z2>> {}",
       "qual_name_offset": 17,
       "short_name": "vector",
       "spell": "26:7-26:13|25:1-28:2|2|-1",
@@ -166,11 +150,11 @@ OUTPUT:
       "vars": [],
       "alias_of": 0,
       "kind": 5,
-      "parent_kind": 1,
+      "parent_kind": 0,
       "declarations": [],
       "derived": [],
       "instances": [15931696253641284761],
-      "uses": ["33:1-33:7|4|-1"]
+      "uses": ["26:7-26:13|4|-1", "33:1-33:7|4|-1"]
     }, {
       "usr": 5760043510674081814,
       "detailed_name": "struct Z1 {}",
@@ -183,43 +167,11 @@ OUTPUT:
       "vars": [],
       "alias_of": 0,
       "kind": 23,
-      "parent_kind": 1,
+      "parent_kind": 0,
       "declarations": [],
       "derived": [],
       "instances": [],
       "uses": ["21:23-21:25|4|-1", "32:8-32:10|4|-1"]
-    }, {
-      "usr": 6953303017847795730,
-      "detailed_name": "T",
-      "qual_name_offset": 0,
-      "short_name": "",
-      "bases": [],
-      "funcs": [],
-      "types": [],
-      "vars": [],
-      "alias_of": 0,
-      "kind": 26,
-      "parent_kind": 0,
-      "declarations": ["11:19-11:20|11:10-11:20|1025|-1"],
-      "derived": [],
-      "instances": [],
-      "uses": ["11:49-11:50|4|-1"]
-    }, {
-      "usr": 7143192229126273961,
-      "detailed_name": "Args",
-      "qual_name_offset": 0,
-      "short_name": "",
-      "bases": [],
-      "funcs": [],
-      "types": [],
-      "vars": [],
-      "alias_of": 0,
-      "kind": 26,
-      "parent_kind": 0,
-      "declarations": [],
-      "derived": [],
-      "instances": [],
-      "uses": ["5:18-5:22|4|-1"]
     }, {
       "usr": 7440942986741176606,
       "detailed_name": "class vector {}",
@@ -228,31 +180,15 @@ OUTPUT:
       "spell": "12:7-12:13|12:1-14:2|2|-1",
       "bases": [],
       "funcs": [18107614608385228556],
-      "types": [6953303017847795730, 9777924294257602255],
-      "vars": [],
-      "alias_of": 0,
-      "kind": 5,
-      "parent_kind": 1,
-      "declarations": [],
-      "derived": [16155717907537731864, 1663022413889915338],
-      "instances": [5792869548777559988, 3566687051827176322],
-      "uses": ["30:1-30:7|4|-1", "32:1-32:7|4|-1"]
-    }, {
-      "usr": 8880262253425334092,
-      "detailed_name": "T",
-      "qual_name_offset": 0,
-      "short_name": "",
-      "bases": [],
-      "funcs": [],
       "types": [],
       "vars": [],
       "alias_of": 0,
-      "kind": 26,
+      "kind": 5,
       "parent_kind": 0,
       "declarations": [],
-      "derived": [],
+      "derived": [16155717907537731864, 1663022413889915338],
-      "instances": [],
+      "instances": [5792869548777559988],
-      "uses": ["17:14-17:15|4|-1"]
+      "uses": ["17:7-17:13|4|-1", "21:16-21:22|4|-1", "30:1-30:7|4|-1", "32:1-32:7|4|-1"]
     }, {
       "usr": 9201299975592934124,
       "detailed_name": "enum Enum {}",
@@ -265,42 +201,10 @@ OUTPUT:
       "vars": [],
       "alias_of": 0,
       "kind": 10,
-      "parent_kind": 1,
-      "declarations": [],
-      "derived": [],
-      "instances": [],
-      "uses": ["38:30-38:34|4|-1"]
-    }, {
-      "usr": 9673599782548740467,
-      "detailed_name": "T",
-      "qual_name_offset": 0,
-      "short_name": "",
-      "bases": [],
-      "funcs": [],
-      "types": [],
-      "vars": [],
-      "alias_of": 0,
-      "kind": 26,
       "parent_kind": 0,
       "declarations": [],
       "derived": [],
       "instances": [],
-      "uses": ["5:16-5:17|4|-1"]
-    }, {
-      "usr": 9777924294257602255,
-      "detailed_name": "Alloc",
-      "qual_name_offset": 0,
-      "short_name": "",
-      "bases": [],
-      "funcs": [],
-      "types": [],
-      "vars": [],
-      "alias_of": 0,
-      "kind": 26,
-      "parent_kind": 0,
-      "declarations": ["11:31-11:36|11:22-11:51|1025|-1"],
-      "derived": [],
-      "instances": [],
       "uses": []
     }, {
       "usr": 10124869160135436852,
@@ -314,7 +218,7 @@ OUTPUT:
       "vars": [],
       "alias_of": 0,
       "kind": 23,
-      "parent_kind": 1,
+      "parent_kind": 0,
       "declarations": [],
       "derived": [],
       "instances": [],
@@ -323,18 +227,19 @@ OUTPUT:
       "usr": 14111105212951082474,
       "detailed_name": "T",
       "qual_name_offset": 0,
-      "short_name": "",
+      "short_name": "T",
+      "spell": "38:20-38:21|38:11-38:21|2|-1",
       "bases": [],
       "funcs": [],
       "types": [],
       "vars": [],
       "alias_of": 0,
       "kind": 26,
-      "parent_kind": 0,
+      "parent_kind": 5,
-      "declarations": ["38:20-38:21|38:11-38:21|1|-1"],
+      "declarations": [],
       "derived": [],
       "instances": [17826688417349629938],
-      "uses": ["39:10-39:11|4|-1"]
+      "uses": []
     }, {
       "usr": 15019211479263750068,
       "detailed_name": "class function",
@@ -342,7 +247,7 @@ OUTPUT:
       "short_name": "function",
       "bases": [],
       "funcs": [],
-      "types": [18140454020659517869],
+      "types": [],
       "vars": [],
       "alias_of": 0,
       "kind": 5,
@@ -350,6 +255,22 @@ OUTPUT:
       "declarations": ["2:7-2:15|2:1-2:15|1|-1"],
       "derived": [218068462278884837],
       "instances": [],
+      "uses": ["5:7-5:15|4|-1"]
+    }, {
+      "usr": 15440970074034693939,
+      "detailed_name": "",
+      "qual_name_offset": 0,
+      "short_name": "",
+      "bases": [],
+      "funcs": [],
+      "types": [],
+      "vars": [],
+      "alias_of": 0,
+      "kind": 0,
+      "parent_kind": 0,
+      "declarations": [],
+      "derived": [],
+      "instances": [3566687051827176322],
       "uses": []
     }, {
       "usr": 15695704394170757108,
@@ -358,7 +279,7 @@ OUTPUT:
       "short_name": "allocator",
       "bases": [],
       "funcs": [],
-      "types": [17690566930043896921],
+      "types": [],
       "vars": [],
       "alias_of": 0,
       "kind": 5,
@@ -369,7 +290,7 @@ OUTPUT:
       "uses": ["11:39-11:48|4|-1"]
     }, {
       "usr": 16155717907537731864,
-      "detailed_name": "template <typename T> class vector<T *> {}",
+      "detailed_name": "template <typename T> class vector<type-parameter-0-0 *, allocator<type-parameter-0-0 *>> {}",
       "qual_name_offset": 28,
       "short_name": "vector",
       "spell": "17:7-17:13|16:1-17:20|2|-1",
@@ -379,43 +300,11 @@ OUTPUT:
       "vars": [],
       "alias_of": 0,
       "kind": 5,
-      "parent_kind": 1,
+      "parent_kind": 0,
       "declarations": [],
       "derived": [],
       "instances": [86949563628772958],
       "uses": ["31:1-31:7|4|-1"]
-    }, {
-      "usr": 17690566930043896921,
-      "detailed_name": "T",
-      "qual_name_offset": 0,
-      "short_name": "",
-      "bases": [],
-      "funcs": [],
-      "types": [],
-      "vars": [],
-      "alias_of": 0,
-      "kind": 26,
-      "parent_kind": 0,
-      "declarations": ["9:19-9:20|9:10-9:20|1025|-1"],
-      "derived": [],
-      "instances": [],
-      "uses": []
-    }, {
-      "usr": 18140454020659517869,
-      "detailed_name": "T",
-      "qual_name_offset": 0,
-      "short_name": "",
-      "bases": [],
-      "funcs": [],
-      "types": [],
-      "vars": [],
-      "alias_of": 0,
-      "kind": 26,
-      "parent_kind": 0,
-      "declarations": ["1:16-1:17|1:10-1:17|1025|-1"],
-      "derived": [],
-      "instances": [],
-      "uses": []
     }],
   "usr2var": [{
       "usr": 86949563628772958,
@@ -425,7 +314,7 @@ OUTPUT:
       "spell": "31:14-31:17|31:1-31:17|2|-1",
       "type": 16155717907537731864,
       "kind": 13,
-      "parent_kind": 1,
+      "parent_kind": 0,
       "storage": 0,
       "declarations": [],
       "uses": []
@@ -437,7 +326,7 @@ OUTPUT:
       "spell": "7:21-7:22|7:1-7:22|2|-1",
       "type": 218068462278884837,
       "kind": 13,
-      "parent_kind": 1,
+      "parent_kind": 0,
       "storage": 0,
       "declarations": [],
       "uses": []
@@ -447,23 +336,12 @@ OUTPUT:
       "qual_name_offset": 11,
       "short_name": "vz1",
       "spell": "32:12-32:15|32:1-32:15|2|-1",
-      "type": 7440942986741176606,
+      "type": 15440970074034693939,
       "kind": 13,
-      "parent_kind": 1,
+      "parent_kind": 0,
       "storage": 0,
       "declarations": [],
       "uses": []
-    }, {
-      "usr": 3621126593459656452,
-      "detailed_name": "int E",
-      "qual_name_offset": 4,
-      "short_name": "E",
-      "type": 452,
-      "kind": 253,
-      "parent_kind": 12,
-      "storage": 0,
-      "declarations": ["38:40-38:41|38:36-38:41|1025|-1"],
-      "uses": []
     }, {
       "usr": 4917621020431490070,
       "detailed_name": "Enum1",
@@ -473,7 +351,7 @@ OUTPUT:
       "spell": "36:10-36:15|36:10-36:15|1026|-1",
       "type": 9201299975592934124,
       "kind": 22,
-      "parent_kind": 1,
+      "parent_kind": 0,
       "storage": 0,
       "declarations": [],
       "uses": []
@@ -485,30 +363,7 @@ OUTPUT:
       "spell": "30:14-30:16|30:1-30:16|2|-1",
       "type": 7440942986741176606,
       "kind": 13,
-      "parent_kind": 1,
+      "parent_kind": 0,
-      "storage": 0,
-      "declarations": [],
-      "uses": []
-    }, {
-      "usr": 9217877221147056536,
-      "detailed_name": "int I",
-      "qual_name_offset": 4,
-      "short_name": "I",
-      "type": 452,
-      "kind": 253,
-      "parent_kind": 12,
-      "storage": 0,
-      "declarations": ["38:27-38:28|38:23-38:28|1025|-1"],
-      "uses": []
-    }, {
-      "usr": 12904523933304867124,
-      "detailed_name": "float Value",
-      "qual_name_offset": 6,
-      "short_name": "Value",
-      "spell": "43:44-43:49|43:38-43:49|1026|-1",
-      "type": 481,
-      "kind": 253,
-      "parent_kind": 12,
       "storage": 0,
       "declarations": [],
       "uses": []
@@ -519,9 +374,9 @@ OUTPUT:
       "short_name": "kOnst",
       "hover": "static const int kOnst = 7",
       "spell": "41:18-41:23|41:1-41:27|2|-1",
-      "type": 452,
+      "type": 53,
       "kind": 13,
-      "parent_kind": 1,
+      "parent_kind": 0,
       "storage": 2,
       "declarations": [],
       "uses": ["43:27-43:32|12|-1"]
@@ -534,7 +389,7 @@ OUTPUT:
       "spell": "36:3-36:8|36:3-36:8|1026|-1",
       "type": 9201299975592934124,
       "kind": 22,
-      "parent_kind": 1,
+      "parent_kind": 0,
       "storage": 0,
       "declarations": [],
       "uses": ["43:20-43:25|4|-1"]
@@ -546,7 +401,7 @@ OUTPUT:
       "spell": "33:12-33:15|33:1-33:15|2|-1",
       "type": 1663022413889915338,
       "kind": 13,
-      "parent_kind": 1,
+      "parent_kind": 0,
       "storage": 0,
       "declarations": [],
       "uses": []

index_tests/templates/specialized_func_definition.cc

@@ -9,6 +9,7 @@ void Template<T>::Foo() {}
 template<>
 void Template<void>::Foo() {}
 
+
 /*
 // TODO: usage information on Template is bad.
 // TODO: Foo() should have multiple definitions.
@@ -53,38 +54,6 @@ OUTPUT:
       "uses": []
     }],
   "usr2type": [{
-      "usr": 4889840470949104569,
-      "detailed_name": "T",
-      "qual_name_offset": 0,
-      "short_name": "",
-      "bases": [],
-      "funcs": [],
-      "types": [],
-      "vars": [],
-      "alias_of": 0,
-      "kind": 26,
-      "parent_kind": 0,
-      "declarations": ["1:16-1:17|1:10-1:17|1025|-1"],
-      "derived": [],
-      "instances": [],
-      "uses": []
-    }, {
-      "usr": 13161199857701142428,
-      "detailed_name": "T",
-      "qual_name_offset": 0,
-      "short_name": "",
-      "bases": [],
-      "funcs": [],
-      "types": [],
-      "vars": [],
-      "alias_of": 0,
-      "kind": 26,
-      "parent_kind": 0,
-      "declarations": [],
-      "derived": [],
-      "instances": [],
-      "uses": ["7:15-7:16|4|-1"]
-    }, {
       "usr": 17107291254533526269,
       "detailed_name": "class Template {}",
       "qual_name_offset": 6,
@@ -92,11 +61,11 @@ OUTPUT:
       "spell": "2:7-2:15|2:1-4:2|2|-1",
       "bases": [],
       "funcs": [11994188353303124840],
-      "types": [4889840470949104569],
+      "types": [],
       "vars": [],
       "alias_of": 0,
       "kind": 5,
-      "parent_kind": 1,
+      "parent_kind": 0,
       "declarations": [],
       "derived": [],
       "instances": [],

index_tests/templates/template_class_func_usage_folded_into_one.cc

@@ -30,7 +30,7 @@ OUTPUT:
       "uses": ["8:19-8:22|36|-1", "9:20-9:23|36|-1"]
     }],
   "usr2type": [{
-      "usr": 452,
+      "usr": 53,
       "detailed_name": "",
       "qual_name_offset": 0,
       "short_name": "",
@@ -53,31 +53,15 @@ OUTPUT:
       "spell": "2:8-2:11|2:1-6:2|2|-1",
       "bases": [],
       "funcs": [8340731781048851399],
-      "types": [14929630827782508810],
+      "types": [],
       "vars": [],
       "alias_of": 0,
       "kind": 23,
-      "parent_kind": 1,
+      "parent_kind": 0,
       "declarations": [],
       "derived": [],
       "instances": [],
       "uses": ["8:9-8:12|4|-1", "9:9-9:12|4|-1"]
-    }, {
-      "usr": 14929630827782508810,
-      "detailed_name": "T",
-      "qual_name_offset": 0,
-      "short_name": "",
-      "bases": [],
-      "funcs": [],
-      "types": [],
-      "vars": [],
-      "alias_of": 0,
-      "kind": 26,
-      "parent_kind": 0,
-      "declarations": ["1:19-1:20|1:10-1:20|1025|-1"],
-      "derived": [],
-      "instances": [],
-      "uses": []
     }],
   "usr2var": [{
       "usr": 12028309045033782423,
@@ -86,9 +70,9 @@ OUTPUT:
       "short_name": "b",
       "hover": "int b = Foo<bool>::foo()",
       "spell": "9:5-9:6|9:1-9:25|2|-1",
-      "type": 452,
+      "type": 53,
       "kind": 13,
-      "parent_kind": 1,
+      "parent_kind": 0,
       "storage": 0,
       "declarations": [],
       "uses": []
@@ -99,9 +83,9 @@ OUTPUT:
       "short_name": "a",
       "hover": "int a = Foo<int>::foo()",
       "spell": "8:5-8:6|8:1-8:24|2|-1",
-      "type": 452,
+      "type": 53,
       "kind": 13,
-      "parent_kind": 1,
+      "parent_kind": 0,
       "storage": 0,
       "declarations": [],
       "uses": []

index_tests/templates/template_class_template_func_usage_folded_into_one.cc

@@ -31,7 +31,7 @@ OUTPUT:
       "uses": ["9:19-9:22|36|-1", "10:20-10:23|36|-1"]
     }],
   "usr2type": [{
-      "usr": 452,
+      "usr": 53,
       "detailed_name": "",
       "qual_name_offset": 0,
       "short_name": "",
@@ -46,22 +46,6 @@ OUTPUT:
       "derived": [],
       "instances": [16721564935990383768, 12028309045033782423],
       "uses": []
-    }, {
-      "usr": 10424609343859267126,
-      "detailed_name": "T",
-      "qual_name_offset": 0,
-      "short_name": "",
-      "bases": [],
-      "funcs": [],
-      "types": [],
-      "vars": [],
-      "alias_of": 0,
-      "kind": 26,
-      "parent_kind": 0,
-      "declarations": ["1:19-1:20|1:10-1:20|1025|-1"],
-      "derived": [],
-      "instances": [],
-      "uses": []
     }, {
       "usr": 10528472276654770367,
       "detailed_name": "struct Foo {}",
@@ -70,31 +54,15 @@ OUTPUT:
       "spell": "2:8-2:11|2:1-7:2|2|-1",
       "bases": [],
       "funcs": [9034026360701857235],
-      "types": [10424609343859267126],
+      "types": [],
       "vars": [],
       "alias_of": 0,
       "kind": 23,
-      "parent_kind": 1,
+      "parent_kind": 0,
       "declarations": [],
       "derived": [],
       "instances": [],
       "uses": ["9:9-9:12|4|-1", "10:9-10:12|4|-1"]
-    }, {
-      "usr": 12336546102385362252,
-      "detailed_name": "R",
-      "qual_name_offset": 0,
-      "short_name": "",
-      "bases": [],
-      "funcs": [],
-      "types": [],
-      "vars": [],
-      "alias_of": 0,
-      "kind": 26,
-      "parent_kind": 0,
-      "declarations": ["3:21-3:22|3:12-3:22|1|-1"],
-      "derived": [],
-      "instances": [],
-      "uses": []
     }],
   "usr2var": [{
       "usr": 12028309045033782423,
@@ -103,9 +71,9 @@ OUTPUT:
       "short_name": "b",
       "hover": "int b = Foo<bool>::foo<double>()",
       "spell": "10:5-10:6|10:1-10:33|2|-1",
-      "type": 452,
+      "type": 53,
       "kind": 13,
-      "parent_kind": 1,
+      "parent_kind": 0,
       "storage": 0,
       "declarations": [],
       "uses": []
@@ -116,9 +84,9 @@ OUTPUT:
       "short_name": "a",
       "hover": "int a = Foo<int>::foo<float>()",
       "spell": "9:5-9:6|9:1-9:31|2|-1",
-      "type": 452,
+      "type": 53,
       "kind": 13,
-      "parent_kind": 1,
+      "parent_kind": 0,
       "storage": 0,
       "declarations": [],
       "uses": []

index_tests/templates/template_class_type_usage_folded_into_one.cc

@@ -31,7 +31,7 @@ VarDecl b
 OUTPUT:
 {
   "includes": [],
-  "skipped_ranges": ["12:1-28:7"],
+  "skipped_ranges": ["12:1-29:1"],
   "usr2func": [],
   "usr2type": [{
       "usr": 6697181287623958829,
@@ -45,7 +45,7 @@ OUTPUT:
       "vars": [],
       "alias_of": 0,
       "kind": 10,
-      "parent_kind": 1,
+      "parent_kind": 0,
       "declarations": [],
       "derived": [],
       "instances": [],
@@ -58,11 +58,11 @@ OUTPUT:
       "spell": "5:8-5:11|5:1-7:2|2|-1",
       "bases": [],
       "funcs": [],
-      "types": [15010559816125069973, 13938528237873543349],
+      "types": [13938528237873543349],
       "vars": [],
       "alias_of": 0,
       "kind": 23,
-      "parent_kind": 1,
+      "parent_kind": 0,
       "declarations": [],
       "derived": [],
       "instances": [],
@@ -79,7 +79,7 @@ OUTPUT:
       "vars": [],
       "alias_of": 0,
       "kind": 10,
-      "parent_kind": 1,
+      "parent_kind": 0,
       "declarations": [],
       "derived": [],
       "instances": [],
@@ -101,22 +101,6 @@ OUTPUT:
       "derived": [],
       "instances": [16721564935990383768, 12028309045033782423],
       "uses": ["9:9-9:14|4|-1", "10:9-10:14|4|-1"]
-    }, {
-      "usr": 15010559816125069973,
-      "detailed_name": "T",
-      "qual_name_offset": 0,
-      "short_name": "",
-      "bases": [],
-      "funcs": [],
-      "types": [],
-      "vars": [],
-      "alias_of": 0,
-      "kind": 26,
-      "parent_kind": 0,
-      "declarations": ["4:19-4:20|4:10-4:20|1025|-1"],
-      "derived": [],
-      "instances": [],
-      "uses": []
     }],
   "usr2var": [{
       "usr": 12028309045033782423,
@@ -126,7 +110,7 @@ OUTPUT:
       "spell": "10:15-10:16|10:1-10:16|2|-1",
       "type": 13938528237873543349,
       "kind": 13,
-      "parent_kind": 1,
+      "parent_kind": 0,
       "storage": 0,
       "declarations": [],
       "uses": []
@@ -138,7 +122,7 @@ OUTPUT:
       "spell": "9:15-9:16|9:1-9:16|2|-1",
       "type": 13938528237873543349,
       "kind": 13,
-      "parent_kind": 1,
+      "parent_kind": 0,
       "storage": 0,
       "declarations": [],
       "uses": []

index_tests/templates/template_class_var_usage_folded_into_one.cc

@@ -13,7 +13,7 @@ OUTPUT:
   "skipped_ranges": [],
   "usr2func": [],
   "usr2type": [{
-      "usr": 452,
+      "usr": 53,
       "detailed_name": "",
       "qual_name_offset": 0,
       "short_name": "",
@@ -28,22 +28,6 @@ OUTPUT:
       "derived": [],
       "instances": [13545144895171991916, 16721564935990383768, 12028309045033782423],
       "uses": []
-    }, {
-      "usr": 8038341777080655976,
-      "detailed_name": "T",
-      "qual_name_offset": 0,
-      "short_name": "",
-      "bases": [],
-      "funcs": [],
-      "types": [],
-      "vars": [],
-      "alias_of": 0,
-      "kind": 26,
-      "parent_kind": 0,
-      "declarations": ["1:19-1:20|1:10-1:20|1025|-1"],
-      "derived": [],
-      "instances": [],
-      "uses": []
     }, {
       "usr": 10528472276654770367,
       "detailed_name": "struct Foo {}",
@@ -52,11 +36,11 @@ OUTPUT:
       "spell": "2:8-2:11|2:1-4:2|2|-1",
       "bases": [],
       "funcs": [],
-      "types": [8038341777080655976],
+      "types": [],
       "vars": [],
       "alias_of": 0,
       "kind": 23,
-      "parent_kind": 1,
+      "parent_kind": 0,
       "declarations": [],
       "derived": [],
       "instances": [],
@@ -69,9 +53,9 @@ OUTPUT:
       "short_name": "b",
       "hover": "int b = Foo<bool>::var",
       "spell": "7:5-7:6|7:1-7:23|2|-1",
-      "type": 452,
+      "type": 53,
       "kind": 13,
-      "parent_kind": 1,
+      "parent_kind": 0,
       "storage": 0,
       "declarations": [],
       "uses": []
@@ -81,12 +65,11 @@ OUTPUT:
       "qual_name_offset": 21,
       "short_name": "var",
       "hover": "static constexpr int Foo::var = 3",
-      "spell": "3:24-3:27|3:3-3:31|1026|-1",
+      "type": 53,
-      "type": 452,
+      "kind": 13,
-      "kind": 8,
       "parent_kind": 23,
       "storage": 2,
-      "declarations": [],
+      "declarations": ["3:24-3:27|3:3-3:31|1025|-1"],
       "uses": ["6:19-6:22|12|-1", "7:20-7:23|12|-1"]
     }, {
       "usr": 16721564935990383768,
@@ -95,9 +78,9 @@ OUTPUT:
       "short_name": "a",
       "hover": "int a = Foo<int>::var",
       "spell": "6:5-6:6|6:1-6:22|2|-1",
-      "type": 452,
+      "type": 53,
       "kind": 13,
-      "parent_kind": 1,
+      "parent_kind": 0,
       "storage": 0,
       "declarations": [],
       "uses": []

index_tests/templates/template_func_usage_folded_into_one.cc

@@ -24,14 +24,14 @@ OUTPUT:
       "vars": [],
       "callees": [],
       "kind": 12,
-      "parent_kind": 1,
+      "parent_kind": 0,
       "storage": 0,
       "declarations": [],
       "derived": [],
       "uses": ["6:9-6:12|36|-1", "7:9-7:12|36|-1"]
     }],
   "usr2type": [{
-      "usr": 452,
+      "usr": 53,
       "detailed_name": "",
       "qual_name_offset": 0,
       "short_name": "",
@@ -46,22 +46,6 @@ OUTPUT:
       "derived": [],
       "instances": [16721564935990383768, 12028309045033782423],
       "uses": []
-    }, {
-      "usr": 17666708977284229997,
-      "detailed_name": "T",
-      "qual_name_offset": 0,
-      "short_name": "",
-      "bases": [],
-      "funcs": [],
-      "types": [],
-      "vars": [],
-      "alias_of": 0,
-      "kind": 26,
-      "parent_kind": 0,
-      "declarations": ["1:19-1:20|1:10-1:20|1|-1"],
-      "derived": [],
-      "instances": [],
-      "uses": []
     }],
   "usr2var": [{
       "usr": 12028309045033782423,
@@ -70,9 +54,9 @@ OUTPUT:
       "short_name": "b",
       "hover": "int b = foo<bool>()",
       "spell": "7:5-7:6|7:1-7:20|2|-1",
-      "type": 452,
+      "type": 53,
       "kind": 13,
-      "parent_kind": 1,
+      "parent_kind": 0,
       "storage": 0,
       "declarations": [],
       "uses": []
@@ -83,9 +67,9 @@ OUTPUT:
       "short_name": "a",
       "hover": "int a = foo<int>()",
       "spell": "6:5-6:6|6:1-6:19|2|-1",
-      "type": 452,
+      "type": 53,
       "kind": 13,
-      "parent_kind": 1,
+      "parent_kind": 0,
       "storage": 0,
       "declarations": [],
       "uses": []

index_tests/templates/template_type_usage_folded_into_one.cc

@@ -11,22 +11,6 @@ OUTPUT:
   "skipped_ranges": [],
   "usr2func": [],
   "usr2type": [{
-      "usr": 8047497394564431352,
-      "detailed_name": "T",
-      "qual_name_offset": 0,
-      "short_name": "",
-      "bases": [],
-      "funcs": [],
-      "types": [],
-      "vars": [],
-      "alias_of": 0,
-      "kind": 26,
-      "parent_kind": 0,
-      "declarations": ["1:19-1:20|1:10-1:20|1025|-1"],
-      "derived": [],
-      "instances": [],
-      "uses": []
-    }, {
       "usr": 10528472276654770367,
       "detailed_name": "class Foo {}",
       "qual_name_offset": 6,
@@ -34,11 +18,11 @@ OUTPUT:
       "spell": "2:7-2:10|2:1-2:13|2|-1",
       "bases": [],
       "funcs": [],
-      "types": [8047497394564431352],
+      "types": [],
       "vars": [],
       "alias_of": 0,
       "kind": 5,
-      "parent_kind": 1,
+      "parent_kind": 0,
       "declarations": [],
       "derived": [],
       "instances": [16721564935990383768, 12028309045033782423],
@@ -52,7 +36,7 @@ OUTPUT:
       "spell": "5:11-5:12|5:1-5:12|2|-1",
       "type": 10528472276654770367,
       "kind": 13,
-      "parent_kind": 1,
+      "parent_kind": 0,
       "storage": 0,
       "declarations": [],
       "uses": []
@@ -64,7 +48,7 @@ OUTPUT:
       "spell": "4:10-4:11|4:1-4:11|2|-1",
       "type": 10528472276654770367,
       "kind": 13,
-      "parent_kind": 1,
+      "parent_kind": 0,
       "storage": 0,
       "declarations": [],
       "uses": []

index_tests/templates/template_var_usage_folded_into_one.cc

@@ -34,7 +34,7 @@ EXTRA_FLAGS:
 OUTPUT:
 {
   "includes": [],
-  "skipped_ranges": ["12:1-28:7"],
+  "skipped_ranges": ["12:1-29:1"],
   "usr2func": [],
   "usr2type": [{
       "usr": 6697181287623958829,
@@ -48,7 +48,7 @@ OUTPUT:
       "vars": [],
       "alias_of": 0,
       "kind": 10,
-      "parent_kind": 1,
+      "parent_kind": 0,
       "declarations": [],
       "derived": [],
       "instances": [16721564935990383768],
@@ -57,18 +57,19 @@ OUTPUT:
       "usr": 11919899838872947844,
       "detailed_name": "T",
       "qual_name_offset": 0,
-      "short_name": "",
+      "short_name": "T",
+      "spell": "4:19-4:20|4:10-4:20|2|-1",
       "bases": [],
       "funcs": [],
       "types": [],
       "vars": [],
       "alias_of": 0,
       "kind": 26,
-      "parent_kind": 0,
+      "parent_kind": 5,
-      "declarations": ["4:19-4:20|4:10-4:20|1|-1"],
+      "declarations": [],
       "derived": [],
       "instances": [8096973118640070624],
-      "uses": ["5:1-5:2|4|-1", "5:9-5:10|4|-1"]
+      "uses": []
     }, {
       "usr": 13892793056005362145,
       "detailed_name": "enum B {}",
@@ -81,7 +82,7 @@ OUTPUT:
       "vars": [],
       "alias_of": 0,
       "kind": 10,
-      "parent_kind": 1,
+      "parent_kind": 0,
       "declarations": [],
       "derived": [],
       "instances": [12028309045033782423],
@@ -96,7 +97,7 @@ OUTPUT:
       "spell": "5:3-5:6|5:1-5:12|2|-1",
       "type": 11919899838872947844,
       "kind": 13,
-      "parent_kind": 1,
+      "parent_kind": 0,
       "storage": 0,
       "declarations": [],
       "uses": ["7:7-7:10|12|-1", "8:7-8:10|12|-1"]
@@ -109,7 +110,7 @@ OUTPUT:
       "spell": "8:3-8:4|8:1-8:13|2|-1",
       "type": 13892793056005362145,
       "kind": 13,
-      "parent_kind": 1,
+      "parent_kind": 0,
       "storage": 0,
       "declarations": [],
       "uses": []
@@ -122,7 +123,7 @@ OUTPUT:
       "spell": "7:3-7:4|7:1-7:13|2|-1",
       "type": 6697181287623958829,
       "kind": 13,
-      "parent_kind": 1,
+      "parent_kind": 0,
       "storage": 0,
       "declarations": [],
       "uses": []

index_tests/types/anonymous_struct.cc

@@ -10,7 +10,7 @@ OUTPUT:
   "skipped_ranges": [],
   "usr2func": [],
   "usr2type": [{
-      "usr": 481,
+      "usr": 82,
       "detailed_name": "",
       "qual_name_offset": 0,
       "short_name": "",
@@ -75,7 +75,7 @@ OUTPUT:
         }],
       "alias_of": 0,
       "kind": 5,
-      "parent_kind": 1,
+      "parent_kind": 0,
       "declarations": [],
       "derived": [],
       "instances": [],
@@ -99,7 +99,7 @@ OUTPUT:
       "qual_name_offset": 6,
       "short_name": "x",
       "spell": "2:18-2:19|2:12-2:19|1026|-1",
-      "type": 481,
+      "type": 82,
       "kind": 8,
       "parent_kind": 23,
       "storage": 0,
@@ -111,7 +111,7 @@ OUTPUT:
       "qual_name_offset": 6,
       "short_name": "y",
       "spell": "2:21-2:22|2:12-2:22|1026|-1",
-      "type": 481,
+      "type": 82,
       "kind": 8,
       "parent_kind": 23,
       "storage": 0,
@@ -123,7 +123,7 @@ OUTPUT:
       "qual_name_offset": 6,
       "short_name": "z",
       "spell": "2:24-2:25|2:12-2:25|1026|-1",
-      "type": 481,
+      "type": 82,
       "kind": 8,
       "parent_kind": 23,
       "storage": 0,

index_tests/types/typedefs.cc

@@ -33,7 +33,7 @@ OUTPUT:
       "vars": [],
       "alias_of": 0,
       "kind": 252,
-      "parent_kind": 1,
+      "parent_kind": 0,
       "declarations": [],
       "derived": [],
       "instances": [],

index_tests/unions/union_decl.cc

@@ -10,7 +10,7 @@ OUTPUT:
   "skipped_ranges": [],
   "usr2func": [],
   "usr2type": [{
-      "usr": 436,
+      "usr": 37,
       "detailed_name": "",
       "qual_name_offset": 0,
       "short_name": "",
@@ -26,7 +26,7 @@ OUTPUT:
       "instances": [8804696910588009104],
       "uses": []
     }, {
-      "usr": 452,
+      "usr": 53,
       "detailed_name": "",
       "qual_name_offset": 0,
       "short_name": "",
@@ -59,7 +59,7 @@ OUTPUT:
         }],
       "alias_of": 0,
       "kind": 5,
-      "parent_kind": 1,
+      "parent_kind": 0,
       "declarations": [],
       "derived": [],
       "instances": [],
@@ -71,7 +71,7 @@ OUTPUT:
       "qual_name_offset": 5,
       "short_name": "b",
       "spell": "3:8-3:9|3:3-3:9|1026|-1",
-      "type": 436,
+      "type": 37,
       "kind": 8,
       "parent_kind": 5,
       "storage": 0,
@@ -83,7 +83,7 @@ OUTPUT:
       "qual_name_offset": 4,
       "short_name": "a",
       "spell": "2:7-2:8|2:3-2:8|1026|-1",
-      "type": 452,
+      "type": 53,
       "kind": 8,
       "parent_kind": 5,
       "storage": 0,

index_tests/unions/union_usage.cc

@@ -26,14 +26,14 @@ OUTPUT:
       "vars": [],
       "callees": [],
       "kind": 12,
-      "parent_kind": 1,
+      "parent_kind": 0,
       "storage": 0,
       "declarations": [],
       "derived": [],
       "uses": []
     }],
   "usr2type": [{
-      "usr": 436,
+      "usr": 37,
       "detailed_name": "",
       "qual_name_offset": 0,
       "short_name": "",
@@ -49,7 +49,7 @@ OUTPUT:
       "instances": [8804696910588009104],
       "uses": []
     }, {
-      "usr": 452,
+      "usr": 53,
       "detailed_name": "",
       "qual_name_offset": 0,
       "short_name": "",
@@ -82,7 +82,7 @@ OUTPUT:
         }],
       "alias_of": 0,
       "kind": 5,
-      "parent_kind": 1,
+      "parent_kind": 0,
       "declarations": [],
       "derived": [],
       "instances": [2933643612409209903],
@@ -96,7 +96,7 @@ OUTPUT:
       "spell": "6:5-6:6|6:1-6:6|2|-1",
       "type": 8501689086387244262,
       "kind": 13,
-      "parent_kind": 1,
+      "parent_kind": 0,
       "storage": 0,
       "declarations": [],
       "uses": ["9:3-9:4|4|-1"]
@@ -106,7 +106,7 @@ OUTPUT:
       "qual_name_offset": 5,
       "short_name": "b",
       "spell": "3:8-3:9|3:3-3:13|1026|-1",
-      "type": 436,
+      "type": 37,
       "kind": 8,
       "parent_kind": 5,
       "storage": 0,
@@ -118,7 +118,7 @@ OUTPUT:
       "qual_name_offset": 4,
       "short_name": "a",
       "spell": "2:7-2:8|2:3-2:12|1026|-1",
-      "type": 452,
+      "type": 53,
       "kind": 8,
       "parent_kind": 5,
       "storage": 0,

index_tests/usage/func_called_from_constructor.cc

@@ -23,7 +23,7 @@ OUTPUT:
       "vars": [],
       "callees": [],
       "kind": 12,
-      "parent_kind": 1,
+      "parent_kind": 0,
       "storage": 0,
       "declarations": [],
       "derived": [],
@@ -56,7 +56,7 @@ OUTPUT:
       "vars": [],
       "alias_of": 0,
       "kind": 23,
-      "parent_kind": 1,
+      "parent_kind": 0,
       "declarations": [],
       "derived": [],
       "instances": [],

index_tests/usage/func_called_from_macro_argument.cc

@@ -17,7 +17,7 @@ OUTPUT:
       "qual_name_offset": 5,
       "short_name": "called",
       "bases": [],
-      "vars": [821688872341099790, 6986353817767193884],
+      "vars": [],
       "callees": [],
       "kind": 12,
       "parent_kind": 0,
@@ -35,54 +35,14 @@ OUTPUT:
       "vars": [],
       "callees": ["6:14-6:20|3787803219955606747|3|16420"],
       "kind": 12,
-      "parent_kind": 1,
-      "storage": 0,
-      "declarations": [],
-      "derived": [],
-      "uses": []
-    }],
-  "usr2type": [{
-      "usr": 436,
-      "detailed_name": "",
-      "qual_name_offset": 0,
-      "short_name": "",
-      "bases": [],
-      "funcs": [],
-      "types": [],
-      "vars": [],
-      "alias_of": 0,
-      "kind": 0,
       "parent_kind": 0,
+      "storage": 0,
       "declarations": [],
       "derived": [],
-      "instances": [821688872341099790, 6986353817767193884],
       "uses": []
     }],
+  "usr2type": [],
   "usr2var": [{
-      "usr": 821688872341099790,
-      "detailed_name": "bool a",
-      "qual_name_offset": 5,
-      "short_name": "a",
-      "spell": "3:18-3:19|3:13-3:19|1026|-1",
-      "type": 436,
-      "kind": 253,
-      "parent_kind": 12,
-      "storage": 0,
-      "declarations": [],
-      "uses": []
-    }, {
-      "usr": 6986353817767193884,
-      "detailed_name": "bool b",
-      "qual_name_offset": 5,
-      "short_name": "b",
-      "spell": "3:26-3:27|3:21-3:27|1026|-1",
-      "type": 436,
-      "kind": 253,
-      "parent_kind": 12,
-      "storage": 0,
-      "declarations": [],
-      "uses": []
-    }, {
       "usr": 16326993795872073150,
       "detailed_name": "MACRO_CALL",
       "qual_name_offset": 0,

index_tests/usage/func_called_from_template.cc

@@ -54,7 +54,7 @@ OUTPUT:
       "vars": [],
       "callees": ["9:3-9:9|10177235824697315808|3|16420"],
       "kind": 12,
-      "parent_kind": 1,
+      "parent_kind": 0,
       "storage": 0,
       "declarations": [],
       "derived": [],
@@ -69,29 +69,13 @@ OUTPUT:
       "vars": [],
       "callees": ["5:3-5:9|468307235068920063|3|16420"],
       "kind": 12,
-      "parent_kind": 1,
+      "parent_kind": 0,
       "storage": 0,
       "declarations": [],
       "derived": [],
       "uses": ["9:3-9:9|16420|-1"]
     }],
-  "usr2type": [{
+  "usr2type": [],
-      "usr": 8908003062153072411,
-      "detailed_name": "T",
-      "qual_name_offset": 0,
-      "short_name": "",
-      "bases": [],
-      "funcs": [],
-      "types": [],
-      "vars": [],
-      "alias_of": 0,
-      "kind": 26,
-      "parent_kind": 0,
-      "declarations": ["3:20-3:21|3:11-3:21|1|-1"],
-      "derived": [],
-      "instances": [],
-      "uses": []
-    }],
   "usr2var": []
 }
 */

index_tests/usage/func_called_implicit_ctor.cc

@@ -23,7 +23,7 @@ OUTPUT:
       "vars": [],
       "callees": [],
       "kind": 12,
-      "parent_kind": 1,
+      "parent_kind": 0,
       "storage": 0,
       "declarations": [],
       "derived": [],
@@ -34,7 +34,7 @@ OUTPUT:
       "qual_name_offset": 0,
       "short_name": "Wrapper",
       "bases": [],
-      "vars": [17356425290273905453],
+      "vars": [],
       "callees": [],
       "kind": 9,
       "parent_kind": 0,
@@ -52,29 +52,13 @@ OUTPUT:
       "vars": [],
       "callees": ["8:10-8:16|10544127002917214589|3|16676", "8:10-8:16|468307235068920063|3|16420"],
       "kind": 12,
-      "parent_kind": 1,
+      "parent_kind": 0,
       "storage": 0,
       "declarations": [],
       "derived": [],
       "uses": []
     }],
   "usr2type": [{
-      "usr": 452,
-      "detailed_name": "",
-      "qual_name_offset": 0,
-      "short_name": "",
-      "bases": [],
-      "funcs": [],
-      "types": [],
-      "vars": [],
-      "alias_of": 0,
-      "kind": 0,
-      "parent_kind": 0,
-      "declarations": [],
-      "derived": [],
-      "instances": [17356425290273905453],
-      "uses": []
-    }, {
       "usr": 13611487872560323389,
       "detailed_name": "struct Wrapper {}",
       "qual_name_offset": 7,
@@ -86,24 +70,12 @@ OUTPUT:
       "vars": [],
       "alias_of": 0,
       "kind": 23,
-      "parent_kind": 1,
+      "parent_kind": 0,
       "declarations": [],
       "derived": [],
       "instances": [],
       "uses": ["2:3-2:10|4|-1", "7:1-7:8|4|-1"]
     }],
-  "usr2var": [{
+  "usr2var": []
-      "usr": 17356425290273905453,
-      "detailed_name": "int i",
-      "qual_name_offset": 4,
-      "short_name": "i",
-      "spell": "2:15-2:16|2:11-2:16|1026|-1",
-      "type": 452,
-      "kind": 253,
-      "parent_kind": 9,
-      "storage": 0,
-      "declarations": [],
-      "uses": []
-    }]
 }
 */

index_tests/usage/func_usage_addr_func.cc

@@ -22,7 +22,7 @@ OUTPUT:
       "vars": [],
       "callees": [],
       "kind": 12,
-      "parent_kind": 1,
+      "parent_kind": 0,
       "storage": 0,
       "declarations": [],
       "derived": [],
@@ -35,8 +35,9 @@ OUTPUT:
       "spell": "5:6-5:10|5:1-8:2|2|-1",
       "bases": [],
       "vars": [16088407831770615719],
-      "callees": ["6:18-6:22|5264867802674151787|3|132", "6:18-6:22|5264867802674151787|3|132",
+      "callees": ["6:18-6:22|5264867802674151787|3|132", "6:18-6:22|5264867802674151787|3|132", "7:3-7:10|12924914488846929470|3|16420", "7:12-7:16|5264867802674151787|3|132"],
-"7:3-7:10|12924914488846929470|3|16420", "7:12-7:16|5264867802674151787|3|132"], "kind": 12, "parent_kind": 1,
+      "kind": 12,
+      "parent_kind": 0,
       "storage": 0,
       "declarations": [],
       "derived": [],
@@ -51,7 +52,7 @@ OUTPUT:
       "vars": [],
       "callees": [],
       "kind": 12,
-      "parent_kind": 1,
+      "parent_kind": 0,
       "storage": 0,
       "declarations": [],
       "derived": [],

index_tests/usage/func_usage_addr_method.cc

@@ -6,6 +6,7 @@ void user() {
   auto x = &Foo::Used;
 }
 
+
 /*
 OUTPUT:
 {
@@ -21,7 +22,7 @@ OUTPUT:
       "vars": [4636142131003982569],
       "callees": ["6:18-6:22|18417145003926999463|3|132", "6:18-6:22|18417145003926999463|3|132"],
       "kind": 12,
-      "parent_kind": 1,
+      "parent_kind": 0,
       "storage": 0,
       "declarations": [],
       "derived": [],
@@ -53,7 +54,7 @@ OUTPUT:
       "vars": [],
       "alias_of": 0,
       "kind": 23,
-      "parent_kind": 1,
+      "parent_kind": 0,
       "declarations": [],
       "derived": [],
       "instances": [],

index_tests/usage/func_usage_call_func.cc

@@ -18,7 +18,7 @@ OUTPUT:
       "vars": [],
       "callees": [],
       "kind": 12,
-      "parent_kind": 1,
+      "parent_kind": 0,
       "storage": 0,
       "declarations": [],
       "derived": [],
@@ -33,7 +33,7 @@ OUTPUT:
       "vars": [],
       "callees": ["3:3-3:9|468307235068920063|3|16420"],
       "kind": 12,
-      "parent_kind": 1,
+      "parent_kind": 0,
       "storage": 0,
       "declarations": [],
       "derived": [],

index_tests/usage/func_usage_call_method.cc

@@ -22,7 +22,7 @@ OUTPUT:
       "vars": [14045150712868309451],
       "callees": ["7:6-7:10|18417145003926999463|3|16420"],
       "kind": 12,
-      "parent_kind": 1,
+      "parent_kind": 0,
       "storage": 0,
       "declarations": [],
       "derived": [],
@@ -54,7 +54,7 @@ OUTPUT:
       "vars": [],
       "alias_of": 0,
       "kind": 23,
-      "parent_kind": 1,
+      "parent_kind": 0,
       "declarations": [],
       "derived": [],
       "instances": [14045150712868309451],

index_tests/usage/func_usage_class_inline_var_def.cc

@@ -21,14 +21,14 @@ OUTPUT:
       "vars": [],
       "callees": [],
       "kind": 12,
-      "parent_kind": 1,
+      "parent_kind": 0,
       "storage": 0,
       "declarations": [],
       "derived": [],
       "uses": ["6:11-6:17|36|-1"]
     }],
   "usr2type": [{
-      "usr": 452,
+      "usr": 53,
       "detailed_name": "",
       "qual_name_offset": 0,
       "short_name": "",
@@ -58,7 +58,7 @@ OUTPUT:
         }],
       "alias_of": 0,
       "kind": 5,
-      "parent_kind": 1,
+      "parent_kind": 0,
       "declarations": [],
       "derived": [],
       "instances": [],
@@ -71,7 +71,7 @@ OUTPUT:
       "short_name": "x",
       "hover": "int Foo::x = helper()",
       "spell": "6:7-6:8|6:3-6:19|1026|-1",
-      "type": 452,
+      "type": 53,
       "kind": 8,
       "parent_kind": 5,
       "storage": 0,

index_tests/usage/func_usage_forward_decl_func.cc

@@ -32,7 +32,7 @@ OUTPUT:
       "vars": [],
       "callees": ["4:3-4:6|4259594751088586730|3|16420"],
       "kind": 12,
-      "parent_kind": 1,
+      "parent_kind": 0,
       "storage": 0,
       "declarations": [],
       "derived": [],

index_tests/usage/func_usage_forward_decl_method.cc

@@ -21,7 +21,7 @@ OUTPUT:
       "vars": [16229832321010999607],
       "callees": ["7:6-7:9|17922201480358737771|3|16420"],
       "kind": 12,
-      "parent_kind": 1,
+      "parent_kind": 0,
       "storage": 0,
       "declarations": [],
       "derived": [],
@@ -53,7 +53,7 @@ OUTPUT:
       "vars": [],
       "alias_of": 0,
       "kind": 23,
-      "parent_kind": 1,
+      "parent_kind": 0,
       "declarations": [],
       "derived": [],
       "instances": [16229832321010999607],

index_tests/usage/func_usage_template_func.cc

@@ -21,7 +21,7 @@ OUTPUT:
       "vars": [],
       "callees": ["5:3-5:9|10585861037135727329|3|16420", "6:3-6:9|10585861037135727329|3|16420"],
       "kind": 12,
-      "parent_kind": 1,
+      "parent_kind": 0,
       "storage": 0,
       "declarations": [],
       "derived": [],
@@ -41,23 +41,7 @@ OUTPUT:
       "derived": [],
       "uses": ["5:3-5:9|16420|-1", "6:3-6:9|16420|-1"]
     }],
-  "usr2type": [{
+  "usr2type": [],
-      "usr": 13420564603121289209,
-      "detailed_name": "T",
-      "qual_name_offset": 0,
-      "short_name": "",
-      "bases": [],
-      "funcs": [],
-      "types": [],
-      "vars": [],
-      "alias_of": 0,
-      "kind": 26,
-      "parent_kind": 0,
-      "declarations": ["1:19-1:20|1:10-1:20|1|-1"],
-      "derived": [],
-      "instances": [],
-      "uses": ["2:13-2:14|4|-1"]
-    }],
   "usr2var": []
 }
 */

index_tests/usage/type_usage_as_template_parameter.cc

@@ -25,7 +25,7 @@ OUTPUT:
       "vars": [3364438781074774169],
       "callees": [],
       "kind": 12,
-      "parent_kind": 1,
+      "parent_kind": 0,
       "storage": 0,
       "declarations": [],
       "derived": [],
@@ -39,31 +39,15 @@ OUTPUT:
       "spell": "2:7-2:17|2:1-2:20|2|-1",
       "bases": [],
       "funcs": [],
-      "types": [3365245325694180663],
+      "types": [],
       "vars": [],
       "alias_of": 0,
       "kind": 5,
-      "parent_kind": 1,
+      "parent_kind": 0,
       "declarations": [],
       "derived": [],
       "instances": [12857919739649552168, 18075066956054788088, 3364438781074774169],
       "uses": ["6:8-6:18|4|-1", "7:8-7:18|4|-1", "9:1-9:11|4|-1", "10:3-10:13|4|-1"]
-    }, {
-      "usr": 3365245325694180663,
-      "detailed_name": "T",
-      "qual_name_offset": 0,
-      "short_name": "",
-      "bases": [],
-      "funcs": [],
-      "types": [],
-      "vars": [],
-      "alias_of": 0,
-      "kind": 26,
-      "parent_kind": 0,
-      "declarations": ["1:19-1:20|1:10-1:20|1025|-1"],
-      "derived": [],
-      "instances": [],
-      "uses": []
     }, {
       "usr": 4750332761459066907,
       "detailed_name": "struct S {}",
@@ -76,7 +60,7 @@ OUTPUT:
       "vars": [],
       "alias_of": 0,
       "kind": 23,
-      "parent_kind": 1,
+      "parent_kind": 0,
       "declarations": [],
       "derived": [],
       "instances": [],
@@ -102,7 +86,7 @@ OUTPUT:
       "spell": "6:25-6:27|6:1-6:27|2|-1",
       "type": 3286534761799572592,
       "kind": 13,
-      "parent_kind": 1,
+      "parent_kind": 0,
       "storage": 2,
       "declarations": [],
       "uses": []
@@ -114,7 +98,7 @@ OUTPUT:
       "spell": "7:22-7:24|7:1-7:24|2|-1",
       "type": 3286534761799572592,
       "kind": 13,
-      "parent_kind": 1,
+      "parent_kind": 0,
       "storage": 2,
       "declarations": [],
       "uses": []

index_tests/usage/type_usage_as_template_parameter_complex.cc

@@ -82,7 +82,7 @@ unique_ptr<S1, S2>* Foo::foo() { return nullptr; }
 OUTPUT:
 {
   "includes": [],
-  "skipped_ranges": ["7:1-14:7", "17:1-32:7", "35:1-39:7", "42:1-52:7", "57:1-63:7", "68:1-78:7"],
+  "skipped_ranges": ["7:1-15:1", "17:1-33:1", "35:1-40:1", "42:1-53:1", "57:1-64:1", "68:1-79:1"],
   "usr2func": [{
       "usr": 1246637699196435450,
       "detailed_name": "unique_ptr<unique_ptr<S1, S2>, S2> *as_return_type(unique_ptr<S1, S2> *)",
@@ -93,7 +93,7 @@ OUTPUT:
       "vars": [],
       "callees": [],
       "kind": 12,
-      "parent_kind": 1,
+      "parent_kind": 0,
       "storage": 0,
       "declarations": [],
       "derived": [],
@@ -108,7 +108,7 @@ OUTPUT:
       "vars": [],
       "callees": [],
       "kind": 12,
-      "parent_kind": 1,
+      "parent_kind": 0,
       "storage": 0,
       "declarations": [],
       "derived": [],
@@ -138,29 +138,13 @@ OUTPUT:
       "vars": [500112618220246],
       "callees": [],
       "kind": 12,
-      "parent_kind": 1,
+      "parent_kind": 0,
       "storage": 0,
       "declarations": [],
       "derived": [],
       "uses": []
     }],
   "usr2type": [{
-      "usr": 875011242051264538,
-      "detailed_name": "T",
-      "qual_name_offset": 0,
-      "short_name": "",
-      "bases": [],
-      "funcs": [],
-      "types": [],
-      "vars": [],
-      "alias_of": 0,
-      "kind": 26,
-      "parent_kind": 0,
-      "declarations": ["1:19-1:20|1:10-1:20|1025|-1"],
-      "derived": [],
-      "instances": [],
-      "uses": []
-    }, {
       "usr": 4310164820010458371,
       "detailed_name": "struct S1",
       "qual_name_offset": 7,
@@ -175,24 +159,7 @@ OUTPUT:
       "declarations": ["4:8-4:10|4:1-4:10|1|-1"],
       "derived": [],
       "instances": [],
-      "uses": ["15:30-15:32|4|-1", "33:23-33:25|4|-1", "33:63-33:65|4|-1", "54:25-54:27|4|-1", "65:14-65:16|4|-1",
+      "uses": ["15:30-15:32|4|-1", "33:23-33:25|4|-1", "33:63-33:65|4|-1", "54:25-54:27|4|-1", "65:14-65:16|4|-1", "79:12-79:14|4|-1"]
-"79:12-79:14|4|-1"]
-    }, {
-      "usr": 10605525886521205308,
-      "detailed_name": "B",
-      "qual_name_offset": 0,
-      "short_name": "",
-      "bases": [],
-      "funcs": [],
-      "types": [],
-      "vars": [],
-      "alias_of": 0,
-      "kind": 26,
-      "parent_kind": 0,
-      "declarations": ["1:31-1:32|1:22-1:32|1025|-1"],
-      "derived": [],
-      "instances": [],
-      "uses": []
     }, {
       "usr": 12728490517004312484,
       "detailed_name": "struct S2",
@@ -208,8 +175,7 @@ OUTPUT:
       "declarations": ["5:8-5:10|5:1-5:10|1|-1"],
       "derived": [],
       "instances": [],
-      "uses": ["15:34-15:36|4|-1", "15:39-15:41|4|-1", "33:27-33:29|4|-1", "33:32-33:34|4|-1", "33:67-33:69|4|-1",
+      "uses": ["15:34-15:36|4|-1", "15:39-15:41|4|-1", "33:27-33:29|4|-1", "33:32-33:34|4|-1", "33:67-33:69|4|-1", "54:29-54:31|4|-1", "54:34-54:36|4|-1", "65:18-65:20|4|-1", "79:16-79:18|4|-1"]
-"54:29-54:31|4|-1", "54:34-54:36|4|-1", "65:18-65:20|4|-1", "79:16-79:18|4|-1"]
     }, {
       "usr": 14209198335088845323,
       "detailed_name": "class unique_ptr",
@@ -217,7 +183,7 @@ OUTPUT:
       "short_name": "unique_ptr",
       "bases": [],
       "funcs": [],
-      "types": [875011242051264538, 10605525886521205308],
+      "types": [],
       "vars": [],
       "alias_of": 0,
       "kind": 5,
@@ -225,8 +191,7 @@ OUTPUT:
       "declarations": ["2:7-2:17|2:1-2:17|1|-1"],
       "derived": [],
       "instances": [2933643612409209903, 500112618220246],
-      "uses": ["15:8-15:18|4|-1", "15:19-15:29|4|-1", "33:1-33:11|4|-1", "33:12-33:22|4|-1", "33:52-33:62|4|-1",
+      "uses": ["15:8-15:18|4|-1", "15:19-15:29|4|-1", "33:1-33:11|4|-1", "33:12-33:22|4|-1", "33:52-33:62|4|-1", "54:3-54:13|4|-1", "54:14-54:24|4|-1", "65:3-65:13|4|-1", "79:1-79:11|4|-1"]
-"54:3-54:13|4|-1", "54:14-54:24|4|-1", "65:3-65:13|4|-1", "79:1-79:11|4|-1"]
     }, {
       "usr": 15041163540773201510,
       "detailed_name": "class Foo {}",
@@ -239,7 +204,7 @@ OUTPUT:
       "vars": [],
       "alias_of": 0,
       "kind": 5,
-      "parent_kind": 1,
+      "parent_kind": 0,
       "declarations": [],
       "derived": [],
       "instances": [],

index_tests/usage/type_usage_as_template_parameter_simple.cc

@@ -19,11 +19,11 @@ OUTPUT:
       "spell": "2:7-2:17|2:1-2:20|2|-1",
       "bases": [],
       "funcs": [],
-      "types": [11508089533865125841],
+      "types": [],
       "vars": [],
       "alias_of": 0,
       "kind": 5,
-      "parent_kind": 1,
+      "parent_kind": 0,
       "declarations": [],
       "derived": [],
       "instances": [3398408600781120939],
@@ -44,22 +44,6 @@ OUTPUT:
       "derived": [],
       "instances": [],
       "uses": ["6:19-6:20|4|-1"]
-    }, {
-      "usr": 11508089533865125841,
-      "detailed_name": "T",
-      "qual_name_offset": 0,
-      "short_name": "",
-      "bases": [],
-      "funcs": [],
-      "types": [],
-      "vars": [],
-      "alias_of": 0,
-      "kind": 26,
-      "parent_kind": 0,
-      "declarations": ["1:19-1:20|1:10-1:20|1025|-1"],
-      "derived": [],
-      "instances": [],
-      "uses": []
     }],
   "usr2var": [{
       "usr": 3398408600781120939,
@@ -69,7 +53,7 @@ OUTPUT:
       "spell": "6:22-6:25|6:1-6:25|2|-1",
       "type": 3286534761799572592,
       "kind": 13,
-      "parent_kind": 1,
+      "parent_kind": 0,
       "storage": 2,
       "declarations": [],
       "uses": []

index_tests/usage/type_usage_declare_extern.cc

@@ -19,7 +19,7 @@ OUTPUT:
       "vars": [],
       "alias_of": 0,
       "kind": 23,
-      "parent_kind": 1,
+      "parent_kind": 0,
       "declarations": [],
       "derived": [],
       "instances": [1346710425945444872],

index_tests/usage/type_usage_declare_field.cc

@@ -24,7 +24,7 @@ OUTPUT:
       "vars": [],
       "alias_of": 0,
       "kind": 23,
-      "parent_kind": 1,
+      "parent_kind": 0,
       "declarations": [],
       "derived": [],
       "instances": [14727441168849658842],
@@ -63,7 +63,7 @@ OUTPUT:
         }],
       "alias_of": 0,
       "kind": 23,
-      "parent_kind": 1,
+      "parent_kind": 0,
       "declarations": [],
       "derived": [],
       "instances": [],

index_tests/usage/type_usage_declare_local.cc

@@ -21,7 +21,7 @@ OUTPUT:
       "vars": [16374832544037266261, 2580122838476012357],
       "callees": [],
       "kind": 12,
-      "parent_kind": 1,
+      "parent_kind": 0,
       "storage": 0,
       "declarations": [],
       "derived": [],
@@ -39,7 +39,7 @@ OUTPUT:
       "vars": [],
       "alias_of": 0,
       "kind": 23,
-      "parent_kind": 1,
+      "parent_kind": 0,
       "declarations": [],
       "derived": [],
       "instances": [2580122838476012357],

index_tests/usage/type_usage_declare_param.cc

@@ -18,7 +18,7 @@ OUTPUT:
       "vars": [13058491096576226774, 11055777568039014776],
       "callees": [],
       "kind": 12,
-      "parent_kind": 1,
+      "parent_kind": 0,
       "storage": 0,
       "declarations": [],
       "derived": [],
@@ -36,7 +36,7 @@ OUTPUT:
       "vars": [],
       "alias_of": 0,
       "kind": 23,
-      "parent_kind": 1,
+      "parent_kind": 0,
       "declarations": [],
       "derived": [],
       "instances": [11055777568039014776],

index_tests/usage/type_usage_declare_param_prototype.cc

@@ -20,10 +20,10 @@ OUTPUT:
       "short_name": "foo",
       "spell": "4:6-4:9|4:1-4:26|2|-1",
       "bases": [],
-      "vars": [9791335934911072644, 13823260660189154978],
+      "vars": [13823260660189154978],
       "callees": [],
       "kind": 12,
-      "parent_kind": 1,
+      "parent_kind": 0,
       "storage": 0,
       "declarations": ["3:6-3:9|3:1-3:23|1|-1"],
       "derived": [],
@@ -43,22 +43,10 @@ OUTPUT:
       "parent_kind": 0,
       "declarations": ["1:8-1:11|1:1-1:11|1|-1"],
       "derived": [],
-      "instances": [9791335934911072644, 13823260660189154978],
+      "instances": [13823260660189154978],
       "uses": ["3:10-3:13|4|-1", "3:18-3:21|4|-1", "4:10-4:13|4|-1", "4:18-4:21|4|-1"]
     }],
   "usr2var": [{
-      "usr": 9791335934911072644,
-      "detailed_name": "Foo *f",
-      "qual_name_offset": 5,
-      "short_name": "f",
-      "spell": "3:15-3:16|3:10-3:16|1026|-1",
-      "type": 15041163540773201510,
-      "kind": 253,
-      "parent_kind": 12,
-      "storage": 0,
-      "declarations": [],
-      "uses": []
-    }, {
       "usr": 13823260660189154978,
       "detailed_name": "Foo *f",
       "qual_name_offset": 5,

index_tests/usage/type_usage_declare_param_unnamed.cc

@@ -15,7 +15,7 @@ OUTPUT:
       "vars": [],
       "callees": [],
       "kind": 12,
-      "parent_kind": 1,
+      "parent_kind": 0,
       "storage": 0,
       "declarations": [],
       "derived": [],