Ver Fonte

HackStudio+TextEditor: Sync extensions from the FileIconProvider file

This adds more possible extensions for highlighting C/C++ files
and JavaScript module files.
Karol Kosek há 4 anos atrás
pai
commit
ceadbafa97

+ 3 - 2
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();

+ 6 - 4
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";