build: Updated Docker Linux 64bit image to Qt 5.12.6 and LLVM/Clang 9.0.0

* updated to CentOS 7 * removed 32bit image
test: fixed java tests
2019-12-16 15:54:01 +01:00 · 2019-12-16 15:54:01 +01:00 · 2019-12-16 15:54:01 +01:00 · 2019-12-16 15:54:01 +01:00 · 2019-12-16 15:54:01 +01:00 · 2019-12-16 15:54:00 +01:00
144 changed files with 1147 additions and 831 deletions
@@ -67,5 +67,6 @@ CMakeLists.txt.user*
 /deployment/windows/wixSetup/build
 /deployment/windows/wixSetup/CustomActions/UninstallRemoveLogFolder/bin
 /deployment/windows/wixSetup/CustomActions/UninstallRemoveLogFolder/obj
 /deployment/windows/wixSetup/CustomActions/.vs
 /deployment/windows/wixSetup/Setup/build/Setup/Release
 /deployment/windows/wixSetup/Setup/build/Setup/x64
@@ -1,6 +1,6 @@
 variables:
    MAVEN_OPTS: "-Dmaven.repo.local=.m2/repository"
-    IMAGE_64: coatisoftware/centos6_64_qt_llvm:qt5101-llvm800
+    IMAGE_64: coatisoftware/centos7_64_qt_llvm:qt5126-llvm900
    IMAGE_32: coatisoftware/centos6_32_qt_llvm:qt5101-llvm800
 ## Templates ##
@@ -1,8 +1,12 @@
 cmake_minimum_required(VERSION 3.1)
 if (WIN32 AND (CMAKE_GENERATOR STREQUAL "Ninja"))
 	set(CMAKE_CONFIGURATION_TYPES ${CMAKE_BUILD_TYPE})
 endif()
 set(BUILD_CXX_LANGUAGE_PACKAGE OFF CACHE BOOL "Add C and C++ support to the Sourcetrail indexer.")
 set(BUILD_JAVA_LANGUAGE_PACKAGE OFF CACHE BOOL "Add Java support to the Sourcetrail indexer.")
 set(BUILD_PYTHON_LANGUAGE_PACKAGE OFF CACHE BOOL "Add Python support to the Sourcetrail indexer.")
 set(DOCKER_BUILD OFF CACHE BOOL "Build runs in Docker")
 #set (CMAKE_VERBOSE_MAKEFILE ON)
@@ -75,6 +79,13 @@ set(CMAKE_C_STANDARD 99)
 if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "AppleClang")
 	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unknown-warning-option -fcolor-diagnostics -fvisibility-inlines-hidden")
 elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
 	ADD_COMPILE_OPTIONS(/MP)
 endif()
 # FIXME: necessary to fix build in Docker
 if (DOCKER_BUILD)
 	set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -static-libstdc++")
 endif()
 # For debugging the release build on linux
@@ -99,10 +110,10 @@ endif()
 # Boost ------------------------------------------------------------------------
 set(Boost_USE_MULTITHREAD ON)
-set(Boost_USE_STATIC_LIBS ON)
+set(Boost_USE_STATIC_LIBS ON CACHE BOOL "Set to ON to force the use of the static libraries.")
 set(Boost_USE_STATIC_RUNTIME OFF)
-find_package(Boost 1.68 COMPONENTS system program_options filesystem date_time REQUIRED)
+find_package(Boost 1.67 COMPONENTS system program_options filesystem date_time REQUIRED)
 # Qt ---------------------------------------------------------------------------
@@ -217,10 +228,15 @@ target_include_directories(${LIB_UTILITY_PROJECT_NAME} SYSTEM
 	PUBLIC ${Boost_INCLUDE_DIR}
 )
-if(UNIX)
+target_link_libraries(${LIB_UTILITY_PROJECT_NAME} ${Boost_LIBRARIES} Qt5::Widgets Qt5::Network)
-	target_link_libraries(${LIB_UTILITY_PROJECT_NAME} ${Boost_LIBRARIES} Qt5::Widgets Qt5::Network)
+
-else()
+if (UNIX AND NOT APPLE)
-	target_link_libraries(${LIB_UTILITY_PROJECT_NAME} ${Boost_LIBRARIES} Qt5::Widgets Qt5::Network Qt5::WinExtras)
+	find_package(Threads REQUIRED)
 	target_link_libraries(${LIB_UTILITY_PROJECT_NAME} ${CMAKE_DL_LIBS} rt ${CMAKE_THREAD_LIBS_INIT})
 endif()
 if (WIN32)
 	target_link_libraries(${LIB_UTILITY_PROJECT_NAME} Qt5::WinExtras)
 endif()
@@ -252,7 +268,7 @@ target_include_directories(${LIB_PROJECT_NAME} SYSTEM
 	"${EXTERNAL_C_INCLUDE_PATHS}"
 )
-target_link_libraries(${LIB_PROJECT_NAME} ${LIB_UTILITY_PROJECT_NAME} ${Boost_LIBRARIES})
+target_link_libraries(${LIB_PROJECT_NAME} ${LIB_UTILITY_PROJECT_NAME} ${LIB_GUI_PROJECT_NAME} ${Boost_LIBRARIES})
 #configure language package defines
 configure_file(
@@ -301,6 +317,7 @@ if (BUILD_CXX_LANGUAGE_PACKAGE)
 		msp430asmparser msp430codegen
 		nvptxcodegen
 		powerpcasmparser powerpccodegen
 		riscvasmparser riscvcodegen
 		sparcasmparser sparccodegen
 		systemzasmparser systemzcodegen
 		webassemblyasmparser webassemblycodegen
@@ -432,10 +449,10 @@ add_custom_target(
 add_library(${LIB_GUI_PROJECT_NAME} ${LIB_GUI_FILES} ${CMAKE_BINARY_DIR}/src/lib_gui/productVersion.h)
-if(UNIX)
+target_link_libraries(${LIB_GUI_PROJECT_NAME} ${LIB_UTILITY_PROJECT_NAME} ${LIB_PROJECT_NAME} Qt5::Widgets Qt5::Network Qt5::Svg)
-	target_link_libraries(${LIB_GUI_PROJECT_NAME} ${LIB_UTILITY_PROJECT_NAME} Qt5::Widgets Qt5::Network Qt5::Svg)
+
-else()
+if (WIN32)
-	target_link_libraries(${LIB_GUI_PROJECT_NAME} ${LIB_UTILITY_PROJECT_NAME} Qt5::Widgets Qt5::Network Qt5::Svg Qt5::WinExtras)
+	target_link_libraries(${LIB_GUI_PROJECT_NAME} Qt5::WinExtras)
 endif()
 # command for versioning script
@@ -525,11 +542,11 @@ create_source_groups(${INDEXER_FILES})
 target_link_libraries(
 	${APP_INDEXER_NAME}
 	${LIB_PROJECT_NAME}
 	${LIB_GUI_PROJECT_NAME}
 	$<$<BOOL:${BUILD_CXX_LANGUAGE_PACKAGE}>:${LIB_CXX_PROJECT_NAME}>
 	$<$<BOOL:${BUILD_JAVA_LANGUAGE_PACKAGE}>:${LIB_JAVA_PROJECT_NAME}>
 	$<$<BOOL:${BUILD_PYTHON_LANGUAGE_PACKAGE}>:${LIB_PYTHON_PROJECT_NAME}>
 	${LIB_PROJECT_NAME}
 )
 if (APPLE)
@@ -606,11 +623,11 @@ create_source_groups(${APP_FILES})
 target_link_libraries(
 	${APP_PROJECT_NAME}
 	${LIB_PROJECT_NAME}
 	${LIB_GUI_PROJECT_NAME}
 	$<$<BOOL:${BUILD_CXX_LANGUAGE_PACKAGE}>:${LIB_CXX_PROJECT_NAME}>
 	$<$<BOOL:${BUILD_JAVA_LANGUAGE_PACKAGE}>:${LIB_JAVA_PROJECT_NAME}>
 	$<$<BOOL:${BUILD_PYTHON_LANGUAGE_PACKAGE}>:${LIB_PYTHON_PROJECT_NAME}>
 	${LIB_PROJECT_NAME}
 )
 set_property(
@@ -677,8 +694,8 @@ if (APPLE)
 	string(REPLACE ";" " " MACOS_QT_FRAMEWORKS "${MACOS_QT_FRAMEWORKS}")
 	set(MACOS_BOOST_DIR "${Boost_INCLUDE_DIR}")
-	STRING(REGEX REPLACE "/lib/cmake/clang" "" MACOS_CLANG_DIR ${Clang_DIR})
+	STRING(REGEX REPLACE "/lib/cmake/clang" "" MACOS_CLANG_DIR "${Clang_DIR}")
-	STRING(REGEX REPLACE "/lib/cmake/Qt5" "" MACOS_QT_DIR ${Qt5_DIR})
+	STRING(REGEX REPLACE "/lib/cmake/Qt5" "" MACOS_QT_DIR "${Qt5_DIR}")
 	configure_file(
 		${PROJECT_SOURCE_DIR}/setup/macOS/bundle_install.sh.in
@@ -712,10 +729,10 @@ create_source_groups(${TEST_FILES})
 target_link_libraries(
 	${TEST_PROJECT_NAME}
 	${LIB_PROJECT_NAME}
 	${LIB_GUI_PROJECT_NAME}
 	$<$<BOOL:${BUILD_CXX_LANGUAGE_PACKAGE}>:${LIB_CXX_PROJECT_NAME}>
 	$<$<BOOL:${BUILD_JAVA_LANGUAGE_PACKAGE}>:${LIB_JAVA_PROJECT_NAME}>
 	${LIB_PROJECT_NAME}
 	${LIB_GUI_PROJECT_NAME}
 )
 set_property(
@@ -189,8 +189,12 @@ Run CMake with these additional options:
 #### Required Tools
 ##### Visual Studio
 ##### Wix 3.11
 ##### Wix extension for Visual Studio
 ##### WinRAR
 Make sure to append these directories to your `PATH` environment variable:
@@ -0,0 +1,39 @@
 version: 0.0.0.{build}
 image: Visual Studio 2017
 install:
  ############################################################################
  # Install Ninja
  ############################################################################
  - set NINJA_URL="https://github.com/ninja-build/ninja/releases/download/v1.9.0/ninja-win.zip"
  - appveyor DownloadFile %NINJA_URL% -FileName ninja.zip
  - 7z x ninja.zip -oC:\projects\deps\ninja > nul
  - set PATH=C:\projects\deps\ninja;%PATH%
  - ninja --version
 before_build:
    - choco install winrar -y
    - SET "PATH=%PATH%;C:\Program Files\WinRAR"
    - mkdir build
    - cd build
    - mkdir temp
    - cd ../
    - cd script
    - cmd: "\"C:/Program Files/Git/usr/bin/bash.exe\" download_python_indexer.sh" 
    - cd ../
    - cd build
    - mkdir win64
    - cd win64
    - call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat" amd64
    - cmake -G "Ninja" -DBOOST_ROOT=C:/Libraries/boost_1_69_0 -DQt5_DIR=C:/Qt/5.12.5/msvc2017_64/lib/cmake/Qt5 -DBUILD_PYTHON_LANGUAGE_PACKAGE=ON -DCMAKE_BUILD_TYPE=Release ../../
    - cd ../../
 build_script:
    - cd build/win64
    - ninja
    - cd ../../
 test_script:
    - cd bin/test
    - ..\..\build\win64\Release\test\Sourcetrail_test.exe
    - cd ../../
@@ -2,6 +2,7 @@
 <config>
 	<window>
 		<background>#494949</background>
 		<separator>#CCCCCC</separator>
 		<scrollbar>
 			<background>transparent</background>
@@ -284,9 +285,6 @@
 			<typedef>
 				<like>type</like>
 			</typedef>
 			<template_parameter>
 				<like>type</like>
 			</template_parameter>
 			<type_parameter>
 				<like>type</like>
 			</type_parameter>
@@ -483,6 +481,14 @@
 				<normal>#797979</normal>
 			</default>
 			<type_use>
 				<like>default</like>
 			</type_use>
 			<inheritance>
 				<like>default</like>
 			</inheritance>
 			<override>
 				<normal>#BA5ECC</normal>
 			</override>
@@ -496,33 +502,24 @@
 				<normal>#00A0B6</normal>
 			</use>
 			<template_argument>
 				<normal>#D93D5F</normal>
 			</template_argument>
 			<type_argument>
-				<like>template_argument</like>
+				<normal>#D93D5F</normal>
 			</type_argument>
 			<template_default_argument>
 				<like>template_argument</like>
 			</template_default_argument>
 			<template_specialization>
-				<like>template_argument</like>
+				<like>type_argument</like>
 			</template_specialization>
 			<template_member_specialization>
 				<like>template_argument</like>
 			</template_member_specialization>
 			<include>
 				<normal>#4E82F6</normal>
 			</include>
 			<import>
-				<normal>#4E82F6</normal>
+				<like>include</like>
 			</import>
 			<macro_use>
-				<normal>#4E82F6</normal>
+				<like>include</like>
 			</macro_use>
 			<annotation_use>
-				<normal>#4E82F6</normal>
+				<like>include</like>
 			</annotation_use>
 			<aggregation>
@@ -2,6 +2,7 @@
 <config>
 	<window>
 		<background>white</background>
 		<separator>#A2A2A2</separator>
 		<scrollbar>
 			<background>transparent</background>
@@ -276,9 +277,6 @@
 			<typedef>
 				<like>type</like>
 			</typedef>
 			<template_parameter>
 				<like>type</like>
 			</template_parameter>
 			<type_parameter>
 				<like>type</like>
 			</type_parameter>
@@ -457,6 +455,14 @@
 				<normal>#878787</normal>
 			</default>
 			<type_use>
 				<like>default</like>
 			</type_use>
 			<inheritance>
 				<like>default</like>
 			</inheritance>
 			<override>
 				<normal>#A37ACC</normal>
 			</override>
@@ -470,33 +476,24 @@
 				<normal>#4B9FC4</normal>
 			</use>
 			<template_argument>
 				<normal>#CF6B7C</normal>
 			</template_argument>
 			<type_argument>
-				<like>template_argument</like>
+				<like>#CF6B7C</like>
 			</type_argument>
 			<template_default_argument>
 				<like>template_argument</like>
 			</template_default_argument>
 			<template_specialization>
-				<like>template_argument</like>
+				<like>type_argument</like>
 			</template_specialization>
 			<template_member_specialization>
 				<like>template_argument</like>
 			</template_member_specialization>
 			<include>
 				<normal>#719660</normal>
 			</include>
 			<import>
-				<normal>#719660</normal>
+				<like>include</like>
 			</import>
 			<macro_use>
-				<normal>#719660</normal>
+				<like>include</like>
 			</macro_use>
 			<annotation_use>
-				<normal>#719660</normal>
+				<like>include</like>
 			</annotation_use>
 			<aggregation>
@@ -2,6 +2,7 @@
 <config>
 	<window>
 		<background>#272728</background>
 		<separator>#CCC</separator>
 		<scrollbar>
 			<background>transparent</background>
@@ -279,9 +280,6 @@
 			<typedef>
 				<like>type</like>
 			</typedef>
 			<template_parameter>
 				<like>type</like>
 			</template_parameter>
 			<type_parameter>
 				<like>type</like>
 			</type_parameter>
@@ -460,6 +458,14 @@
 				<normal>#797979</normal>
 			</default>
 			<type_use>
 				<like>default</like>
 			</type_use>
 			<inheritance>
 				<like>default</like>
 			</inheritance>
 			<override>
 				<normal>#8A5A94</normal>
 			</override>
@@ -473,33 +479,24 @@
 				<normal>#2D6A8C</normal>
 			</use>
 			<template_argument>
 				<normal>#C14057</normal>
 			</template_argument>
 			<type_argument>
-				<like>template_argument</like>
+				<normal>#C14057</normal>
 			</type_argument>
 			<template_default_argument>
 				<like>template_argument</like>
 			</template_default_argument>
 			<template_specialization>
-				<like>template_argument</like>
+				<like>type_argument</like>
 			</template_specialization>
 			<template_member_specialization>
 				<like>template_argument</like>
 			</template_member_specialization>
 			<include>
 				<normal>#247368</normal>
 			</include>
 			<import>
-				<normal>#247368</normal>
+				<like>include</like>
 			</import>
 			<macro_use>
-				<normal>#247368</normal>
+				<like>include</like>
 			</macro_use>
 			<annotation_use>
-				<normal>#247368</normal>
+				<like>include</like>
 			</annotation_use>
 			<aggregation>
@@ -228,7 +228,7 @@
 #code_area {
 	background-color: <color:code/snippet/background>;
-	color: <color:code/snippet/syntax/normal>;
+	color: <color:code/snippet/syntax/text>;
 	selection-color: <color:code/snippet/selection/text>;
 	selection-background-color: <color:code/snippet/selection/background>;
 }
@@ -53,12 +53,6 @@
 	color: <color:custom_trail/button/hover/text>;
 }
 #button:disabled, #button_small:disabled {
 	background: <color:custom_trail/button/disabled/background>;
 	border-color: <color:custom_trail/button/disabled/border>;
 	color: <color:custom_trail/button/disabled/text>;
 }
 #error {
 	color: red;
 }
@@ -24,5 +24,5 @@
 	background-color: <color:code/snippet/background>;
 	border-bottom: 1px solid <color:code/file/background>;
 	padding: 3px;
-	color: <color:code/snippet/syntax/normal>;
+	color: <color:code/snippet/syntax/text>;
 }
@@ -17,7 +17,7 @@
 	</description>
    <source_groups>
        <source_group_7a9e75fc-2cad-42d5-8c5b-c86d02f7b4e4>
-            <java_standard>8</java_standard>
+            <java_standard>12</java_standard>
            <name>Javaparser Source Group</name>
            <source_extensions>
                <source_extension>.java</source_extension>
@@ -613,14 +613,14 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.SourceFileInfoExtractor.toStrin
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.SourceFileInfoExtractor.toString<0> [SourceFileInfoExtractor.java <161:20 161:51>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.SourceFileInfoExtractor.toString<1> [SourceFileInfoExtractor.java <150:28 150:28>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.SourceFileInfoExtractor.toString<1> [SourceFileInfoExtractor.java <153:17 153:17>]
-LOCAL_SYMBOL: java.util.Comparator<T>.compare<4> [SourceFileInfoExtractor.java <170:21 170:22>]
+LOCAL_SYMBOL: java.util.Comparator<T>.compare<2> [SourceFileInfoExtractor.java <170:21 170:22>]
-LOCAL_SYMBOL: java.util.Comparator<T>.compare<4> [SourceFileInfoExtractor.java <170:32 170:33>]
+LOCAL_SYMBOL: java.util.Comparator<T>.compare<2> [SourceFileInfoExtractor.java <170:32 170:33>]
-LOCAL_SYMBOL: java.util.Comparator<T>.compare<5> [SourceFileInfoExtractor.java <170:25 170:26>]
+LOCAL_SYMBOL: java.util.Comparator<T>.compare<3> [SourceFileInfoExtractor.java <170:25 170:26>]
-LOCAL_SYMBOL: java.util.Comparator<T>.compare<5> [SourceFileInfoExtractor.java <170:62 170:63>]
+LOCAL_SYMBOL: java.util.Comparator<T>.compare<3> [SourceFileInfoExtractor.java <170:62 170:63>]
-LOCAL_SYMBOL: java.util.function.Consumer<T>.accept<3> [SourceFileInfoExtractor.java <176:38 176:38>]
+LOCAL_SYMBOL: java.util.function.Consumer<T>.accept<2> [SourceFileInfoExtractor.java <176:38 176:38>]
-LOCAL_SYMBOL: java.util.function.Consumer<T>.accept<3> [SourceFileInfoExtractor.java <176:59 176:59>]
+LOCAL_SYMBOL: java.util.function.Consumer<T>.accept<2> [SourceFileInfoExtractor.java <176:59 176:59>]
-LOCAL_SYMBOL: java.util.function.Consumer<T>.accept<8> [SourceFileInfoExtractor.java <191:31 191:31>]
+LOCAL_SYMBOL: java.util.function.Consumer<T>.accept<7> [SourceFileInfoExtractor.java <191:31 191:31>]
-LOCAL_SYMBOL: java.util.function.Consumer<T>.accept<8> [SourceFileInfoExtractor.java <191:42 191:42>]
+LOCAL_SYMBOL: java.util.function.Consumer<T>.accept<7> [SourceFileInfoExtractor.java <191:42 191:42>]
 COMMENT: comment [SourceFileInfoExtractor.java <1:1 15:3>]
 COMMENT: comment [SourceFileInfoExtractor.java <46:1 50:3>]
 COMMENT: comment [SourceFileInfoExtractor.java <119:17 119:23>]
@@ -308,12 +308,12 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.declarations.common.MethodDecla
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.declarations.common.MethodDeclarationCommonLogic.typeParamByName<0> [MethodDeclarationCommonLogic.java <88:96 88:99>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.declarations.common.MethodDeclarationCommonLogic.typeParamByName<1> [MethodDeclarationCommonLogic.java <87:70 87:79>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.declarations.common.MethodDeclarationCommonLogic.typeParamByName<2> [MethodDeclarationCommonLogic.java <87:90 87:96>]
-LOCAL_SYMBOL: com.github.javaparser.symbolsolver.model.typesystem.TypeTransformer.transform<6> [MethodDeclarationCommonLogic.java <81:60 81:61>]
+LOCAL_SYMBOL: com.github.javaparser.symbolsolver.model.typesystem.TypeTransformer.transform<5> [MethodDeclarationCommonLogic.java <81:60 81:61>]
-LOCAL_SYMBOL: com.github.javaparser.symbolsolver.model.typesystem.TypeTransformer.transform<6> [MethodDeclarationCommonLogic.java <81:84 81:85>]
+LOCAL_SYMBOL: com.github.javaparser.symbolsolver.model.typesystem.TypeTransformer.transform<5> [MethodDeclarationCommonLogic.java <81:84 81:85>]
 LOCAL_SYMBOL: java.util.function.Function<T, R>.apply<6> [MethodDeclarationCommonLogic.java <88:107 88:108>]
 LOCAL_SYMBOL: java.util.function.Function<T, R>.apply<6> [MethodDeclarationCommonLogic.java <88:120 88:121>]
-LOCAL_SYMBOL: java.util.function.Predicate<T>.test<4> [MethodDeclarationCommonLogic.java <88:70 88:71>]
+LOCAL_SYMBOL: java.util.function.Predicate<T>.test<3> [MethodDeclarationCommonLogic.java <88:70 88:71>]
-LOCAL_SYMBOL: java.util.function.Predicate<T>.test<4> [MethodDeclarationCommonLogic.java <88:76 88:77>]
+LOCAL_SYMBOL: java.util.function.Predicate<T>.test<3> [MethodDeclarationCommonLogic.java <88:76 88:77>]
 COMMENT: comment [MethodDeclarationCommonLogic.java <1:1 15:3>]
 COMMENT: comment [MethodDeclarationCommonLogic.java <33:1 35:3>]
 COMMENT: comment [MethodDeclarationCommonLogic.java <54:9 54:104>]
@@ -801,8 +801,8 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparser.Navigator.getParentN
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparser.Navigator.getParentNode<0> [Navigator.java <44:23 44:26>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparser.Navigator.getParentNode<1> [Navigator.java <44:14 44:19>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparser.Navigator.getParentNode<1> [Navigator.java <45:16 45:21>]
-LOCAL_SYMBOL: java.util.function.Predicate<T>.test<5> [Navigator.java <54:76 54:76>]
+LOCAL_SYMBOL: java.util.function.Predicate<T>.test<4> [Navigator.java <54:76 54:76>]
-LOCAL_SYMBOL: java.util.function.Predicate<T>.test<5> [Navigator.java <54:82 54:82>]
+LOCAL_SYMBOL: java.util.function.Predicate<T>.test<4> [Navigator.java <54:82 54:82>]
 COMMENT: comment [Navigator.java <1:1 15:3>]
 COMMENT: comment [Navigator.java <32:1 36:3>]
 COMMENT: comment [Navigator.java <40:9 40:32>]
@@ -1815,8 +1815,8 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.JavaParserFacad
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.JavaParserFacade.toMethodUsage<4> [JavaParserFacade.java <367:24 367:35>]
 LOCAL_SYMBOL: java.util.function.Function<T, R>.apply<8> [JavaParserFacade.java <443:94 443:95>]
 LOCAL_SYMBOL: java.util.function.Function<T, R>.apply<8> [JavaParserFacade.java <443:116 443:117>]
-LOCAL_SYMBOL: java.util.function.Predicate<T>.test<6> [JavaParserFacade.java <362:164 362:165>]
+LOCAL_SYMBOL: java.util.function.Predicate<T>.test<5> [JavaParserFacade.java <362:164 362:165>]
-LOCAL_SYMBOL: java.util.function.Predicate<T>.test<6> [JavaParserFacade.java <362:170 362:171>]
+LOCAL_SYMBOL: java.util.function.Predicate<T>.test<5> [JavaParserFacade.java <362:170 362:171>]
 COMMENT: comment [JavaParserFacade.java <1:1 15:3>]
 COMMENT: comment [JavaParserFacade.java <51:1 55:3>]
 COMMENT: comment [JavaParserFacade.java <92:5 94:7>]
@@ -1710,10 +1710,10 @@ LOCAL_SYMBOL: java.util.function.Function<T, R>.apply<24> [TypeExtractor.java <4
 LOCAL_SYMBOL: java.util.function.Function<T, R>.apply<25> [TypeExtractor.java <434:54 434:63>]
 LOCAL_SYMBOL: java.util.function.Function<T, R>.apply<25> [TypeExtractor.java <435:37 435:46>]
 LOCAL_SYMBOL: java.util.function.Function<T, R>.apply<25> [TypeExtractor.java <436:59 436:68>]
-LOCAL_SYMBOL: java.util.function.Predicate<T>.test<27> [TypeExtractor.java <441:37 441:37>]
+LOCAL_SYMBOL: java.util.function.Predicate<T>.test<26> [TypeExtractor.java <441:37 441:37>]
-LOCAL_SYMBOL: java.util.function.Predicate<T>.test<27> [TypeExtractor.java <441:42 441:42>]
+LOCAL_SYMBOL: java.util.function.Predicate<T>.test<26> [TypeExtractor.java <441:42 441:42>]
-LOCAL_SYMBOL: java.util.function.Predicate<T>.test<27> [TypeExtractor.java <441:56 441:56>]
+LOCAL_SYMBOL: java.util.function.Predicate<T>.test<26> [TypeExtractor.java <441:56 441:56>]
-LOCAL_SYMBOL: java.util.function.Predicate<T>.test<27> [TypeExtractor.java <441:71 441:71>]
+LOCAL_SYMBOL: java.util.function.Predicate<T>.test<26> [TypeExtractor.java <441:71 441:71>]
 COMMENT: comment [TypeExtractor.java <61:1 61:83>]
 COMMENT: comment [TypeExtractor.java <64:1 64:97>]
 COMMENT: comment [TypeExtractor.java <145:9 145:89>]
@@ -344,8 +344,8 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.contexts.Abstra
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.contexts.AbstractJavaParserContext<N>.solveWithAsValue<2> [AbstractJavaParserContext.java <131:107 131:116>]
 LOCAL_SYMBOL: java.util.function.Function<T, R>.apply<6> [AbstractJavaParserContext.java <134:22 134:22>]
 LOCAL_SYMBOL: java.util.function.Function<T, R>.apply<6> [AbstractJavaParserContext.java <134:38 134:38>]
-LOCAL_SYMBOL: java.util.function.Predicate<T>.test<4> [AbstractJavaParserContext.java <133:25 133:25>]
+LOCAL_SYMBOL: java.util.function.Predicate<T>.test<3> [AbstractJavaParserContext.java <133:25 133:25>]
-LOCAL_SYMBOL: java.util.function.Predicate<T>.test<4> [AbstractJavaParserContext.java <133:30 133:30>]
+LOCAL_SYMBOL: java.util.function.Predicate<T>.test<3> [AbstractJavaParserContext.java <133:30 133:30>]
 COMMENT: comment [AbstractJavaParserContext.java <1:1 15:3>]
 COMMENT: comment [AbstractJavaParserContext.java <36:1 38:3>]
 COMMENT: comment [AbstractJavaParserContext.java <44:5 44:7>]
@@ -570,15 +570,15 @@ LOCAL_SYMBOL: java.util.function.Function<T, R>.apply<22> [AnonymousClassDeclara
 LOCAL_SYMBOL: java.util.function.Function<T, R>.apply<22> [AnonymousClassDeclarationContext.java <146:72 146:83>]
 LOCAL_SYMBOL: java.util.function.Function<T, R>.apply<8> [AnonymousClassDeclarationContext.java <111:18 111:29>]
 LOCAL_SYMBOL: java.util.function.Function<T, R>.apply<8> [AnonymousClassDeclarationContext.java <113:78 113:89>]
-LOCAL_SYMBOL: java.util.function.Predicate<T>.test<11> [AnonymousClassDeclarationContext.java <122:21 122:32>]
+LOCAL_SYMBOL: java.util.function.Predicate<T>.test<10> [AnonymousClassDeclarationContext.java <122:21 122:32>]
-LOCAL_SYMBOL: java.util.function.Predicate<T>.test<11> [AnonymousClassDeclarationContext.java <122:74 122:85>]
+LOCAL_SYMBOL: java.util.function.Predicate<T>.test<10> [AnonymousClassDeclarationContext.java <122:74 122:85>]
-LOCAL_SYMBOL: java.util.function.Predicate<T>.test<19> [AnonymousClassDeclarationContext.java <142:21 142:24>]
+LOCAL_SYMBOL: java.util.function.Predicate<T>.test<18> [AnonymousClassDeclarationContext.java <142:21 142:24>]
-LOCAL_SYMBOL: java.util.function.Predicate<T>.test<19> [AnonymousClassDeclarationContext.java <142:29 142:32>]
+LOCAL_SYMBOL: java.util.function.Predicate<T>.test<18> [AnonymousClassDeclarationContext.java <142:29 142:32>]
-LOCAL_SYMBOL: java.util.function.Predicate<T>.test<5> [AnonymousClassDeclarationContext.java <109:21 109:32>]
+LOCAL_SYMBOL: java.util.function.Predicate<T>.test<4> [AnonymousClassDeclarationContext.java <109:21 109:32>]
-LOCAL_SYMBOL: java.util.function.Predicate<T>.test<5> [AnonymousClassDeclarationContext.java <109:37 109:48>]
+LOCAL_SYMBOL: java.util.function.Predicate<T>.test<4> [AnonymousClassDeclarationContext.java <109:37 109:48>]
-LOCAL_SYMBOL: java.util.function.Predicate<T>.test<6> [AnonymousClassDeclarationContext.java <50:21 50:21>]
+LOCAL_SYMBOL: java.util.function.Predicate<T>.test<5> [AnonymousClassDeclarationContext.java <50:21 50:21>]
-LOCAL_SYMBOL: java.util.function.Predicate<T>.test<6> [AnonymousClassDeclarationContext.java <50:26 50:26>]
+LOCAL_SYMBOL: java.util.function.Predicate<T>.test<5> [AnonymousClassDeclarationContext.java <50:26 50:26>]
-LOCAL_SYMBOL: java.util.function.Predicate<T>.test<6> [AnonymousClassDeclarationContext.java <50:70 50:70>]
+LOCAL_SYMBOL: java.util.function.Predicate<T>.test<5> [AnonymousClassDeclarationContext.java <50:70 50:70>]
 COMMENT: comment [AnonymousClassDeclarationContext.java <27:1 29:3>]
 COMMENT: comment [AnonymousClassDeclarationContext.java <61:9 61:88>]
 COMMENT: comment [AnonymousClassDeclarationContext.java <62:9 62:65>]
@@ -938,8 +938,8 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.contexts.Compil
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.contexts.CompilationUnitContext.toSimpleName<1> [CompilationUnitContext.java <213:18 213:22>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.contexts.CompilationUnitContext.toSimpleName<1> [CompilationUnitContext.java <214:16 214:20>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.contexts.CompilationUnitContext.toSimpleName<1> [CompilationUnitContext.java <214:22 214:26>]
-LOCAL_SYMBOL: java.util.function.Predicate<T>.test<8> [CompilationUnitContext.java <235:78 235:79>]
+LOCAL_SYMBOL: java.util.function.Predicate<T>.test<7> [CompilationUnitContext.java <235:78 235:79>]
-LOCAL_SYMBOL: java.util.function.Predicate<T>.test<8> [CompilationUnitContext.java <235:84 235:85>]
+LOCAL_SYMBOL: java.util.function.Predicate<T>.test<7> [CompilationUnitContext.java <235:84 235:85>]
 COMMENT: comment [CompilationUnitContext.java <1:1 15:3>]
 COMMENT: comment [CompilationUnitContext.java <39:1 41:3>]
 COMMENT: comment [CompilationUnitContext.java <44:5 44:7>]
@@ -552,10 +552,10 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.contexts.JavaPa
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.contexts.JavaParserTypeDeclarationAdapter.solveType<8> [JavaParserTypeDeclarationAdapter.java <65:79 65:83>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.contexts.JavaParserTypeDeclarationAdapter.solveType<9> [JavaParserTypeDeclarationAdapter.java <71:28 71:35>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.contexts.JavaParserTypeDeclarationAdapter.solveType<9> [JavaParserTypeDeclarationAdapter.java <73:61 73:68>]
-LOCAL_SYMBOL: java.util.function.Predicate<T>.test<6> [JavaParserTypeDeclarationAdapter.java <88:25 88:25>]
+LOCAL_SYMBOL: java.util.function.Predicate<T>.test<5> [JavaParserTypeDeclarationAdapter.java <88:25 88:25>]
-LOCAL_SYMBOL: java.util.function.Predicate<T>.test<6> [JavaParserTypeDeclarationAdapter.java <88:30 88:30>]
+LOCAL_SYMBOL: java.util.function.Predicate<T>.test<5> [JavaParserTypeDeclarationAdapter.java <88:30 88:30>]
-LOCAL_SYMBOL: java.util.function.Predicate<T>.test<8> [JavaParserTypeDeclarationAdapter.java <89:25 89:25>]
+LOCAL_SYMBOL: java.util.function.Predicate<T>.test<7> [JavaParserTypeDeclarationAdapter.java <89:25 89:25>]
-LOCAL_SYMBOL: java.util.function.Predicate<T>.test<8> [JavaParserTypeDeclarationAdapter.java <89:61 89:61>]
+LOCAL_SYMBOL: java.util.function.Predicate<T>.test<7> [JavaParserTypeDeclarationAdapter.java <89:61 89:61>]
 COMMENT: comment [JavaParserTypeDeclarationAdapter.java <22:1 24:3>]
 COMMENT: comment [JavaParserTypeDeclarationAdapter.java <46:9 46:27>]
 COMMENT: comment [JavaParserTypeDeclarationAdapter.java <70:9 70:64>]
@@ -604,8 +604,8 @@ LOCAL_SYMBOL: java.util.function.Function<T, R>.apply<5> [JavaParserAnonymousCla
 LOCAL_SYMBOL: java.util.function.Function<T, R>.apply<5> [JavaParserAnonymousClassDeclaration.java <115:79 115:86>]
 LOCAL_SYMBOL: java.util.function.Function<T, R>.apply<9> [JavaParserAnonymousClassDeclaration.java <124:33 124:40>]
 LOCAL_SYMBOL: java.util.function.Function<T, R>.apply<9> [JavaParserAnonymousClassDeclaration.java <124:45 124:52>]
-LOCAL_SYMBOL: java.util.function.Predicate<T>.test<1> [JavaParserAnonymousClassDeclaration.java <79:21 79:24>]
+LOCAL_SYMBOL: java.util.function.Predicate<T>.test<0> [JavaParserAnonymousClassDeclaration.java <79:21 79:24>]
-LOCAL_SYMBOL: java.util.function.Predicate<T>.test<1> [JavaParserAnonymousClassDeclaration.java <79:29 79:32>]
+LOCAL_SYMBOL: java.util.function.Predicate<T>.test<0> [JavaParserAnonymousClassDeclaration.java <79:29 79:32>]
-LOCAL_SYMBOL: java.util.function.Predicate<T>.test<2> [JavaParserAnonymousClassDeclaration.java <58:17 58:20>]
+LOCAL_SYMBOL: java.util.function.Predicate<T>.test<1> [JavaParserAnonymousClassDeclaration.java <58:17 58:20>]
-LOCAL_SYMBOL: java.util.function.Predicate<T>.test<2> [JavaParserAnonymousClassDeclaration.java <58:54 58:57>]
+LOCAL_SYMBOL: java.util.function.Predicate<T>.test<1> [JavaParserAnonymousClassDeclaration.java <58:54 58:57>]
 COMMENT: comment [JavaParserAnonymousClassDeclaration.java <29:1 31:3>]
@@ -1091,11 +1091,11 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.declarations.Ja
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserClassDeclaration.toReferenceType<4> [JavaParserClassDeclaration.java <367:33 367:41>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserClassDeclaration.toReferenceType<5> [JavaParserClassDeclaration.java <376:20 376:43>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserClassDeclaration.toReferenceType<5> [JavaParserClassDeclaration.java <379:91 379:114>]
-LOCAL_SYMBOL: java.util.function.Consumer<T>.accept<10> [JavaParserClassDeclaration.java <120:33 120:38>]
+LOCAL_SYMBOL: java.util.function.Consumer<T>.accept<7> [JavaParserClassDeclaration.java <120:33 120:38>]
-LOCAL_SYMBOL: java.util.function.Consumer<T>.accept<10> [JavaParserClassDeclaration.java <120:43 120:48>]
+LOCAL_SYMBOL: java.util.function.Consumer<T>.accept<7> [JavaParserClassDeclaration.java <120:43 120:48>]
-LOCAL_SYMBOL: java.util.function.Consumer<T>.accept<12> [JavaParserClassDeclaration.java <120:94 120:94>]
+LOCAL_SYMBOL: java.util.function.Consumer<T>.accept<8> [JavaParserClassDeclaration.java <120:94 120:94>]
-LOCAL_SYMBOL: java.util.function.Consumer<T>.accept<12> [JavaParserClassDeclaration.java <121:24 121:24>]
+LOCAL_SYMBOL: java.util.function.Consumer<T>.accept<8> [JavaParserClassDeclaration.java <121:24 121:24>]
-LOCAL_SYMBOL: java.util.function.Function<T, R>.apply<11> [JavaParserClassDeclaration.java <377:50 377:50>]
+LOCAL_SYMBOL: java.util.function.Function<T, R>.apply<10> [JavaParserClassDeclaration.java <377:50 377:50>]
 LOCAL_SYMBOL: java.util.function.Function<T, R>.apply<1> [JavaParserClassDeclaration.java <309:18 309:19>]
 LOCAL_SYMBOL: java.util.function.Function<T, R>.apply<1> [JavaParserClassDeclaration.java <309:53 309:54>]
 LOCAL_SYMBOL: java.util.function.Function<T, R>.apply<9> [JavaParserClassDeclaration.java <377:31 377:32>]
@@ -927,15 +927,15 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.declarations.Ja
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserInterfaceDeclaration.toReferenceType<1> [JavaParserInterfaceDeclaration.java <317:38 317:40>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserInterfaceDeclaration.toReferenceType<2> [JavaParserInterfaceDeclaration.java <314:20 314:43>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javaparsermodel.declarations.JavaParserInterfaceDeclaration.toReferenceType<2> [JavaParserInterfaceDeclaration.java <317:91 317:114>]
-LOCAL_SYMBOL: java.util.function.Consumer<T>.accept<7> [JavaParserInterfaceDeclaration.java <201:32 201:32>]
+LOCAL_SYMBOL: java.util.function.Consumer<T>.accept<6> [JavaParserInterfaceDeclaration.java <201:32 201:32>]
-LOCAL_SYMBOL: java.util.function.Consumer<T>.accept<7> [JavaParserInterfaceDeclaration.java <202:17 202:17>]
+LOCAL_SYMBOL: java.util.function.Consumer<T>.accept<6> [JavaParserInterfaceDeclaration.java <202:17 202:17>]
-LOCAL_SYMBOL: java.util.function.Consumer<T>.accept<7> [JavaParserInterfaceDeclaration.java <203:31 203:31>]
+LOCAL_SYMBOL: java.util.function.Consumer<T>.accept<6> [JavaParserInterfaceDeclaration.java <203:31 203:31>]
 LOCAL_SYMBOL: java.util.function.Function<T, R>.apply<1> [JavaParserInterfaceDeclaration.java <258:22 258:23>]
 LOCAL_SYMBOL: java.util.function.Function<T, R>.apply<1> [JavaParserInterfaceDeclaration.java <258:57 258:58>]
 LOCAL_SYMBOL: java.util.function.Function<T, R>.apply<6> [JavaParserInterfaceDeclaration.java <315:31 315:32>]
 LOCAL_SYMBOL: java.util.function.Function<T, R>.apply<6> [JavaParserInterfaceDeclaration.java <315:96 315:97>]
 LOCAL_SYMBOL: java.util.function.Function<T, R>.apply<6> [JavaParserInterfaceDeclaration.java <315:100 315:101>]
-LOCAL_SYMBOL: java.util.function.Function<T, R>.apply<8> [JavaParserInterfaceDeclaration.java <315:50 315:50>]
+LOCAL_SYMBOL: java.util.function.Function<T, R>.apply<7> [JavaParserInterfaceDeclaration.java <315:50 315:50>]
 COMMENT: comment [JavaParserInterfaceDeclaration.java <1:1 15:3>]
 COMMENT: comment [JavaParserInterfaceDeclaration.java <42:1 44:3>]
 COMMENT: comment [JavaParserInterfaceDeclaration.java <159:9 159:38>]
@@ -1091,10 +1091,10 @@ LOCAL_SYMBOL: java.util.function.Function<T, R>.apply<3> [JavassistClassDeclarat
 LOCAL_SYMBOL: java.util.function.Function<T, R>.apply<3> [JavassistClassDeclaration.java <305:57 305:57>]
 LOCAL_SYMBOL: java.util.function.Function<T, R>.apply<6> [JavassistClassDeclaration.java <310:30 310:30>]
 LOCAL_SYMBOL: java.util.function.Function<T, R>.apply<6> [JavassistClassDeclaration.java <310:70 310:70>]
-LOCAL_SYMBOL: java.util.function.Predicate<T>.test<2> [JavassistClassDeclaration.java <381:55 381:55>]
+LOCAL_SYMBOL: java.util.function.Predicate<T>.test<1> [JavassistClassDeclaration.java <381:55 381:55>]
-LOCAL_SYMBOL: java.util.function.Predicate<T>.test<2> [JavassistClassDeclaration.java <381:60 381:60>]
+LOCAL_SYMBOL: java.util.function.Predicate<T>.test<1> [JavassistClassDeclaration.java <381:60 381:60>]
-LOCAL_SYMBOL: java.util.function.Predicate<T>.test<3> [JavassistClassDeclaration.java <370:54 370:54>]
+LOCAL_SYMBOL: java.util.function.Predicate<T>.test<2> [JavassistClassDeclaration.java <370:54 370:54>]
-LOCAL_SYMBOL: java.util.function.Predicate<T>.test<3> [JavassistClassDeclaration.java <370:59 370:59>]
+LOCAL_SYMBOL: java.util.function.Predicate<T>.test<2> [JavassistClassDeclaration.java <370:59 370:59>]
 LOCAL_SYMBOL: java.util.function.Predicate<T>.test<5> [JavassistClassDeclaration.java <175:47 175:47>]
 LOCAL_SYMBOL: java.util.function.Predicate<T>.test<5> [JavassistClassDeclaration.java <175:100 175:100>]
 COMMENT: comment [JavassistClassDeclaration.java <1:1 15:3>]
@@ -689,14 +689,14 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javassistmodel.JavassistEnumDec
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javassistmodel.JavassistEnumDeclaration.solveMethodAsUsage<4> [JavassistEnumDeclaration.java <194:154 194:172>]
 LOCAL_SYMBOL: java.util.function.Function<T, R>.apply<1> [JavassistEnumDeclaration.java <205:68 205:72>]
 LOCAL_SYMBOL: java.util.function.Function<T, R>.apply<1> [JavassistEnumDeclaration.java <205:112 205:116>]
-LOCAL_SYMBOL: java.util.function.Predicate<T>.test<2> [JavassistEnumDeclaration.java <124:86 124:86>]
+LOCAL_SYMBOL: java.util.function.Predicate<T>.test<1> [JavassistEnumDeclaration.java <124:86 124:86>]
-LOCAL_SYMBOL: java.util.function.Predicate<T>.test<2> [JavassistEnumDeclaration.java <124:91 124:91>]
+LOCAL_SYMBOL: java.util.function.Predicate<T>.test<1> [JavassistEnumDeclaration.java <124:91 124:91>]
-LOCAL_SYMBOL: java.util.function.Predicate<T>.test<2> [JavassistEnumDeclaration.java <229:55 229:55>]
+LOCAL_SYMBOL: java.util.function.Predicate<T>.test<1> [JavassistEnumDeclaration.java <229:55 229:55>]
-LOCAL_SYMBOL: java.util.function.Predicate<T>.test<2> [JavassistEnumDeclaration.java <229:60 229:60>]
+LOCAL_SYMBOL: java.util.function.Predicate<T>.test<1> [JavassistEnumDeclaration.java <229:60 229:60>]
-LOCAL_SYMBOL: java.util.function.Predicate<T>.test<3> [JavassistEnumDeclaration.java <117:112 117:112>]
+LOCAL_SYMBOL: java.util.function.Predicate<T>.test<2> [JavassistEnumDeclaration.java <117:112 117:112>]
-LOCAL_SYMBOL: java.util.function.Predicate<T>.test<3> [JavassistEnumDeclaration.java <117:117 117:117>]
+LOCAL_SYMBOL: java.util.function.Predicate<T>.test<2> [JavassistEnumDeclaration.java <117:117 117:117>]
-LOCAL_SYMBOL: java.util.function.Predicate<T>.test<3> [JavassistEnumDeclaration.java <218:54 218:54>]
+LOCAL_SYMBOL: java.util.function.Predicate<T>.test<2> [JavassistEnumDeclaration.java <218:54 218:54>]
-LOCAL_SYMBOL: java.util.function.Predicate<T>.test<3> [JavassistEnumDeclaration.java <218:59 218:59>]
+LOCAL_SYMBOL: java.util.function.Predicate<T>.test<2> [JavassistEnumDeclaration.java <218:59 218:59>]
 LOCAL_SYMBOL: java.util.function.Predicate<T>.test<5> [JavassistEnumDeclaration.java <170:47 170:47>]
 LOCAL_SYMBOL: java.util.function.Predicate<T>.test<5> [JavassistEnumDeclaration.java <170:100 170:100>]
 COMMENT: comment [JavassistEnumDeclaration.java <1:1 15:3>]
@@ -843,16 +843,16 @@ LOCAL_SYMBOL: java.util.function.Function<T, R>.apply<1> [JavassistInterfaceDecl
 LOCAL_SYMBOL: java.util.function.Function<T, R>.apply<1> [JavassistInterfaceDeclaration.java <254:112 254:116>]
 LOCAL_SYMBOL: java.util.function.Function<T, R>.apply<3> [JavassistInterfaceDeclaration.java <72:26 72:26>]
 LOCAL_SYMBOL: java.util.function.Function<T, R>.apply<3> [JavassistInterfaceDeclaration.java <72:53 72:53>]
-LOCAL_SYMBOL: java.util.function.Predicate<T>.test<2> [JavassistInterfaceDeclaration.java <278:55 278:55>]
+LOCAL_SYMBOL: java.util.function.Predicate<T>.test<1> [JavassistInterfaceDeclaration.java <278:55 278:55>]
-LOCAL_SYMBOL: java.util.function.Predicate<T>.test<2> [JavassistInterfaceDeclaration.java <278:60 278:60>]
+LOCAL_SYMBOL: java.util.function.Predicate<T>.test<1> [JavassistInterfaceDeclaration.java <278:60 278:60>]
-LOCAL_SYMBOL: java.util.function.Predicate<T>.test<3> [JavassistInterfaceDeclaration.java <267:54 267:54>]
+LOCAL_SYMBOL: java.util.function.Predicate<T>.test<2> [JavassistInterfaceDeclaration.java <267:54 267:54>]
-LOCAL_SYMBOL: java.util.function.Predicate<T>.test<3> [JavassistInterfaceDeclaration.java <267:59 267:59>]
+LOCAL_SYMBOL: java.util.function.Predicate<T>.test<2> [JavassistInterfaceDeclaration.java <267:59 267:59>]
 LOCAL_SYMBOL: java.util.function.Predicate<T>.test<5> [JavassistInterfaceDeclaration.java <107:47 107:47>]
 LOCAL_SYMBOL: java.util.function.Predicate<T>.test<5> [JavassistInterfaceDeclaration.java <107:100 107:100>]
-LOCAL_SYMBOL: java.util.function.Predicate<T>.test<6> [JavassistInterfaceDeclaration.java <188:86 188:87>]
+LOCAL_SYMBOL: java.util.function.Predicate<T>.test<5> [JavassistInterfaceDeclaration.java <188:86 188:87>]
-LOCAL_SYMBOL: java.util.function.Predicate<T>.test<6> [JavassistInterfaceDeclaration.java <188:92 188:93>]
+LOCAL_SYMBOL: java.util.function.Predicate<T>.test<5> [JavassistInterfaceDeclaration.java <188:92 188:93>]
-LOCAL_SYMBOL: java.util.function.Predicate<T>.test<8> [JavassistInterfaceDeclaration.java <168:47 168:47>]
+LOCAL_SYMBOL: java.util.function.Predicate<T>.test<7> [JavassistInterfaceDeclaration.java <168:47 168:47>]
-LOCAL_SYMBOL: java.util.function.Predicate<T>.test<8> [JavassistInterfaceDeclaration.java <168:52 168:52>]
+LOCAL_SYMBOL: java.util.function.Predicate<T>.test<7> [JavassistInterfaceDeclaration.java <168:52 168:52>]
 COMMENT: comment [JavassistInterfaceDeclaration.java <1:1 15:3>]
 COMMENT: comment [JavassistInterfaceDeclaration.java <42:1 44:3>]
 COMMENT: comment [JavassistInterfaceDeclaration.java <250:13 253:15>]
@@ -249,8 +249,8 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javassistmodel.JavassistTypeDec
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javassistmodel.JavassistTypeDeclarationAdapter.getTypeParameters<0> [JavassistTypeDeclarationAdapter.java <75:64 75:77>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javassistmodel.JavassistTypeDeclarationAdapter.getTypeParameters<3> [JavassistTypeDeclarationAdapter.java <78:28 78:38>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javassistmodel.JavassistTypeDeclarationAdapter.getTypeParameters<3> [JavassistTypeDeclarationAdapter.java <79:36 79:46>]
-LOCAL_SYMBOL: java.util.function.Consumer<T>.accept<3> [JavassistTypeDeclarationAdapter.java <59:20 59:20>]
+LOCAL_SYMBOL: java.util.function.Consumer<T>.accept<2> [JavassistTypeDeclarationAdapter.java <59:20 59:20>]
-LOCAL_SYMBOL: java.util.function.Consumer<T>.accept<3> [JavassistTypeDeclarationAdapter.java <59:70 59:70>]
+LOCAL_SYMBOL: java.util.function.Consumer<T>.accept<2> [JavassistTypeDeclarationAdapter.java <59:70 59:70>]
 LOCAL_SYMBOL: java.util.function.Function<T, R>.apply<1> [JavassistTypeDeclarationAdapter.java <42:14 42:14>]
 LOCAL_SYMBOL: java.util.function.Function<T, R>.apply<1> [JavassistTypeDeclarationAdapter.java <42:50 42:50>]
 LOCAL_SYMBOL: java.util.function.Function<T, R>.apply<1> [JavassistTypeDeclarationAdapter.java <47:14 47:14>]
@@ -626,7 +626,7 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javassistmodel.JavassistUtils.t
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javassistmodel.JavassistUtils.typeArgumentToType<2> [JavassistUtils.java <167:107 167:124>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javassistmodel.JavassistUtils.typeArgumentToType<2> [JavassistUtils.java <169:105 169:122>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.javassistmodel.JavassistUtils.typeArgumentToType<2> [JavassistUtils.java <174:81 174:98>]
-LOCAL_SYMBOL: com.github.javaparser.symbolsolver.model.typesystem.TypeTransformer.transform<14> [JavassistUtils.java <59:101 59:102>]
+LOCAL_SYMBOL: com.github.javaparser.symbolsolver.model.typesystem.TypeTransformer.transform<13> [JavassistUtils.java <59:101 59:102>]
 LOCAL_SYMBOL: java.util.function.Function<T, R>.apply<6> [JavassistUtils.java <124:154 124:155>]
 LOCAL_SYMBOL: java.util.function.Function<T, R>.apply<6> [JavassistUtils.java <124:179 124:180>]
 COMMENT: comment [JavassistUtils.java <1:1 15:3>]
@@ -664,7 +664,7 @@ LOCAL_SYMBOL: java.util.function.Function<T, R>.apply<4> [ReflectionClassAdapter
 LOCAL_SYMBOL: java.util.function.Function<T, R>.apply<4> [ReflectionClassAdapter.java <43:64 43:64>]
 LOCAL_SYMBOL: java.util.function.Function<T, R>.apply<8> [ReflectionClassAdapter.java <56:31 56:31>]
 LOCAL_SYMBOL: java.util.function.Function<T, R>.apply<8> [ReflectionClassAdapter.java <56:68 56:68>]
-LOCAL_SYMBOL: java.util.function.Predicate<T>.test<1> [ReflectionClassAdapter.java <128:25 128:25>]
+LOCAL_SYMBOL: java.util.function.Predicate<T>.test<0> [ReflectionClassAdapter.java <128:25 128:25>]
-LOCAL_SYMBOL: java.util.function.Predicate<T>.test<1> [ReflectionClassAdapter.java <128:31 128:31>]
+LOCAL_SYMBOL: java.util.function.Predicate<T>.test<0> [ReflectionClassAdapter.java <128:31 128:31>]
-LOCAL_SYMBOL: java.util.function.Predicate<T>.test<1> [ReflectionClassAdapter.java <128:51 128:51>]
+LOCAL_SYMBOL: java.util.function.Predicate<T>.test<0> [ReflectionClassAdapter.java <128:51 128:51>]
 COMMENT: comment [ReflectionClassAdapter.java <20:1 22:3>]
@@ -977,10 +977,10 @@ LOCAL_SYMBOL: java.util.function.Function<T, R>.apply<1> [ReflectionClassDeclara
 LOCAL_SYMBOL: java.util.function.Function<T, R>.apply<1> [ReflectionClassDeclaration.java <330:65 330:66>]
 LOCAL_SYMBOL: java.util.function.Predicate<T>.test<5> [ReflectionClassDeclaration.java <136:42 136:42>]
 LOCAL_SYMBOL: java.util.function.Predicate<T>.test<5> [ReflectionClassDeclaration.java <136:95 136:95>]
-LOCAL_SYMBOL: java.util.function.Predicate<T>.test<8> [ReflectionClassDeclaration.java <137:80 137:80>]
+LOCAL_SYMBOL: java.util.function.Predicate<T>.test<7> [ReflectionClassDeclaration.java <137:80 137:80>]
-LOCAL_SYMBOL: java.util.function.Predicate<T>.test<8> [ReflectionClassDeclaration.java <137:86 137:86>]
+LOCAL_SYMBOL: java.util.function.Predicate<T>.test<7> [ReflectionClassDeclaration.java <137:86 137:86>]
-LOCAL_SYMBOL: java.util.function.Predicate<T>.test<8> [ReflectionClassDeclaration.java <173:80 173:80>]
+LOCAL_SYMBOL: java.util.function.Predicate<T>.test<7> [ReflectionClassDeclaration.java <173:80 173:80>]
-LOCAL_SYMBOL: java.util.function.Predicate<T>.test<8> [ReflectionClassDeclaration.java <173:86 173:86>]
+LOCAL_SYMBOL: java.util.function.Predicate<T>.test<7> [ReflectionClassDeclaration.java <173:86 173:86>]
 COMMENT: comment [ReflectionClassDeclaration.java <1:1 15:3>]
 COMMENT: comment [ReflectionClassDeclaration.java <41:1 43:3>]
 COMMENT: comment [ReflectionClassDeclaration.java <46:5 46:7>]
@@ -351,7 +351,7 @@ LOCAL_SYMBOL: ReflectionFactory.java<95:59> [ReflectionFactory.java <95:59 95:59
 LOCAL_SYMBOL: ReflectionFactory.java<95:59> [ReflectionFactory.java <100:13 100:13>]
 LOCAL_SYMBOL: ReflectionFactory.java<96:63> [ReflectionFactory.java <96:63 96:63>]
 LOCAL_SYMBOL: ReflectionFactory.java<96:63> [ReflectionFactory.java <98:17 98:17>]
-LOCAL_SYMBOL: com.github.javaparser.symbolsolver.model.typesystem.TypeTransformer.transform<9> [ReflectionFactory.java <64:55 64:56>]
+LOCAL_SYMBOL: com.github.javaparser.symbolsolver.model.typesystem.TypeTransformer.transform<8> [ReflectionFactory.java <64:55 64:56>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.reflectionmodel.ReflectionFactory.modifiersToAccessLevel<0> [ReflectionFactory.java <107:57 107:65>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.reflectionmodel.ReflectionFactory.modifiersToAccessLevel<0> [ReflectionFactory.java <108:31 108:39>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.reflectionmodel.ReflectionFactory.modifiersToAccessLevel<0> [ReflectionFactory.java <110:41 110:49>]
@@ -676,8 +676,8 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.resolution.ConstructorResolutio
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.resolution.ConstructorResolutionLogic.isMoreSpecific<6> [ConstructorResolutionLogic.java <214:36 214:38>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.resolution.ConstructorResolutionLogic.isMoreSpecific<6> [ConstructorResolutionLogic.java <214:45 214:47>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.resolution.ConstructorResolutionLogic.isMoreSpecific<6> [ConstructorResolutionLogic.java <219:83 219:85>]
-LOCAL_SYMBOL: java.util.function.Predicate<T>.test<6> [ConstructorResolutionLogic.java <157:93 157:93>]
+LOCAL_SYMBOL: java.util.function.Predicate<T>.test<5> [ConstructorResolutionLogic.java <157:93 157:93>]
-LOCAL_SYMBOL: java.util.function.Predicate<T>.test<6> [ConstructorResolutionLogic.java <157:112 157:112>]
+LOCAL_SYMBOL: java.util.function.Predicate<T>.test<5> [ConstructorResolutionLogic.java <157:112 157:112>]
 COMMENT: comment [ConstructorResolutionLogic.java <1:1 13:3>]
 COMMENT: comment [ConstructorResolutionLogic.java <31:1 33:3>]
 COMMENT: comment [ConstructorResolutionLogic.java <41:13 41:101>]
@@ -1437,8 +1437,8 @@ LOCAL_SYMBOL: MethodResolutionLogic.java<92:50> [MethodResolutionLogic.java <92:
 LOCAL_SYMBOL: MethodResolutionLogic.java<92:50> [MethodResolutionLogic.java <94:17 94:17>]
 LOCAL_SYMBOL: MethodResolutionLogic.java<99:66> [MethodResolutionLogic.java <99:66 99:66>]
 LOCAL_SYMBOL: MethodResolutionLogic.java<99:66> [MethodResolutionLogic.java <101:9 101:9>]
-LOCAL_SYMBOL: com.github.javaparser.symbolsolver.model.typesystem.TypeTransformer.transform<6> [MethodResolutionLogic.java <245:53 245:61>]
+LOCAL_SYMBOL: com.github.javaparser.symbolsolver.model.typesystem.TypeTransformer.transform<5> [MethodResolutionLogic.java <245:53 245:61>]
-LOCAL_SYMBOL: com.github.javaparser.symbolsolver.model.typesystem.TypeTransformer.transform<6> [MethodResolutionLogic.java <245:83 245:91>]
+LOCAL_SYMBOL: com.github.javaparser.symbolsolver.model.typesystem.TypeTransformer.transform<5> [MethodResolutionLogic.java <245:83 245:91>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.resolution.MethodResolutionLogic.areOverride<0> [MethodResolutionLogic.java <555:52 555:67>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.resolution.MethodResolutionLogic.areOverride<0> [MethodResolutionLogic.java <556:14 556:29>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.resolution.MethodResolutionLogic.areOverride<0> [MethodResolutionLogic.java <559:13 559:28>]
@@ -2181,10 +2181,10 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.resolution.MethodResolutionLogi
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.resolution.MethodResolutionLogic.solveMethodInType<6> [MethodResolutionLogic.java <592:20 592:22>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.resolution.MethodResolutionLogic.solveMethodInType<7> [MethodResolutionLogic.java <598:21 598:23>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.resolution.MethodResolutionLogic.solveMethodInType<7> [MethodResolutionLogic.java <599:20 599:22>]
-LOCAL_SYMBOL: java.util.function.Predicate<T>.test<6> [MethodResolutionLogic.java <525:72 525:72>]
+LOCAL_SYMBOL: java.util.function.Predicate<T>.test<5> [MethodResolutionLogic.java <525:72 525:72>]
-LOCAL_SYMBOL: java.util.function.Predicate<T>.test<6> [MethodResolutionLogic.java <525:91 525:91>]
+LOCAL_SYMBOL: java.util.function.Predicate<T>.test<5> [MethodResolutionLogic.java <525:91 525:91>]
-LOCAL_SYMBOL: java.util.function.Predicate<T>.test<7> [MethodResolutionLogic.java <382:107 382:107>]
+LOCAL_SYMBOL: java.util.function.Predicate<T>.test<6> [MethodResolutionLogic.java <382:107 382:107>]
-LOCAL_SYMBOL: java.util.function.Predicate<T>.test<7> [MethodResolutionLogic.java <382:126 382:126>]
+LOCAL_SYMBOL: java.util.function.Predicate<T>.test<6> [MethodResolutionLogic.java <382:126 382:126>]
 COMMENT: comment [MethodResolutionLogic.java <1:1 15:3>]
 COMMENT: comment [MethodResolutionLogic.java <39:1 41:3>]
 COMMENT: comment [MethodResolutionLogic.java <48:13 48:101>]
@@ -226,8 +226,8 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.resolution.typesolvers.Reflecti
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.resolution.typesolvers.ReflectionTypeSolver.tryToSolveType<8> [ReflectionTypeSolver.java <77:60 77:69>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.resolution.typesolvers.ReflectionTypeSolver.tryToSolveType<8> [ReflectionTypeSolver.java <79:29 79:38>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.resolution.typesolvers.ReflectionTypeSolver.tryToSolveType<8> [ReflectionTypeSolver.java <80:59 80:68>]
-LOCAL_SYMBOL: java.util.function.Predicate<T>.test<10> [ReflectionTypeSolver.java <78:50 78:51>]
+LOCAL_SYMBOL: java.util.function.Predicate<T>.test<9> [ReflectionTypeSolver.java <78:50 78:51>]
-LOCAL_SYMBOL: java.util.function.Predicate<T>.test<10> [ReflectionTypeSolver.java <78:56 78:57>]
+LOCAL_SYMBOL: java.util.function.Predicate<T>.test<9> [ReflectionTypeSolver.java <78:56 78:57>]
 COMMENT: comment [ReflectionTypeSolver.java <1:1 15:3>]
 COMMENT: comment [ReflectionTypeSolver.java <26:1 28:3>]
 COMMENT: comment [ReflectionTypeSolver.java <59:17 59:117>]
@@ -155,8 +155,8 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.logic.AbstractClassDeclaration.
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.logic.AbstractClassDeclaration.getAllSuperClasses<1> [AbstractClassDeclaration.java <46:13 46:22>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.logic.AbstractClassDeclaration.getAllSuperClasses<1> [AbstractClassDeclaration.java <47:30 47:39>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.logic.AbstractClassDeclaration.getAllSuperClasses<1> [AbstractClassDeclaration.java <48:33 48:42>]
-LOCAL_SYMBOL: java.util.function.Predicate<T>.test<3> [AbstractClassDeclaration.java <51:35 51:35>]
+LOCAL_SYMBOL: java.util.function.Predicate<T>.test<2> [AbstractClassDeclaration.java <51:35 51:35>]
-LOCAL_SYMBOL: java.util.function.Predicate<T>.test<3> [AbstractClassDeclaration.java <51:40 51:40>]
+LOCAL_SYMBOL: java.util.function.Predicate<T>.test<2> [AbstractClassDeclaration.java <51:40 51:40>]
 COMMENT: comment [AbstractClassDeclaration.java <1:1 15:3>]
 COMMENT: comment [AbstractClassDeclaration.java <26:1 30:3>]
 COMMENT: comment [AbstractClassDeclaration.java <33:5 33:7>]
@@ -215,10 +215,10 @@ LOCAL_SYMBOL: java.util.function.Function<T, R>.apply<1> [FunctionalInterfaceLog
 LOCAL_SYMBOL: java.util.function.Function<T, R>.apply<1> [FunctionalInterfaceLogic.java <79:41 79:46>]
 LOCAL_SYMBOL: java.util.function.Function<T, R>.apply<2> [FunctionalInterfaceLogic.java <71:108 71:108>]
 LOCAL_SYMBOL: java.util.function.Function<T, R>.apply<2> [FunctionalInterfaceLogic.java <71:125 71:125>]
-LOCAL_SYMBOL: java.util.function.Predicate<T>.test<3> [FunctionalInterfaceLogic.java <57:25 57:25>]
+LOCAL_SYMBOL: java.util.function.Predicate<T>.test<2> [FunctionalInterfaceLogic.java <57:25 57:25>]
-LOCAL_SYMBOL: java.util.function.Predicate<T>.test<3> [FunctionalInterfaceLogic.java <57:30 57:30>]
+LOCAL_SYMBOL: java.util.function.Predicate<T>.test<2> [FunctionalInterfaceLogic.java <57:30 57:30>]
-LOCAL_SYMBOL: java.util.function.Predicate<T>.test<5> [FunctionalInterfaceLogic.java <60:25 60:25>]
+LOCAL_SYMBOL: java.util.function.Predicate<T>.test<4> [FunctionalInterfaceLogic.java <60:25 60:25>]
-LOCAL_SYMBOL: java.util.function.Predicate<T>.test<5> [FunctionalInterfaceLogic.java <60:48 60:48>]
+LOCAL_SYMBOL: java.util.function.Predicate<T>.test<4> [FunctionalInterfaceLogic.java <60:48 60:48>]
 COMMENT: comment [FunctionalInterfaceLogic.java <1:1 15:3>]
 COMMENT: comment [FunctionalInterfaceLogic.java <31:1 33:3>]
 COMMENT: comment [FunctionalInterfaceLogic.java <37:9 37:32>]
@@ -669,14 +669,14 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.logic.InferenceContext.resolve<
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.logic.InferenceContext.resolve<0> [InferenceContext.java <206:53 206:56>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.logic.InferenceContext.resolve<1> [InferenceContext.java <189:35 189:55>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.logic.InferenceContext.resolve<1> [InferenceContext.java <190:20 190:40>]
-LOCAL_SYMBOL: com.github.javaparser.symbolsolver.model.typesystem.TypeTransformer.transform<2> [InferenceContext.java <173:67 173:68>]
+LOCAL_SYMBOL: com.github.javaparser.symbolsolver.model.typesystem.TypeTransformer.transform<1> [InferenceContext.java <173:67 173:68>]
-LOCAL_SYMBOL: com.github.javaparser.symbolsolver.model.typesystem.TypeTransformer.transform<2> [InferenceContext.java <173:97 173:98>]
+LOCAL_SYMBOL: com.github.javaparser.symbolsolver.model.typesystem.TypeTransformer.transform<1> [InferenceContext.java <173:97 173:98>]
-LOCAL_SYMBOL: com.github.javaparser.symbolsolver.model.typesystem.TypeTransformer.transform<3> [InferenceContext.java <192:67 192:68>]
+LOCAL_SYMBOL: com.github.javaparser.symbolsolver.model.typesystem.TypeTransformer.transform<2> [InferenceContext.java <192:67 192:68>]
-LOCAL_SYMBOL: com.github.javaparser.symbolsolver.model.typesystem.TypeTransformer.transform<3> [InferenceContext.java <192:81 192:82>]
+LOCAL_SYMBOL: com.github.javaparser.symbolsolver.model.typesystem.TypeTransformer.transform<2> [InferenceContext.java <192:81 192:82>]
-LOCAL_SYMBOL: java.util.function.Predicate<T>.test<12> [InferenceContext.java <80:84 80:84>]
+LOCAL_SYMBOL: java.util.function.Predicate<T>.test<11> [InferenceContext.java <80:84 80:84>]
-LOCAL_SYMBOL: java.util.function.Predicate<T>.test<12> [InferenceContext.java <80:89 80:89>]
+LOCAL_SYMBOL: java.util.function.Predicate<T>.test<11> [InferenceContext.java <80:89 80:89>]
-LOCAL_SYMBOL: java.util.function.Predicate<T>.test<8> [InferenceContext.java <76:81 76:81>]
+LOCAL_SYMBOL: java.util.function.Predicate<T>.test<7> [InferenceContext.java <76:81 76:81>]
-LOCAL_SYMBOL: java.util.function.Predicate<T>.test<8> [InferenceContext.java <76:87 76:87>]
+LOCAL_SYMBOL: java.util.function.Predicate<T>.test<7> [InferenceContext.java <76:87 76:87>]
 COMMENT: comment [InferenceContext.java <1:1 15:3>]
 COMMENT: comment [InferenceContext.java <28:1 30:3>]
 COMMENT: comment [InferenceContext.java <53:5 56:7>]
@@ -396,19 +396,19 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.logic.InferenceVariableType.reg
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.logic.InferenceVariableType.registerEquivalentType<0> [InferenceVariableType.java <53:34 53:37>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.logic.InferenceVariableType.setCorrespondingTp<0> [InferenceVariableType.java <45:61 45:75>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.logic.InferenceVariableType.setCorrespondingTp<0> [InferenceVariableType.java <46:32 46:46>]
-LOCAL_SYMBOL: java.util.function.Consumer<T>.accept<10> [InferenceVariableType.java <106:35 106:37>]
+LOCAL_SYMBOL: java.util.function.Consumer<T>.accept<7> [InferenceVariableType.java <105:112 105:112>]
-LOCAL_SYMBOL: java.util.function.Consumer<T>.accept<10> [InferenceVariableType.java <107:38 107:40>]
+LOCAL_SYMBOL: java.util.function.Consumer<T>.accept<7> [InferenceVariableType.java <106:64 106:64>]
-LOCAL_SYMBOL: java.util.function.Consumer<T>.accept<10> [InferenceVariableType.java <108:81 108:83>]
+LOCAL_SYMBOL: java.util.function.Consumer<T>.accept<8> [InferenceVariableType.java <106:35 106:37>]
-LOCAL_SYMBOL: java.util.function.Consumer<T>.accept<9> [InferenceVariableType.java <105:112 105:112>]
+LOCAL_SYMBOL: java.util.function.Consumer<T>.accept<8> [InferenceVariableType.java <107:38 107:40>]
-LOCAL_SYMBOL: java.util.function.Consumer<T>.accept<9> [InferenceVariableType.java <106:64 106:64>]
+LOCAL_SYMBOL: java.util.function.Consumer<T>.accept<8> [InferenceVariableType.java <108:81 108:83>]
-LOCAL_SYMBOL: java.util.function.Predicate<T>.test<3> [InferenceVariableType.java <127:61 127:61>]
+LOCAL_SYMBOL: java.util.function.Predicate<T>.test<2> [InferenceVariableType.java <127:61 127:61>]
-LOCAL_SYMBOL: java.util.function.Predicate<T>.test<3> [InferenceVariableType.java <127:67 127:67>]
+LOCAL_SYMBOL: java.util.function.Predicate<T>.test<2> [InferenceVariableType.java <127:67 127:67>]
-LOCAL_SYMBOL: java.util.function.Predicate<T>.test<3> [InferenceVariableType.java <127:112 127:112>]
+LOCAL_SYMBOL: java.util.function.Predicate<T>.test<2> [InferenceVariableType.java <127:112 127:112>]
-LOCAL_SYMBOL: java.util.function.Predicate<T>.test<4> [InferenceVariableType.java <104:77 104:77>]
+LOCAL_SYMBOL: java.util.function.Predicate<T>.test<3> [InferenceVariableType.java <104:77 104:77>]
-LOCAL_SYMBOL: java.util.function.Predicate<T>.test<4> [InferenceVariableType.java <104:83 104:83>]
+LOCAL_SYMBOL: java.util.function.Predicate<T>.test<3> [InferenceVariableType.java <104:83 104:83>]
-LOCAL_SYMBOL: java.util.function.Predicate<T>.test<4> [InferenceVariableType.java <104:107 104:107>]
+LOCAL_SYMBOL: java.util.function.Predicate<T>.test<3> [InferenceVariableType.java <104:107 104:107>]
-LOCAL_SYMBOL: java.util.function.Predicate<T>.test<6> [InferenceVariableType.java <105:63 105:63>]
+LOCAL_SYMBOL: java.util.function.Predicate<T>.test<5> [InferenceVariableType.java <105:63 105:63>]
-LOCAL_SYMBOL: java.util.function.Predicate<T>.test<6> [InferenceVariableType.java <105:68 105:68>]
+LOCAL_SYMBOL: java.util.function.Predicate<T>.test<5> [InferenceVariableType.java <105:68 105:68>]
 COMMENT: comment [InferenceVariableType.java <1:1 15:3>]
 COMMENT: comment [InferenceVariableType.java <29:1 33:3>]
 COMMENT: comment [InferenceVariableType.java <85:13 85:46>]
@@ -382,25 +382,25 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.model.declarations.ReferenceTyp
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration.hasVisibleField<0> [ReferenceTypeDeclaration.java <105:75 105:78>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration.isAssignableBy<0> [ReferenceTypeDeclaration.java <168:33 168:36>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.model.declarations.ReferenceTypeDeclaration.isAssignableBy<0> [ReferenceTypeDeclaration.java <182:53 182:57>]
-LOCAL_SYMBOL: java.util.function.Predicate<T>.test<1> [ReferenceTypeDeclaration.java <120:25 120:25>]
+LOCAL_SYMBOL: java.util.function.Predicate<T>.test<0> [ReferenceTypeDeclaration.java <120:25 120:25>]
-LOCAL_SYMBOL: java.util.function.Predicate<T>.test<1> [ReferenceTypeDeclaration.java <120:30 120:30>]
+LOCAL_SYMBOL: java.util.function.Predicate<T>.test<0> [ReferenceTypeDeclaration.java <120:30 120:30>]
-LOCAL_SYMBOL: java.util.function.Predicate<T>.test<1> [ReferenceTypeDeclaration.java <120:64 120:64>]
+LOCAL_SYMBOL: java.util.function.Predicate<T>.test<0> [ReferenceTypeDeclaration.java <120:64 120:64>]
-LOCAL_SYMBOL: java.util.function.Predicate<T>.test<1> [ReferenceTypeDeclaration.java <128:47 128:48>]
+LOCAL_SYMBOL: java.util.function.Predicate<T>.test<0> [ReferenceTypeDeclaration.java <128:47 128:48>]
-LOCAL_SYMBOL: java.util.function.Predicate<T>.test<1> [ReferenceTypeDeclaration.java <128:54 128:55>]
+LOCAL_SYMBOL: java.util.function.Predicate<T>.test<0> [ReferenceTypeDeclaration.java <128:54 128:55>]
-LOCAL_SYMBOL: java.util.function.Predicate<T>.test<1> [ReferenceTypeDeclaration.java <135:47 135:48>]
+LOCAL_SYMBOL: java.util.function.Predicate<T>.test<0> [ReferenceTypeDeclaration.java <135:47 135:48>]
-LOCAL_SYMBOL: java.util.function.Predicate<T>.test<1> [ReferenceTypeDeclaration.java <135:53 135:54>]
+LOCAL_SYMBOL: java.util.function.Predicate<T>.test<0> [ReferenceTypeDeclaration.java <135:53 135:54>]
-LOCAL_SYMBOL: java.util.function.Predicate<T>.test<1> [ReferenceTypeDeclaration.java <142:47 142:48>]
+LOCAL_SYMBOL: java.util.function.Predicate<T>.test<0> [ReferenceTypeDeclaration.java <142:47 142:48>]
-LOCAL_SYMBOL: java.util.function.Predicate<T>.test<1> [ReferenceTypeDeclaration.java <142:53 142:54>]
+LOCAL_SYMBOL: java.util.function.Predicate<T>.test<0> [ReferenceTypeDeclaration.java <142:53 142:54>]
-LOCAL_SYMBOL: java.util.function.Predicate<T>.test<2> [ReferenceTypeDeclaration.java <98:52 98:52>]
+LOCAL_SYMBOL: java.util.function.Predicate<T>.test<1> [ReferenceTypeDeclaration.java <98:52 98:52>]
-LOCAL_SYMBOL: java.util.function.Predicate<T>.test<2> [ReferenceTypeDeclaration.java <98:57 98:57>]
+LOCAL_SYMBOL: java.util.function.Predicate<T>.test<1> [ReferenceTypeDeclaration.java <98:57 98:57>]
-LOCAL_SYMBOL: java.util.function.Predicate<T>.test<2> [ReferenceTypeDeclaration.java <105:51 105:51>]
+LOCAL_SYMBOL: java.util.function.Predicate<T>.test<1> [ReferenceTypeDeclaration.java <105:51 105:51>]
-LOCAL_SYMBOL: java.util.function.Predicate<T>.test<2> [ReferenceTypeDeclaration.java <105:56 105:56>]
+LOCAL_SYMBOL: java.util.function.Predicate<T>.test<1> [ReferenceTypeDeclaration.java <105:56 105:56>]
-LOCAL_SYMBOL: java.util.function.Predicate<T>.test<2> [ReferenceTypeDeclaration.java <200:52 200:53>]
+LOCAL_SYMBOL: java.util.function.Predicate<T>.test<1> [ReferenceTypeDeclaration.java <200:52 200:53>]
-LOCAL_SYMBOL: java.util.function.Predicate<T>.test<2> [ReferenceTypeDeclaration.java <200:58 200:59>]
+LOCAL_SYMBOL: java.util.function.Predicate<T>.test<1> [ReferenceTypeDeclaration.java <200:58 200:59>]
-LOCAL_SYMBOL: java.util.function.Predicate<T>.test<3> [ReferenceTypeDeclaration.java <74:80 74:80>]
+LOCAL_SYMBOL: java.util.function.Predicate<T>.test<2> [ReferenceTypeDeclaration.java <74:80 74:80>]
-LOCAL_SYMBOL: java.util.function.Predicate<T>.test<3> [ReferenceTypeDeclaration.java <74:85 74:85>]
+LOCAL_SYMBOL: java.util.function.Predicate<T>.test<2> [ReferenceTypeDeclaration.java <74:85 74:85>]
-LOCAL_SYMBOL: java.util.function.Predicate<T>.test<3> [ReferenceTypeDeclaration.java <86:79 86:79>]
+LOCAL_SYMBOL: java.util.function.Predicate<T>.test<2> [ReferenceTypeDeclaration.java <86:79 86:79>]
-LOCAL_SYMBOL: java.util.function.Predicate<T>.test<3> [ReferenceTypeDeclaration.java <86:84 86:84>]
+LOCAL_SYMBOL: java.util.function.Predicate<T>.test<2> [ReferenceTypeDeclaration.java <86:84 86:84>]
 COMMENT: comment [ReferenceTypeDeclaration.java <14:1 16:3>]
 COMMENT: comment [ReferenceTypeDeclaration.java <24:5 24:7>]
 COMMENT: comment [ReferenceTypeDeclaration.java <25:5 25:17>]
@@ -185,10 +185,10 @@ LOCAL_SYMBOL: com.github.javaparser.symbolsolver.model.declarations.TypeDeclarat
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration.getInternalType<1> [TypeDeclaration.java <50:16 50:19>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration.hasInternalType<0> [TypeDeclaration.java <58:44 58:47>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.model.declarations.TypeDeclaration.hasInternalType<0> [TypeDeclaration.java <59:79 59:82>]
-LOCAL_SYMBOL: java.util.function.Predicate<T>.test<2> [TypeDeclaration.java <59:55 59:55>]
+LOCAL_SYMBOL: java.util.function.Predicate<T>.test<1> [TypeDeclaration.java <59:55 59:55>]
-LOCAL_SYMBOL: java.util.function.Predicate<T>.test<2> [TypeDeclaration.java <59:60 59:60>]
+LOCAL_SYMBOL: java.util.function.Predicate<T>.test<1> [TypeDeclaration.java <59:60 59:60>]
-LOCAL_SYMBOL: java.util.function.Predicate<T>.test<3> [TypeDeclaration.java <49:54 49:54>]
+LOCAL_SYMBOL: java.util.function.Predicate<T>.test<2> [TypeDeclaration.java <49:54 49:54>]
-LOCAL_SYMBOL: java.util.function.Predicate<T>.test<3> [TypeDeclaration.java <49:59 49:59>]
+LOCAL_SYMBOL: java.util.function.Predicate<T>.test<2> [TypeDeclaration.java <49:59 49:59>]
 COMMENT: comment [TypeDeclaration.java <1:1 15:3>]
 COMMENT: comment [TypeDeclaration.java <24:1 29:3>]
 COMMENT: comment [TypeDeclaration.java <32:5 32:7>]
@@ -1100,12 +1100,12 @@ LOCAL_SYMBOL: java.util.function.Function<T, R>.apply<4> [ReferenceType.java <39
 LOCAL_SYMBOL: java.util.function.Function<T, R>.apply<4> [ReferenceType.java <395:55 395:56>]
 LOCAL_SYMBOL: java.util.function.Function<T, R>.apply<7> [ReferenceType.java <452:138 452:142>]
 LOCAL_SYMBOL: java.util.function.Function<T, R>.apply<7> [ReferenceType.java <452:147 452:151>]
-LOCAL_SYMBOL: java.util.function.Predicate<T>.test<1> [ReferenceType.java <249:25 249:26>]
+LOCAL_SYMBOL: java.util.function.Predicate<T>.test<0> [ReferenceType.java <249:25 249:26>]
-LOCAL_SYMBOL: java.util.function.Predicate<T>.test<1> [ReferenceType.java <249:31 249:32>]
+LOCAL_SYMBOL: java.util.function.Predicate<T>.test<0> [ReferenceType.java <249:31 249:32>]
-LOCAL_SYMBOL: java.util.function.Predicate<T>.test<1> [ReferenceType.java <255:25 255:26>]
+LOCAL_SYMBOL: java.util.function.Predicate<T>.test<0> [ReferenceType.java <255:25 255:26>]
-LOCAL_SYMBOL: java.util.function.Predicate<T>.test<1> [ReferenceType.java <255:31 255:32>]
+LOCAL_SYMBOL: java.util.function.Predicate<T>.test<0> [ReferenceType.java <255:31 255:32>]
-LOCAL_SYMBOL: java.util.function.Predicate<T>.test<4> [ReferenceType.java <240:28 240:28>]
+LOCAL_SYMBOL: java.util.function.Predicate<T>.test<3> [ReferenceType.java <240:28 240:28>]
-LOCAL_SYMBOL: java.util.function.Predicate<T>.test<4> [ReferenceType.java <240:33 240:33>]
+LOCAL_SYMBOL: java.util.function.Predicate<T>.test<3> [ReferenceType.java <240:33 240:33>]
 COMMENT: comment [ReferenceType.java <1:1 15:3>]
 COMMENT: comment [ReferenceType.java <32:1 37:3>]
 COMMENT: comment [ReferenceType.java <40:5 40:6>]
@@ -116,8 +116,8 @@ LOCAL_SYMBOL: TypeParameterValueProvider.java<38:20> [TypeParameterValueProvider
 LOCAL_SYMBOL: TypeParameterValueProvider.java<38:20> [TypeParameterValueProvider.java <40:13 40:13>]
 LOCAL_SYMBOL: TypeParameterValueProvider.java<43:37> [TypeParameterValueProvider.java <43:37 43:37>]
 LOCAL_SYMBOL: TypeParameterValueProvider.java<43:37> [TypeParameterValueProvider.java <45:9 45:9>]
-LOCAL_SYMBOL: com.github.javaparser.symbolsolver.model.typesystem.TypeTransformer.transform<4> [TypeParameterValueProvider.java <44:67 44:68>]
+LOCAL_SYMBOL: com.github.javaparser.symbolsolver.model.typesystem.TypeTransformer.transform<3> [TypeParameterValueProvider.java <44:67 44:68>]
-LOCAL_SYMBOL: com.github.javaparser.symbolsolver.model.typesystem.TypeTransformer.transform<4> [TypeParameterValueProvider.java <44:109 44:110>]
+LOCAL_SYMBOL: com.github.javaparser.symbolsolver.model.typesystem.TypeTransformer.transform<3> [TypeParameterValueProvider.java <44:109 44:110>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.model.typesystem.parametrization.TypeParameterValueProvider.getGenericParameterByName<0> [TypeParameterValueProvider.java <50:53 50:56>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.model.typesystem.parametrization.TypeParameterValueProvider.typeParamValue<0> [TypeParameterValueProvider.java <18:60 18:83>]
 LOCAL_SYMBOL: com.github.javaparser.symbolsolver.model.typesystem.parametrization.TypeParameterValueProvider.useThisTypeParametersOnTheGivenType<0> [TypeParameterValueProvider.java <24:59 24:62>]
@@ -1,6 +1,6 @@
 function(InstallQtModule module qtversion)
-	get_filename_component(realpath $ENV{QT_DIR}/lib/libQt5${module}.so.${qtversion} REALPATH)
+	get_filename_component(realpath $ENV{Qt5_DIR}/lib/libQt5${module}.so.${qtversion} REALPATH)
 	INSTALL(FILES
 		${realpath}
 		DESTINATION Sourcetrail/lib
@@ -55,10 +55,12 @@ function(AddSharedToComponent)
 		PATTERN "python/SourcetrailPythonIndexer" EXCLUDE
 	)
-	INSTALL(PROGRAMS
+	if (BUILD_PYTHON_LANGUAGE_PACKAGE)
-		${CMAKE_SOURCE_DIR}/bin/app/data/python/SourcetrailPythonIndexer
+		INSTALL(PROGRAMS
-		DESTINATION Sourcetrail/data/python
+			${CMAKE_SOURCE_DIR}/bin/app/data/python/SourcetrailPythonIndexer
-	)
+			DESTINATION Sourcetrail/data/python
 		)
 	endif()
    InstallQt(5)
@@ -97,7 +99,7 @@ function(AddSharedToComponent)
 	GetAndInstallLibrary(libcrypto.so 1)
 	INSTALL(DIRECTORY
-		$ENV{QT_DIR}/plugins/platforms
+		$ENV{Qt5_DIR}/plugins/platforms
 		DESTINATION Sourcetrail/lib
 	)
@@ -29,18 +29,21 @@ if(EXISTS "${CMAKE_SOURCE_DIR}/.git")
        OUTPUT_VARIABLE GIT_VERSION_NUMBER
        OUTPUT_STRIP_TRAILING_WHITESPACE
    )
    string(REGEX REPLACE "^([0-9]+)\\..*" "\\1" VERSION_YEAR "${GIT_VERSION_NUMBER}")
    string(REGEX REPLACE "^[0-9]+\\.([0-9]+).*" "\\1" VERSION_MINOR "${GIT_VERSION_NUMBER}")
    string(REGEX REPLACE "^[0-9]+\\.[0-9]+-([0-9]+).*" "\\1" VERSION_COMMIT "${GIT_VERSION_NUMBER}")
 else(EXISTS "${CMAKE_SOURCE_DIR}/.git")
    set(GIT_BRANCH "")
    set(GIT_COMMIT_HASH "")
    set(GIT_VERSION_NUMBER "")
    set(VERSION_YEAR "0")
    set(VERSION_MINOR "0")
    set(VERSION_COMMIT "0")
    set(BUILD_TYPE "")
 endif(EXISTS "${CMAKE_SOURCE_DIR}/.git")
 string(REGEX REPLACE "^([0-9]+)\\..*" "\\1" VERSION_YEAR "${GIT_VERSION_NUMBER}")
 string(REGEX REPLACE "^[0-9]+\\.([0-9]+).*" "\\1" VERSION_MINOR "${GIT_VERSION_NUMBER}")
 string(REGEX REPLACE "^[0-9]+\\.[0-9]+-([0-9]+).*" "\\1" VERSION_COMMIT "${GIT_VERSION_NUMBER}")
 set(VERSION_STRING "${VERSION_YEAR}.${VERSION_MINOR}.${VERSION_COMMIT}")
 message(STATUS "Version: ${VERSION_STRING}")
@@ -1,155 +0,0 @@
 FROM toopher/centos-i386:centos6
 MAINTAINER "Andreas Stallinger" <astallinger@coati.io>
 WORKDIR /opt
 RUN rpm --rebuilddb; yum install -y yum-plugin-ovl ca-certificates;
 RUN yum -y install wget && \
 wget https://copr.fedorainfracloud.org/coprs/mlampe/devtoolset-6/repo/\
 epel-6/mlampe-devtoolset-6-epel-6.repo -O /etc/yum.repos.d/mlampe-devtoolset.repo && \
 yum -y update && \
 yum -y install devtoolset-6-gcc devtoolset-6-gcc-c++ devtoolset-6-binutils \
       wget tar bzip2 git libtool which fuse fuse-devel libpng-devel automake \
       glibc-headers libstdc++-devel gcc-c++ freetype-devel fontconfig-devel \
       ibxml2-devel libstdc++-devel libXrender-devel patch xcb-util-keysyms-devel \
       libXi-devel libudev-devel openssl-devel sqlite-devel \
       gperftools gperf libicu-devel boost-devel \
       libxslt-devel docbook-style-xsl.noarch python27 \
       xz mesa-libEGL-devel mesa-libGL-devel glib-devel \
       java-1.8.0-openjdk-devel ccache re2c ImageMagick vim lftp unzip && \
 yum clean all
 # CMake and Maven
 RUN wget https://cmake.org/files/v3.8/cmake-3.8.2.tar.gz && \
 tar xf cmake-3.8.2.tar.gz && \
 cd cmake-3.8.2 && ./bootstrap && \
 make && make install && \
 cd .. && rm cmake-3.8.2.tar.gz && \
 rm -rf cmake-3.8.2 && \
 wget https://archive.apache.org/dist/maven/maven-3/3.5.0/binaries/apache-maven-3.5.0-bin.tar.gz && \
 tar xzf apache-maven-3.5.0-bin.tar.gz && \
 ln -s apache-maven-3.5.0 maven && \
 rm apache-maven-3.5.0-bin.tar.gz
 ENV M2_HOME=/opt/maven
 ENV PATH=${M2_HOME}/bin:${PATH}
 # Install Qt
 ARG QVERSION_SHORT=5.10
 ARG QTVERSION=5.10.1
 # Install Qt
 RUN mkdir -p /qt && cd /qt && \
 wget http://download.qt.io/archive/qt/${QVERSION_SHORT}/${QTVERSION}/\
 single/qt-everywhere-src-${QTVERSION}.tar.xz && \
 tar xvf qt-everywhere-src-${QTVERSION}.tar.xz && \
 ln -sf /opt/rh/devtoolset-6/root/usr/bin/g++ /usr/bin/g++ && \
 ln -sf /opt/rh/devtoolset-6/root/usr/bin/c++ /usr/bin/c++ && \
 cd /qt/qt-everywhere-src-${QTVERSION} && \
 ./configure -v \
 -prefix /opt/qt${QTVERSION} \
 -skip qtgamepad \
 -platform linux-g++ \
 -qt-pcre \
 -qt-xcb \
 -qt-xkbcommon \
 -no-pch \
 -xkb-config-root /usr/share/X11/xkb \
 -no-use-gold-linker \
 -release \
 -no-compile-examples \
 -confirm-license \
 -opensource \
 -nomake examples \
 -nomake tests \
 -skip sensors \
 -skip webchannel \
 -skip webengine \
 -skip 3d \
 -skip doc \
 -skip multimedia \
 -skip tools \
 -skip connectivity \
 -skip androidextras \
 -skip canvas3d && \
 make -j8 && \
 make -j8 install && rm -Rf /qt
 ## set env
 ENV CXX=g++ \
 CC=gcc \
 DEVTOOLSET=/opt/rh/devtoolset-6/root/usr/
 RUN wget https://www.python.org/ftp/python/2.7.13/Python-2.7.13.tgz && \
 tar xzf Python-2.7.13.tgz && \
 cd Python-2.7.13 && \
 ./configure && \
 make altinstall
 ## Install llvm
 ARG LLVM_VERSION=8.0.0
 RUN alias python=/usr/local/bin/python2.7 && mkdir -p /llvm && cd /llvm && \
 wget http://llvm.org/releases/${LLVM_VERSION}/llvm-${LLVM_VERSION}.src.tar.xz && \
 tar xf llvm-${LLVM_VERSION}.src.tar.xz && \
 cd llvm-${LLVM_VERSION}.src && pwd && \
 cd tools && pwd && \
 wget http://llvm.org/releases/${LLVM_VERSION}/cfe-${LLVM_VERSION}.src.tar.xz && \
 tar xf cfe-${LLVM_VERSION}.src.tar.xz && \
 cd /llvm/llvm-${LLVM_VERSION}.src/projects && \
 wget http://llvm.org/releases/${LLVM_VERSION}/compiler-rt-${LLVM_VERSION}.src.tar.xz && \
 tar xf compiler-rt-${LLVM_VERSION}.src.tar.xz && \
 . /opt/rh/devtoolset-6/enable && \
 cd /llvm/llvm-${LLVM_VERSION}.src && mkdir -p build && cd build && \
 cmake .. -DCMAKE_INSTALL_PREFIX=/opt/llvm/ \
 -DCMAKE_BUILD_TYPE=Release \
 -DLLVM_ENABLE_RTTI=ON \
 && make -j8 install && rm -Rf /llvm
 #COPY scripts/install-llvm.sh /opt/
 #RUN ./install-llvm.sh
 ## Boost
 ARG BOOST_MAJOR=1
 ARG BOOST_MINOR=68
 ARG BOOST_PATCH=0
 ENV BOOST_VERSION=${BOOST_MAJOR}.${BOOST_MINOR}.${BOOST_PATCH} \
 BOOST_VERSION_UNDERSCORE=${BOOST_MAJOR}_${BOOST_MINOR}_${BOOST_PATCH}
 RUN wget http://downloads.sourceforge.net/project/boost/boost/${BOOST_VERSION}/boost_${BOOST_VERSION_UNDERSCORE}.tar.gz && \
 tar -xzf boost_${BOOST_VERSION_UNDERSCORE}.tar.gz && cd boost_${BOOST_VERSION_UNDERSCORE} && \
 ./bootstrap.sh --with-libraries=filesystem,program_options,system,date_time --prefix=/opt/boost && \
 ./b2 install cxxstd=14 --link=static --variant=release --threading=multi --runtime-link=static --cxxflags="-std=c++14 -fPIC" && \
 cd .. && rm boost_${BOOST_VERSION_UNDERSCORE}.tar.gz && rm boost_${BOOST_VERSION_UNDERSCORE} -r
 ## Ninja
 RUN git clone https://github.com/martine/ninja.git && \
 cd ninja && \
 git checkout release && \
 ./configure.py --bootstrap && \
 mv ninja /usr/bin/ && \
 cd .. && rm -rf ninja
 #add user
 RUN useradd builder
 # Make sure the above SCLs are already enabled
 #ENTRYPOINT ["/bin/bash", "-c", "source", "/opt/rh/devtoolset-6/enable"]
 #CMD ["/bin/bash", "-c", "source", "/opt/rh/devtoolset-6/enable"]
 RUN GCC_VERSION=$(g++ -dumpversion) && \
 ln -s /opt/rh/devtoolset-6/root/usr/include/c++/${GCC_VERSION} /usr/include/c++/${GCC_VERSION} && \
 ln -s /opt/rh/devtoolset-6/root/usr/lib/gcc/i686-redhat-linux/${GCC_VERSION} \
 /usr/lib/gcc/i686-redhat-linux/${GCC_VERSION} && \
 echo "source /opt/rh/devtoolset-6/enable" >> /etc/bashrc
 ENV CXX=/opt/rh/devtoolset-6/root/usr/bin/g++ \
 CC=/opt/rh/devtoolset-6/root/usr/bin/gcc \
 JAVA_HOME=/usr/lib/jvm/java-openjdk \
 LLVM_DIR=/opt/llvm \
 BOOST_DIR=/opt/boost \
 QT_DIR=/opt/qt${QTVERSION}
 WORKDIR /home/builder
 USER builder
@@ -1,13 +0,0 @@
 32 bit Builder for Sourcetrail
 ==============================
 based on centos 6
 * devtoolset4 (gcc)
 * cmake 3.8.2
 * maven 3.5.0
 * qt 5.9.1
 * llvm 5.0.0
 * boost 1.64.0
 * ninja (release branch Aug2017)
 * cxxtext 4.4
@@ -1,40 +0,0 @@
 FROM centos:6
 MAINTAINER "Andreas Stallinger" <astallinger@coati.io>
 WORKDIR /opt
 RUN rpm --rebuilddb; yum install -y yum-plugin-ovl ca-certificates;
 RUN yum -y install centos-release-scl epel-release && \
 yum -y install wget devtoolset-6-gcc devtoolset-6-gcc-c++ devtoolset-6-binutils \
 	wget tar bzip2 git libtool which fuse fuse-devel libpng-devel automake \
 	glibc-headers libstdc++-devel gcc-c++ freetype-devel fontconfig-devel\
 	libxml2-devel libstdc++-devel libXrender-devel patch xcb-util-keysyms-devel \
 	libXi-devel libudev-devel.x86_64 openssl-devel sqlite-devel.x86_64 \
 	gperftools.x86_64 gperf.x86_64 libicu-devel.x86_64 boost-devel.x86_64 \
 	libxslt-devel.x86_64 python27.x86_64 \
 	xz mesa-libEGL-devel mesa-libGL-devel glib-devel \
 	java-1.8.0-openjdk-devel re2c ccache ImageMagick vim lftp unzip && \
 yum clean all
 # CMake
 RUN wget https://cmake.org/files/v3.8/cmake-3.8.2-Linux-x86_64.tar.gz && \
 tar xf cmake-3.8.2-Linux-x86_64.tar.gz && \
 cd cmake-3.8.2-Linux-x86_64 && cp -R * / && \
 cd .. && rm -rf cmake-3.8.2-Linux-x86_64 && \
 rm cmake-3.8.2-Linux-x86_64.tar.gz && \
 wget https://archive.apache.org/dist/maven/maven-3/3.5.0/binaries/apache-maven-3.5.0-bin.tar.gz && \
 tar xzf apache-maven-3.5.0-bin.tar.gz && \
 ln -s apache-maven-3.5.0 maven && \
 rm apache-maven-3.5.0-bin.tar.gz
 ENV M2_HOME=/opt/maven \
 JAVA_HOME=/usr/lib/jvm/java-openjdk \
 DEVTOOLSET=/opt/rh/devtoolset-6/root/usr/
 ENV PATH=${M2_HOME}/bin:${PATH}
 # Make sure the above SCLs are already enabled
 ENTRYPOINT ["/usr/bin/scl", "enable", "python27", "devtoolset-6", "git", "--"]
 CMD ["/usr/bin/scl", "enable", "python27", "devtoolset-6", "git", "--", "/bin/bash"]
@@ -1,22 +0,0 @@
 FROM coatisoftware/centos6_64_qt_llvm:qt591-llvm401
 MAINTAINER "Andreas Stallinger" <astallinger@coati.io>
 USER root
 WORKDIR /opt
 RUN yum install -y yum install xorg-x11-drv-nouveau.x86_64 firefox gdb xkeyboard-config p7zip && yum clean all
 ENV QT_XKB_CONFIG_ROOT="/usr/share/X11/xkb:$QT_XKB_CONFIG_ROOT"
 RUN export uid=0 gid=0
 RUN dbus-uuidgen > /var/lib/dbus/machine-id && \
 wget http://download.qt.io/official_releases/qtcreator/4.2/4.2.0/installer_source/linux_gcc_64_rhel66/qtcreator.7z && \
 7za x qtcreator.7z -o/usr/local && \
 rm qtcreator.7z
 WORKDIR /home/builder
 USER builder
 CMD /usr/bin/firefox
@@ -1,36 +1,39 @@
-FROM coatisoftware/centos6_64_base
+FROM coatisoftware/centos7_64_base
-MAINTAINER "Andreas Stallinger" <astallinger@coati.io>
+MAINTAINER "Eberhard Graether" <egraether@coati.io>
 RUN make --version
 RUN cmake --version
 RUN mvn --version
 RUN ninja --version
 WORKDIR /opt
 ## set env
-ARG QVERSION_SHORT=5.10
+ARG QTVERSION_SHORT=5.12
-ARG QTVERSION=5.10.1
+ARG QTVERSION=5.12.6
-ENV QT_DIR=/opt/qt${QTVERSION} \
+ENV Qt5_DIR=/opt/qt${QTVERSION} \
-LLVM_DIR=/opt/llvm \
+Clang_DIR=/opt/llvm \
-BOOST_DIR=/opt/boost \
+BOOST_ROOT=/opt/boost \
-LD_LIBRARY_PATH=$QT_DIR/lib/
+LD_LIBRARY_PATH=$Qt5_DIR/lib/
-# Install Qt
+# Qt
 RUN mkdir -p /qt && cd /qt && \
-wget http://download.qt.io/archive/qt/${QVERSION_SHORT}/${QTVERSION}/\
+wget http://download.qt.io/archive/qt/${QTVERSION_SHORT}/${QTVERSION}/\
 single/qt-everywhere-src-${QTVERSION}.tar.xz && \
 tar xvf qt-everywhere-src-${QTVERSION}.tar.xz && \
-ln -sf /opt/rh/devtoolset-6/root/usr/bin/g++ /usr/bin/g++ && \
+ln -sf /opt/rh/devtoolset-7/root/usr/bin/g++ /usr/bin/g++ && \
-ln -sf /opt/rh/devtoolset-6/root/usr/bin/c++ /usr/bin/c++ && \
+ln -sf /opt/rh/devtoolset-7/root/usr/bin/c++ /usr/bin/c++ && \
 cd /qt/qt-everywhere-src-${QTVERSION} && \
 ./configure -v \
 -prefix /opt/qt${QTVERSION} \
 -skip qtgamepad \
 -platform linux-g++ \
 #-no-rpath \
 -qt-pcre \
 -qt-xcb \
-qt-xkbcommon \
+-xkbcommon \
 -no-pch \
 -xkb-config-root  /usr/share/X11/xkb \
 -no-use-gold-linker \
 -release \
 -no-compile-examples \
@@ -51,8 +54,8 @@ cd /qt/qt-everywhere-src-${QTVERSION} && \
 make -j8 && \
 make -j8 install && rm -Rf /qt
-## Install llvm
+# LLVM/Clang
-ARG LLVM_VERSION=8.0.0
+ARG LLVM_VERSION=9.0.0
 RUN mkdir -p /llvm && cd /llvm && \
 wget http://llvm.org/releases/${LLVM_VERSION}/llvm-${LLVM_VERSION}.src.tar.xz && \
 tar xvf llvm-${LLVM_VERSION}.src.tar.xz && \
@@ -61,7 +64,7 @@ cd tools && \
 wget http://llvm.org/releases/${LLVM_VERSION}/cfe-${LLVM_VERSION}.src.tar.xz && \
 tar xvf cfe-${LLVM_VERSION}.src.tar.xz && \
 . /opt/rh/python27/enable && \
-. /opt/rh/devtoolset-6/enable && \
+. /opt/rh/devtoolset-7/enable && \
 python --version && \
 cd /llvm/llvm-${LLVM_VERSION}.src && mkdir -p build && cd build && \
 cmake .. -DCMAKE_INSTALL_PREFIX=/opt/llvm/ \
@@ -71,9 +74,9 @@ cmake .. -DCMAKE_INSTALL_PREFIX=/opt/llvm/ \
 WORKDIR /opt
-## Boost
+# Boost
 ARG BOOST_MAJOR=1
-ARG BOOST_MINOR=68
+ARG BOOST_MINOR=67
 ARG BOOST_PATCH=0
 ENV BOOST_VERSION=${BOOST_MAJOR}.${BOOST_MINOR}.${BOOST_PATCH} \
 BOOST_VERSION_UNDERSCORE=${BOOST_MAJOR}_${BOOST_MINOR}_${BOOST_PATCH}
@@ -84,21 +87,7 @@ tar -xzf boost_${BOOST_VERSION_UNDERSCORE}.tar.gz && cd boost_${BOOST_VERSION_UN
 ./b2 install cxxstd=14 --link=static --variant=release --threading=multi --runtime-link=static --cxxflags="-std=c++14 -fPIC" && \
 cd .. && rm boost_${BOOST_VERSION_UNDERSCORE}.tar.gz && rm boost_${BOOST_VERSION_UNDERSCORE} -r
 ## Ninja
 RUN git clone https://github.com/martine/ninja.git && \
 cd ninja && \
 git checkout release && \
 ./configure.py --bootstrap && \
 mv ninja /usr/bin/ && \
 cd .. && rm -rf ninja
 #add user
 RUN useradd -u 1000 builder
 # Make sure the above SCLs are already enabled
 ENTRYPOINT ["/usr/bin/scl", "enable", "python27", "devtoolset-6", "--"]
 CMD ["/usr/bin/scl", "enable", "python27", "devtoolset-6", "--", "/bin/bash"]
 WORKDIR /home/builder
 USER builder
@@ -0,0 +1,52 @@
 FROM centos:7
 MAINTAINER "Andreas Stallinger" <astallinger@coati.io>
 WORKDIR /opt
 RUN rpm --rebuilddb; yum install -y yum-plugin-ovl ca-certificates;
 RUN yum -y install centos-release-scl epel-release && \
 yum -y install make wget devtoolset-7-gcc devtoolset-7-gcc-c++ devtoolset-7-binutils \
 	wget tar bzip2 git libtool which fuse fuse-devel libpng-devel automake \
 	glibc-headers libstdc++-devel gcc-c++ freetype-devel fontconfig-devel\
 	libxml2-devel libstdc++-devel libXrender libXrender-devel patch xcb-util-keysyms xcb-util-keysyms-devel \
 	libxcb libxcb-devel xcb-util xcb-util-devel xcb-util-wm xcb-util-wm-devel xcb-util xcb-util-devel \
 	libxkbcommon libxkbcommon-devel libXi-devel libudev-devel.x86_64 openssl-devel sqlite-devel.x86_64 \
 	gperftools.x86_64 gperf.x86_64 libicu-devel.x86_64 boost-devel.x86_64 \
 	libxslt-devel.x86_64 python27.x86_64 \
 	xz mesa-libEGL-devel mesa-libGL-devel glib-devel \
 	java-1.8.0-openjdk-devel re2c ccache ImageMagick vim lftp unzip && \
 yum clean all
 # CMake
 RUN wget https://cmake.org/files/v3.8/cmake-3.8.2-Linux-x86_64.tar.gz && \
 tar xf cmake-3.8.2-Linux-x86_64.tar.gz && \
 cp -R cmake-3.8.2-Linux-x86_64/* /usr/local/ && cmake --version && \
 rm -rf cmake-3.8.2-Linux-x86_64 && \
 rm cmake-3.8.2-Linux-x86_64.tar.gz
 # Maven
 RUN wget https://archive.apache.org/dist/maven/maven-3/3.5.0/binaries/apache-maven-3.5.0-bin.tar.gz && \
 tar xzf apache-maven-3.5.0-bin.tar.gz && \
 ln -s apache-maven-3.5.0 maven && \
 rm apache-maven-3.5.0-bin.tar.gz
 # Ninja
 RUN git clone https://github.com/martine/ninja.git && \
 cd ninja && \
 git checkout release && \
 ./configure.py --bootstrap && \
 mv ninja /usr/local/bin/ && \
 cd .. && rm -rf ninja
 ENV M2_HOME=/opt/maven \
 JAVA_HOME=/usr/lib/jvm/java-openjdk \
 DEVTOOLSET=/opt/rh/devtoolset-7/root/usr/
 ENV PATH=${M2_HOME}/bin:${PATH}
 RUN make --version
 RUN cmake --version
 RUN mvn --version
 RUN ninja --version
@@ -21,7 +21,7 @@ VERSION_STRING="${VERSION_STRING//_/.}"
 VERSION_STRING="${VERSION_STRING:2}"
 echo "installer version is $VERSION_STRING"
-PRODUCT_GUID=$(cmd.exe /c "VsDevCmd.bat & uuidgen")
+PRODUCT_GUID=$(cmd.exe /c "uuidgen")
 echo "$WIN_ARCH product guid is $PRODUCT_GUID"
 rm -rf build
@@ -48,100 +48,100 @@
 		<dependency>
 			<groupId>org.eclipse.core</groupId>
 			<artifactId>org.eclipse.core.commands</artifactId>
-			<version>3.9.200</version>
+			<version>3.9.500</version>
 			<scope>system</scope>
-			<systemPath>${basedir}/lib/org.eclipse.core.commands-3.9.200.jar</systemPath>
+			<systemPath>${basedir}/lib/org.eclipse.core.commands-3.9.500.jar</systemPath>
 		</dependency>
 		<dependency>
 			<groupId>org.eclipse.core</groupId>
 			<artifactId>org.eclipse.core.contenttype</artifactId>
-			<version>3.7.200</version>
+			<version>3.7.400</version>
 			<scope>system</scope>
-			<systemPath>${basedir}/lib/org.eclipse.core.contenttype-3.7.200.jar</systemPath>
+			<systemPath>${basedir}/lib/org.eclipse.core.contenttype-3.7.400.jar</systemPath>
 		</dependency>
 		<dependency>
 			<groupId>org.eclipse.core</groupId>
 			<artifactId>org.eclipse.core.expressions</artifactId>
-			<version>3.6.200</version>
+			<version>3.6.500</version>
 			<scope>system</scope>
-			<systemPath>${basedir}/lib/org.eclipse.core.expressions-3.6.200.jar</systemPath>
+			<systemPath>${basedir}/lib/org.eclipse.core.expressions-3.6.500.jar</systemPath>
 		</dependency>
 		<dependency>
 			<groupId>org.eclipse.core</groupId>
 			<artifactId>org.eclipse.core.filesystem</artifactId>
-			<version>1.7.200</version>
+			<version>1.7.500</version>
 			<scope>system</scope>
-			<systemPath>${basedir}/lib/org.eclipse.core.filesystem-1.7.200.jar</systemPath>
+			<systemPath>${basedir}/lib/org.eclipse.core.filesystem-1.7.500.jar</systemPath>
 		</dependency>
 		<dependency>
 			<groupId>org.eclipse.core</groupId>
 			<artifactId>org.eclipse.core.jobs</artifactId>
-			<version>3.10.200</version>
+			<version>3.10.500</version>
 			<scope>system</scope>
-			<systemPath>${basedir}/lib/org.eclipse.core.jobs-3.10.200.jar</systemPath>
+			<systemPath>${basedir}/lib/org.eclipse.core.jobs-3.10.500.jar</systemPath>
 		</dependency>
 		<dependency>
 			<groupId>org.eclipse.core</groupId>
 			<artifactId>org.eclipse.core.resources</artifactId>
-			<version>3.13.200</version>
+			<version>3.13.500</version>
 			<scope>system</scope>
-			<systemPath>${basedir}/lib/org.eclipse.core.resources-3.13.200.jar</systemPath>
+			<systemPath>${basedir}/lib/org.eclipse.core.resources-3.13.500.jar</systemPath>
 		</dependency>
 		<dependency>
 			<groupId>org.eclipse.core</groupId>
 			<artifactId>org.eclipse.core.runtime</artifactId>
-			<version>3.15.100</version>
+			<version>3.16.0</version>
 			<scope>system</scope>
-			<systemPath>${basedir}/lib/org.eclipse.core.runtime-3.15.100.jar</systemPath>
+			<systemPath>${basedir}/lib/org.eclipse.core.runtime-3.16.0.jar</systemPath>
 		</dependency>
 		<dependency>
 			<groupId>org.eclipse.equinox</groupId>
 			<artifactId>org.eclipse.equinox.app</artifactId>
-			<version>1.4.0</version>
+			<version>1.4.300</version>
 			<scope>system</scope>
-			<systemPath>${basedir}/lib/org.eclipse.equinox.app-1.4.0.jar</systemPath>
+			<systemPath>${basedir}/lib/org.eclipse.equinox.app-1.4.300.jar</systemPath>
 		</dependency>
 		<dependency>
 			<groupId>org.eclipse.equinox</groupId>
 			<artifactId>org.eclipse.equinox.common</artifactId>
-			<version>3.10.200</version>
+			<version>3.10.500</version>
 			<scope>system</scope>
-			<systemPath>${basedir}/lib/org.eclipse.equinox.common-3.10.200.jar</systemPath>
+			<systemPath>${basedir}/lib/org.eclipse.equinox.common-3.10.500.jar</systemPath>
 		</dependency>
 		<dependency>
 			<groupId>org.eclipse.equinox</groupId>
 			<artifactId>org.eclipse.equinox.preferences</artifactId>
-			<version>3.7.200</version>
+			<version>3.7.500</version>
 			<scope>system</scope>
-			<systemPath>${basedir}/lib/org.eclipse.equinox.preferences-3.7.200.jar</systemPath>
+			<systemPath>${basedir}/lib/org.eclipse.equinox.preferences-3.7.500.jar</systemPath>
 		</dependency>
 		<dependency>
 			<groupId>org.eclipse.equinox</groupId>
 			<artifactId>org.eclipse.equinox.registry</artifactId>
-			<version>3.8.200</version>
+			<version>3.8.500</version>
 			<scope>system</scope>
-			<systemPath>${basedir}/lib/org.eclipse.equinox.registry-3.8.200.jar</systemPath>
+			<systemPath>${basedir}/lib/org.eclipse.equinox.registry-3.8.500.jar</systemPath>
 		</dependency>
 		<dependency>
 			<groupId>org.eclipse.jdt</groupId>
 			<artifactId>org.eclipse.jdt.core</artifactId>
-			<version>3.13.102</version>
+			<version>3.19.0</version>
 			<scope>system</scope>
-			<systemPath>${basedir}/lib/org.eclipse.jdt.core-3.13.102.jar</systemPath>
+			<systemPath>${basedir}/lib/org.eclipse.jdt.core-3.19.0.jar</systemPath>
 		</dependency>
 		<dependency>
 			<groupId>org.eclipse</groupId>
 			<artifactId>org.eclipse.osgi</artifactId>
-			<version>3.13.200</version>
+			<version>3.15.0</version>
 			<scope>system</scope>
-			<systemPath>${basedir}/lib/org.eclipse.osgi-3.13.200.jar</systemPath>
+			<systemPath>${basedir}/lib/org.eclipse.osgi-3.15.0.jar</systemPath>
 		</dependency>
 		<dependency>
 			<groupId>org.eclipse</groupId>
 			<artifactId>org.eclipse.text</artifactId>
-			<version>3.8.0</version>
+			<version>3.9.0</version>
 			<scope>system</scope>
-			<systemPath>${basedir}/lib/org.eclipse.text-3.8.0.jar</systemPath>
+			<systemPath>${basedir}/lib/org.eclipse.text-3.9.0.jar</systemPath>
 		</dependency>
 		<dependency>
 			<groupId>org.slf4j</groupId>
@@ -41,19 +41,23 @@ public class JavaIndexer
 			Path path = Paths.get(filePath);
-			ASTParser parser = ASTParser.newParser(AST.JLS10);
+			ASTParser parser = ASTParser.newParser(AST.JLS12);
-			parser.setResolveBindings(true); // solve "bindings" like the declatarion of the type used in a var decl
+			parser.setResolveBindings(true); // solve "bindings" like the declaration of the type used in a var decl
 			parser.setKind(ASTParser.K_COMPILATION_UNIT); // specify to parse the entire compilation unit
 			parser.setBindingsRecovery(true); // also return bindings that are not resolved completely
 			parser.setStatementsRecovery(true);
 			{
 				Hashtable<String, String> options = JavaCore.getOptions();
 				String convertedLanguageStandard = convertLanguageStandard(languageStandard);
 				astVisitorClient.logInfo("using language standard " + convertedLanguageStandard);
-				JavaCore.setComplianceOptions(convertedLanguageStandard, options);
+				
 				Hashtable<String, String> options = JavaCore.getOptions();
 			    options.put(JavaCore.COMPILER_PB_ENABLE_PREVIEW_FEATURES, JavaCore.ENABLED);
 			    options.put(JavaCore.COMPILER_PB_REPORT_PREVIEW_FEATURES, JavaCore.IGNORE);
 			    options.put(JavaCore.COMPILER_SOURCE, convertedLanguageStandard);
 			    options.put(JavaCore.COMPILER_CODEGEN_TARGET_PLATFORM, convertedLanguageStandard);
 			    options.put(JavaCore.COMPILER_COMPLIANCE, convertedLanguageStandard);
 				parser.setCompilerOptions(options);
 			}
@@ -136,7 +140,7 @@ public class JavaIndexer
 	{
 		String packageName = "";
-		ASTParser parser = ASTParser.newParser(AST.JLS10);
+		ASTParser parser = ASTParser.newParser(AST.JLS12);
 		parser.setKind(ASTParser.K_COMPILATION_UNIT); // specify to parse the entire compilation unit
 		parser.setSource(fileContent.toCharArray());
 		CompilationUnit cu = (CompilationUnit) parser.createAST(null);
@@ -176,8 +180,12 @@ public class JavaIndexer
        case "9":
    		return JavaCore.VERSION_9;
        case "10":
    	default:
    		return JavaCore.VERSION_10;
        case "11":
    		return JavaCore.VERSION_11;
        case "12":
    	default:
    		return JavaCore.VERSION_12;
        }
 	}
@@ -13,12 +13,12 @@ then
 	mkdir -p build/Debug
 	cd build/Debug
-	cmake -G Ninja -DCMAKE_BUILD_TYPE="Debug" ../..
+	cmake -G Ninja -DCMAKE_BUILD_TYPE="Debug" -DBUILD_CXX_LANGUAGE_PACKAGE=ON -DBUILD_JAVA_LANGUAGE_PACKAGE=ON -DBUILD_PYTHON_LANGUAGE_PACKAGE=ON -DDOCKER_BUILD=ON ../..
 	cd ../..
 	mkdir -p build/Release
 	cd build/Release
-	cmake -G Ninja -DCMAKE_BUILD_TYPE="Release" ../..
+	cmake -G Ninja -DCMAKE_BUILD_TYPE="Release" -DBUILD_CXX_LANGUAGE_PACKAGE=ON -DBUILD_JAVA_LANGUAGE_PACKAGE=ON -DBUILD_PYTHON_LANGUAGE_PACKAGE=ON -DDOCKER_BUILD=ON ../..
 	cd ../..
 	if [ $? -ne 0 ]
@@ -1,9 +1,13 @@
 # FLAGS
 CLEAN_AND_SETUP=true
 REBUILD=true
 RUN_CODE_SIGNING=false
 UPDATE_DATABASES=true
-CREATE_INSTALLER_ZIP=true
+CREATE_WIX_INSTALLER=true
-CREATE_PORTABLE_ZIP=true
+CREATE_PORTABLE_PACKAGE=true
 RUN_32_BIT_PIPELINE=true
 RUN_64_BIT_PIPELINE=true
 # USEFUL VARIABLES
@@ -14,6 +18,7 @@ INFO="\033[33mInfo:\033[00m"
 ORIGINAL_PATH_TO_SCRIPT="${0}"
 CLEANED_PATH_TO_SCRIPT="${ORIGINAL_PATH_TO_SCRIPT//\\//}"
 BASE_DIR=`dirname "$CLEANED_PATH_TO_SCRIPT"`
 OUTPUT_FOLDER="release"
 cd $BASE_DIR/..
@@ -28,18 +33,33 @@ if [ $REBUILD = false ]; then
 	read -p "Press [Enter] key to continue"
 fi
 if [ $RUN_CODE_SIGNING = false ]; then
 	echo -e "$INFO RUN_CODE_SIGNING flag is set to false. Do you want to proceed?"
 	read -p "Press [Enter] key to continue"
 fi
 if [ $UPDATE_DATABASES = false ]; then
 	echo -e "$INFO UPDATE_DATABASES flag is set to false. Do you want to proceed?"
 	read -p "Press [Enter] key to continue"
 fi
-if [ $CREATE_INSTALLER_ZIP = false ]; then
+if [ $CREATE_WIX_INSTALLER = false ]; then
-	echo -e "$INFO CREATE_INSTALLER_ZIP flag is set to false. Do you want to proceed?"
+	echo -e "$INFO CREATE_WIX_INSTALLER flag is set to false. Do you want to proceed?"
 	read -p "Press [Enter] key to continue"
 fi
-if [ $CREATE_PORTABLE_ZIP = false ]; then
+if [ $CREATE_PORTABLE_PACKAGE = false ]; then
-	echo -e "$INFO CREATE_PORTABLE_ZIP flag is set to false. Do you want to proceed?"
+	echo -e "$INFO CREATE_PORTABLE_PACKAGE flag is set to false. Do you want to proceed?"
 	read -p "Press [Enter] key to continue"
 fi
 if [ $RUN_32_BIT_PIPELINE = false ]; then
 	echo -e "$INFO RUN_32_BIT_PIPELINE flag is set to false. Do you want to proceed?"
 	read -p "Press [Enter] key to continue"
 fi
 if [ $RUN_64_BIT_PIPELINE = false ]; then
 	echo -e "$INFO RUN_64_BIT_PIPELINE flag is set to false. Do you want to proceed?"
 	read -p "Press [Enter] key to continue"
 fi
@@ -51,29 +71,48 @@ VERSION_STRING="${VERSION_STRING%_*}"
 DOTTED_VERSION_STRING="${VERSION_STRING//_/.}"
 if [ $RUN_CODE_SIGNING = true ]; then
 	echo -e "$INFO Code signing is enabled. provide the key file path >"
 	read CODE_SIGNING_KEY_FILE
 fi
 if [ $RUN_CODE_SIGNING = true ]; then
 	echo -e "$INFO Code signing is enabled. Please enter your password >"
 	read CODE_SIGNING_PASSWORD
 fi
 if [ $CLEAN_AND_SETUP = true ]; then
 	echo -e "$INFO Cleaning the project"
 	script/clean.sh
-	echo -e $INFO "$INFO Running cmake with 32 bit configuration"
+	if [ $RUN_32_BIT_PIPELINE = true ]; then
-	mkdir -p build/win32
+		echo -e $INFO "$INFO Running cmake with 32 bit configuration"
-	cd build/win32
+		mkdir -p build/win32
-	cmake -G "Visual Studio 14 2015" -DBUILD_CXX_LANGUAGE_PACKAGE=ON -DBUILD_JAVA_LANGUAGE_PACKAGE=ON -DBUILD_PYTHON_LANGUAGE_PACKAGE=ON ../..
+		cd build/win32
-	cd ../..
+		cmake -G "Visual Studio 15 2017" -DBOOST_ROOT=${BOOST_ROOT} -DQt5_DIR=${Qt5_DIR} -DClang_DIR=${Clang_DIR} -DBUILD_CXX_LANGUAGE_PACKAGE=ON -DBUILD_JAVA_LANGUAGE_PACKAGE=ON -DBUILD_PYTHON_LANGUAGE_PACKAGE=ON ../..
 		cd ../..
 	fi
-	echo -e $INFO "$INFO Running cmake with 64 bit configuration"
+	if [ $RUN_64_BIT_PIPELINE = true ]; then
-	mkdir -p build/win64
+		echo -e $INFO "$INFO Running cmake with 64 bit configuration"
-	cd build/win64
+		mkdir -p build/win64
-	cmake -G "Visual Studio 14 2015 Win64" -DBUILD_CXX_LANGUAGE_PACKAGE=ON -DBUILD_JAVA_LANGUAGE_PACKAGE=ON -DBUILD_PYTHON_LANGUAGE_PACKAGE=ON ../..
+		cd build/win64
-	cd ../..
+		cmake -G "Visual Studio 15 2017 Win64" -DBOOST_ROOT=${BOOST_ROOT} -DQt5_DIR=${Qt5_64_DIR} -DClang_DIR=${Clang_64_DIR} -DBUILD_CXX_LANGUAGE_PACKAGE=ON -DBUILD_JAVA_LANGUAGE_PACKAGE=ON -DBUILD_PYTHON_LANGUAGE_PACKAGE=ON ../..
 		cd ../..
 	fi
 fi
 # CLEANING THE SOLUTIONS
 if [ $REBUILD = true ]; then
 	echo -e "$INFO Cleaning the solution"
-	"devenv.com" build/win32/Sourcetrail.sln //clean Release
+	if [ $RUN_32_BIT_PIPELINE = true ]; then
-	"devenv.com" build/win64/Sourcetrail.sln //clean Release
+		"devenv.com" build/win32/Sourcetrail.sln //clean Release
 	fi
 	if [ $RUN_64_BIT_PIPELINE = true ]; then
 		"devenv.com" build/win64/Sourcetrail.sln //clean Release
 	fi
 fi
@@ -82,9 +121,61 @@ build_executable() # Parameters: bit {32, 64}
 {
 	echo -e "$INFO Building the app (${1} bit)"
 	"devenv.com" build/win${1}/Sourcetrail.sln //build Release //project build/win${1}/Sourcetrail.vcxproj
 	if [ $RUN_CODE_SIGNING = true ]; then
 		echo -e "$INFO Signing the app (${1} bit)"
 		signtool.exe sign //f $CODE_SIGNING_KEY_FILE //p $CODE_SIGNING_PASSWORD //t "http://timestamp.verisign.com/scripts/timstamp.dll" //d "Sourcetrail ${DOTTED_VERSION_STRING}" //du "https://www.sourcetrail.com/" //v build/win${1}/Release/app/Sourcetrail.exe
 		echo -e "$INFO Signing the indexer (${1} bit)"
 		signtool.exe sign //f $CODE_SIGNING_KEY_FILE //p $CODE_SIGNING_PASSWORD //t "http://timestamp.verisign.com/scripts/timstamp.dll" //d "Sourcetrail Indexer ${DOTTED_VERSION_STRING}" //du "https://www.sourcetrail.com/" //v build/win${1}/Release/app/sourcetrail_indexer.exe
 	fi
 }
-build_executable "32"
+
-build_executable "64"
+if [ $RUN_32_BIT_PIPELINE = true ]; then
 	build_executable "32"
 fi
 if [ $RUN_64_BIT_PIPELINE = true ]; then
 	build_executable "64"
 fi
 if [ $RUN_CODE_SIGNING = true ]; then
 	echo -e "$INFO Signing the Python indexer"
 	signtool.exe sign //f $CODE_SIGNING_KEY_FILE //p $CODE_SIGNING_PASSWORD //t "http://timestamp.verisign.com/scripts/timstamp.dll" //d "Sourcetrail Python Indexer" //du "https://github.com/CoatiSoftware/SourcetrailPythonIndexer" //v bin/app/data/python/SourcetrailPythonIndexer.exe
 fi
 rm -rf ./$OUTPUT_FOLDER
 mkdir ./$OUTPUT_FOLDER
 # STORING PDB FILES
 store_pdb() # Parameters: bit {32, 64}
 {
 	echo -e "$INFO storing pdb file for win$1"
 	mkdir ./$OUTPUT_FOLDER/PDB_${1}bit
 	cp -u -r ./build/win$1/Release/app/Sourcetrail.pdb ./$OUTPUT_FOLDER/PDB_${1}bit/
 }
 if [ $RUN_32_BIT_PIPELINE = true ]; then
 	store_pdb "32"
 fi
 if [ $RUN_64_BIT_PIPELINE = true ]; then
 	store_pdb "64"
 fi
 # FIXME: we should do this right at the start
 BIT=""
 if [ $RUN_64_BIT_PIPELINE = true ]; then
 	BIT="64"
 elif [ $RUN_32_BIT_PIPELINE = true ]; then
 	BIT="32"
 fi
 if [ $BIT == "" ]; then
 	echo -e "$INFO No configuration has been built, aborting now."
 	exit
 fi
 # CREATING DATABASES
@@ -101,19 +192,19 @@ if [ $UPDATE_DATABASES = true ]; then
 	cd temp
 	echo -e "$INFO configuring application"
-	../build/win32/Release/app/Sourcetrail.exe config -t 8
+	../build/win$BIT/Release/app/Sourcetrail.exe config -t 8
 	echo -e "$INFO creating database for tutorial"
-	../build/win32/Release/app/Sourcetrail.exe index --full --project-file ../bin/app/user/projects/tutorial/tutorial.srctrlprj
+	../build/win$BIT/Release/app/Sourcetrail.exe index --full --project-file ../bin/app/user/projects/tutorial/tutorial.srctrlprj
 	echo -e "$INFO creating database for tictactoe_cpp"
-	../build/win32/Release/app/Sourcetrail.exe index --full --project-file ../bin/app/user/projects/tictactoe_cpp/tictactoe_cpp.srctrlprj
+	../build/win$BIT/Release/app/Sourcetrail.exe index --full --project-file ../bin/app/user/projects/tictactoe_cpp/tictactoe_cpp.srctrlprj
 	echo -e "$INFO creating database for tictactoe_py"
-	../build/win32/Release/app/Sourcetrail.exe index --full --project-file ../bin/app/user/projects/tictactoe_py/tictactoe_py.srctrlprj
+	../build/win$BIT/Release/app/Sourcetrail.exe index --full --project-file ../bin/app/user/projects/tictactoe_py/tictactoe_py.srctrlprj
 	echo -e "$INFO creating database for javaparser"
-	../build/win32/Release/app/Sourcetrail.exe index --full --project-file ../bin/app/user/projects/javaparser/javaparser.srctrlprj
+	../build/win$BIT/Release/app/Sourcetrail.exe index --full --project-file ../bin/app/user/projects/javaparser/javaparser.srctrlprj
 	cd ..
 	rm -rf temp
@@ -122,19 +213,35 @@ fi
 # BUILDING THE INSTALLER
 cd deployment/windows/wixSetup
-sh build_win32.sh
+if [ $RUN_32_BIT_PIPELINE = true ]; then
-sh build_win64.sh
+	sh build_win32.sh
 fi
 if [ $RUN_64_BIT_PIPELINE = true ]; then
 	sh build_win64.sh
 fi
 cd ../../..
 if [ $RUN_CODE_SIGNING = true ]; then
 	if [ $RUN_32_BIT_PIPELINE = true ]; then
 		echo -e "$INFO Signing the 32 bit windows installer"
 		signtool.exe sign //f $CODE_SIGNING_KEY_FILE //p $CODE_SIGNING_PASSWORD //t "http://timestamp.verisign.com/scripts/timstamp.dll" //d "Sourcetrail ${DOTTED_VERSION_STRING} Installer" //du "https://www.sourcetrail.com/" //v deployment/windows/wixSetup/bin/win32/sourcetrail.msi
 	fi
 	if [ $RUN_64_BIT_PIPELINE = true ]; then
 		echo -e "$INFO Signing the 64 bit windows installer"
 		signtool.exe sign //f $CODE_SIGNING_KEY_FILE //p $CODE_SIGNING_PASSWORD //t "http://timestamp.verisign.com/scripts/timstamp.dll" //d "Sourcetrail ${DOTTED_VERSION_STRING} Installer" //du "https://www.sourcetrail.com/" //v deployment/windows/wixSetup/bin/win64/sourcetrail.msi
 	fi
 fi
 # CREATING THE INSTALLER ZIP FILES
-if [ $CREATE_INSTALLER_ZIP = true ]; then
+if [ $CREATE_WIX_INSTALLER = true ]; then
 	create_installer_zip() # Parameters: bit {32, 64}
 	{
 		# CREATING INSTALLER PACKAGE FOLDER
 		echo -e "$INFO creating installer package folder for win$1"
 		local INSTALLER_PACKAGE_NAME=Sourcetrail_${VERSION_STRING}_${1}bit_Installer
-		local INSTALLER_PACKAGE_DIR=release/$INSTALLER_PACKAGE_NAME
+		local INSTALLER_PACKAGE_DIR=$OUTPUT_FOLDER/$INSTALLER_PACKAGE_NAME
 		local INSTALLER_PACKAGE_PLUGINS_DIR=$INSTALLER_PACKAGE_DIR/plugins
 		rm -rf $INSTALLER_PACKAGE_DIR
@@ -162,17 +269,12 @@ if [ $CREATE_INSTALLER_ZIP = true ]; then
 		mkdir -p $INSTALLER_PACKAGE_PLUGINS_DIR/visual_studio/
 		cp -u -r ide_plugins/visual_studio/* $INSTALLER_PACKAGE_PLUGINS_DIR/visual_studio/
-		cd ./release/
+		cd ./$OUTPUT_FOLDER/
 		# PACKAGING SOURCETRAIL
 		echo -e "$INFO packaging sourcetrail installer for win$1"
 		winrar a -afzip Sourcetrail_${VERSION_STRING}_Windows_${1}bit_Installer.zip $INSTALLER_PACKAGE_NAME
 		# STORING PDB FILES
 		echo -e "$INFO storing pdb file for win$1"
 		mkdir PDB_${INSTALLER_PACKAGE_NAME}
 		cp -u -r ../build/win$1/Release/app/Sourcetrail.pdb PDB_${INSTALLER_PACKAGE_NAME}/
 		cd ../
 		# CLEANING UP
@@ -180,19 +282,23 @@ if [ $CREATE_INSTALLER_ZIP = true ]; then
 		rm -rf $INSTALLER_PACKAGE_DIR
 	}
-	create_installer_zip "32"
+	if [ $RUN_32_BIT_PIPELINE = true ]; then
-	create_installer_zip "64"
+		create_installer_zip "32"
 	fi
 	if [ $RUN_64_BIT_PIPELINE = true ]; then
 		create_installer_zip "64"
 	fi
 fi
 # CREATING THE PORTABLE ZIP FILES
-if [ $CREATE_PORTABLE_ZIP = true ]; then
+if [ $CREATE_PORTABLE_PACKAGE = true ]; then
 	create_portable_zip() # Parameters: bit {32, 64}
 	{
 		# CREATING PORTABLE PACKAGE FOLDER
 		echo -e "$INFO creating portable package folder for win$1"
 		local PORTABLE_PACKAGE_NAME=Sourcetrail_${VERSION_STRING}_${1}bit_Portable
-		local PORTABLE_PACKAGE_DIR=release/$PORTABLE_PACKAGE_NAME
+		local PORTABLE_PACKAGE_DIR=$OUTPUT_FOLDER/$PORTABLE_PACKAGE_NAME
 		local PORTABLE_PACKAGE_APP_DIR=$PORTABLE_PACKAGE_DIR/Sourcetrail_${VERSION_STRING}_${1}bit
 		local PORTABLE_PACKAGE_PLUGINS_DIR=$PORTABLE_PACKAGE_DIR/plugins
@@ -264,7 +370,7 @@ if [ $CREATE_PORTABLE_ZIP = true ]; then
 		mkdir -p $PORTABLE_PACKAGE_PLUGINS_DIR/visual_studio/
 		cp -u -r ide_plugins/visual_studio/* $PORTABLE_PACKAGE_PLUGINS_DIR/visual_studio/
-		cd ./release/
+		cd ./$OUTPUT_FOLDER/
 		# PACKAGING SOURCETRAIL
 		echo -e "$INFO packaging sourcetrail portable for win$1"
@@ -277,8 +383,12 @@ if [ $CREATE_PORTABLE_ZIP = true ]; then
 		rm -rf $PORTABLE_PACKAGE_DIR
 	}
-	create_portable_zip "32"
+	if [ $RUN_32_BIT_PIPELINE = true ]; then
-	create_portable_zip "64"
+		create_portable_zip "32"
 	fi
 	if [ $RUN_64_BIT_PIPELINE = true ]; then
 		create_portable_zip "64"
 	fi
 fi
@@ -1,6 +1,6 @@
 #!/bin/bash
-SOURCETRAIL_PYTHON_INDEXER_VERSION="v1_db25_p0"
+SOURCETRAIL_PYTHON_INDEXER_VERSION="v1_db25_p2"
 # Determine current platform
 PLATFORM='unknown'
@@ -10,6 +10,10 @@ elif [ "$(expr substr $(uname -s) 1 5)" == "Linux" ]; then
 	PLATFORM='linux'
 elif [ "$(expr substr $(uname -s) 1 10)" == "MINGW32_NT" ]; then
 	PLATFORM='windows'
 elif [ "$(expr substr $(uname -s) 1 10)" == "MINGW64_NT" ]; then
 	PLATFORM='windows'
 elif [ "$OSTYPE" == "msys" ]; then
 	PLATFORM='windows'
 fi
 PACKAGE_NAME="SourcetrailPythonIndexer_${SOURCETRAIL_PYTHON_INDEXER_VERSION}-${PLATFORM}"
@@ -24,30 +28,41 @@ SUCCESS="\033[32mSuccess:\033[00m"
 INFO="\033[33mInfo:\033[00m"
 if [ $PLATFORM == "windows" ]; then
-	ORIGINAL_PATH_TO_SCRIPT="${0}"
+	SCRIPT=`realpath $0`
-	CLEANED_PATH_TO_SCRIPT="${ORIGINAL_PATH_TO_SCRIPT//\\//}"
+	if [ "$SCRIPT" == "" ]; then
-	ROOT_DIR=`dirname "$CLEANED_PATH_TO_SCRIPT"`
+
 		ORIGINAL_PATH_TO_SCRIPT="${0}"
 		CLEANED_PATH_TO_SCRIPT="${ORIGINAL_PATH_TO_SCRIPT//\\//}"
 		SCRIPT_DIR=${CLEANED_PATH_TO_SCRIPT%/*}
 	else
 		ORIGINAL_PATH_TO_SCRIPT=`dirname $SCRIPT`
 		SCRIPT_DIR="${ORIGINAL_PATH_TO_SCRIPT//\\//}"
 	fi
 else
-	ROOT_DIR="$( cd "$( dirname "$0" )" && pwd )"
+	SCRIPT_DIR="$( cd "$( dirname "$0" )" && pwd )"
 fi
-ROOT_DIR=$ROOT_DIR/..
+echo "This script is running in: $SCRIPT_DIR"
 # Enter main directory
-cd $ROOT_DIR/
+cd $SCRIPT_DIR/
 cd ..
 BINARY_PATH="$TARGET_PATH/SourcetrailPythonIndexer"
 if [ $PLATFORM == "windows" ]; then
 	BINARY_PATH="${BINARY_PATH}.exe"
 fi
-if [ -e "$TARGET_PATH/SourcetrailPythonIndexer.exe" ]; then
+if [ -e "${BINARY_PATH}" ]; then
-    echo "SourcetrailPythonIndexer already exists, checking version..."
+    echo -e $INFO "SourcetrailPythonIndexer already exists, checking version..."
-	INSTALLED_VERSION="$($TARGET_PATH/SourcetrailPythonIndexer.exe --version)"
+	INSTALLED_VERSION="$(${BINARY_PATH} --version)"
-	INSTALLED_VERSION="$(sed -e 's#.* \(\)#\1#' <<< $INSTALLED_VERSION)"
+	INSTALLED_VERSION=${INSTALLED_VERSION#* }
-	echo "SourcetrailPythonIndexer version is: $INSTALLED_VERSION"
+	INSTALLED_VERSION="${INSTALLED_VERSION//./$'_'}"
-	INSTALLED_VERSION="$(echo $INSTALLED_VERSION | tr . _)"
+	if [ "$INSTALLED_VERSION" == "$SOURCETRAIL_PYTHON_INDEXER_VERSION" ]; then
-	
+		echo -e $INFO "Nothing to update. Target version of SourcetrailPythonIndexer is already installed."
 	if [ $INSTALLED_VERSION == $SOURCETRAIL_PYTHON_INDEXER_VERSION ]; then
 		echo "Nothing to update. Target version of SourcetrailPythonIndexer is already installed."
 		exit
 	fi
 fi
@@ -29,6 +29,9 @@ cd $ROOT_DIR/
 cd java_indexer
 # exit when any command fails
 set -e 
 echo -e $INFO "cleaning and building java_indexer.jar"
 mvn clean package
@@ -169,7 +169,8 @@ int main(int argc, char *argv[])
 			MessageLoadProject(
 				commandLineParser.getProjectFilePath(),
 				false,
-				commandLineParser.getRefreshMode()
+				commandLineParser.getRefreshMode(),
 				commandLineParser.getShallowIndexingRequested()
 			).dispatch();
 		}
@@ -255,7 +255,7 @@ void Application::handleMessage(MessageLoadProject* message)
 		if (message->settingsChanged && m_hasGUI)
 		{
 			m_project->setStateOutdated();
-			refreshProject(REFRESH_ALL_FILES);
+			refreshProject(REFRESH_ALL_FILES, message->shallowIndexingRequested);
 		}
 	}
 	else
@@ -316,7 +316,7 @@ void Application::handleMessage(MessageLoadProject* message)
 		if (message->refreshMode != REFRESH_NONE)
 		{
-			refreshProject(message->refreshMode);
+			refreshProject(message->refreshMode, message->shallowIndexingRequested);
 		}
 	}
 }
@@ -325,7 +325,8 @@ void Application::handleMessage(MessageRefresh* message)
 {
 	TRACE("app refresh");
-	refreshProject(message->all ? REFRESH_ALL_FILES : REFRESH_UPDATED_FILES);
+	refreshProject(
 		message->all ? REFRESH_ALL_FILES : REFRESH_UPDATED_FILES, false);
 }
 void Application::handleMessage(MessageRefreshUI* message)
@@ -409,11 +410,11 @@ void Application::loadWindow(bool showStartWindow)
 	}
 }
-void Application::refreshProject(RefreshMode refreshMode)
+void Application::refreshProject(RefreshMode refreshMode, bool shallowIndexingRequested)
 {
 	if (m_project && checkSharedMemory())
 	{
-		m_project->refresh(refreshMode, getDialogView(DialogView::UseCase::INDEXING));
+		m_project->refresh(getDialogView(DialogView::UseCase::INDEXING), refreshMode, shallowIndexingRequested);
 		if (!m_hasGUI && !m_project->isIndexing())
 		{
@@ -79,7 +79,7 @@ private:
 	void loadWindow(bool showStartWindow);
-	void refreshProject(RefreshMode refreshMode);
+	void refreshProject(RefreshMode refreshMode, bool shallowIndexingRequested);
 	void updateRecentProjects(const FilePath& projectSettingsFilePath);
 	void logStorageStats() const;
@@ -15,6 +15,16 @@
 #include "ViewFactory.h"
 #include "logging.h"
 namespace
 {
 template <class Container>
 void reverseErase(Container & container)
 {
 	while(!container.empty())
 		container.pop_back();
 }
 }	 // namespace
 ComponentManager::ComponentManager(const ViewFactory* viewFactory, StorageAccess* storageAccess)
 	: m_componentFactory(viewFactory, storageAccess)
 {
@@ -23,8 +33,8 @@ ComponentManager::ComponentManager(const ViewFactory* viewFactory, StorageAccess
 void ComponentManager::clear()
 {
 	m_dialogViews.clear();
-	m_components.clear();
+	reverseErase(m_components);
-	m_singleViews.clear();
+	reverseErase(m_singleViews);
 }
 void ComponentManager::setupMain(ViewLayout* viewLayout, Id appId)
@@ -214,18 +214,6 @@ void CodeController::handleMessage(MessageActivateTokens* message)
 		return;
 	}
 	if (message->keepContent())	   // deactivating an edge
 	{
 		m_codeParams.activeTokenIds = params.activeTokenIds;
 		m_codeParams.activeLocationIds.clear();
 		m_codeParams.activeLocalSymbolIds.clear();
 		m_codeParams.currentActiveLocalLocationIds.clear();
 		clearLocalReferences();
 		showFiles(m_codeParams, CodeScrollParams(), !message->isReplayed());
 		return;
 	}
 	m_collection = m_storageAccess->getSourceLocationsForTokenIds(params.activeTokenIds);
 	m_files = getFilesForActiveSourceLocations(m_collection.get(), declarationId);
@@ -414,19 +402,19 @@ void CodeController::handleMessage(MessageCodeShowDefinition* message)
 void CodeController::handleMessage(MessageDeactivateEdge* message)
 {
 	CodeScrollParams scrollParams;
 	m_codeParams.activeLocationIds.clear();
 	m_codeParams.activeLocalSymbolIds.clear();
 	m_codeParams.currentActiveLocalLocationIds.clear();
 	m_referenceIndex = -1;
 	clearLocalReferences();
 	if (message->scrollToDefinition)
 	{
-		CodeScrollParams scrollParams = definitionReferenceScrollParams(m_codeParams.activeTokenIds);
+		scrollParams = definitionReferenceScrollParams(m_codeParams.activeTokenIds);
 		if (message->isReplayed())
 		{
 			m_scrollParams = scrollParams;
 		}
 		else
 		{
 			getView()->scrollTo(scrollParams, true);
 		}
 	}
 	showFiles(m_codeParams, scrollParams, !message->isReplayed());
 }
 void CodeController::handleMessage(MessageErrorCountClear* message)
@@ -316,6 +316,16 @@ void GraphController::handleMessage(MessageActivateTrailEdge* message)
 	getView()->activateEdge(message->edgeIds.back());
 }
 void GraphController::handleMessage(MessageDeactivateEdge* message)
 {
 	TRACE("edge deactivate");
 	m_activeEdgeIds.clear();
 	setActive(utility::concat(m_activeNodeIds, m_activeEdgeIds), false);
 	getView()->activateEdge(0);
 }
 void GraphController::handleMessage(MessageFlushUpdates* message)
 {
 	GraphView::GraphParams params;
@@ -11,6 +11,7 @@
 #include "MessageActivateTokens.h"
 #include "MessageActivateTrail.h"
 #include "MessageActivateTrailEdge.h"
 #include "MessageDeactivateEdge.h"
 #include "MessageFlushUpdates.h"
 #include "MessageFocusIn.h"
 #include "MessageFocusOut.h"
@@ -40,6 +41,7 @@ class GraphController
 	, public MessageListener<MessageActivateTokens>
 	, public MessageListener<MessageActivateTrail>
 	, public MessageListener<MessageActivateTrailEdge>
 	, public MessageListener<MessageDeactivateEdge>
 	, public MessageListener<MessageFlushUpdates>
 	, public MessageListener<MessageFocusIn>
 	, public MessageListener<MessageFocusOut>
@@ -64,6 +66,7 @@ private:
 	void handleMessage(MessageActivateTokens* message) override;
 	void handleMessage(MessageActivateTrail* message) override;
 	void handleMessage(MessageActivateTrailEdge* message) override;
 	void handleMessage(MessageDeactivateEdge* message) override;
 	void handleMessage(MessageFlushUpdates* message) override;
 	void handleMessage(MessageFocusIn* message) override;
 	void handleMessage(MessageFocusOut* message) override;
@@ -172,25 +172,14 @@ void UndoRedoController::handleMessage(MessageCodeShowDefinition* message)
 void UndoRedoController::handleMessage(MessageDeactivateEdge* message)
 {
-	if (m_iterator == m_list.begin())
+	if (sameMessageTypeAsLast(message) &&
 		static_cast<MessageDeactivateEdge*>(lastMessage())->scrollToDefinition == message->scrollToDefinition)
 	{
 		return;
 	}
-	std::list<Command>::iterator it = m_iterator;
+	Command command(std::make_shared<MessageDeactivateEdge>(*message), Command::ORDER_ADAPT);
-	do
+	processCommand(command);
 	{
 		std::advance(it, -1);
 	} while (it != m_list.begin() && it->order != Command::ORDER_ACTIVATE);
 	MessageBase* m = it->message.get();
 	bool keepContent = m->keepContent();
 	m->setIsReplayed(false);
 	m->setKeepContent(true);
 	m->dispatch();
 	m->setKeepContent(keepContent);
 }
 void UndoRedoController::handleMessage(MessageGraphNodeBundleSplit* message)
@@ -378,6 +378,7 @@ NodeType::StyleType NodeType::getNodeStyle() const
 	case NodeType::NODE_GLOBAL_VARIABLE:
 	case NodeType::NODE_FIELD:
 	case NodeType::NODE_ENUM_CONSTANT:
 	default:
 		return STYLE_SMALL_NODE;
 	}
 }
@@ -3,6 +3,7 @@
 #include <typeinfo>
 #include <vector>
 #include <string>
 #include "TokenComponent.h"
 #include "types.h"
@@ -33,6 +33,8 @@ std::wstring SearchMatch::getSearchTypeName(SearchType type)
 	case SEARCH_FULLTEXT:
 		return L"fulltext";
 	}
 	return L"none";
 }
 std::wstring SearchMatch::searchMatchesToString(const std::vector<SearchMatch>& matches)
@@ -272,7 +272,7 @@ void Project::load(std::shared_ptr<DialogView> dialogView)
 	}
 }
-void Project::refresh(RefreshMode refreshMode, std::shared_ptr<DialogView> dialogView)
+void Project::refresh(std::shared_ptr<DialogView> dialogView, RefreshMode refreshMode, bool shallowIndexingRequested)
 {
 	if (m_refreshStage != RefreshStageType::NONE)
 	{
@@ -399,8 +399,7 @@ void Project::refresh(RefreshMode refreshMode, std::shared_ptr<DialogView> dialo
 		}
 	}
-	const bool useShallowIndexing = allowsShallowIndexing &&
+	const bool useShallowIndexing = allowsShallowIndexing && shallowIndexingRequested;
 		(!isLoaded() || m_state == PROJECT_STATE_EMPTY);
 	if (m_hasGUI)
 	{
@@ -422,7 +421,9 @@ void Project::refresh(RefreshMode refreshMode, std::shared_ptr<DialogView> dialo
 	}
 	else
 	{
-		buildIndex(getRefreshInfo(refreshMode), dialogView);
+		RefreshInfo info = getRefreshInfo(refreshMode);
 		info.shallow = useShallowIndexing;
 		buildIndex(info, dialogView);
 	}
 }
@@ -440,6 +441,7 @@ RefreshInfo Project::getRefreshInfo(RefreshMode mode) const
 		return RefreshInfoGenerator::getRefreshInfoForIncompleteFiles(m_sourceGroups, m_storage);
 	case REFRESH_ALL_FILES:
 	default:
 		return RefreshInfoGenerator::getRefreshInfoForAllFiles(m_sourceGroups);
 	}
 }
@@ -37,7 +37,7 @@ public:
 	void load(std::shared_ptr<DialogView> dialogView);
-	void refresh(RefreshMode refreshMode, std::shared_ptr<DialogView> dialogView);
+	void refresh(std::shared_ptr<DialogView> dialogView, RefreshMode refreshMode, bool shallowIndexingRequested);
 	RefreshInfo getRefreshInfo(RefreshMode mode) const;
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Eberhard Graether	3518404a73	build: Updated Docker Linux 64bit image to Qt 5.12.6 and LLVM/Clang 9.0.0 * updated to CentOS 7 * removed 32bit image	2019-12-16 15:54:01 +01:00
mlangkabelandEberhard Graether	bb9c219713	test: fixed java tests	2019-12-16 15:54:01 +01:00
Malte LangkabelandEberhard Graether	1e245a1743	ui: update selectable cxx language standards and cross-compiler flags (issue #835 ) (#856 )	2019-12-16 15:54:01 +01:00
Malte LangkabelandEberhard Graether	21c07cf5bf	logic: allow to specify custom Maven settings.xml file in project settings (issue #794 ) (#847 )	2019-12-16 15:54:01 +01:00
Malte LangkabelandEberhard Graether	32136c5d78	logic: update python indexer to fix issue #771 (#846 ) This will allow the Python indexer to accept a Windows Python environment with the python.exe located in the root directory of the environment.	2019-12-16 15:54:01 +01:00
Malte LangkabelandEberhard Graether	8a7ba18b8a	logic: extend language support to Java 12 (issue #752 ) (#844 ) * update java indexer dependencies * update java language support to java 12 * enable java preview features by default * add test for Java 12 support	2019-12-16 15:54:00 +01:00
Malte LangkabelandEberhard Graether	d7e16d30e0	logic: add java 9 path detector for windows (#843 )	2019-12-16 15:54:00 +01:00
Malte LangkabelandEberhard Graether	d66d86dd89	build: make build fail if maven fails to generate the java indexer jar (#842 )	2019-12-16 15:53:59 +01:00
Eberhard Graether	cc3703d1e8	ui: Return to active symbol definition in code view when clicking active node in graph view (issue #836 )	2019-12-16 15:53:59 +01:00
Eberhard Gräther	31918ae0db	build: Changes to compile on Debian Buster (#827 ) based on #784	2019-12-16 15:53:59 +01:00
Malte LangkabelandEberhard Graether	7a48136017	logic: fix recording template parameter as local symbol instead of qualifier (#824 )	2019-12-16 15:53:59 +01:00
Malte LangkabelandEberhard Graether	362aefaa16	logic: improve usability of shallow indexing ui (#823 ) * added "--shallow" command line option to request shallow indexing * modified behavior of Sourcetrail to always perform a deep index if not explicitly specified differently by the user	2019-12-16 15:53:59 +01:00
Malte LangkabelandEberhard Graether	bc7178f49d	logic: color scheme fixes (#821 ) * fixed issues where color scheme entries were missing * removed color scheme entries for nodes and edges that do not exist anymore	2019-12-16 15:53:59 +01:00
Alexey AndronovandEberhard Graether	3d6b86ec3f	ui: drag and drop selected source code from code view into other applications (#817 ) (issue #707 )	2019-12-16 15:53:59 +01:00
Michał JaniszewskiandEberhard Graether	246c7f0e8b	build: use ninja on appveyor (#819 )	2019-12-16 15:53:59 +01:00
Alexey AndronovandEberhard Graether	a10e96b1a3	build: add multiprocessor compilation flag to cmake to speedup builds (#793 )	2019-12-16 15:53:59 +01:00
Malte LangkabelandEberhard Graether	1fadf7f2b6	build: update to SourcetrailPythonIndexer v1_db25_p1 (#813 ) This allows to use "unsafe" Python environment if this environment has explicitly been specified by the user (issues #697, #747).	2019-12-16 15:53:59 +01:00
Michael VetterandEberhard Graether	385cd3542f	build: Link to LIB_GUI_PROJECT (#797 ) This is needed to build successfully on openSUSE. Regards https://github.com/CoatiSoftware/Sourcetrail/issues/758	2019-12-16 15:53:59 +01:00
Michael VetterandEberhard Graether	9918cfd99a	build: Install SourcetrailPythonIndexer only if Python language package is enabled (#800 ) Regards https://github.com/CoatiSoftware/Sourcetrail/issues/758	2019-12-16 15:53:59 +01:00
Malte LangkabelandEberhard Graether	23236541f8	update to clang 9 (#799 )	2019-12-16 15:53:58 +01:00
Malte LangkabelandEberhard Graether	13ed6ee903	build: enable Python language support in appveyor builds (#798 )	2019-12-16 15:53:58 +01:00
Alexey AndronovandEberhard Graether	ee2d6662e8	src: Fix crash on exit when deleting components (#789 ) * build: add missing includes in header files * logic: delete components in reverse to creation order	2019-12-16 15:53:58 +01:00
Eberhard Gräther	3f88aba025	build: Downgraded Boost to 1.67 (#775 )	2019-12-16 15:53:58 +01:00
Song LiandEberhard Graether	2a0aa1875b	build: Fix a possible cmake error on macOS (#782 )	2019-12-16 15:53:58 +01:00
ale rimoldiandEberhard Graether	7a5948e542	ui: Corrected cmake export compile command hint (#776 ) Modern CMakes seem to need need -DCMAKE_EXPORT_COMPILE_COMMANDS=ON instead of -DCMAKE_EXPORT_COMPILE_COMMANDS=1	2019-12-16 15:53:58 +01:00
Malte LangkabelandEberhard Graether	36e812e30e	Add Appveyor based CI (#773 ) The CI will build the entire project on Windows (currently without language support) and run all applicable tests.	2019-12-16 15:53:58 +01:00
Eberhard Graether	9b8253f21c	ui: Fixed code view cleared in single file mode on ui refresh (#772 )	2019-12-16 15:53:58 +01:00
Eberhard Graether	e0a7a7c667	logic: Fixed update check url going to wrong subdomain	2019-12-16 15:53:58 +01:00
Iru Cai (vimacs)andEberhard Graether	6ee49ab434	build: Add a default version if not in git (#765 ) This fixes building with the tarball source.	2019-12-16 15:53:58 +01:00
Michael VetterandEberhard Graether	8c589502d8	src: getNodeStyle() always return a value (#767 ) Regards #758	2019-12-16 15:53:58 +01:00
Michael VetterandEberhard Graether	5185b8de44	src: getRefreshInfo() always return a value (#768 ) Regards #758	2019-12-16 15:53:58 +01:00
mlangkabelandEberhard Graether	72ff668f44	build: update deploy script for windows * added option to disable 32 or 64 bit build * re-added option to enable code signing on demand	2019-12-16 15:53:57 +01:00
mlangkabelandEberhard Graether	729d297f45	build: fix build errors on windows * fix compiler issue where string was returned instead of wstring * fix boost caching in CMakeList: for CMake 3.12.2 the "set" command requires a docstring if the CACHE flag is set	2019-12-16 15:53:57 +01:00
Benjamin TandEberhard Graether	407997f406	build: Fix lib order (#755 )	2019-12-16 15:53:57 +01:00
Michael VetterandEberhard Graether	2e341240ca	src: Always return a value from non void function getSearchTypeName() (#761 ) getSearchTypeName() needs to always return std:wstring. We cover all cases because our switch contains all current possibilities for Search_Type. But the compiler will still warn/error on this, depending on system configuration. Regards https://github.com/CoatiSoftware/Sourcetrail/issues/758	2019-12-16 15:53:57 +01:00
Michael VetterandEberhard Graether	25bb613124	src: Always return a value from non void function elide() (#760 ) elide() needs to always return std:string. We cover all cases because our switch contains all current possibilities for ElideMode. But the compiler will still warn/error on this, depending on system configuration. I would like to add a `return "";` or `return str;` or add a `default:` case to the switch to silence this compiler complaint. Regards https://github.com/CoatiSoftware/Sourcetrail/issues/758	2019-12-16 15:53:57 +01:00
Michael VetterandEberhard Graether	a89097a556	build: Make Boost_USE_STATIC_LIBS a cache variable (#759 ) Like this we can overwrite it's value from the commandline via `-DBoost_USE_STATIC_LIBS=OFF`. Linux distributions will prefer this. Regards https://github.com/CoatiSoftware/Sourcetrail/issues/758	2019-12-16 15:53:57 +01:00