Merge pull request #82 from kapilratnani/feature-55-change-lang-to-json

kapilratnani · web-flow · commit 34978f92c6a9 · 2020-07-04T22:42:07.000+05:30
set langtype to json on parse success
diff --git a/NppJSONViewer/JSONDialog.cpp b/NppJSONViewer/JSONDialog.cpp
@@ -114,6 +114,8 @@ void JSONDialog::populateTreeUsingSax(HWND /*hWndDlg*/, HTREEITEM tree_root, cha
 		::SendMessage(curScintilla, SCI_SETSEL, errPosition, errPosition + 1);
 	}
 	
+  ::SendMessage(nppData._nppHandle, NPPM_SETCURRENTLANGTYPE, 0, LangType::L_JSON);
+
 	//sw.Stop();
 	//long long elapsed = sw.ElapsedMilliseconds();
 	//std::wstringstream s;
diff --git a/NppJSONViewer/PluginDefinition.cpp b/NppJSONViewer/PluginDefinition.cpp
@@ -276,7 +276,8 @@ void formatSelectedJSON()
 	{
 		const char* fJson = sb.GetString();
 		::SendMessage(curScintilla, SCI_REPLACESEL, 0, (LPARAM)fJson);
-	}
+    ::SendMessage(nppData._nppHandle, NPPM_SETCURRENTLANGTYPE, 0, LangType::L_JSON);
+  }
 	else
 	{
 		// Mark the error position

Original file line number	Diff line number	Diff line change
`@@ -114,6 +114,8 @@ void JSONDialog::populateTreeUsingSax(HWND /hWndDlg/, HTREEITEM tree_root, cha`
`114`	`114`	`::SendMessage(curScintilla, SCI_SETSEL, errPosition, errPosition + 1);`
`115`	`115`	`}`
`116`	`116`
	`117`	`+ ::SendMessage(nppData._nppHandle, NPPM_SETCURRENTLANGTYPE, 0, LangType::L_JSON);`
	`118`	`+`
`117`	`119`	`//sw.Stop();`
`118`	`120`	`//long long elapsed = sw.ElapsedMilliseconds();`
`119`	`121`	`//std::wstringstream s;`
Original file line number	Diff line number	Diff line change
`@@ -276,7 +276,8 @@ void formatSelectedJSON()`
`276`	`276`	`{`
`277`	`277`	`const char* fJson = sb.GetString();`
`278`	`278`	`::SendMessage(curScintilla, SCI_REPLACESEL, 0, (LPARAM)fJson);`
`279`		`- }`
	`279`	`+ ::SendMessage(nppData._nppHandle, NPPM_SETCURRENTLANGTYPE, 0, LangType::L_JSON);`
	`280`	`+ }`
`280`	`281`	`else`
`281`	`282`	`{`
`282`	`283`	`// Mark the error position`