Skip to content

Commit c86e58c

Browse files
committed
Enabled syntax highlighting for R programming language.
1 parent 84bb7c8 commit c86e58c

18 files changed

+76
-370
lines changed

FileList.cpp

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ bool IsTextFile(CString strFilePath)
128128
lpszFolder, _MAX_DIR,
129129
lpszFileName, _MAX_FNAME,
130130
lpszExtension, _MAX_EXT);
131-
if ( (_tcsicmp(lpszExtension, _T(".asp")) == 0) ||
131+
if ((_tcsicmp(lpszExtension, _T(".asp")) == 0) ||
132132
(_tcsicmp(lpszExtension, _T(".aspx")) == 0) ||
133133
(_tcsicmp(lpszExtension, _T(".bat")) == 0) ||
134134
(_tcsicmp(lpszExtension, _T(".c")) == 0) ||
@@ -140,19 +140,23 @@ bool IsTextFile(CString strFilePath)
140140
(_tcsicmp(lpszExtension, _T(".hpp")) == 0) ||
141141
(_tcsicmp(lpszExtension, _T(".htm")) == 0) ||
142142
(_tcsicmp(lpszExtension, _T(".html")) == 0) ||
143+
(_tcsicmp(lpszExtension, _T(".ini")) == 0) ||
143144
(_tcsicmp(lpszExtension, _T(".java")) == 0) ||
144145
(_tcsicmp(lpszExtension, _T(".js")) == 0) ||
145146
(_tcsicmp(lpszExtension, _T(".json")) == 0) ||
146147
(_tcsicmp(lpszExtension, _T(".log")) == 0) ||
147148
(_tcsicmp(lpszExtension, _T(".m")) == 0) ||
149+
(_tcsicmp(lpszExtension, _T(".mak")) == 0) ||
148150
(_tcsicmp(lpszExtension, _T(".md")) == 0) ||
149151
(_tcsicmp(lpszExtension, _T(".py")) == 0) ||
152+
(_tcsicmp(lpszExtension, _T(".r")) == 0) ||
150153
(_tcsicmp(lpszExtension, _T(".rs")) == 0) ||
151154
(_tcsicmp(lpszExtension, _T(".sh")) == 0) ||
152155
(_tcsicmp(lpszExtension, _T(".sql")) == 0) ||
153156
(_tcsicmp(lpszExtension, _T(".php")) == 0) ||
154157
(_tcsicmp(lpszExtension, _T(".txt")) == 0) ||
155-
(_tcsicmp(lpszExtension, _T(".xml")) == 0) )
158+
(_tcsicmp(lpszExtension, _T(".xml")) == 0) ||
159+
(_tcsicmp(lpszExtension, _T("")) == 0))
156160
{
157161
return true;
158162
}

FileView.cpp

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ IntelliFile. If not, see <http://www.opensource.org/licenses/gpl-3.0.html>*/
2525
#include "SearchFileDlg.h"
2626
#include "QuickAccessDlg.h"
2727
#include "NewFolderDlg.h"
28-
#include "ViewMetaFileDlg.h"
2928
#include "ViewRichFileDlg.h"
3029
#include "ViewTextFileDlg.h"
3130

@@ -545,19 +544,10 @@ bool CFileView::ViewFile()
545544
}
546545
else
547546
{
548-
if (IsMetaFile(strFilePath))
549-
{
550-
CViewMetaFileDlg dlgViewMetaFile(this);
551-
dlgViewMetaFile.m_strFilePath = strFilePath;
552-
dlgViewMetaFile.DoModal();
553-
return true;
554-
}
555-
else
556-
{
557-
MessageBox(_T("The selected file format cannot be viewed!\nText, RichText or Metafile formats are supported"), _T("IntelliFile"), MB_OK | MB_ICONEXCLAMATION);
558-
return false;
559-
}
560-
547+
CString strWarningPreview;
548+
VERIFY(strWarningPreview.LoadString(IDS_WARNING_PREVIEW));
549+
MessageBox(strWarningPreview, _T("IntelliFile"), MB_OK | MB_ICONEXCLAMATION);
550+
return false;
561551
}
562552
}
563553
}

HTMLCtrl.cpp

Lines changed: 0 additions & 116 deletions
This file was deleted.

HTMLCtrl.h

Lines changed: 0 additions & 43 deletions
This file was deleted.

IntelliFile.html

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,10 +74,12 @@ <h2>Supported Programming Languages</h2>
7474
<li>Java</li>
7575
<li>JavaScript</li>
7676
<li>JSON</li>
77+
<li>Makefile</li>
7778
<li>Markdown</li>
7879
<li>MATLAB</li>
7980
<li>PHP</li>
8081
<li>Python</li>
82+
<li>R</li>
8183
<li>Rust</li>
8284
<li>SQL</li>
8385
<li>XML</li>

IntelliFile.rc

-760 Bytes
Binary file not shown.

IntelliFile.vcxproj

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -473,7 +473,6 @@ echo.
473473
<ClInclude Include="FilteredFolderDlg.h" />
474474
<ClInclude Include="FolderDlg.h" />
475475
<ClInclude Include="HLinkCtrl.h" />
476-
<ClInclude Include="HTMLCtrl.h" />
477476
<ClInclude Include="IntelliFile.h" />
478477
<ClInclude Include="MainFrame.h" />
479478
<ClInclude Include="MFCListView.h" />
@@ -485,7 +484,6 @@ echo.
485484
<ClInclude Include="sinstance.h" />
486485
<ClInclude Include="SortListCtrl.h" />
487486
<ClInclude Include="VersionInfo.h" />
488-
<ClInclude Include="ViewMetaFileDlg.h" />
489487
<ClInclude Include="ViewRichFileDlg.h" />
490488
<ClInclude Include="ViewTextFileDlg.h" />
491489
<ClInclude Include="WndResizer.h" />
@@ -579,7 +577,6 @@ makehm /h /a afxhh.h IDW_,HIDW_,0x50000 "%(FullPath)" &gt;&gt; "hlp\HTMLDefines.
579577
<ClCompile Include="FilteredFolderDlg.cpp" />
580578
<ClCompile Include="FolderDlg.cpp" />
581579
<ClCompile Include="HLinkCtrl.cpp" />
582-
<ClCompile Include="HTMLCtrl.cpp" />
583580
<ClCompile Include="IntelliFile.cpp" />
584581
<ClCompile Include="MainFrame.cpp" />
585582
<ClCompile Include="MFCListView.cpp" />
@@ -597,7 +594,6 @@ makehm /h /a afxhh.h IDW_,HIDW_,0x50000 "%(FullPath)" &gt;&gt; "hlp\HTMLDefines.
597594
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
598595
</ClCompile>
599596
<ClCompile Include="VersionInfo.cpp" />
600-
<ClCompile Include="ViewMetaFileDlg.cpp" />
601597
<ClCompile Include="ViewRichFileDlg.cpp" />
602598
<ClCompile Include="ViewTextFileDlg.cpp" />
603599
<ClCompile Include="WndResizer.cpp" />

IntelliFile.vcxproj.filters

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -326,12 +326,6 @@
326326
<ClInclude Include="ViewRichFileDlg.h">
327327
<Filter>Header Files</Filter>
328328
</ClInclude>
329-
<ClInclude Include="HTMLCtrl.h">
330-
<Filter>Header Files</Filter>
331-
</ClInclude>
332-
<ClInclude Include="ViewMetaFileDlg.h">
333-
<Filter>Header Files</Filter>
334-
</ClInclude>
335329
<ClInclude Include="FolderDlg.h">
336330
<Filter>Header Files</Filter>
337331
</ClInclude>
@@ -403,12 +397,6 @@
403397
<ClCompile Include="ViewRichFileDlg.cpp">
404398
<Filter>Source Files</Filter>
405399
</ClCompile>
406-
<ClCompile Include="HTMLCtrl.cpp">
407-
<Filter>Source Files</Filter>
408-
</ClCompile>
409-
<ClCompile Include="ViewMetaFileDlg.cpp">
410-
<Filter>Source Files</Filter>
411-
</ClCompile>
412400
<ClCompile Include="FolderDlg.cpp">
413401
<Filter>Source Files</Filter>
414402
</ClCompile>

ViewMetaFileDlg.cpp

Lines changed: 0 additions & 100 deletions
This file was deleted.

0 commit comments

Comments
 (0)