macOS: clThemedTextCtrl now generates the wxTE_PROCESS_ENTER event

Built-in terminal: include '@' as a valid word char Signed-off-by: Eran Ifrah <[email protected]>
eranif · Dec 25, 2024 · 31fa988 · 31fa988
1 parent 8bad38e
commit 31fa988
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/LiteEditor/BuildTabView.cpp b/LiteEditor/BuildTabView.cpp
@@ -108,7 +108,7 @@ void BuildTabView::InitialiseView()
     }
 
     SetScrollWidthTracking(true);
-    SetWordChars(R"#(\:~abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_$/.-+)#");
+    SetWordChars(R"#(\:~abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_$/.-+@)#");
     SetEditable(false);
 }
 #define PROCESSBUFFER_FMT_LINES_MAX 8192

diff --git a/Plugin/clThemedTextCtrl.cpp b/Plugin/clThemedTextCtrl.cpp
@@ -31,7 +31,7 @@ clThemedTextCtrl::clThemedTextCtrl(
 {
     wxUnusedVar(style);
 #if USE_TEXT_CTRL
-    wxTextCtrl::Create(parent, id, value, wxDefaultPosition, wxDefaultSize, BORDER_STYLE);
+    wxTextCtrl::Create(parent, id, value, wxDefaultPosition, wxDefaultSize, BORDER_STYLE | wxTE_PROCESS_ENTER);
 #else
     clThemedTextCtrlBase::Create(parent, wxID_ANY, wxDefaultPosition, wxDefaultSize, BORDER_STYLE);
     ApplySettings();

diff --git a/Plugin/wxTerminalCtrl/wxTerminalOutputCtrl.cpp b/Plugin/wxTerminalCtrl/wxTerminalOutputCtrl.cpp
@@ -129,7 +129,7 @@ void wxTerminalOutputCtrl::Initialise(const wxFont& font, const wxColour& bg_col
     m_ctrl->SetLexer(wxSTC_LEX_CONTAINER);
     m_ctrl->SetWrapMode(wxSTC_WRAP_CHAR);
     m_ctrl->SetEditable(false);
-    m_ctrl->SetWordChars(R"#(\:~abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_$/.-+)#");
+    m_ctrl->SetWordChars(R"#(\:~abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_$/.-+@)#");
     m_ctrl->IndicatorSetStyle(INDICATOR_HYPERLINK, wxSTC_INDIC_COMPOSITIONTHICK);
     auto lexer = ColoursAndFontsManager::Get().GetLexer("terminal");
     if (lexer) {