RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 02:17:34 +00:00
Code Issues Activity Actions

LibSyntax+TextEditor: Move Highlighter::language_string() out of class

Browse source
This commit is contained in:
Karol Kosek 2022-12-19 19:13:18 +01:00 • committed by Tim Flynn
parent 3c2227ceed
commit b00865bce5
3 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Userland/Applications/TextEditor/MainWidget.cpp
View file

@ -872,7 +872,7 @@ void MainWidget::update_statusbar()
if (m_editor && m_editor->syntax_highlighter()) { if (m_editor && m_editor->syntax_highlighter()) {
auto language = m_editor->syntax_highlighter()->language(); auto language = m_editor->syntax_highlighter()->language();
m_statusbar->set_text(1, m_editor->syntax_highlighter()->language_string(language)); m_statusbar->set_text(1, Syntax::language_to_string(language));
} }
m_statusbar->set_text(2, DeprecatedString::formatted("Ln {}, Col {}", m_editor->cursor().line() + 1, m_editor->cursor().column())); m_statusbar->set_text(2, DeprecatedString::formatted("Ln {}, Col {}", m_editor->cursor().line() + 1, m_editor->cursor().column()));
} }

2
Userland/Libraries/LibSyntax/Highlighter.cpp
View file

@ -138,7 +138,7 @@ void Highlighter::register_nested_token_pairs(Vector<MatchingTokenPair> pairs)
m_nested_token_pairs.set(pair); m_nested_token_pairs.set(pair);
} }
StringView Highlighter::language_string(Language language) const StringView language_to_string(Language language)
{ {
switch (language) { switch (language) {
case Language::Cpp: case Language::Cpp:

3
Userland/Libraries/LibSyntax/Highlighter.h
View file

@ -32,6 +32,8 @@ struct TextStyle {
bool const bold { false }; bool const bold { false };
}; };
StringView language_to_string(Language);
class Highlighter { class Highlighter {
AK_MAKE_NONCOPYABLE(Highlighter); AK_MAKE_NONCOPYABLE(Highlighter);
AK_MAKE_NONMOVABLE(Highlighter); AK_MAKE_NONMOVABLE(Highlighter);
@ -40,7 +42,6 @@ public:
virtual ~Highlighter() = default; virtual ~Highlighter() = default;
virtual Language language() const = 0; virtual Language language() const = 0;
StringView language_string(Language) const;
virtual Optional<StringView> comment_prefix() const = 0; virtual Optional<StringView> comment_prefix() const = 0;
virtual Optional<StringView> comment_suffix() const = 0; virtual Optional<StringView> comment_suffix() const = 0;
virtual void rehighlight(Palette const&) = 0; virtual void rehighlight(Palette const&) = 0;