Browse Source

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

master
eidheim 3 months ago
parent
commit
a8d8188bf2
  1. 15
      src/source.cpp

15
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,19 @@ 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 buffer(256, '\0');
input.read(&buffer[0], static_cast<std::streamsize>(buffer.size()));
buffer.resize(static_cast<std::size_t>(input.gcount()));
if(input && (buffer.find("#import ") != std::string::npos ||
buffer.find("@interface ") != std::string::npos ||
buffer.find("/*") != std::string::npos ||
buffer.find("//") != std::string::npos)) {
language = language_manager->get_language("objc");
}
}
return language; return language;
} }

Loading…
Cancel
Save