Fixed build

updated lexilla export TERM env variable for built-in terminals clang-format config file updated Signed-off-by: Eran Ifrah <[email protected]>
eranif · Dec 8, 2024 · 9083e12 · 9083e12
1 parent 162a4d6
commit 9083e12
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 3 deletions.
diff --git a/.clang-format b/.clang-format
@@ -9,7 +9,6 @@ AllowShortBlocksOnASingleLine: true
 AllowShortFunctionsOnASingleLine: true
 #AllowShortIfStatementsOnASingleLine: true
 AllowShortLoopsOnASingleLine: false
-BinPackParameters: true
 BreakBeforeBraces: Linux
 BreakBeforeTernaryOperators: true
 BreakConstructorInitializersBeforeComma: true
@@ -52,3 +51,7 @@ SortIncludes: true
 IncludeBlocks: Regroup
 AlwaysBreakTemplateDeclarations: true
 AlwaysBreakBeforeMultilineStrings: false
+AlignEscapedNewlines: LeftWithLastLine
+AlignOperands: true
+BinPackParameters: false
+BinPackArguments: false
diff --git a/Plugin/wxTerminalCtrl/wxTerminalCtrl.cpp b/Plugin/wxTerminalCtrl/wxTerminalCtrl.cpp
@@ -100,6 +100,8 @@ void wxTerminalCtrl::StartShell()
     env.push_back({ "WD", wxFileName(shell_exec).GetPath() });
 #endif
 
+    // required to get colours
+    env.push_back({ "TERM", "xterm-256color" });
     LOG_DEBUG(TERM_LOG()) << "Starting shell process:" << shell_exec << endl;
     if (m_shellCommand == "bash") {
         m_shell = ::CreateAsyncProcess(this, shell_exec + " --login -i", IProcessRawOutput, wxEmptyString, &env);

diff --git a/submodules/lexilla b/submodules/lexilla
diff --git a/submodules/wxdap b/submodules/wxdap
+2 −0		CMakeLists.txt
+279 −22		lexers/LexTerminal.cxx
+2 −2		lexilla.workspace
+6 −0		dap/StringUtils.cpp
+1 −0		dap/StringUtils.hpp
+7 −7		dap/msw.cpp