[prev in list] [next in list] [prev in thread] [next in thread]
List: kwrite-devel
Subject: Re: Review Request 111540: process beginRegion and endRegion when using lookAhead=true
From: "Commit Hook" <null () kde ! org>
Date: 2013-07-17 7:41:29
Message-ID: 20130717074129.19683.50543 () vidsolbach ! de
[Download RAW message or body]
[Attachment #2 (multipart/alternative)]
-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
http://git.reviewboard.kde.org/r/111540/
-----------------------------------------------------------
(Updated July 17, 2013, 7:41 a.m.)
Status
------
This change has been marked as submitted.
Review request for Kate, Christoph Cullmann and Milian Wolff.
Description
-------
Currently, when using lookAhead="true", the beginRegion and endRegion attributes are \
not processed. Therefore, a rule like the following does not work:
<StringDetect String="x" lookAhead="true" endRegion="a" beginRegion="a" />
This patch fixes this. Therefore, using endRegion and beginRegion along with \
lookAhead will
- not process any characters as before, but
- folding regions are still processed.
This effectively means, that TextLineData::addAttribute (const Attribute &attribute) \
is called as follows: one time for endRegion:
Attribute(offset, length=0, someAttribute (does not matter, since length=0), \
someFoldingId) one time for startRegion:
Attribute(offset, length=0, someAttribute (does not matter, since length=0), \
someFoldingId)
The endRegion is pushed first, i.e. before the startRegion.
The changes are as follows:
1. The folding stuff is moved out of the if (!lookAhead) {...} scope, and therefore \
always executed 2. Therewith, the if (!lookAhead) {...} scope is split into two \
scopes. The first one is moved a bit up.
This addresses bug 322076.
http://bugs.kde.org/show_bug.cgi?id=322076
Diffs
-----
part/syntax/katehighlight.cpp 1a34395
Diff: http://git.reviewboard.kde.org/r/111540/diff/
Testing
-------
Minimal test, which works for me. No thorough testing, since we are missing a test \
suite for this anyways.
Thanks,
Dominik Haumann
[Attachment #5 (text/html)]
<html>
<body>
<div style="font-family: Verdana, Arial, Helvetica, Sans-Serif;">
<table bgcolor="#f9f3c9" width="100%" cellpadding="8" style="border: 1px #c9c399 \
solid;"> <tr>
<td>
This is an automatically generated e-mail. To reply, visit:
<a href="http://git.reviewboard.kde.org/r/111540/">http://git.reviewboard.kde.org/r/111540/</a>
</td>
</tr>
</table>
<br />
<table bgcolor="#e0e0e0" width="100%" cellpadding="8" style="border: 1px gray \
solid;"> <tr>
<td>
<h1 style="margin-right: 0.2em; padding: 0; font-size: 10pt;">This change has been \
marked as submitted.</h1> </td>
</tr>
</table>
<br />
<table bgcolor="#fefadf" width="100%" cellspacing="0" cellpadding="8" \
style="background-image: \
url('http://git.reviewboard.kde.org/static/rb/images/review_request_box_top_bg.ab6f3b1072c9.png'); \
background-position: left top; background-repeat: repeat-x; border: 1px black \
solid;"> <tr>
<td>
<div>Review request for Kate, Christoph Cullmann and Milian Wolff.</div>
<div>By Dominik Haumann.</div>
<p style="color: grey;"><i>Updated July 17, 2013, 7:41 a.m.</i></p>
<h1 style="color: #575012; font-size: 10pt; margin-top: 1.5em;">Description </h1>
<table width="100%" bgcolor="#ffffff" cellspacing="0" cellpadding="10" \
style="border: 1px solid #b8b5a0"> <tr>
<td>
<pre style="margin: 0; padding: 0; white-space: pre-wrap; white-space: \
-moz-pre-wrap; white-space: -pre-wrap; white-space: -o-pre-wrap; word-wrap: \
break-word;">Currently, when using lookAhead="true", the beginRegion and \
endRegion attributes are not processed. Therefore, a rule like the following does not \
work: <StringDetect String="x" lookAhead="true" \
endRegion="a" beginRegion="a" />
This patch fixes this. Therefore, using endRegion and beginRegion along with \
lookAhead will
- not process any characters as before, but
- folding regions are still processed.
This effectively means, that TextLineData::addAttribute (const Attribute \
&attribute) is called as follows: one time for endRegion:
Attribute(offset, length=0, someAttribute (does not matter, since length=0), \
someFoldingId) one time for startRegion:
Attribute(offset, length=0, someAttribute (does not matter, since length=0), \
someFoldingId)
The endRegion is pushed first, i.e. before the startRegion.
The changes are as follows:
1. The folding stuff is moved out of the if (!lookAhead) {...} scope, and therefore \
always executed 2. Therewith, the if (!lookAhead) {...} scope is split into two \
scopes. The first one is moved a bit up.</pre> </td>
</tr>
</table>
<h1 style="color: #575012; font-size: 10pt; margin-top: 1.5em;">Testing </h1>
<table width="100%" bgcolor="#ffffff" cellspacing="0" cellpadding="10" style="border: \
1px solid #b8b5a0"> <tr>
<td>
<pre style="margin: 0; padding: 0; white-space: pre-wrap; white-space: \
-moz-pre-wrap; white-space: -pre-wrap; white-space: -o-pre-wrap; word-wrap: \
break-word;">Minimal test, which works for me. No thorough testing, since we are \
missing a test suite for this anyways.</pre> </td>
</tr>
</table>
<div style="margin-top: 1.5em;">
<b style="color: #575012; font-size: 10pt; margin-top: 1.5em;">Bugs: </b>
<a href="http://bugs.kde.org/show_bug.cgi?id=322076">322076</a>
</div>
<h1 style="color: #575012; font-size: 10pt; margin-top: 1.5em;">Diffs</b> </h1>
<ul style="margin-left: 3em; padding-left: 0;">
<li>part/syntax/katehighlight.cpp <span style="color: grey">(1a34395)</span></li>
</ul>
<p><a href="http://git.reviewboard.kde.org/r/111540/diff/" style="margin-left: \
3em;">View Diff</a></p>
</td>
</tr>
</table>
</div>
</body>
</html>
_______________________________________________
KWrite-Devel mailing list
KWrite-Devel@kde.org
https://mail.kde.org/mailman/listinfo/kwrite-devel
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic