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

LibGUI+LibCpp: Move C++ syntax highlighter to LibCpp

Browse source 
This makes LibGUI not depend on LibCpp.
This commit is contained in:
Andreas Kling 2021-02-07 14:40:36 +01:00
parent b1f1f5afcf
commit ff2438e0ce
9 changed files with 23 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Userland/Applications/TextEditor/CMakeLists.txt
View file

@ -7,4 +7,4 @@ set(SOURCES
) )
serenity_app(TextEditor ICON app-text-editor) serenity_app(TextEditor ICON app-text-editor)
target_link_libraries(TextEditor LibWeb LibMarkdown LibGUI LibShell LibRegex LibDesktop) target_link_libraries(TextEditor LibWeb LibMarkdown LibGUI LibShell LibRegex LibDesktop LibCpp)

4
Userland/Applications/TextEditor/TextEditorWidget.cpp
View file

@ -33,12 +33,12 @@
#include <Applications/TextEditor/TextEditorWindowGML.h> #include <Applications/TextEditor/TextEditorWindowGML.h>
#include <LibCore/File.h> #include <LibCore/File.h>
#include <LibCore/MimeData.h> #include <LibCore/MimeData.h>
#include <LibCpp/SyntaxHighlighter.h>
#include <LibDesktop/Launcher.h> #include <LibDesktop/Launcher.h>
#include <LibGUI/Action.h> #include <LibGUI/Action.h>
#include <LibGUI/ActionGroup.h> #include <LibGUI/ActionGroup.h>
#include <LibGUI/BoxLayout.h> #include <LibGUI/BoxLayout.h>
#include <LibGUI/Button.h> #include <LibGUI/Button.h>
#include <LibGUI/CppSyntaxHighlighter.h>
#include <LibGUI/FilePicker.h> #include <LibGUI/FilePicker.h>
#include <LibGUI/FontPicker.h> #include <LibGUI/FontPicker.h>
#include <LibGUI/GMLSyntaxHighlighter.h> #include <LibGUI/GMLSyntaxHighlighter.h>
@ -469,7 +469,7 @@ TextEditorWidget::TextEditorWidget()
syntax_menu.add_action(*m_plain_text_highlight); syntax_menu.add_action(*m_plain_text_highlight);
m_cpp_highlight = GUI::Action::create_checkable("C++", [&](auto&) { m_cpp_highlight = GUI::Action::create_checkable("C++", [&](auto&) {
m_editor->set_syntax_highlighter(make<GUI::CppSyntaxHighlighter>()); m_editor->set_syntax_highlighter(make<Cpp::SyntaxHighlighter>());
m_editor->update(); m_editor->update();
}); });
syntax_actions.add_action(*m_cpp_highlight); syntax_actions.add_action(*m_cpp_highlight);

2
Userland/DevTools/HackStudio/CMakeLists.txt
View file

@ -33,5 +33,5 @@ set(SOURCES
) )
serenity_app(HackStudio ICON app-hack-studio) serenity_app(HackStudio ICON app-hack-studio)
target_link_libraries(HackStudio LibWeb LibMarkdown LibGUI LibGfx LibCore LibVT LibDebug LibX86 LibDiff LibShell) target_link_libraries(HackStudio LibWeb LibMarkdown LibGUI LibCpp LibGfx LibCore LibVT LibDebug LibX86 LibDiff LibShell)
add_dependencies(HackStudio CppLanguageServer) add_dependencies(HackStudio CppLanguageServer)

4
Userland/DevTools/HackStudio/Editor.cpp
View file

@ -34,8 +34,8 @@
#include <AK/LexicalPath.h> #include <AK/LexicalPath.h>
#include <LibCore/DirIterator.h> #include <LibCore/DirIterator.h>
#include <LibCore/File.h> #include <LibCore/File.h>
#include <LibCpp/SyntaxHighlighter.h>
#include <LibGUI/Application.h> #include <LibGUI/Application.h>
#include <LibGUI/CppSyntaxHighlighter.h>
#include <LibGUI/GMLSyntaxHighlighter.h> #include <LibGUI/GMLSyntaxHighlighter.h>
#include <LibGUI/INISyntaxHighlighter.h> #include <LibGUI/INISyntaxHighlighter.h>
#include <LibGUI/JSSyntaxHighlighter.h> #include <LibGUI/JSSyntaxHighlighter.h>
@ -418,7 +418,7 @@ void Editor::set_document(GUI::TextDocument& doc)
CodeDocument& code_document = static_cast<CodeDocument&>(doc); CodeDocument& code_document = static_cast<CodeDocument&>(doc);
switch (code_document.language()) { switch (code_document.language()) {
case Language::Cpp: case Language::Cpp:
set_syntax_highlighter(make<GUI::CppSyntaxHighlighter>()); set_syntax_highlighter(make<Cpp::SyntaxHighlighter>());
m_language_client = get_language_client<LanguageClients::Cpp::ServerConnection>(project().root_path()); m_language_client = get_language_client<LanguageClients::Cpp::ServerConnection>(project().root_path());
break; break;
case Language::GML: case Language::GML:

1
Userland/Libraries/LibCpp/CMakeLists.txt
View file

@ -2,6 +2,7 @@ set(SOURCES
AST.cpp AST.cpp
Lexer.cpp Lexer.cpp
Parser.cpp Parser.cpp
SyntaxHighlighter.cpp
) )
serenity_lib(LibCpp cpp) serenity_lib(LibCpp cpp)

18
Userland/Libraries/LibGUI/CppSyntaxHighlighter.cpp → Userland/Libraries/LibCpp/SyntaxHighlighter.cpp
View file

@ -26,14 +26,14 @@
#include <AK/Debug.h> #include <AK/Debug.h>
#include <LibCpp/Lexer.h> #include <LibCpp/Lexer.h>
#include <LibGUI/CppSyntaxHighlighter.h> #include <LibCpp/SyntaxHighlighter.h>
#include <LibGUI/TextEditor.h> #include <LibGUI/TextEditor.h>
#include <LibGfx/Font.h> #include <LibGfx/Font.h>
#include <LibGfx/Palette.h> #include <LibGfx/Palette.h>
namespace GUI { namespace Cpp {
static TextStyle style_for_token_type(Gfx::Palette palette, Cpp::Token::Type type) static GUI::TextStyle style_for_token_type(const Gfx::Palette& palette, Cpp::Token::Type type)
{ {
switch (type) { switch (type) {
case Cpp::Token::Type::Keyword: case Cpp::Token::Type::Keyword:
@ -63,19 +63,19 @@ static TextStyle style_for_token_type(Gfx::Palette palette, Cpp::Token::Type typ
} }
} }
bool CppSyntaxHighlighter::is_identifier(void* token) const bool SyntaxHighlighter::is_identifier(void* token) const
{ {
auto cpp_token = static_cast<Cpp::Token::Type>(reinterpret_cast<size_t>(token)); auto cpp_token = static_cast<Cpp::Token::Type>(reinterpret_cast<size_t>(token));
return cpp_token == Cpp::Token::Type::Identifier; return cpp_token == Cpp::Token::Type::Identifier;
} }
bool CppSyntaxHighlighter::is_navigatable(void* token) const bool SyntaxHighlighter::is_navigatable(void* token) const
{ {
auto cpp_token = static_cast<Cpp::Token::Type>(reinterpret_cast<size_t>(token)); auto cpp_token = static_cast<Cpp::Token::Type>(reinterpret_cast<size_t>(token));
return cpp_token == Cpp::Token::Type::IncludePath; return cpp_token == Cpp::Token::Type::IncludePath;
} }
void CppSyntaxHighlighter::rehighlight(Gfx::Palette palette) void SyntaxHighlighter::rehighlight(Gfx::Palette palette)
{ {
ASSERT(m_editor); ASSERT(m_editor);
auto text = m_editor->text(); auto text = m_editor->text();
@ -103,7 +103,7 @@ void CppSyntaxHighlighter::rehighlight(Gfx::Palette palette)
m_editor->update(); m_editor->update();
} }
Vector<SyntaxHighlighter::MatchingTokenPair> CppSyntaxHighlighter::matching_token_pairs() const Vector<SyntaxHighlighter::MatchingTokenPair> SyntaxHighlighter::matching_token_pairs() const
{ {
static Vector<SyntaxHighlighter::MatchingTokenPair> pairs; static Vector<SyntaxHighlighter::MatchingTokenPair> pairs;
if (pairs.is_empty()) { if (pairs.is_empty()) {
@ -114,12 +114,12 @@ Vector<SyntaxHighlighter::MatchingTokenPair> CppSyntaxHighlighter::matching_toke
return pairs; return pairs;
} }
bool CppSyntaxHighlighter::token_types_equal(void* token1, void* token2) const bool SyntaxHighlighter::token_types_equal(void* token1, void* token2) const
{ {
return static_cast<Cpp::Token::Type>(reinterpret_cast<size_t>(token1)) == static_cast<Cpp::Token::Type>(reinterpret_cast<size_t>(token2)); return static_cast<Cpp::Token::Type>(reinterpret_cast<size_t>(token1)) == static_cast<Cpp::Token::Type>(reinterpret_cast<size_t>(token2));
} }
CppSyntaxHighlighter::~CppSyntaxHighlighter() SyntaxHighlighter::~SyntaxHighlighter()
{ {
} }

10
Userland/Libraries/LibGUI/CppSyntaxHighlighter.h → Userland/Libraries/LibCpp/SyntaxHighlighter.h
View file

@ -28,17 +28,17 @@
#include <LibGUI/SyntaxHighlighter.h> #include <LibGUI/SyntaxHighlighter.h>
namespace GUI { namespace Cpp {
class CppSyntaxHighlighter final : public SyntaxHighlighter { class SyntaxHighlighter final : public GUI::SyntaxHighlighter {
public: public:
CppSyntaxHighlighter() { } SyntaxHighlighter() { }
virtual ~CppSyntaxHighlighter() override; virtual ~SyntaxHighlighter() override;
virtual bool is_identifier(void*) const override; virtual bool is_identifier(void*) const override;
virtual bool is_navigatable(void*) const override; virtual bool is_navigatable(void*) const override;
virtual SyntaxLanguage language() const override { return SyntaxLanguage::Cpp; } virtual GUI::SyntaxLanguage language() const override { return GUI::SyntaxLanguage::Cpp; }
virtual void rehighlight(Gfx::Palette) override; virtual void rehighlight(Gfx::Palette) override;
protected: protected:

3
Userland/Libraries/LibGUI/CMakeLists.txt
View file

@ -22,7 +22,6 @@ set(SOURCES
ComboBox.cpp ComboBox.cpp
Command.cpp Command.cpp
ControlBoxButton.cpp ControlBoxButton.cpp
CppSyntaxHighlighter.cpp
Desktop.cpp Desktop.cpp
Dialog.cpp Dialog.cpp
DisplayLink.cpp DisplayLink.cpp
@ -111,4 +110,4 @@ set(GENERATED_SOURCES
) )
serenity_lib(LibGUI gui) serenity_lib(LibGUI gui)
target_link_libraries(LibGUI LibCore LibGfx LibIPC LibThread LibCpp LibShell LibRegex LibJS) target_link_libraries(LibGUI LibCore LibGfx LibIPC LibThread LibShell LibRegex LibJS)

2
Userland/Utilities/CMakeLists.txt
View file

@ -48,4 +48,4 @@ target_link_libraries(test-web LibWeb)
target_link_libraries(tt LibPthread) target_link_libraries(tt LibPthread)
target_link_libraries(grep LibRegex) target_link_libraries(grep LibRegex)
target_link_libraries(gunzip LibCompress) target_link_libraries(gunzip LibCompress)
target_link_libraries(CppParserTest LibCpp) target_link_libraries(CppParserTest LibCpp LibGUI)