[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: "Dominik Haumann" <dhaumann () kde ! org>
Date: 2013-07-17 7:39:52
Message-ID: 20130717073952.19669.64294 () vidsolbach ! de
[Download RAW message or body]
[Attachment #2 (multipart/alternative)]
> On July 16, 2013, 10:43 p.m., Milian Wolff wrote:
> > part/syntax/katehighlight.cpp, line 403
> > <http://git.reviewboard.kde.org/r/111540/diff/1/?file=170972#file170972line403>
> >
> > why can offset not be > len? i.e. why only check this here?
In theory, offset2 can never be len: len is the length of the text line. No rule \
should ever match behind the length of the line. Hence, it should be a Q_ASSERT. I'd \
change this in KDE 5, but for now it's fine I guess.
- Dominik
-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
http://git.reviewboard.kde.org/r/111540/#review36066
-----------------------------------------------------------
On July 16, 2013, 9:25 p.m., Dominik Haumann wrote:
>
> -----------------------------------------------------------
> This is an automatically generated e-mail. To reply, visit:
> http://git.reviewboard.kde.org/r/111540/
> -----------------------------------------------------------
>
> (Updated July 16, 2013, 9:25 p.m.)
>
>
> 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 />
<blockquote style="margin-left: 1em; border-left: 2px solid #d0d0d0; padding-left: \
10px;"> <p style="margin-top: 0;">On July 16th, 2013, 10:43 p.m. UTC, <b>Milian \
Wolff</b> wrote:</p> <blockquote style="margin-left: 1em; border-left: 2px solid \
#d0d0d0; padding-left: 10px;">
<table width="100%" border="0" bgcolor="white" style="border: 1px solid #C0C0C0; \
border-collapse: collapse; margin: 2px padding: 2px;"> <thead>
<tr>
<th colspan="4" bgcolor="#F0F0F0" style="border-bottom: 1px solid #C0C0C0; \
font-size: 9pt; padding: 4px 8px; text-align: left;"> <a \
href="http://git.reviewboard.kde.org/r/111540/diff/1/?file=170972#file170972line403" \
style="color: black; font-weight: bold; text-decoration: \
underline;">part/syntax/katehighlight.cpp</a> <span style="font-weight: normal;">
(Diff revision 1)
</span>
</th>
</tr>
</thead>
<tbody style="background-color: #e4d9cb; padding: 4px 8px; text-align: center;">
<tr>
<td colspan="4"><pre style="font-size: 8pt; line-height: 140%; margin: 0; ">void \
KateHighlighting::doHighlight ( const Kate::TextLineData *_prevLine,</pre></td>
</tr>
</tbody>
<tbody>
<tr>
<th bgcolor="#b1ebb0" style="border-right: 1px solid #C0C0C0;" \
align="right"><font size="2"></font></th> <td bgcolor="#c5ffc4" width="50%"><pre \
style="font-size: 8pt; line-height: 140%; margin: 0; "></pre></td> <th \
bgcolor="#b1ebb0" style="border-left: 1px solid #C0C0C0; border-right: 1px solid \
#C0C0C0;" align="right"><font size="2">403</font></th> <td bgcolor="#c5ffc4" \
width="50%"><pre style="font-size: 8pt; line-height: 140%; margin: 0; "> \
<span class="k">if</span> <span class="p">(</span><span class="n">offset2</span> \
<span class="o">></span> <span class="n">len</span><span \
class="p">)</span></pre></td> </tr>
</tbody>
</table>
<pre style="white-space: pre-wrap; white-space: -moz-pre-wrap; white-space: \
-pre-wrap; white-space: -o-pre-wrap; word-wrap: break-word;">why can offset not be \
> len? i.e. why only check this here?</pre> </blockquote>
</blockquote>
<pre style="margin-left: 1em; white-space: pre-wrap; white-space: -moz-pre-wrap; \
white-space: -pre-wrap; white-space: -o-pre-wrap; word-wrap: break-word;">In theory, \
offset2 can never be len: len is the length of the text line. No rule should ever \
match behind the length of the line. Hence, it should be a Q_ASSERT. I'd change \
this in KDE 5, but for now it's fine I guess.</pre> <br />
<p>- Dominik</p>
<br />
<p>On July 16th, 2013, 9:25 p.m. UTC, Dominik Haumann wrote:</p>
<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 16, 2013, 9:25 p.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