play around with Scintilla and Lexilla
This commit is contained in:
49
3rdparty/lexilla532/lexilla/test/examples/diff/AllStyles.diff
vendored
Normal file
49
3rdparty/lexilla532/lexilla/test/examples/diff/AllStyles.diff
vendored
Normal file
@ -0,0 +1,49 @@
|
||||
Default=0
|
||||
Default
|
||||
|
||||
Comment=1
|
||||
Another comment
|
||||
|
||||
Command=2 diff
|
||||
diff -u a/cocoa/ScintillaCocoa.mm b/cocoa/ScintillaCocoa.mm
|
||||
|
||||
Header=3 ---
|
||||
--- a/cocoa/ScintillaCocoa.mm 2016-12-30 14:38:22.000000000 -0600
|
||||
|
||||
Header=3 +++
|
||||
+++ b/cocoa/ScintillaCocoa.mm 2017-02-15 08:20:12.000000000 -0600
|
||||
|
||||
Position=4 @@
|
||||
@@ -388,7 +388,8 @@
|
||||
|
||||
- (void) idleTriggered: (NSNotification*) notification
|
||||
{
|
||||
#pragma unused(notification)
|
||||
|
||||
Deleted=5 -
|
||||
- static_cast<ScintillaCocoa*>(mTarget)->IdleTimerFired();
|
||||
|
||||
Added=6 +
|
||||
+ if (mTarget)
|
||||
+ static_cast<ScintillaCocoa*>(mTarget)->IdleTimerFired();
|
||||
}
|
||||
|
||||
@end
|
||||
|
||||
Changed=7 !
|
||||
! GdkColor white = { 0, 0xFFFF, 0xFFFF, 0xFFFF};
|
||||
|
||||
PatchAdd=8 ++
|
||||
++ styler.ColourTo(i - 1, StateToPrint);
|
||||
|
||||
PatchDelete=9 +-
|
||||
+- styler.ColourTo(i - 1, StateToPrint);
|
||||
|
||||
RemovedPatchAdd=10 -+
|
||||
-+ styler.ColourTo(i - 1, StateToPrint);
|
||||
|
||||
RemovedPatchDelete=11 --
|
||||
-- styler.ColourTo(i - 1, StateToPrint);
|
||||
|
||||
diff -u a/cocoa/ScintillaCocoa.h b/cocoa/ScintillaCocoa.h
|
||||
|
50
3rdparty/lexilla532/lexilla/test/examples/diff/AllStyles.diff.folded
vendored
Normal file
50
3rdparty/lexilla532/lexilla/test/examples/diff/AllStyles.diff.folded
vendored
Normal file
@ -0,0 +1,50 @@
|
||||
0 400 0 Default=0
|
||||
0 400 0 Default
|
||||
0 400 0
|
||||
0 400 0 Comment=1
|
||||
0 400 0 Another comment
|
||||
0 400 0
|
||||
0 400 0 Command=2 diff
|
||||
2 400 0 + diff -u a/cocoa/ScintillaCocoa.mm b/cocoa/ScintillaCocoa.mm
|
||||
0 401 0 |
|
||||
0 401 0 | Header=3 ---
|
||||
2 401 0 + --- a/cocoa/ScintillaCocoa.mm 2016-12-30 14:38:22.000000000 -0600
|
||||
0 402 0 |
|
||||
0 402 0 | Header=3 +++
|
||||
2 401 0 + +++ b/cocoa/ScintillaCocoa.mm 2017-02-15 08:20:12.000000000 -0600
|
||||
0 402 0 |
|
||||
0 402 0 | Position=4 @@
|
||||
2 402 0 + @@ -388,7 +388,8 @@
|
||||
0 403 0 |
|
||||
0 403 0 | - (void) idleTriggered: (NSNotification*) notification
|
||||
0 403 0 | {
|
||||
0 403 0 | #pragma unused(notification)
|
||||
0 403 0 |
|
||||
0 403 0 | Deleted=5 -
|
||||
0 403 0 | - static_cast<ScintillaCocoa*>(mTarget)->IdleTimerFired();
|
||||
0 403 0 |
|
||||
0 403 0 | Added=6 +
|
||||
0 403 0 | + if (mTarget)
|
||||
0 403 0 | + static_cast<ScintillaCocoa*>(mTarget)->IdleTimerFired();
|
||||
0 403 0 | }
|
||||
0 403 0 |
|
||||
0 403 0 | @end
|
||||
0 403 0 |
|
||||
0 403 0 | Changed=7 !
|
||||
0 403 0 | ! GdkColor white = { 0, 0xFFFF, 0xFFFF, 0xFFFF};
|
||||
0 403 0 |
|
||||
0 403 0 | PatchAdd=8 ++
|
||||
0 403 0 | ++ styler.ColourTo(i - 1, StateToPrint);
|
||||
0 403 0 |
|
||||
0 403 0 | PatchDelete=9 +-
|
||||
0 403 0 | +- styler.ColourTo(i - 1, StateToPrint);
|
||||
0 403 0 |
|
||||
0 403 0 | RemovedPatchAdd=10 -+
|
||||
0 403 0 | -+ styler.ColourTo(i - 1, StateToPrint);
|
||||
0 403 0 |
|
||||
0 403 0 | RemovedPatchDelete=11 --
|
||||
0 403 0 | -- styler.ColourTo(i - 1, StateToPrint);
|
||||
0 403 0 |
|
||||
2 400 0 + diff -u a/cocoa/ScintillaCocoa.h b/cocoa/ScintillaCocoa.h
|
||||
0 401 0 |
|
||||
0 400 0
|
49
3rdparty/lexilla532/lexilla/test/examples/diff/AllStyles.diff.styled
vendored
Normal file
49
3rdparty/lexilla532/lexilla/test/examples/diff/AllStyles.diff.styled
vendored
Normal file
@ -0,0 +1,49 @@
|
||||
{1}Default=0
|
||||
{0} Default
|
||||
{1}
|
||||
Comment=1
|
||||
Another comment
|
||||
|
||||
Command=2 diff
|
||||
{2}diff -u a/cocoa/ScintillaCocoa.mm b/cocoa/ScintillaCocoa.mm
|
||||
{1}
|
||||
Header=3 ---
|
||||
{3}--- a/cocoa/ScintillaCocoa.mm 2016-12-30 14:38:22.000000000 -0600
|
||||
{1}
|
||||
Header=3 +++
|
||||
{3}+++ b/cocoa/ScintillaCocoa.mm 2017-02-15 08:20:12.000000000 -0600
|
||||
{1}
|
||||
Position=4 @@
|
||||
{4}@@ -388,7 +388,8 @@
|
||||
{1}
|
||||
{0} - (void) idleTriggered: (NSNotification*) notification
|
||||
{
|
||||
#pragma unused(notification)
|
||||
{1}
|
||||
Deleted=5 -
|
||||
{5}- static_cast<ScintillaCocoa*>(mTarget)->IdleTimerFired();
|
||||
{1}
|
||||
Added=6 +
|
||||
{6}+ if (mTarget)
|
||||
+ static_cast<ScintillaCocoa*>(mTarget)->IdleTimerFired();
|
||||
{0} }
|
||||
|
||||
@end
|
||||
{1}
|
||||
Changed=7 !
|
||||
{7}! GdkColor white = { 0, 0xFFFF, 0xFFFF, 0xFFFF};
|
||||
{1}
|
||||
PatchAdd=8 ++
|
||||
{8}++ styler.ColourTo(i - 1, StateToPrint);
|
||||
{1}
|
||||
PatchDelete=9 +-
|
||||
{9}+- styler.ColourTo(i - 1, StateToPrint);
|
||||
{1}
|
||||
RemovedPatchAdd=10 -+
|
||||
{10}-+ styler.ColourTo(i - 1, StateToPrint);
|
||||
{1}
|
||||
RemovedPatchDelete=11 --
|
||||
{11}-- styler.ColourTo(i - 1, StateToPrint);
|
||||
{1}
|
||||
{2}diff -u a/cocoa/ScintillaCocoa.h b/cocoa/ScintillaCocoa.h
|
||||
{1}
|
2
3rdparty/lexilla532/lexilla/test/examples/diff/LongLine.diff
vendored
Normal file
2
3rdparty/lexilla532/lexilla/test/examples/diff/LongLine.diff
vendored
Normal file
@ -0,0 +1,2 @@
|
||||
+A 1026-byte line is longer than 1024-byte buffer but doesn't cause problems as diff state determine by short line prefix 3456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456
|
||||
|
3
3rdparty/lexilla532/lexilla/test/examples/diff/LongLine.diff.folded
vendored
Normal file
3
3rdparty/lexilla532/lexilla/test/examples/diff/LongLine.diff.folded
vendored
Normal file
@ -0,0 +1,3 @@
|
||||
0 400 0 +A 1026-byte line is longer than 1024-byte buffer but doesn't cause problems as diff state determine by short line prefix 3456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456
|
||||
0 400 0
|
||||
0 400 0
|
2
3rdparty/lexilla532/lexilla/test/examples/diff/LongLine.diff.styled
vendored
Normal file
2
3rdparty/lexilla532/lexilla/test/examples/diff/LongLine.diff.styled
vendored
Normal file
@ -0,0 +1,2 @@
|
||||
{6}+A 1026-byte line is longer than 1024-byte buffer but doesn't cause problems as diff state determine by short line prefix 3456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456
|
||||
{1}
|
2
3rdparty/lexilla532/lexilla/test/examples/diff/SciTE.properties
vendored
Normal file
2
3rdparty/lexilla532/lexilla/test/examples/diff/SciTE.properties
vendored
Normal file
@ -0,0 +1,2 @@
|
||||
lexer.*.diff=diff
|
||||
fold=1
|
Reference in New Issue
Block a user