Remove Retagging Hooks From Workspace And Editor

Eliminate the legacy retagging flow from project creation, file additions, file renames, and several editor/workspace UI actions. Workspace and file tag refreshes are no longer triggered directly from Manager, FileViewTree, MainBook, or ContextCpp, and the retag-in-progress guard is removed along with its related menu and update handlers.

The change also fixes the FileSystemWorkspace compile-flags file helper declaration to use the correct class name.

* Manager
* FileViewTree
* MainBook
* ContextCpp
* FileSystemWorkspace

**Generated by CodeLite**

Signed-off-by: Eran Ifrah <eran@codelite.org>

Author: eranif

LiteEditor/context_cpp.cpp

@@ -144,7 +144,6 @@ EVT_MENU(XRCID("add_multi_impl"), ContextCpp::OnAddMultiImpl)
 EVT_MENU(XRCID("setters_getters"), ContextCpp::OnGenerateSettersGetters)
 EVT_MENU(XRCID("add_include_file"), ContextCpp::OnAddIncludeFile)
 EVT_MENU(XRCID("add_forward_decl"), ContextCpp::OnAddForwardDecl)
-EVT_MENU(XRCID("retag_file"), ContextCpp::OnRetagFile)
 EVT_MENU(XRCID("open_include_file"), ContextCpp::OnContextOpenDocument)
 END_EVENT_TABLE()
 
@@ -1688,36 +1687,6 @@ bool ContextCpp::IsComment(long pos) const
             style == wxSTC_C_COMMENTDOCKEYWORDERROR);
 }
 
-void ContextCpp::OnRetagFile(wxCommandEvent& e)
-{
-    CHECK_JS_RETURN_VOID();
-    VALIDATE_WORKSPACE();
-
-    wxUnusedVar(e);
-    clEditor& editor = GetCtrl();
-    if (editor.GetModify()) {
-        wxMessageBox(wxString::Format(_("Please save the file before retagging it")));
-        return;
-    }
-
-    RetagFile();
-    editor.SetActive();
-}
-
-void ContextCpp::RetagFile()
-{
-    CHECK_JS_RETURN_VOID();
-    if (ManagerST::Get()->GetRetagInProgress()) {
-        return;
-    }
-
-    clEditor& editor = GetCtrl();
-    ManagerST::Get()->RetagFile(editor.GetFileName().GetFullPath());
-
-    // incase this file is not cache this function does nothing
-    TagsManagerST::Get()->ClearCachedFile(editor.GetFileName().GetFullPath());
-}
-
 void ContextCpp::OnUserTypedXChars(const wxString& word)
 {
     // user typed more than 3 chars, display completion box with C++ keywords

LiteEditor/context_cpp.h

@@ -55,7 +55,8 @@ class ContextCpp : public ContextBase
     bool DoCodeComplete(long pos);
     void DoCreateFile(const wxFileName& fn);
     void DoUpdateCalltipHighlight();
-    size_t DoGetEntriesForHeaderAndImpl(std::vector<TagEntryPtr>& prototypes, std::vector<TagEntryPtr>& functions,
+    size_t DoGetEntriesForHeaderAndImpl(std::vector<TagEntryPtr>& prototypes,
+                                        std::vector<TagEntryPtr>& functions,
                                         wxString& otherfile);
 
 public:
@@ -84,7 +85,6 @@ class ContextCpp : public ContextBase
     void AddMenuDynamicContent(wxMenu* menu) override;
     void RemoveMenuDynamicContent(wxMenu* menu) override;
     void ApplySettings() override;
-    void RetagFile() override;
     wxString CallTipContent() override;
     void SetActive() override;
     void SemicolonShift() override;
@@ -120,7 +120,6 @@ class ContextCpp : public ContextBase
     virtual void OnMoveImpl(wxCommandEvent& e);
     virtual void OnAddImpl(wxCommandEvent& e);
     virtual void OnAddMultiImpl(wxCommandEvent& e);
-    virtual void OnRetagFile(wxCommandEvent& e);
     virtual void OnUserTypedXChars(const wxString& word);
     void OnCallTipClick(wxStyledTextEvent& e) override;
     void OnCalltipCancel() override;

LiteEditor/fileview.cpp

@@ -105,7 +105,6 @@ EVT_MENU(XRCID("pin_project"), FileViewTree::OnPinProject)
 EVT_MENU(XRCID("rebuild_project"), FileViewTree::OnReBuild)
 EVT_MENU(XRCID("generate_makefile"), FileViewTree::OnRunPremakeStep)
 EVT_MENU(XRCID("stop_build"), FileViewTree::OnStopBuild)
-EVT_MENU(XRCID("retag_project"), FileViewTree::OnRetagProject)
 EVT_MENU(XRCID("build_project_only"), FileViewTree::OnBuildProjectOnly)
 EVT_MENU(XRCID("clean_project_only"), FileViewTree::OnCleanProjectOnly)
 EVT_MENU(XRCID("rebuild_project_only"), FileViewTree::OnRebuildProjectOnly)
@@ -140,8 +139,6 @@ EVT_UPDATE_UI(XRCID("build_order"), FileViewTree::OnBuildInProgress)
 EVT_UPDATE_UI(XRCID("clean_project"), FileViewTree::OnBuildInProgress)
 EVT_UPDATE_UI(XRCID("build_project"), FileViewTree::OnBuildInProgress)
 EVT_UPDATE_UI(XRCID("rebuild_project"), FileViewTree::OnBuildInProgress)
-EVT_UPDATE_UI(XRCID("retag_project"), FileViewTree::OnRetagInProgressUI)
-EVT_UPDATE_UI(XRCID("retag_workspace"), FileViewTree::OnRetagInProgressUI)
 EVT_UPDATE_UI(XRCID("build_project_only"), FileViewTree::OnBuildInProgress)
 EVT_UPDATE_UI(XRCID("clean_project_only"), FileViewTree::OnBuildInProgress)
 EVT_UPDATE_UI(XRCID("rebuild_project_only"), FileViewTree::OnBuildInProgress)
@@ -1335,22 +1332,6 @@ size_t FileViewTree::GetMultiSelection(wxArrayTreeItemIds& arr)
     }
 }
 
-void FileViewTree::OnRetagProject(wxCommandEvent& event)
-{
-    wxUnusedVar(event);
-    wxTreeItemId item = GetSingleSelection();
-    if (item.IsOk()) {
-        wxString projectName = GetItemText(item);
-        ManagerST::Get()->RetagProject(projectName, true);
-    }
-}
-
-void FileViewTree::OnRetagWorkspace(wxCommandEvent& event)
-{
-    wxUnusedVar(event);
-    ManagerST::Get()->RetagWorkspace(TagsManager::Retag_Quick);
-}
-
 void FileViewTree::OnItemBeginDrag(wxTreeEvent& event)
 {
     wxArrayTreeItemIds selections;
@@ -2060,11 +2041,6 @@ void FileViewTree::OnLocalWorkspaceSettings(wxCommandEvent& e)
     }
 }
 
-void FileViewTree::OnRetagInProgressUI(wxUpdateUIEvent& event)
-{
-    event.Enable(!ManagerST::Get()->GetRetagInProgress());
-}
-
 void FileViewTree::OnOpenWithDefaultApplication(wxCommandEvent& event)
 {
     wxArrayTreeItemIds items;
@@ -2433,10 +2409,6 @@ void FileViewTree::OnFolderDropped(clCommandEvent& event)
         evtOpenworkspace.SetEventObject(clMainFrame::Get());
         clMainFrame::Get()->GetEventHandler()->AddPendingEvent(evtOpenworkspace);
     }
-
-    // And trigger a full reparse of the workspace
-    wxCommandEvent evtOpenworkspace(wxEVT_MENU, XRCID("full_retag_workspace"));
-    clMainFrame::Get()->GetEventHandler()->AddPendingEvent(evtOpenworkspace);
 }
 
 void FileViewTree::FolderDropped(const wxArrayString& folders)

LiteEditor/fileview.h

@@ -164,11 +164,8 @@ class FileViewTree : public clThemedTreeCtrl
     virtual void OnCleanProjectOnly(wxCommandEvent& event);
     virtual void OnRebuildProjectOnly(wxCommandEvent& event);
     virtual void OnStopBuild(wxCommandEvent& event);
-    virtual void OnRetagProject(wxCommandEvent& event);
-    virtual void OnRetagWorkspace(wxCommandEvent& event);
     virtual void OnBuildInProgress(wxUpdateUIEvent& event);
     virtual void OnExcludeFromBuildUI(wxUpdateUIEvent& event);
-    virtual void OnRetagInProgressUI(wxUpdateUIEvent& event);
     virtual void OnItemBeginDrag(wxTreeEvent& event);
     virtual void OnItemEndDrag(wxTreeEvent& event);
     virtual void OnImportDirectory(wxCommandEvent& e);

LiteEditor/mainbook.cpp

@@ -1031,18 +1031,6 @@ void MainBook::ReloadExternallyModified(bool prompt)
 
     // reset the recursive protector
     depth = wxNOT_FOUND;
-
-    std::vector<wxFileName> filesToRetag;
-    for (size_t i = 0; i < files.size(); i++) {
-        if (files[i].second) {
-            editors[i]->ReloadFromDisk(true);
-            filesToRetag.push_back(files[i].first);
-        }
-    }
-
-    if (filesToRetag.size() > 1) {
-        TagsManagerST::Get()->ParseWorkspaceIncremental();
-    }
 }
 
 bool MainBook::ClosePage(wxWindow* page)

LiteEditor/manager.cpp

@@ -259,7 +259,6 @@ Manager::Manager()
     , m_tipWinPos(wxNOT_FOUND)
     , m_frameLineno(wxNOT_FOUND)
     , m_watchDlg(NULL)
-    , m_retagInProgress(false)
 {
     Bind(wxEVT_RESTART_CODELITE, &Manager::OnRestart, this);
     Bind(wxEVT_FORCE_RESTART_CODELITE, &Manager::OnForcedRestart, this);
@@ -649,7 +648,6 @@ void Manager::CreateProject(ProjectData& data, const wxString& workspaceFolder)
     }
 
     wxString projectName = proj->GetName();
-    RetagProject(projectName, true);
 
     // Update the parser search paths
     CallAfter(&Manager::UpdateParserPaths, false);
@@ -681,7 +679,6 @@ void Manager::AddProject(const wxString& path)
 
     wxFileName fn(path);
     wxString projectName(fn.GetName());
-    RetagProject(projectName, true);
 
     clCommandEvent evtProjectAdded(wxEVT_PROJ_ADDED);
     evtProjectAdded.SetString(projectName);
@@ -879,21 +876,6 @@ void Manager::GetWorkspaceFiles(std::vector<wxFileName>& files, bool absPath)
     }
 }
 
-void Manager::RetagWorkspace(TagsManager::RetagType type)
-{
-    if (!clWorkspaceManager::Get().IsWorkspaceOpened()) {
-        return;
-    }
-
-    if (type == TagsManager::Retag_Quick) {
-        TagsManagerST::Get()->ParseWorkspaceIncremental();
-    } else {
-        TagsManagerST::Get()->ParseWorkspaceFull(clWorkspaceManager::Get().GetWorkspace()->GetDir());
-    }
-}
-
-void Manager::RetagFile(const wxString& filename) { wxUnusedVar(filename); }
-
 //--------------------------- Project Files Mgmt -----------------------------
 
 int Manager::AddVirtualDirectory(const wxString& virtualDirFullPath, bool createIt)
@@ -1046,11 +1028,6 @@ void Manager::AddFilesToProject(const wxArrayString& files, const wxString& vdFu
         vFiles.push_back(actualAdded.Item(i));
     }
 
-    // re-tag the added files
-    if (vFiles.empty() == false) {
-        TagsManagerST::Get()->ParseWorkspaceIncremental();
-    }
-
     if (!actualAdded.IsEmpty()) {
         clCommandEvent evtAddFiles(wxEVT_PROJ_FILE_ADDED);
         evtAddFiles.SetStrings(actualAdded);
@@ -1123,9 +1100,6 @@ bool Manager::RenameFile(const wxString& origName, const wxString& newName, cons
     ProjectPtr proj = GetProject(projName);
     proj->FastAddFile(newName, vdFullPath.AfterFirst(wxT(':')));
 
-    // Step 3: retag the new file
-    RetagFile(newName);
-
     // Step 4: send an event about new file was added
     // to the workspace
     wxArrayString files;
@@ -1249,7 +1223,6 @@ void Manager::RetagProject(const wxString& projectName, bool quickRetag)
 {
     wxUnusedVar(projectName);
     wxUnusedVar(quickRetag);
-    TagsManagerST::Get()->ParseWorkspaceIncremental();
 }
 
 void Manager::GetProjectFiles(const wxString& project, wxArrayString& files)

LiteEditor/manager.h

@@ -95,7 +95,6 @@ class Manager : public wxEvtHandler, public IDebuggerObserver
     std::list<QueueCommand> m_buildQueue;
     wxArrayString m_dbgWatchExpressions;
     DisplayVariableDlg* m_watchDlg;
-    bool m_retagInProgress;
     DbgStackInfo m_dbgCurrentFrameInfo;
     PerspectiveManager m_perspectiveManager;
     clDebuggerTerminalPOSIX m_debuggerTerminal;
@@ -111,9 +110,6 @@ class Manager : public wxEvtHandler, public IDebuggerObserver
 
     PerspectiveManager& GetPerspectiveManager() { return m_perspectiveManager; }
 
-    void SetRetagInProgress(bool retagInProgress) { this->m_retagInProgress = retagInProgress; }
-    bool GetRetagInProgress() const { return m_retagInProgress; }
-
     const wxString& GetOriginalCwd() const { return m_originalCwd; }
     void SetOriginalCwd(const wxString& path) { m_originalCwd = path; }
 
@@ -298,17 +294,6 @@ class Manager : public wxEvtHandler, public IDebuggerObserver
      */
     void GetWorkspaceFiles(std::vector<wxFileName>& files, bool absPath = false);
 
-    /**
-     * retag workspace
-     */
-    void RetagWorkspace(TagsManager::RetagType type);
-
-    /**
-     * @brief retag a given file
-     * @param filename
-     */
-    void RetagFile(const wxString& filename);
-
     /**
      * @brief Launch the ParseThread to update the preprocessor visualization
      * @param filename

Plugin/FileSystemWorkspace/clFileSystemWorkspace.cpp

@@ -1047,7 +1047,7 @@ void clFileSystemWorkspace::OnFileSystemUpdated(clFileSystemEvent& event)
     }
 }
 
-void cl`ystemWorkspace::CreateCompileFlagsFile()
+void clFileSystemWorkspace::CreateCompileFlagsFile()
 {
     wxBusyCursor bc;
     const wxFileName& filename = clFileSystemWorkspace::Get().GetFileName();