diff --git a/src/ctags.cpp b/src/ctags.cpp index 9a82a07..46226e0 100644 --- a/src/ctags.cpp +++ b/src/ctags.cpp @@ -294,13 +294,15 @@ void Ctags::init_module(py::module &api) { ; ctags - .def_static("get_location", &Ctags::get_location, - py::arg("line"), - py::arg("markup")) + .def("get_location", &Ctags::get_location, + py::arg("line"), + py::arg("add_markup"), + py::arg("symbol_ends_with_open_parenthesis")) .def_static("get_locations", &Ctags::get_locations, py::arg("path"), py::arg("name"), - py::arg("type")) + py::arg("type"), + py::arg("languages")) ; } diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index cba50ea..662eded 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -19,7 +19,6 @@ add_library(test_stubs OBJECT stubs/notebook.cpp stubs/project.cpp stubs/selection_dialog.cpp - stubs/tooltips.cpp stubs/plugins.cc ) @@ -29,167 +28,109 @@ if(BUILD_TESTING) add_test(process_test process_test) add_executable(compile_commands_test compile_commands_test.cpp $) - target_link_libraries(compile_commands_test juci_shared) + target_link_libraries(compile_commands_test juci_shared ${PYTHON_LIBRARIES}) add_test(compile_commands_test compile_commands_test) add_executable(filesystem_test filesystem_test.cpp $) - target_link_libraries(filesystem_test juci_shared) + target_link_libraries(filesystem_test juci_shared ${PYTHON_LIBRARIES}) add_test(filesystem_test filesystem_test) add_executable(cmake_build_test cmake_build_test.cpp $) - target_link_libraries(cmake_build_test juci_shared) + target_link_libraries(cmake_build_test juci_shared ${PYTHON_LIBRARIES}) add_test(cmake_build_test cmake_build_test) add_executable(meson_build_test meson_build_test.cpp $) - target_link_libraries(meson_build_test juci_shared) + target_link_libraries(meson_build_test juci_shared ${PYTHON_LIBRARIES}) add_test(meson_build_test meson_build_test) add_executable(source_test source_test.cpp $) - target_link_libraries(source_test juci_shared) + target_link_libraries(source_test juci_shared ${PYTHON_LIBRARIES}) add_test(source_test source_test) add_executable(source_clang_test source_clang_test.cpp $) - target_link_libraries(source_clang_test juci_shared) + target_link_libraries(source_clang_test juci_shared ${PYTHON_LIBRARIES}) add_test(source_clang_test source_clang_test) add_executable(source_generic_test source_generic_test.cpp $) - target_link_libraries(source_generic_test juci_shared) + target_link_libraries(source_generic_test juci_shared ${PYTHON_LIBRARIES}) add_test(source_generic_test source_generic_test) add_executable(source_key_test source_key_test.cpp $) - target_link_libraries(source_key_test juci_shared) + target_link_libraries(source_key_test juci_shared ${PYTHON_LIBRARIES}) add_test(source_key_test source_key_test) add_executable(terminal_test terminal_test.cpp $) - target_link_libraries(terminal_test juci_shared) + target_link_libraries(terminal_test juci_shared ${PYTHON_LIBRARIES}) add_test(terminal_test terminal_test) add_executable(usages_clang_test usages_clang_test.cpp $) - target_link_libraries(usages_clang_test juci_shared) + target_link_libraries(usages_clang_test juci_shared ${PYTHON_LIBRARIES}) add_test(usages_clang_test usages_clang_test) - - if(LIBLLDB_FOUND) + + set(debian_version_file /etc/debian_version) + if(EXISTS ${debian_version_file}) + file(READ ${debian_version_file} debian_version) + message(${debian_version}) + if(${debian_version} EQUAL 9.9) + set(DEBIAN_STRETCH_FOUND True) + endif() + endif() + + if(LIBLLDB_FOUND AND NOT DEBIAN_STRETCH_FOUND) add_executable(lldb_test lldb_test.cpp $) - target_link_libraries(lldb_test juci_shared) + target_link_libraries(lldb_test juci_shared ${PYTHON_LIBRARIES}) add_test(lldb_test lldb_test) add_subdirectory("lldb_test_files") endif() - + add_executable(git_test git_test.cpp $) - target_link_libraries(git_test juci_shared) + target_link_libraries(git_test juci_shared ${PYTHON_LIBRARIES}) add_test(git_test git_test) - + add_executable(ctags_grep_test ctags_grep_test.cpp $) - target_link_libraries(ctags_grep_test juci_shared) + target_link_libraries(ctags_grep_test juci_shared ${PYTHON_LIBRARIES}) add_test(ctags_grep_test ctags_grep_test) - + add_executable(tooltips_test tooltips_test.cpp $) - target_link_libraries(tooltips_test juci_shared) + target_link_libraries(tooltips_test juci_shared ${PYTHON_LIBRARIES}) add_test(tooltips_test tooltips_test) - + add_executable(utility_test utility_test.cpp $) - target_link_libraries(utility_test juci_shared) + target_link_libraries(utility_test juci_shared ${PYTHON_LIBRARIES}) add_test(utility_test utility_test) + + add_subdirectory(./python_bindings) endif() if(BUILD_FUZZING) add_executable(cmake_fuzzer fuzzers/cmake.cpp $) target_compile_options(cmake_fuzzer PRIVATE -fsanitize=address,fuzzer) target_link_options(cmake_fuzzer PRIVATE -fsanitize=address,fuzzer) - target_link_libraries(cmake_fuzzer juci_shared) + target_link_libraries(cmake_fuzzer juci_shared ${PYTHON_LIBRARIES}) add_executable(ctags_fuzzer fuzzers/ctags.cpp $) target_compile_options(ctags_fuzzer PRIVATE -fsanitize=address,fuzzer) target_link_options(ctags_fuzzer PRIVATE -fsanitize=address,fuzzer) - target_link_libraries(ctags_fuzzer juci_shared) + target_link_libraries(ctags_fuzzer juci_shared ${PYTHON_LIBRARIES}) add_executable(docstring_fuzzer fuzzers/docstring.cpp $) target_compile_options(docstring_fuzzer PRIVATE -fsanitize=address,fuzzer) target_link_options(docstring_fuzzer PRIVATE -fsanitize=address,fuzzer) - target_link_libraries(docstring_fuzzer juci_shared) + target_link_libraries(docstring_fuzzer juci_shared ${PYTHON_LIBRARIES}) add_executable(doxygen_fuzzer fuzzers/doxygen.cpp $) target_compile_options(doxygen_fuzzer PRIVATE -fsanitize=address,fuzzer) target_link_options(doxygen_fuzzer PRIVATE -fsanitize=address,fuzzer) - target_link_libraries(doxygen_fuzzer juci_shared) + target_link_libraries(doxygen_fuzzer juci_shared ${PYTHON_LIBRARIES}) add_executable(grep_fuzzer fuzzers/grep.cpp $) target_compile_options(grep_fuzzer PRIVATE -fsanitize=address,fuzzer) target_link_options(grep_fuzzer PRIVATE -fsanitize=address,fuzzer) - target_link_libraries(grep_fuzzer juci_shared) + target_link_libraries(grep_fuzzer juci_shared ${PYTHON_LIBRARIES}) add_executable(markdown_fuzzer fuzzers/markdown.cpp $) target_compile_options(markdown_fuzzer PRIVATE -fsanitize=address,fuzzer) target_link_options(markdown_fuzzer PRIVATE -fsanitize=address,fuzzer) - target_link_libraries(markdown_fuzzer juci_shared) + target_link_libraries(markdown_fuzzer juci_shared ${PYTHON_LIBRARIES}) endif() -add_executable(process_test process_test.cc $) -target_link_libraries(process_test juci_shared ${PYTHON_LIBRARIES}) -add_test(process_test process_test) - -add_executable(compile_commands_test compile_commands_test.cc $) - target_link_libraries(compile_commands_test juci_shared ${PYTHON_LIBRARIES}) -add_test(compile_commands_test compile_commands_test) - -add_executable(filesystem_test filesystem_test.cc $) -target_link_libraries(filesystem_test juci_shared ${PYTHON_LIBRARIES}) -add_test(filesystem_test filesystem_test) - -add_executable(cmake_build_test cmake_build_test.cc $) -target_link_libraries(cmake_build_test juci_shared ${PYTHON_LIBRARIES}) -add_test(cmake_build_test cmake_build_test) - -add_executable(meson_build_test meson_build_test.cc $) -target_link_libraries(meson_build_test juci_shared ${PYTHON_LIBRARIES}) -add_test(meson_build_test meson_build_test) - -add_executable(source_test source_test.cc $) -target_link_libraries(source_test juci_shared ${PYTHON_LIBRARIES}) -add_test(source_test source_test) - -add_executable(source_clang_test source_clang_test.cc $) -target_link_libraries(source_clang_test juci_shared ${PYTHON_LIBRARIES}) -add_test(source_clang_test source_clang_test) - -add_executable(source_generic_test source_generic_test.cc $) -target_link_libraries(source_generic_test juci_shared ${PYTHON_LIBRARIES}) -add_test(source_generic_test source_generic_test) - -add_executable(source_key_test source_key_test.cc $) -target_link_libraries(source_key_test juci_shared ${PYTHON_LIBRARIES}) -add_test(source_key_test source_key_test) - -add_executable(terminal_test terminal_test.cc $) -target_link_libraries(terminal_test juci_shared ${PYTHON_LIBRARIES}) -add_test(terminal_test terminal_test) - -add_executable(usages_clang_test usages_clang_test.cc $) -target_link_libraries(usages_clang_test juci_shared ${PYTHON_LIBRARIES}) -add_test(usages_clang_test usages_clang_test) - -set(debian_version_file /etc/debian_version) -if(EXISTS ${debian_version_file}) - file(READ ${debian_version_file} debian_version) - message(${debian_version}) - if(${debian_version} EQUAL 9.9) - set(DEBIAN_STRETCH_FOUND True) - endif() -endif() - -if(LIBLLDB_FOUND AND NOT DEBIAN_STRETCH_FOUND) - add_executable(lldb_test lldb_test.cc $) - target_link_libraries(lldb_test juci_shared ${PYTHON_LIBRARIES}) - add_test(lldb_test lldb_test) - add_subdirectory("lldb_test_files") -endif() - -add_executable(git_test git_test.cc $) -target_link_libraries(git_test juci_shared ${PYTHON_LIBRARIES}) -add_test(git_test git_test) - -add_executable(python_interpreter_test python_interpreter_test.cc $) -target_link_libraries(python_interpreter_test juci_shared ${PYTHON_LIBRARIES}) -add_test(python_interpreter_test python_interpreter_test) - -add_subdirectory(./python_bindings)