Re draw tree view on compress/format/sort validate etc.

SinghRajenM · SinghRajenM · commit 0008b20fc561 · 2024-10-19T21:33:23.000+05:30
diff --git a/src/NppJsonViewer/JsonViewDlg.cpp b/src/NppJsonViewer/JsonViewDlg.cpp
@@ -102,6 +102,8 @@ void JsonViewDlg::FormatJson()
 
         ReportError(res);
     }
+
+    ReDrawJsonTree();
 }
 
 void JsonViewDlg::CompressJson()
@@ -132,6 +134,8 @@ void JsonViewDlg::CompressJson()
 
         ReportError(res);
     }
+
+    ReDrawJsonTree();
 }
 
 void JsonViewDlg::SortJsonByKey()
@@ -164,6 +168,8 @@ void JsonViewDlg::SortJsonByKey()
 
         ReportError(res);
     }
+
+    ReDrawJsonTree();
 }
 
 bool JsonViewDlg::CheckForTokenUndefined(eMethod method, std::string selectedText, Result& res, HTREEITEM tree_root)
@@ -213,7 +219,7 @@ bool JsonViewDlg::CheckForTokenUndefined(eMethod method, std::string selectedTex
                 else
                 {
                     m_pEditor->ReplaceSelection(text);
-                    m_pEditor->MakeSelection(m_pEditor->GetSelectionStart(), static_cast<int>(text.length()));
+                    m_pEditor->MakeSelection(m_pEditor->GetSelectionStart(), text.length());
                     m_pEditor->RefreshSelectionPos();
                 }
             }
@@ -322,6 +328,8 @@ void JsonViewDlg::ValidateJson()
 
         ReportError(res);
     }
+
+    DrawJsonTree();
 }
 
 void JsonViewDlg::DrawJsonTree()
@@ -375,6 +383,16 @@ void JsonViewDlg::DrawJsonTree()
     EnableControls(ctrls, true);
 }
 
+void JsonViewDlg::ReDrawJsonTree(bool bForce)
+{
+    const bool bIsVisible = isCreated() && isVisible();
+    const bool bReDraw    = bForce || bIsVisible;
+    if (bReDraw)
+    {
+        DrawJsonTree();
+    }
+}
+
 void JsonViewDlg::HighlightAsJson(bool bForcefully) const
 {
     bool setJsonLang = bForcefully || m_pSetting->bUseJsonHighlight;
@@ -456,12 +474,12 @@ void JsonViewDlg::UpdateNodePath(HTREEITEM htiNode)
 
 void JsonViewDlg::GoToLine(size_t nLineToGo)
 {
-    m_pEditor->GoToLine(0, nLineToGo);
+    m_pEditor->GoToLine(nLineToGo);
 }
 
 void JsonViewDlg::GoToPosition(size_t nLineToGo, size_t nPos)
 {
-    m_pEditor->GoToPosition(0, nLineToGo, nPos);
+    m_pEditor->GoToPosition(nLineToGo, nPos);
 }
 
 void JsonViewDlg::SearchInTree()
@@ -910,7 +928,7 @@ void JsonViewDlg::HandleTreeEvents(LPARAM lParam)
             auto pPosition = GetNodePosition(hItem);
             if (pPosition != nullptr)
             {
-                GoToLine(pPosition->nLine - 1);    // line index start with 0 in editor, hence --
+                GoToLine(pPosition->nLine);
             }
         }
     }
@@ -923,7 +941,7 @@ void JsonViewDlg::HandleTreeEvents(LPARAM lParam)
         auto pPosition = GetNodePosition(hItem);
         if (pPosition != nullptr)
         {
-            GoToPosition(pPosition->nLine - 1, pPosition->nColumn);    // line index start with 0 in editor, hence --
+            GoToPosition(pPosition->nLine, pPosition->nColumn);
         }
     }
     break;
diff --git a/src/NppJsonViewer/JsonViewDlg.h b/src/NppJsonViewer/JsonViewDlg.h
@@ -50,6 +50,7 @@ class JsonViewDlg : public DockingDlgInterface
 
 private:
     void DrawJsonTree();
+    void ReDrawJsonTree(bool bForce = false);
     void HighlightAsJson(bool bForcefully = false) const;
     auto PopulateTreeUsingSax(HTREEITEM tree_root, const std::string& jsonText) -> std::optional<std::wstring>;
 
diff --git a/src/NppJsonViewer/ScintillaEditor.cpp b/src/NppJsonViewer/ScintillaEditor.cpp
@@ -69,6 +69,9 @@ auto ScintillaEditor::GetCurrentFileName() const -> std::wstring
 void ScintillaEditor::ReplaceSelection(const std::string& text) const
 {
     ::SendMessage(m_hScintilla, SCI_REPLACESEL, 0, reinterpret_cast<LPARAM>(text.c_str()));
+
+    // Restore the selection
+    MakeSelection(m_nStartPos, m_nStartPos + text.length());
 }
 
 void ScintillaEditor::MakeSelection(size_t start, size_t end) const
@@ -97,16 +100,18 @@ void ScintillaEditor::RefreshSelectionPos()
 
     if (m_nEndPos < m_nStartPos)
         std::swap(m_nStartPos, m_nEndPos);
+
+    m_nStartLine = ::SendMessage(m_hScintilla, SCI_LINEFROMPOSITION, m_nStartPos, 0);
 }
 
-void ScintillaEditor::GoToLine(size_t nStartLine, size_t nLineToGo) const
+void ScintillaEditor::GoToLine(size_t nLineToGo) const
 {
-    ::SendMessage(m_hScintilla, SCI_GOTOLINE, nStartLine + nLineToGo, 0);
+    ::SendMessage(m_hScintilla, SCI_GOTOLINE, m_nStartLine + nLineToGo, 0);
 }
 
-void ScintillaEditor::GoToPosition(size_t nStartLine, size_t nLineToGo, size_t nColumnIndex) const
+void ScintillaEditor::GoToPosition(size_t nLineToGo, size_t nColumnIndex) const
 {
-    size_t lineStartPos = SendMessage(m_hScintilla, SCI_POSITIONFROMLINE, nStartLine + nLineToGo, 0);
+    size_t lineStartPos = SendMessage(m_hScintilla, SCI_POSITIONFROMLINE, m_nStartLine + nLineToGo, 0);
     size_t targetPos    = lineStartPos + nColumnIndex;
     ::SendMessage(m_hScintilla, SCI_GOTOPOS, targetPos, 0);
 }
diff --git a/src/NppJsonViewer/ScintillaEditor.h b/src/NppJsonViewer/ScintillaEditor.h
@@ -29,28 +29,33 @@ class ScintillaEditor
 
     void ReplaceSelection(const std::string& text) const;
 
-    void MakeSelection(size_t start, size_t end) const;
-    auto GetSelectionStart() const -> size_t
+    void        MakeSelection(size_t start, size_t end) const;
+    inline auto GetSelectionStart() const -> size_t
     {
         return m_nStartPos;
     }
-    auto GetSelectionEnd() const -> size_t
+    inline auto GetSelectionEnd() const -> size_t
     {
         return m_nEndPos;
     }
+    inline auto GetSelectionStartLine() const -> size_t
+    {
+        return m_nStartLine;
+    }
 
     auto GetEOL() const -> unsigned;
     auto GetIndent() const -> std::tuple<char, unsigned>;
 
     void RefreshSelectionPos();
 
-    void GoToLine(size_t nStartLine, size_t nLineToGo) const;
-    void GoToPosition(size_t nStartLine, size_t nLineToGo, size_t nColumnIndex) const;
+    void GoToLine(size_t nLineToGo) const;
+    void GoToPosition(size_t nLineToGo, size_t nColumnIndex) const;
 
 private:
     NppData m_NppData    = {};
     HWND    m_hScintilla = nullptr;
 
-    size_t m_nStartPos = 0;
-    size_t m_nEndPos   = 0;
+    size_t m_nStartLine = 0;
+    size_t m_nStartPos  = 0;
+    size_t m_nEndPos    = 0;
 };
diff --git a/src/NppJsonViewer/TrackingStream.h b/src/NppJsonViewer/TrackingStream.h
@@ -19,8 +19,8 @@ class TrackingStream : public std::enable_shared_from_this<TrackingStream>
 
     TrackingStream(const std::string& jsonText)
         : m_ss(jsonText.c_str())
-        , m_nLine(1)
-        , m_nColumn(1)
+        , m_nLine(0)
+        , m_nColumn(0)
         , m_chPrevChar('\0')
     {
     }

Original file line number	Diff line number	Diff line change
`@@ -102,6 +102,8 @@ void JsonViewDlg::FormatJson()`
`102`	`102`
`103`	`103`	`ReportError(res);`
`104`	`104`	`}`
	`105`	`+`
	`106`	`+ ReDrawJsonTree();`
`105`	`107`	`}`
`106`	`108`
`107`	`109`	`void JsonViewDlg::CompressJson()`
`@@ -132,6 +134,8 @@ void JsonViewDlg::CompressJson()`
`132`	`134`
`133`	`135`	`ReportError(res);`
`134`	`136`	`}`
	`137`	`+`
	`138`	`+ ReDrawJsonTree();`
`135`	`139`	`}`
`136`	`140`
`137`	`141`	`void JsonViewDlg::SortJsonByKey()`
`@@ -164,6 +168,8 @@ void JsonViewDlg::SortJsonByKey()`
`164`	`168`
`165`	`169`	`ReportError(res);`
`166`	`170`	`}`
	`171`	`+`
	`172`	`+ ReDrawJsonTree();`
`167`	`173`	`}`
`168`	`174`
`169`	`175`	`bool JsonViewDlg::CheckForTokenUndefined(eMethod method, std::string selectedText, Result& res, HTREEITEM tree_root)`
`@@ -213,7 +219,7 @@ bool JsonViewDlg::CheckForTokenUndefined(eMethod method, std::string selectedTex`
`213`	`219`	`else`
`214`	`220`	`{`
`215`	`221`	`m_pEditor->ReplaceSelection(text);`
`216`		`- m_pEditor->MakeSelection(m_pEditor->GetSelectionStart(), static_cast<int>(text.length()));`
	`222`	`+ m_pEditor->MakeSelection(m_pEditor->GetSelectionStart(), text.length());`
`217`	`223`	`m_pEditor->RefreshSelectionPos();`
`218`	`224`	`}`
`219`	`225`	`}`
`@@ -322,6 +328,8 @@ void JsonViewDlg::ValidateJson()`
`322`	`328`
`323`	`329`	`ReportError(res);`
`324`	`330`	`}`
	`331`	`+`
	`332`	`+ DrawJsonTree();`
`325`	`333`	`}`
`326`	`334`
`327`	`335`	`void JsonViewDlg::DrawJsonTree()`
`@@ -375,6 +383,16 @@ void JsonViewDlg::DrawJsonTree()`
`375`	`383`	`EnableControls(ctrls, true);`
`376`	`384`	`}`
`377`	`385`
	`386`	`+void JsonViewDlg::ReDrawJsonTree(bool bForce)`
	`387`	`+{`
	`388`	`+ const bool bIsVisible = isCreated() && isVisible();`
	`389`	`+ const bool bReDraw = bForce \|\| bIsVisible;`
	`390`	`+ if (bReDraw)`
	`391`	`+ {`
	`392`	`+ DrawJsonTree();`
	`393`	`+ }`
	`394`	`+}`
	`395`	`+`
`378`	`396`	`void JsonViewDlg::HighlightAsJson(bool bForcefully) const`
`379`	`397`	`{`
`380`	`398`	`bool setJsonLang = bForcefully \|\| m_pSetting->bUseJsonHighlight;`
`@@ -456,12 +474,12 @@ void JsonViewDlg::UpdateNodePath(HTREEITEM htiNode)`
`456`	`474`
`457`	`475`	`void JsonViewDlg::GoToLine(size_t nLineToGo)`
`458`	`476`	`{`
`459`		`- m_pEditor->GoToLine(0, nLineToGo);`
	`477`	`+ m_pEditor->GoToLine(nLineToGo);`
`460`	`478`	`}`
`461`	`479`
`462`	`480`	`void JsonViewDlg::GoToPosition(size_t nLineToGo, size_t nPos)`
`463`	`481`	`{`
`464`		`- m_pEditor->GoToPosition(0, nLineToGo, nPos);`
	`482`	`+ m_pEditor->GoToPosition(nLineToGo, nPos);`
`465`	`483`	`}`
`466`	`484`
`467`	`485`	`void JsonViewDlg::SearchInTree()`
`@@ -910,7 +928,7 @@ void JsonViewDlg::HandleTreeEvents(LPARAM lParam)`
`910`	`928`	`auto pPosition = GetNodePosition(hItem);`
`911`	`929`	`if (pPosition != nullptr)`
`912`	`930`	`{`
`913`		`- GoToLine(pPosition->nLine - 1); // line index start with 0 in editor, hence --`
	`931`	`+ GoToLine(pPosition->nLine);`
`914`	`932`	`}`
`915`	`933`	`}`
`916`	`934`	`}`
`@@ -923,7 +941,7 @@ void JsonViewDlg::HandleTreeEvents(LPARAM lParam)`
`923`	`941`	`auto pPosition = GetNodePosition(hItem);`
`924`	`942`	`if (pPosition != nullptr)`
`925`	`943`	`{`
`926`		`- GoToPosition(pPosition->nLine - 1, pPosition->nColumn); // line index start with 0 in editor, hence --`
	`944`	`+ GoToPosition(pPosition->nLine, pPosition->nColumn);`
`927`	`945`	`}`
`928`	`946`	`}`
`929`	`947`	`break;`
Original file line number	Diff line number	Diff line change
`@@ -69,6 +69,9 @@ auto ScintillaEditor::GetCurrentFileName() const -> std::wstring`
`69`	`69`	`void ScintillaEditor::ReplaceSelection(const std::string& text) const`
`70`	`70`	`{`
`71`	`71`	`::SendMessage(m_hScintilla, SCI_REPLACESEL, 0, reinterpret_cast<LPARAM>(text.c_str()));`
	`72`	`+`
	`73`	`+ // Restore the selection`
	`74`	`+ MakeSelection(m_nStartPos, m_nStartPos + text.length());`
`72`	`75`	`}`
`73`	`76`
`74`	`77`	`void ScintillaEditor::MakeSelection(size_t start, size_t end) const`
`@@ -97,16 +100,18 @@ void ScintillaEditor::RefreshSelectionPos()`
`97`	`100`
`98`	`101`	`if (m_nEndPos < m_nStartPos)`
`99`	`102`	`std::swap(m_nStartPos, m_nEndPos);`
	`103`	`+`
	`104`	`+ m_nStartLine = ::SendMessage(m_hScintilla, SCI_LINEFROMPOSITION, m_nStartPos, 0);`
`100`	`105`	`}`
`101`	`106`
`102`		`-void ScintillaEditor::GoToLine(size_t nStartLine, size_t nLineToGo) const`
	`107`	`+void ScintillaEditor::GoToLine(size_t nLineToGo) const`
`103`	`108`	`{`
`104`		`- ::SendMessage(m_hScintilla, SCI_GOTOLINE, nStartLine + nLineToGo, 0);`
	`109`	`+ ::SendMessage(m_hScintilla, SCI_GOTOLINE, m_nStartLine + nLineToGo, 0);`
`105`	`110`	`}`
`106`	`111`
`107`		`-void ScintillaEditor::GoToPosition(size_t nStartLine, size_t nLineToGo, size_t nColumnIndex) const`
	`112`	`+void ScintillaEditor::GoToPosition(size_t nLineToGo, size_t nColumnIndex) const`
`108`	`113`	`{`
`109`		`- size_t lineStartPos = SendMessage(m_hScintilla, SCI_POSITIONFROMLINE, nStartLine + nLineToGo, 0);`
	`114`	`+ size_t lineStartPos = SendMessage(m_hScintilla, SCI_POSITIONFROMLINE, m_nStartLine + nLineToGo, 0);`
`110`	`115`	`size_t targetPos = lineStartPos + nColumnIndex;`
`111`	`116`	`::SendMessage(m_hScintilla, SCI_GOTOPOS, targetPos, 0);`
`112`	`117`	`}`
Original file line number	Diff line number	Diff line change
`@@ -19,8 +19,8 @@ class TrackingStream : public std::enable_shared_from_this<TrackingStream>`
`19`	`19`
`20`	`20`	`TrackingStream(const std::string& jsonText)`
`21`	`21`	`: m_ss(jsonText.c_str())`
`22`		`- , m_nLine(1)`
`23`		`- , m_nColumn(1)`
	`22`	`+ , m_nLine(0)`
	`23`	`+ , m_nColumn(0)`
`24`	`24`	`, m_chPrevChar('\0')`
`25`	`25`	`{`
`26`	`26`	`}`