Refactor tab path display and apply code style cleanup

eranif · eranif · commit 672c9e4b6bd8 · 2026-03-07T22:40:10.000+02:00
Replaced magic boolean with configurable integer option for tab path display depth.
Applied consistent code formatting across multiple files, including spacing around control flow statements (if, switch, for) and braces in initializer lists.

Key changes:
* Modified SetTabShowPath() and IsTabShowPath() to use integer count parameter instead of boolean, allowing display of multiple directory levels
* Added GetFileNameWithDirPart() utility function to extract filename with configurable directory depth
* Updated tab label rendering to use new utility function with path depth configuration
* Changed modified file indicator in tabs from asterisk to floppy disk emoji (💾)
* Fixed line-length violations by reformatting long function signatures and calls
* Corrected loop variable types from size_t to int in PatchApplier for consistency with comparison operations

**Generated by CodeLite**

Signed-off-by: Eran Ifrah &lt;eran@codelite.org&gt;
diff --git a/CodeLite/fileutils.cpp b/CodeLite/fileutils.cpp
@@ -976,3 +976,39 @@ wxFileName FileUtils::wxReadLink(const wxFileName& filename)
     return filename;
 #endif
 }
+
+wxString FileUtils::GetFileNameWithDirPart(const wxString& fullpath, size_t count)
+{
+    wxString normalize_path = fullpath;
+    normalize_path.Replace("\\", "/");
+
+    // Split the path into parts
+    wxArrayString parts = ::wxStringTokenize(normalize_path, "/", wxTOKEN_STRTOK);
+
+    // If there are no parts, return the original path
+    if (parts.IsEmpty()) {
+        return fullpath;
+    }
+
+    // Get the filename (last part)
+    wxString filename = parts[parts.GetCount() - 1];
+
+    // Calculate the number of directory parts to include
+    size_t dirCount = parts.GetCount() - 1; // total dir parts (excluding filename)
+    size_t partsToInclude = (dirCount > count) ? count : dirCount;
+
+    // If no directory parts to include, just return the filename
+    if (partsToInclude == 0) {
+        return filename;
+    }
+
+    // Build the result: get the last 'partsToInclude' directory parts + filename
+    wxString result;
+    size_t startIdx = parts.GetCount() - 1 - partsToInclude; // index to start from
+    for (size_t i = startIdx; i < parts.GetCount(); ++i) {
+        result += parts[i];
+        if (i < parts.GetCount() - 1)
+            result += "/";
+    }
+    return result;
+}
diff --git a/CodeLite/fileutils.h b/CodeLite/fileutils.h
@@ -48,7 +48,7 @@ class WXDLLIMPEXP_CL FileUtils
 
         ~Deleter()
         {
-            if(m_filename.Exists()) {
+            if (m_filename.Exists()) {
                 clRemoveFile(m_filename);
             }
         }
@@ -99,16 +99,16 @@ class WXDLLIMPEXP_CL FileUtils
      * @param password the password
      * @param port ssh port
      */
-    static void OpenSSHTerminal(const wxString& sshClient, const wxString& connectString, const wxString& password,
-                                int port = 22);
+    static void
+    OpenSSHTerminal(const wxString& sshClient, const wxString& connectString, const wxString& password, int port = 22);
 
     /**
      * @brief OSX only: open Terminal and return its TTY
      * @param path working directory
      * @param [output] tty the TTY of the launched terminal
      */
-    static void OSXOpenDebuggerTerminalAndGetTTY(const wxString& path, const wxString& appname, wxString& tty,
-                                                 long& pid);
+    static void
+    OSXOpenDebuggerTerminalAndGetTTY(const wxString& path, const wxString& appname, wxString& tty, long& pid);
 
     /**
      * @brief file masking search
@@ -214,7 +214,7 @@ class WXDLLIMPEXP_CL FileUtils
     /**
      * @brief (on Linux) makes-absolute filepath, and dereferences it and any symlinked dirs in the path
      */
-    static wxString RealPath(const wxString& filepath, bool forced=false);
+    static wxString RealPath(const wxString& filepath, bool forced = false);
     static bool RealPathGetModeResolveSymlinks();
     static void RealPathSetModeResolveSymlinks(bool resolveSymlinks);
 
@@ -244,7 +244,9 @@ class WXDLLIMPEXP_CL FileUtils
      * passing suffix_list = {"-10", "-9"...} will also check for these files (in order)
      * @return true if a filepath was found
      */
-    static bool FindExe(const wxString& name, wxFileName& exepath, const wxArrayString& hint = {},
+    static bool FindExe(const wxString& name,
+                        wxFileName& exepath,
+                        const wxArrayString& hint = {},
                         const wxArrayString& suffix_list = {});
 
     /**
@@ -259,8 +261,8 @@ class WXDLLIMPEXP_CL FileUtils
      * @param extensions
      * @param [out] the files found
      */
-    static size_t FindSimilar(const wxFileName& filename, const std::vector<wxString>& extensions,
-                              std::vector<wxFileName>& vout);
+    static size_t
+    FindSimilar(const wxFileName& filename, const std::vector<wxString>& extensions, std::vector<wxFileName>& vout);
 
     /**
      * @brief convert path to uri
@@ -310,6 +312,8 @@ class WXDLLIMPEXP_CL FileUtils
      * \return true on success, false otherwise
      */
     static bool CopyDir(const wxString& src, const wxString& target);
+
+    static wxString GetFileNameWithDirPart(const wxString& fullpath, size_t count = 1);
 };
 
 #endif // FILEUTILS_H
diff --git a/LiteEditor/editorsettingsdockingwidows.cpp b/LiteEditor/editorsettingsdockingwidows.cpp
@@ -32,19 +32,21 @@ EditorSettingsDockingWindows::EditorSettingsDockingWindows(wxWindow* parent, Opt
 {
     AddHeader(_("Tabs"));
 
-    const std::unordered_map<wxString, int> tab_height_map = { { "TALL", OptionsConfig::nbTabHt_Tall },
-                                                               { "MEDIUM", OptionsConfig::nbTabHt_Medium },
-                                                               { "SHORT", OptionsConfig::nbTabHt_Short },
-                                                               { "TINY", OptionsConfig::nbTabHt_Tiny } };
+    const std::unordered_map<wxString, int> tab_height_map = {{"TALL", OptionsConfig::nbTabHt_Tall},
+                                                              {"MEDIUM", OptionsConfig::nbTabHt_Medium},
+                                                              {"SHORT", OptionsConfig::nbTabHt_Short},
+                                                              {"TINY", OptionsConfig::nbTabHt_Tiny}};
 
-    std::unordered_map<int, wxString> tab_height_map_reverse = { { OptionsConfig::nbTabHt_Tall, "TALL" },
-                                                                 { OptionsConfig::nbTabHt_Medium, "MEDIUM" },
-                                                                 { OptionsConfig::nbTabHt_Short, "SHORT" },
-                                                                 { OptionsConfig::nbTabHt_Tiny, "TINY" } };
+    std::unordered_map<int, wxString> tab_height_map_reverse = {{OptionsConfig::nbTabHt_Tall, "TALL"},
+                                                                {OptionsConfig::nbTabHt_Medium, "MEDIUM"},
+                                                                {OptionsConfig::nbTabHt_Short, "SHORT"},
+                                                                {OptionsConfig::nbTabHt_Tiny, "TINY"}};
 
-    std::vector<wxString> tab_heights = { "TALL", "MEDIUM", "SHORT", "TINY" };
+    std::vector<wxString> tab_heights = {"TALL", "MEDIUM", "SHORT", "TINY"};
 
-    AddProperty(_("Height"), tab_heights, tab_height_map_reverse.find(m_options->GetNotebookTabHeight())->second,
+    AddProperty(_("Height"),
+                tab_heights,
+                tab_height_map_reverse.find(m_options->GetNotebookTabHeight())->second,
                 [this, tab_height_map](const wxString& label, const wxAny& value) {
                     wxString value_str;
                     if (value.GetAs(&value_str)) {
@@ -53,23 +55,23 @@ EditorSettingsDockingWindows::EditorSettingsDockingWindows(wxWindow* parent, Opt
                 });
 
     std::unordered_map<wxString, wxDirection> orientation_map = {
-        { "UP", wxUP }, { "DOWN", wxDOWN }, { "LEFT", wxLEFT }, { "RIGHT", wxRIGHT }, { "VERTICAL", wxLEFT }
-    };
+        {"UP", wxUP}, {"DOWN", wxDOWN}, {"LEFT", wxLEFT}, {"RIGHT", wxRIGHT}, {"VERTICAL", wxLEFT}};
 
     std::unordered_map<int, wxString> orientation_map_reverse = {
-        { wxUP, "UP" }, { wxDOWN, "DOWN" }, { wxLEFT, "LEFT" }, { wxRIGHT, "RIGHT" }, { wxLEFT, "VERTICAL" }
-    };
+        {wxUP, "UP"}, {wxDOWN, "DOWN"}, {wxLEFT, "LEFT"}, {wxRIGHT, "RIGHT"}, {wxLEFT, "VERTICAL"}};
 
-    std::vector<wxString> sidebar_tab_orientation = { "VERTICAL", "UP", "DOWN" };
-    AddProperty(_("Sidebar buttons position"), sidebar_tab_orientation,
+    std::vector<wxString> sidebar_tab_orientation = {"VERTICAL", "UP", "DOWN"};
+    AddProperty(_("Sidebar buttons position"),
+                sidebar_tab_orientation,
                 orientation_map_reverse[m_options->GetWorkspaceTabsDirection()],
                 [this, orientation_map](const wxString&, const wxAny& value) mutable {
                     wxString str_value;
                     if (value.GetAs(&str_value)) {
                         m_options->SetWorkspaceTabsDirection(orientation_map[str_value]);
                     }
                 });
-    AddProperty(_("Output tabs orientation"), std::vector<wxString>{ "UP", "DOWN" },
+    AddProperty(_("Output tabs orientation"),
+                std::vector<wxString>{"UP", "DOWN"},
                 orientation_map_reverse[m_options->GetOutputTabsDirection()],
                 [this, orientation_map](const wxString&, const wxAny& value) mutable {
                     wxString str_value;
@@ -79,28 +81,32 @@ EditorSettingsDockingWindows::EditorSettingsDockingWindows(wxWindow* parent, Opt
                 });
 
     AddProperty(_("Show close button on tabs"), m_options->IsTabHasXButton(), UPDATE_BOOL_CB(SetTabHasXButton));
-    AddProperty(_("Show file path on tab label"), m_options->IsTabShowPath(), UPDATE_BOOL_CB(SetTabShowPath));
+    AddProperty(_("Dir parts in tab label"), m_options->GetTabShowPath(), UPDATE_INT_CB(SetTabShowPath));
 
 #if !MAINBOOK_AUIBOOK
-    AddProperty(_("Mouse scroll switch bewtween tabs"), m_options->IsMouseScrollSwitchTabs(),
+    AddProperty(_("Mouse scroll switch bewtween tabs"),
+                m_options->IsMouseScrollSwitchTabs(),
                 UPDATE_BOOL_CB(SetMouseScrollSwitchTabs));
-    AddProperty(_("Sort tab file list"), m_options->IsSortTabsDropdownAlphabetically(),
+    AddProperty(_("Sort tab file list"),
+                m_options->IsSortTabsDropdownAlphabetically(),
                 UPDATE_BOOL_CB(SetSortTabsDropdownAlphabetically));
 #endif
 
     AddProperty(_("Use Ctrl+TAB to switch tabs"), m_options->IsCtrlTabEnabled(), UPDATE_BOOL_CB(SetCtrlTabEnabled));
 #ifndef __WXGTK__
-    AddProperty(_("Hide main tab bar"), clConfig::Get().Read("HideTabBar", false),
-                UPDATE_CLCONFIG_BOOL_CB("HideTabBar"));
+    AddProperty(
+        _("Hide main tab bar"), clConfig::Get().Read("HideTabBar", false), UPDATE_CLCONFIG_BOOL_CB("HideTabBar"));
 #endif
     AddHeader(_("Find in files"));
-    AddProperty(_("Don't automatically fold search results"), m_options->GetDontAutoFoldResults(),
+    AddProperty(_("Don't automatically fold search results"),
+                m_options->GetDontAutoFoldResults(),
                 UPDATE_BOOL_CB(SetDontAutoFoldResults));
     AddProperty(_("When searching, don't override search string with current selection"),
                 m_options->GetDontOverrideSearchStringWithSelection(),
                 UPDATE_BOOL_CB(SetDontOverrideSearchStringWithSelection));
     AddHeader(_("Find next/Find previous"));
-    AddProperty(_("Find next/Find previous actions override search string with current selection (like Find next at caret/prev at caret)"),
+    AddProperty(_("Find next/Find previous actions override search string with current selection (like Find next at "
+                  "caret/prev at caret)"),
                 m_options->GetFindNextOrPreviousUseSelection(),
                 UPDATE_BOOL_CB(SetFindNextOrPreviousUseSelection));
 }
diff --git a/LiteEditor/mainbook.cpp b/LiteEditor/mainbook.cpp
@@ -1200,15 +1200,15 @@ void MainBook::ApplyTabLabelChanges()
 {
     // We only want to do this if there *is* a change, and it's hard to be sure
     // by looking.  So store any previous state in:
-    static int previousShowParentPath = -1;
+    static std::optional<int> previousShowParentPath{std::nullopt};
 
-    if (previousShowParentPath < 0 ||
-        EditorConfigST::Get()->GetOptions()->IsTabShowPath() != (bool)previousShowParentPath) {
-        previousShowParentPath = EditorConfigST::Get()->GetOptions()->IsTabShowPath();
+    if (!previousShowParentPath.has_value() ||
+        EditorConfigST::Get()->GetOptions()->GetTabShowPath() != previousShowParentPath.value()) {
+        previousShowParentPath = EditorConfigST::Get()->GetOptions()->GetTabShowPath();
 
         std::vector<clEditor*> editors = GetAllEditors();
         for (size_t i = 0; i < editors.size(); i++) {
-            SetPageTitle(editors[i], editors[i]->GetFileName(), editors[i]->IsEditorModified());
+            SetPageTitle(editors[i], editors[i]->GetRemotePathOrLocal(), editors[i]->IsEditorModified());
         }
     }
 }
@@ -1967,17 +1967,11 @@ void MainBook::SetPageTitle(wxWindow* page, const wxFileName& filename, bool mod
 wxString MainBook::CreateLabel(const wxFileName& fn, bool modified) const
 {
     wxString label = fn.GetFullName();
-    if (fn.GetDirCount() && EditorConfigST::Get()->GetOptions()->IsTabShowPath()) {
-        label.Prepend(fn.GetDirs().Last() + wxFileName::GetPathSeparator());
-    }
+    label = FileUtils::GetFileNameWithDirPart(fn.GetFullPath(), EditorConfigST::Get()->GetOptions()->GetTabShowPath());
 
 #if CL_USE_NATIVEBOOK || MAINBOOK_AUIBOOK
     if (modified) {
-#if defined(__WXMSW__) || defined(__WXMAC__)
         label.Prepend(wxT(" \U0001F4BE "));
-#else
-        label.Prepend(wxT(" * "));
-#endif
     }
 #else
     wxUnusedVar(modified);
diff --git a/LiteEditor/openwindowspanel.cpp b/LiteEditor/openwindowspanel.cpp
@@ -30,6 +30,7 @@
 #include "cl_config.h"
 #include "editor_config.h"
 #include "event_notifier.h"
+#include "fileutils.h"
 #include "globals.h"
 #include "imanager.h"
 #include "macros.h"
@@ -471,7 +472,7 @@ wxVariant OpenWindowsPanel::PrepareValue(const clTab& tab, bool* isModified)
     int imgId = clGetManager()->GetStdIcons()->GetMimeImageId(ft);
     if (editor && editor->GetModify()) {
         *isModified = true;
-        title.Prepend("*");
+        title.Prepend(wxT(" \U0001F4BE "));
     }
 
     wxVariant value = ::MakeBitmapIndexText(title, imgId);
@@ -519,13 +520,10 @@ wxString OpenWindowsPanel::GetDisplayName(const clTab& tab) const
     wxString title;
     if (tab.isFile) {
         const wxFileName& fn = tab.filename;
-        if (fn.GetDirCount() && EditorConfigST::Get()->GetOptions()->IsTabShowPath()) {
-            title = fn.GetDirs().Last() + wxFileName::GetPathSeparator() + fn.GetFullName();
-        } else {
-            title = tab.filename.GetFullName();
-        }
+        title =
+            FileUtils::GetFileNameWithDirPart(fn.GetFullPath(), EditorConfigST::Get()->GetOptions()->GetTabShowPath());
     } else {
         title = tab.text;
     }
     return title;
-}
+}
diff --git a/Plugin/Diff/clPatchApplier.cpp b/Plugin/Diff/clPatchApplier.cpp
@@ -192,7 +192,7 @@ clStatusOr<int> PatchApplier::ApplyHunk(ITextArea* ctrl, const wxArrayString& li
 
     // First pass: locate the hunk.
     int hunk_found_line{wxNOT_FOUND};
-    for (size_t current_editor_line_number = start_line; current_editor_line_number < totalLines;
+    for (int current_editor_line_number = start_line; current_editor_line_number < totalLines;
          ++current_editor_line_number) {
         wxString editor_line = ctrl->GetLine(current_editor_line_number);
         editor_line.Trim();
@@ -201,7 +201,7 @@ clStatusOr<int> PatchApplier::ApplyHunk(ITextArea* ctrl, const wxArrayString& li
         }
 
         bool hunk_found{true};
-        for (size_t hunk_line_number = 0; hunk_line_number < lines_to_find.size(); ++hunk_line_number) {
+        for (int hunk_line_number = 0; hunk_line_number < lines_to_find.size(); ++hunk_line_number) {
             wxString hunk_line = lines_to_find[hunk_line_number];
             // These lines must exist and match in the control
             if (current_editor_line_number + hunk_line_number >= totalLines) {
diff --git a/Plugin/clDataViewListCtrl.cpp b/Plugin/clDataViewListCtrl.cpp
diff --git a/Plugin/optionsconfig.cpp b/Plugin/optionsconfig.cpp
diff --git a/Plugin/optionsconfig.h b/Plugin/optionsconfig.h
