github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-08-25 14:22:54 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

.CodeEditor: DiffSyntax improved #864

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@7712 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2014-09-21 16:09:26 +00:00
parent c863f38e22
commit 77df3b6790
1 changed files with 94 additions and 94 deletions
Download patch file Download diff file Expand all files Collapse all files

188
uppsrc/CodeEditor/DiffSyntax.cpp
View file

@ -1,94 +1,94 @@
#include "CodeEditor.h"
NAMESPACE_UPP
DiffSyntax::DiffSyntax()
{
hout = NULL;
}
void DiffSyntax::Highlight(const wchar *start, const wchar *end, HighlightOutput& hls, CodeEditor *editor, int line, int pos)
{
hout = &hls;
Do(start, end, editor, line, editor ? editor->GetTabSize() : 4, pos);
hout = NULL;
}
void DiffSyntax::Put(int ink, int n, int paper)
{
if(hout)
hout->Put(n, hl_style[ink], hl_style[paper]);
}
void DiffSyntax::Do(const wchar *ln, const wchar *end, CodeEditor *editor, int line, int tabsize, int pos)
{
const int lineLength = FindTheNumberOfCharsToLineEnd(ln, end);
if(IsPattern(ln, end, "---") || IsPattern(ln, end, "***")) {
const wchar *lnPrefix = end - 4;
if(lnPrefix >= ln) {
if (IsPattern(lnPrefix, end, "----") || IsPattern(lnPrefix, end, "****")) {
Put(INK_DIFF_HEADER, lineLength);
return;
}
}
Put(INK_DIFF_FILE_INFO, lineLength);
}
else
if(IsPattern(ln, end, "====") || IsPattern(ln, end, "index"))
Put(INK_DIFF_FILE_INFO, lineLength);
else
if(IsPattern(ln, end, "+++"))
Put(INK_DIFF_HEADER, lineLength);
else
if(IsPattern(ln, end, "@@"))
Put(INK_DIFF_HEADER, lineLength);
else
if(IsDigit(*ln))
Put(INK_DIFF_HEADER, lineLength);
else
if(*ln == '+' || *ln == '>')
Put(INK_DIFF_ADDED, lineLength);
else
if(*ln == '-' || *ln == '<' || *ln == '!')
Put(INK_DIFF_REMOVED, lineLength);
else
if(*ln == '\\')
Put(INK_DIFF_COMMENT, lineLength);
else
Put(INK_NORMAL, lineLength);
}
int DiffSyntax::FindTheNumberOfCharsToLineEnd(const wchar *current, const wchar *end) const
{
int counter = 0;
while(current < end) {
current++;
counter++;
}
return counter;
}
bool DiffSyntax::IsPattern(const wchar *current, const wchar *end, String pattern) const
{
bool containing = true;
int i = 0;
while((current < end) && (i < pattern.GetCount())) {
if(ToLower(*current) != ToLower(pattern[i])) {
containing = false;
break;
}
current++;
i++;
}
return (containing && (i == pattern.GetCount()));
}
END_UPP_NAMESPACE
#include "CodeEditor.h"
NAMESPACE_UPP
DiffSyntax::DiffSyntax()
{
hout = NULL;
}
void DiffSyntax::Highlight(const wchar *start, const wchar *end, HighlightOutput& hls, CodeEditor *editor, int line, int pos)
{
hout = &hls;
Do(start, end, editor, line, editor ? editor->GetTabSize() : 4, pos);
hout = NULL;
}
void DiffSyntax::Put(int ink, int n, int paper)
{
if(hout)
hout->Put(n, hl_style[ink], hl_style[paper]);
}
void DiffSyntax::Do(const wchar *ln, const wchar *end, CodeEditor *editor, int line, int tabsize, int pos)
{
const int lineLength = FindTheNumberOfCharsToLineEnd(ln, end);
if(IsPattern(ln, end, "---") || IsPattern(ln, end, "***")) {
const wchar *lnPrefix = end - 4;
if(lnPrefix >= ln) {
if (IsPattern(lnPrefix, end, "----") || IsPattern(lnPrefix, end, "****")) {
Put(INK_DIFF_HEADER, lineLength);
return;
}
}
Put(INK_DIFF_FILE_INFO, lineLength);
}
else
if(IsPattern(ln, end, "====") || IsPattern(ln, end, "index"))
Put(INK_DIFF_FILE_INFO, lineLength);
else
if(IsPattern(ln, end, "+++"))
Put(INK_DIFF_HEADER, lineLength);
else
if(IsPattern(ln, end, "@@"))
Put(INK_DIFF_HEADER, lineLength);
else
if(IsDigit(*ln))
Put(INK_DIFF_HEADER, lineLength);
else
if(*ln == '+' || *ln == '>')
Put(INK_DIFF_ADDED, lineLength);
else
if(*ln == '-' || *ln == '<' || *ln == '!')
Put(INK_DIFF_REMOVED, lineLength);
else
if(*ln == ' ')
Put(INK_NORMAL, lineLength);
else
Put(INK_DIFF_COMMENT, lineLength);
}
int DiffSyntax::FindTheNumberOfCharsToLineEnd(const wchar *current, const wchar *end) const
{
int counter = 0;
while(current < end) {
current++;
counter++;
}
return counter;
}
bool DiffSyntax::IsPattern(const wchar *current, const wchar *end, String pattern) const
{
bool containing = true;
int i = 0;
while((current < end) && (i < pattern.GetCount())) {
if(ToLower(*current) != ToLower(pattern[i])) {
containing = false;
break;
}
current++;
i++;
}
return (containing && (i == pattern.GetCount()));
}
END_UPP_NAMESPACE