Enabled syntax highlighting for JSON files.

Author: mihaimoga

FileList.cpp

@@ -142,6 +142,7 @@ bool IsTextFile(CString strFilePath)
 		(_tcsicmp(lpszExtension, _T(".html")) == 0) ||
 		(_tcsicmp(lpszExtension, _T(".java")) == 0) ||
 		(_tcsicmp(lpszExtension, _T(".js")) == 0) ||
+		(_tcsicmp(lpszExtension, _T(".json")) == 0) ||
 		(_tcsicmp(lpszExtension, _T(".log")) == 0) ||
 		(_tcsicmp(lpszExtension, _T(".m")) == 0) ||
 		(_tcsicmp(lpszExtension, _T(".md")) == 0) ||

IntelliFile.html

@@ -72,6 +72,7 @@ <h2>Supported Programming Languages</h2>
                         <li>CSS</li>
                         <li>HTML</li>
                         <li>Java</li>
+                        <li>JSON</li>
                         <li>MarkDown</li>
                         <li>MATLAB</li>
                         <li>PHP</li>

ViewTextFileDlg.cpp

@@ -277,89 +277,103 @@ BOOL CViewTextFileDlg::OnInitDialog()
 						}
 						else
 						{
-							if (_tcsicmp(lpszExtension, _T(".m")) == 0)
+							if (_tcsicmp(lpszExtension, _T(".json")) == 0)
 							{
-								// Create the Matlab Lexer
+								// Create the JSON Lexer
 #pragma warning(suppress: 26429)
-								m_pLexer = theApp.m_pCreateLexer("matlab");
+								m_pLexer = theApp.m_pCreateLexer("json");
 								if (m_pLexer == nullptr)
 									return FALSE;
 
-								// Setup the Matlab Lexer
+								// Setup the JSON Lexer
 								m_ctrlTextFile.SetILexer(m_pLexer);
-								m_ctrlTextFile.SetKeyWords(0, g_matlabKeywords);
 							}
 							else
 							{
-								if (_tcsicmp(lpszExtension, _T(".md")) == 0)
+								if (_tcsicmp(lpszExtension, _T(".m")) == 0)
 								{
-									// Create the MD Lexer
+									// Create the Matlab Lexer
 #pragma warning(suppress: 26429)
-									m_pLexer = theApp.m_pCreateLexer("markdown");
+									m_pLexer = theApp.m_pCreateLexer("matlab");
 									if (m_pLexer == nullptr)
 										return FALSE;
 
-									// Setup the MD Lexer
+									// Setup the Matlab Lexer
 									m_ctrlTextFile.SetILexer(m_pLexer);
+									m_ctrlTextFile.SetKeyWords(0, g_matlabKeywords);
 								}
 								else
 								{
-									if (_tcsicmp(lpszExtension, _T(".py")) == 0)
+									if (_tcsicmp(lpszExtension, _T(".md")) == 0)
 									{
-										// Create the Python Lexer
+										// Create the MD Lexer
 #pragma warning(suppress: 26429)
-										m_pLexer = theApp.m_pCreateLexer("python");
+										m_pLexer = theApp.m_pCreateLexer("markdown");
 										if (m_pLexer == nullptr)
 											return FALSE;
 
-										// Setup the Python Lexer
+										// Setup the MD Lexer
 										m_ctrlTextFile.SetILexer(m_pLexer);
-										m_ctrlTextFile.SetKeyWords(0, g_pyKeywords);
 									}
 									else
 									{
-										if (_tcsicmp(lpszExtension, _T(".sh")) == 0)
+										if (_tcsicmp(lpszExtension, _T(".py")) == 0)
 										{
-											// Create the Shell Lexer
+											// Create the Python Lexer
 #pragma warning(suppress: 26429)
-											m_pLexer = theApp.m_pCreateLexer("bash");
+											m_pLexer = theApp.m_pCreateLexer("python");
 											if (m_pLexer == nullptr)
 												return FALSE;
 
-											// Setup the Shell Lexer
+											// Setup the Python Lexer
 											m_ctrlTextFile.SetILexer(m_pLexer);
+											m_ctrlTextFile.SetKeyWords(0, g_pyKeywords);
 										}
 										else
 										{
-											if (_tcsicmp(lpszExtension, _T(".sql")) == 0)
+											if (_tcsicmp(lpszExtension, _T(".sh")) == 0)
 											{
-												// Create the SQL Lexer
+												// Create the Shell Lexer
 #pragma warning(suppress: 26429)
-												m_pLexer = theApp.m_pCreateLexer("sql");
+												m_pLexer = theApp.m_pCreateLexer("bash");
 												if (m_pLexer == nullptr)
 													return FALSE;
 
-												// Setup the SQL Lexer
+												// Setup the Shell Lexer
 												m_ctrlTextFile.SetILexer(m_pLexer);
-												m_ctrlTextFile.SetKeyWords(0, g_sqlKeywords);
 											}
 											else
 											{
-												if (_tcsicmp(lpszExtension, _T(".xml")) == 0)
+												if (_tcsicmp(lpszExtension, _T(".sql")) == 0)
 												{
-													// Create the XML Lexer
+													// Create the SQL Lexer
 #pragma warning(suppress: 26429)
-													m_pLexer = theApp.m_pCreateLexer("xml");
+													m_pLexer = theApp.m_pCreateLexer("sql");
 													if (m_pLexer == nullptr)
 														return FALSE;
 
-													// Setup the XML Lexer
+													// Setup the SQL Lexer
 													m_ctrlTextFile.SetILexer(m_pLexer);
+													m_ctrlTextFile.SetKeyWords(0, g_sqlKeywords);
 												}
 												else
 												{
-													m_ctrlTextFile.SetupDirectAccess();
-													m_ctrlTextFile.SetILexer(nullptr);
+													if (_tcsicmp(lpszExtension, _T(".xml")) == 0)
+													{
+														// Create the XML Lexer
+#pragma warning(suppress: 26429)
+														m_pLexer = theApp.m_pCreateLexer("xml");
+														if (m_pLexer == nullptr)
+															return FALSE;
+
+														// Setup the XML Lexer
+														m_ctrlTextFile.SetILexer(m_pLexer);
+													}
+													else
+													{
+														m_ctrlTextFile.SetupDirectAccess();
+														m_ctrlTextFile.SetILexer(nullptr);
+													}
 												}
 											}
 										}