Compare commits

..

6 Commits

Author SHA1 Message Date
Jørgen Lien Sellæg e2e799029f
Merge branch 'python-refactor' into 'master' 3 months ago
eidheim 18c119f651 Slight improvement to last commit 3 months ago
eidheim a8d8188bf2 Merge branch 'objective_c' of https://gitlab.com/doe300/jucipp 3 months ago
eidheim 6ae1680438 Made variable sized array constant size 3 months ago
doe300 598fdee582 Try to detect .m files as Objective-C 4 months ago
doe300 30cdbbf170 Add detection of .mm files as Objective-C 4 months ago
  1. 10
      src/source.cpp

10
src/source.cpp

@ -83,6 +83,8 @@ Glib::RefPtr<Gsv::Language> Source::guess_language(const boost::filesystem::path
language = language_manager->get_language("glsl"); language = language_manager->get_language("glsl");
else if(extension == ".in" || extension == ".bak") else if(extension == ".in" || extension == ".bak")
return guess_language(boost::filesystem::path(file_path).replace_extension()); return guess_language(boost::filesystem::path(file_path).replace_extension());
else if(extension == ".mm")
language = language_manager->get_language("objc");
else if(!file_path.has_extension() && std::any_of(file_path.begin(), file_path.end(), else if(!file_path.has_extension() && std::any_of(file_path.begin(), file_path.end(),
[](const boost::filesystem::path &path) { return path == "include"; })) [](const boost::filesystem::path &path) { return path == "include"; }))
language = language_manager->get_language("cpphdr"); language = language_manager->get_language("cpphdr");
@ -101,6 +103,14 @@ Glib::RefPtr<Gsv::Language> Source::guess_language(const boost::filesystem::path
} }
else if(language->get_id() == "opencl") else if(language->get_id() == "opencl")
language = language_manager->get_language("cpp"); language = language_manager->get_language("cpp");
else if(language->get_id() == "octave" && extension == ".m") {
// .m is used for both Octave and Objective-C, so try to differentiate
std::ifstream input(file_path.string(), std::ios::binary);
std::string line;
if(input && std::getline(input, line) &&
(starts_with(line, "#import ") || starts_with(line, "@interface ") || starts_with(line, "/*") || starts_with(line, "//")))
language = language_manager->get_language("objc");
}
return language; return language;
} }

Loading…
Cancel
Save