Make Json highlighter configurable (#160)

Author: SinghRajenM

NppJSONViewer/NppJsonViewer/Define.h

@@ -62,6 +62,7 @@ const TCHAR STR_INI_FORMATTING_INDENTCOUNT[] = TEXT("INDENTATION_COUNT");
 const TCHAR STR_INI_OTHER_SEC[]            = TEXT("Others");
 const TCHAR STR_INI_OTHER_FOLLOW_TAB[]     = TEXT("FOLLOW_TAB");
 const TCHAR STR_INI_OTHER_AUTO_FORMAT[]    = TEXT("AUTO_FORMAT");
+const TCHAR STR_INI_OTHER_USE_HIGHLIGHT[]  = TEXT("USE_JSON_HIGHLIGHT");
 const TCHAR STR_INI_OTHER_IGNORE_COMMENT[] = TEXT("IGNORE_COMMENT");
 const TCHAR STR_INI_OTHER_IGNORE_COMMA[]   = TEXT("IGNORE_TRAILLING_COMMA");
 
@@ -109,5 +110,6 @@ struct Setting
     Indent       indent {};
     bool         bFollowCurrentTab = false;
     bool         bAutoFormat       = false;
+    bool         bUseJsonHighlight = true;
     ParseOptions parseOptions {};
 };

NppJSONViewer/NppJsonViewer/JsonViewDlg.cpp

@@ -72,7 +72,7 @@ void JsonViewDlg::FormatJson()
     if (res.success)
     {
         m_Editor->ReplaceSelection(res.response);
-        m_Editor->SetLangAsJson();
+        HightlightAsJson();
     }
     else
     {
@@ -157,6 +157,13 @@ void JsonViewDlg::DrawJsonTree()
     EnableControls(ctrls, true);
 }
 
+void JsonViewDlg::HightlightAsJson(bool bForcefully) const
+{
+    bool setJsonLang = bForcefully || m_pSetting->bUseJsonHighlight;
+    if (setJsonLang)
+        m_Editor->SetLangAsJson();
+}
+
 void JsonViewDlg::PopulateTreeUsingSax(HTREEITEM tree_root, const std::string &jsonText)
 {
     RapidJsonHandler        handler(this, tree_root);
@@ -183,7 +190,7 @@ void JsonViewDlg::PopulateTreeUsingSax(HTREEITEM tree_root, const std::string &j
     }
     else
     {
-        m_Editor->SetLangAsJson();
+        HightlightAsJson();
     }
 }
 

NppJSONViewer/NppJsonViewer/JsonViewDlg.h

@@ -33,6 +33,7 @@ class JsonViewDlg : public DockingDlgInterface
 
 private:
     void DrawJsonTree();
+    void HightlightAsJson(bool bForcefully = false) const;
     void PopulateTreeUsingSax(HTREEITEM tree_root, const std::string &jsonText);
 
     void ValidateJson();

NppJSONViewer/NppJsonViewer/Profile.cpp

@@ -74,30 +74,34 @@ bool ProfileSetting::GetSettings(Setting &info) const
     bool bRetVal = true;
 
     int nVal = 0;
-    bRetVal &= ReadValue(STR_INI_FORMATTING_SEC, STR_INI_FORMATTING_EOL, nVal);
+    bRetVal &= ReadValue(STR_INI_FORMATTING_SEC, STR_INI_FORMATTING_EOL, nVal, static_cast<int>(info.lineEnding));
     if (bRetVal)
         info.lineEnding = static_cast<LineEnding>(nVal);
 
-    bRetVal &= ReadValue(STR_INI_FORMATTING_SEC, STR_INI_FORMATTING_LINE, nVal);
+    bRetVal &= ReadValue(STR_INI_FORMATTING_SEC, STR_INI_FORMATTING_LINE, nVal, static_cast<int>(info.lineFormat));
     if (bRetVal)
         info.lineFormat = static_cast<LineFormat>(nVal);
 
-    bRetVal &= ReadValue(STR_INI_FORMATTING_SEC, STR_INI_FORMATTING_INDENT, nVal);
+    bRetVal &= ReadValue(STR_INI_FORMATTING_SEC, STR_INI_FORMATTING_INDENT, nVal, static_cast<int>(info.indent.style));
     if (bRetVal)
         info.indent.style = static_cast<IndentStyle>(nVal);
 
     bRetVal &= ReadValue(STR_INI_FORMATTING_SEC, STR_INI_FORMATTING_INDENTCOUNT, nVal, info.indent.len);
     if (bRetVal)
         info.indent.len = nVal;
 
-    bRetVal &= ReadValue(STR_INI_OTHER_SEC, STR_INI_OTHER_FOLLOW_TAB, nVal);
+    bRetVal &= ReadValue(STR_INI_OTHER_SEC, STR_INI_OTHER_FOLLOW_TAB, nVal, info.bFollowCurrentTab);
     if (bRetVal)
         info.bFollowCurrentTab = static_cast<bool>(nVal);
 
-    bRetVal &= ReadValue(STR_INI_OTHER_SEC, STR_INI_OTHER_AUTO_FORMAT, nVal);
+    bRetVal &= ReadValue(STR_INI_OTHER_SEC, STR_INI_OTHER_AUTO_FORMAT, nVal, info.bAutoFormat);
     if (bRetVal)
         info.bAutoFormat = static_cast<bool>(nVal);
 
+    bRetVal &= ReadValue(STR_INI_OTHER_SEC, STR_INI_OTHER_USE_HIGHLIGHT, nVal, info.bUseJsonHighlight);
+    if (bRetVal)
+        info.bUseJsonHighlight = static_cast<bool>(nVal);
+
     bRetVal &= ReadValue(STR_INI_OTHER_SEC, STR_INI_OTHER_IGNORE_COMMENT, nVal, info.parseOptions.bIgnoreComment);
     if (bRetVal)
         info.parseOptions.bIgnoreComment = static_cast<bool>(nVal);
@@ -120,6 +124,7 @@ bool ProfileSetting::SetSettings(const Setting &info) const
 
     bRetVal &= WriteValue(STR_INI_OTHER_SEC, STR_INI_OTHER_FOLLOW_TAB, info.bFollowCurrentTab);
     bRetVal &= WriteValue(STR_INI_OTHER_SEC, STR_INI_OTHER_AUTO_FORMAT, info.bAutoFormat);
+    bRetVal &= WriteValue(STR_INI_OTHER_SEC, STR_INI_OTHER_USE_HIGHLIGHT, info.bUseJsonHighlight);
     bRetVal &= WriteValue(STR_INI_OTHER_SEC, STR_INI_OTHER_IGNORE_COMMENT, info.parseOptions.bIgnoreComment);
     bRetVal &= WriteValue(STR_INI_OTHER_SEC, STR_INI_OTHER_IGNORE_COMMA, info.parseOptions.bIgnoreTraillingComma);
 

NppJSONViewer/NppJsonViewer/SettingsDlg.cpp

@@ -124,6 +124,7 @@ bool SettingsDlg::Apply()
 
     m_pSetting->bFollowCurrentTab                  = CUtility::GetCheckboxStatus(::GetDlgItem(_hSelf, IDC_CHK_FOLLOW_CURRENT_DOC));
     m_pSetting->bAutoFormat                        = CUtility::GetCheckboxStatus(::GetDlgItem(_hSelf, IDC_CHK_FORMAT_ON_OPEN));
+    m_pSetting->bUseJsonHighlight                  = CUtility::GetCheckboxStatus(::GetDlgItem(_hSelf, IDC_CHK_JSON_HIGHLIGHT));
     m_pSetting->parseOptions.bIgnoreTraillingComma = CUtility::GetCheckboxStatus(::GetDlgItem(_hSelf, IDC_CHK_IGNORE_COMMA));
     m_pSetting->parseOptions.bIgnoreComment        = CUtility::GetCheckboxStatus(::GetDlgItem(_hSelf, IDC_CHK_IGNORE_COMMENT));
 
@@ -204,6 +205,7 @@ void SettingsDlg::InitDlg()
 
     CUtility::SetCheckboxStatus(::GetDlgItem(_hSelf, IDC_CHK_FOLLOW_CURRENT_DOC), m_pSetting->bFollowCurrentTab);
     CUtility::SetCheckboxStatus(::GetDlgItem(_hSelf, IDC_CHK_FORMAT_ON_OPEN), m_pSetting->bAutoFormat);
+    CUtility::SetCheckboxStatus(::GetDlgItem(_hSelf, IDC_CHK_JSON_HIGHLIGHT), m_pSetting->bUseJsonHighlight);
     CUtility::SetCheckboxStatus(::GetDlgItem(_hSelf, IDC_CHK_IGNORE_COMMA), m_pSetting->parseOptions.bIgnoreTraillingComma);
     CUtility::SetCheckboxStatus(::GetDlgItem(_hSelf, IDC_CHK_IGNORE_COMMENT), m_pSetting->parseOptions.bIgnoreComment);
 }

NppJSONViewer/NppJsonViewer/resource.h

@@ -40,6 +40,7 @@
 #define IDC_CHK_FORMAT_ON_OPEN          1029
 #define IDC_CHK_IGNORE_COMMA            1030
 #define IDC_CHK_IGNORE_COMMENT          1031
+#define IDC_CHK_JSON_HIGHLIGHT          1032
 #define IDM_COPY_TREEITEM               40001
 #define IDM_COPY_NODENAME               40002
 #define IDM_COPY_NODEVALUE              40003
@@ -53,7 +54,7 @@
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_NEXT_RESOURCE_VALUE        110
 #define _APS_NEXT_COMMAND_VALUE         40007
-#define _APS_NEXT_CONTROL_VALUE         1032
+#define _APS_NEXT_CONTROL_VALUE         1033
 #define _APS_NEXT_SYMED_VALUE           101
 #endif
 #endif

NppJSONViewer/NppJsonViewer/resource.rc

@@ -103,6 +103,7 @@ BEGIN
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,5,20,140,10
     CONTROL         "Ignore trailing comma",IDC_CHK_IGNORE_COMMA,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,5,33,140,10
     CONTROL         "Ignore comments in json",IDC_CHK_IGNORE_COMMENT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,5,46,140,10
+    CONTROL         "Use json highlighting",IDC_CHK_JSON_HIGHLIGHT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,5,59,140,10
     GROUPBOX        " Indentation: ",IDC_STATIC,153,7,140,43
     CONTROL         "Auto detect",IDC_RADIO_INDENT_AUTO,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,160,21,50,10
     CONTROL         "Use tab",IDC_RADIO_INDENT_TAB,"Button",BS_AUTORADIOBUTTON,240,21,50,10