From ceadbafa972feca384128c0b780ceede243f2671 Mon Sep 17 00:00:00 2001 From: Karol Kosek Date: Thu, 29 Jul 2021 22:31:59 +0200 Subject: [PATCH] HackStudio+TextEditor: Sync extensions from the FileIconProvider file This adds more possible extensions for highlighting C/C++ files and JavaScript module files. --- Userland/Applications/TextEditor/MainWidget.cpp | 5 +++-- Userland/DevTools/HackStudio/Language.cpp | 10 ++++++---- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/Userland/Applications/TextEditor/MainWidget.cpp b/Userland/Applications/TextEditor/MainWidget.cpp index 94948e9513..1c03a0035c 100644 --- a/Userland/Applications/TextEditor/MainWidget.cpp +++ b/Userland/Applications/TextEditor/MainWidget.cpp @@ -625,9 +625,10 @@ void MainWidget::set_path(StringView const& path) m_extension = lexical_path.extension(); } - if (m_extension == "c" || m_extension == "cc" || m_extension == "cxx" || m_extension == "cpp" || m_extension == "h") { + if (m_extension == "c" || m_extension == "cc" || m_extension == "cxx" || m_extension == "cpp" || m_extension == "c++" + || m_extension == "h" || m_extension == "hh" || m_extension == "hxx" || m_extension == "hpp" || m_extension == "h++") { m_cpp_highlight->activate(); - } else if (m_extension == "js" || m_extension == "json") { + } else if (m_extension == "js" || m_extension == "mjs" || m_extension == "json") { m_js_highlight->activate(); } else if (m_extension == "gml") { m_gml_highlight->activate(); diff --git a/Userland/DevTools/HackStudio/Language.cpp b/Userland/DevTools/HackStudio/Language.cpp index 743e27042d..c4d87f18f2 100644 --- a/Userland/DevTools/HackStudio/Language.cpp +++ b/Userland/DevTools/HackStudio/Language.cpp @@ -11,9 +11,10 @@ namespace HackStudio { Language language_from_file_extension(const String& extension) { VERIFY(!extension.starts_with(".")); - if (extension == "cpp" || extension == "h") + if (extension == "c" || extension == "cc" || extension == "cxx" || extension == "cpp" || extension == "c++" + || extension == "h" || extension == "cc" || extension == "hxx" || extension == "hpp" || extension == "h++") return Language::Cpp; - if (extension == "js" || extension == "json") + if (extension == "js" || extension == "mjs" || extension == "json") return Language::JavaScript; if (extension == "html" || extension == "htm") return Language::HTML; @@ -44,9 +45,10 @@ Language language_from_name(const String& name) String language_name_from_file_extension(const String& extension) { VERIFY(!extension.starts_with(".")); - if (extension == "cpp" || extension == "h") + if (extension == "c" || extension == "cc" || extension == "cxx" || extension == "cpp" || extension == "c++" + || extension == "h" || extension == "hh" || extension == "hxx" || extension == "hpp" || extension == "h++") return "C++"; - if (extension == "js" || extension == "json") + if (extension == "js" || extension == "mjs" || extension == "json") return "JavaScript"; if (extension == "gml") return "GML";