diff options
| author | Ali Mohammad Pur <ali.mpfard@gmail.com> | 2021-05-20 23:17:30 +0430 |
|---|---|---|
| committer | Andreas Kling <kling@serenityos.org> | 2021-05-20 22:06:45 +0200 |
| commit | dc388297ebe661908f4da549dab2c57697a7414b (patch) | |
| tree | 65752507d48206dff5e125255a1ee144f594defe /Userland/Applications | |
| parent | 97a230e4efedf92879da89cce57ffcb8d26fa517 (diff) | |
| download | serenity-dc388297ebe661908f4da549dab2c57697a7414b.zip | |
TextEditor+Browser: Enable HTML syntax highlighting on HTML documents
Diffstat (limited to 'Userland/Applications')
| -rw-r--r-- | Userland/Applications/Browser/Tab.cpp | 2 | ||||
| -rw-r--r-- | Userland/Applications/TextEditor/MainWidget.cpp | 10 | ||||
| -rw-r--r-- | Userland/Applications/TextEditor/MainWidget.h | 1 |
3 files changed, 13 insertions, 0 deletions
diff --git a/Userland/Applications/Browser/Tab.cpp b/Userland/Applications/Browser/Tab.cpp index 2af6c42ed6..e7e05682e5 100644 --- a/Userland/Applications/Browser/Tab.cpp +++ b/Userland/Applications/Browser/Tab.cpp @@ -25,6 +25,7 @@ #include <LibGUI/ToolbarContainer.h> #include <LibGUI/Window.h> #include <LibJS/Interpreter.h> +#include <LibWeb/HTML/SyntaxHighlighter/SyntaxHighlighter.h> #include <LibWeb/InProcessWebView.h> #include <LibWeb/Layout/BlockBox.h> #include <LibWeb/Layout/InitialContainingBlockBox.h> @@ -69,6 +70,7 @@ void Tab::view_source(const URL& url, const String& source) auto& editor = window->set_main_widget<GUI::TextEditor>(); editor.set_text(source); editor.set_mode(GUI::TextEditor::ReadOnly); + editor.set_syntax_highlighter(make<Web::HTML::SyntaxHighlighter>()); editor.set_ruler_visible(true); window->resize(640, 480); window->set_title(url.to_string()); diff --git a/Userland/Applications/TextEditor/MainWidget.cpp b/Userland/Applications/TextEditor/MainWidget.cpp index 44949060ce..a893d511eb 100644 --- a/Userland/Applications/TextEditor/MainWidget.cpp +++ b/Userland/Applications/TextEditor/MainWidget.cpp @@ -39,6 +39,7 @@ #include <LibJS/SyntaxHighlighter.h> #include <LibMarkdown/Document.h> #include <LibSQL/SyntaxHighlighter.h> +#include <LibWeb/HTML/SyntaxHighlighter/SyntaxHighlighter.h> #include <LibWeb/OutOfProcessWebView.h> #include <Shell/SyntaxHighlighter.h> @@ -547,6 +548,13 @@ void MainWidget::initialize_menubar(GUI::Menubar& menubar) syntax_actions.add_action(*m_js_highlight); syntax_menu.add_action(*m_js_highlight); + m_html_highlight = GUI::Action::create_checkable("&HTML File", [&](auto&) { + m_editor->set_syntax_highlighter(make<Web::HTML::SyntaxHighlighter>()); + m_editor->update(); + }); + syntax_actions.add_action(*m_html_highlight); + syntax_menu.add_action(*m_html_highlight); + m_gml_highlight = GUI::Action::create_checkable("&GML", [&](auto&) { m_editor->set_syntax_highlighter(make<GUI::GMLSyntaxHighlighter>()); m_editor->update(); @@ -598,6 +606,8 @@ void MainWidget::set_path(const LexicalPath& lexical_path) m_ini_highlight->activate(); } else if (m_extension == "sql") { m_sql_highlight->activate(); + } else if (m_extension == "html") { + m_html_highlight->activate(); } else { m_plain_text_highlight->activate(); } diff --git a/Userland/Applications/TextEditor/MainWidget.h b/Userland/Applications/TextEditor/MainWidget.h index dc19f487b9..301cb84f80 100644 --- a/Userland/Applications/TextEditor/MainWidget.h +++ b/Userland/Applications/TextEditor/MainWidget.h @@ -111,6 +111,7 @@ private: RefPtr<GUI::Action> m_plain_text_highlight; RefPtr<GUI::Action> m_cpp_highlight; RefPtr<GUI::Action> m_js_highlight; + RefPtr<GUI::Action> m_html_highlight; RefPtr<GUI::Action> m_gml_highlight; RefPtr<GUI::Action> m_ini_highlight; RefPtr<GUI::Action> m_shell_highlight; |