Browse Source

Merge branch 'bak_in_detection' of https://gitlab.com/doe300/jucipp

merge-requests/413/head
eidheim 3 years ago
parent
commit
44e31bc0c4
  1. 9
      src/source.cpp

9
src/source.cpp

@ -58,8 +58,13 @@ Glib::RefPtr<Gsv::Language> Source::guess_language(const boost::filesystem::path
if(result_uncertain) if(result_uncertain)
content_type.clear(); content_type.clear();
auto language = language_manager->guess_language(filename, content_type); auto language = language_manager->guess_language(filename, content_type);
auto extension = file_path.extension().string();
if(!language && (extension == ".in" || extension == ".bak")) {
auto path_copy = file_path;
path_copy.replace_extension();
return guess_language(path_copy);
}
if(!language) { if(!language) {
auto extension = file_path.extension().string();
if(filename == "CMakeLists.txt") if(filename == "CMakeLists.txt")
language = language_manager->get_language("cmake"); language = language_manager->get_language("cmake");
else if(filename == "meson.build") else if(filename == "meson.build")
@ -99,7 +104,7 @@ Glib::RefPtr<Gsv::Language> Source::guess_language(const boost::filesystem::path
} }
} }
else if(language->get_id() == "cuda") { else if(language->get_id() == "cuda") {
if(file_path.extension() == ".cuh") if(extension == ".cuh")
language = language_manager->get_language("cpphdr"); language = language_manager->get_language("cpphdr");
else else
language = language_manager->get_language("cpp"); language = language_manager->get_language("cpp");

Loading…
Cancel
Save