<table><tr><td style="">dhaumann requested changes to this revision.<br />dhaumann added a comment.<br />This revision now requires changes to proceed.
</td><a style="text-decoration: none; padding: 4px 8px; margin: 0 8px 8px; float: right; color: #464C5C; font-weight: bold; border-radius: 3px; background-color: #F7F7F9; background-image: linear-gradient(to bottom,#fff,#f1f0f1); display: inline-block; border: 1px solid rgba(71,87,120,.2);" href="https://phabricator.kde.org/D11470">View Revision</a></tr></table><br /><div><div><p>Looks mostly good, but there are some minor issues we first need to address:</p>
<ul class="remarkup-list">
<li class="remarkup-list-item">dsControlFlow and similar default styles were added with KDE Frameworks 5, so kateversion="5.0" is required in the header</li>
<li class="remarkup-list-item">WordDetect for things like "end if" is not sensitive to multiple spaces anymore. Are you sure this is correct? If not, please keep RegExpr.</li>
</ul>
<p>Please provide an updated revision, I think the next one is good to go in. :-)</p></div></div><br /><div><strong>INLINE COMMENTS</strong><div><div style="margin: 6px 0 12px 0;"><div style="border: 1px solid #C7CCD9; border-radius: 3px;"><div style="padding: 0; background: #F7F7F7; border-color: #e3e4e8; border-style: solid; border-width: 0 0 1px 0; margin: 0;"><div style="color: #74777d; background: #eff2f4; padding: 6px 8px; overflow: hidden;"><a style="float: right; text-decoration: none;" href="https://phabricator.kde.org/D11470#inline-61470">View Inline</a><span style="color: #4b4d51; font-weight: bold;">sql-mysql.xml:9</span></div>
<div style="font: 11px/15px "Menlo", "Consolas", "Monaco", monospace; white-space: pre-wrap; clear: both; padding: 4px 0; margin: 0;"><div style="padding: 0 8px; margin: 0 4px; "><span style="color: #74777d">--></span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(251, 175, 175, .7);"><span style="color: #00702a"><language</span> <span style="color: #354bb3">name=</span><span style="color: #766510">"SQL (MySQL)"</span> <span style="color: #354bb3">version=</span><span style="color: #766510">"<span class="bright">3</span>"</span> <span style="color: #354bb3">kateversion=</span><span style="color: #766510">"3.4"</span> <span style="color: #354bb3">section=</span><span style="color: #766510">"Database"</span> <span style="color: #354bb3">extensions=</span><span style="color: #766510">"*.sql;*.SQL;*.ddl;*.DDL"</span> <span style="color: #354bb3">mimetype=</span><span style="color: #766510">"text/x-sql"</span> <span style="color: #354bb3">casesensitive=</span><span style="color: #766510">"0"</span> <span style="color: #354bb3">author=</span><span style="color: #766510">"Shane Wright (me@shanewright.co.uk)"</span> <span style="color: #354bb3">license=</span><span style="color: #766510">""</span><span style="color: #00702a">></span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);"><span style="color: #00702a"><language</span> <span style="color: #354bb3">name=</span><span style="color: #766510">"SQL (MySQL)"</span> <span style="color: #354bb3">version=</span><span style="color: #766510">"<span class="bright">4</span>"</span> <span style="color: #354bb3">kateversion=</span><span style="color: #766510">"3.4"</span> <span style="color: #354bb3">section=</span><span style="color: #766510">"Database"</span> <span style="color: #354bb3">extensions=</span><span style="color: #766510">"*.sql;*.SQL;*.ddl;*.DDL"</span> <span style="color: #354bb3">mimetype=</span><span style="color: #766510">"text/x-sql"</span> <span style="color: #354bb3">casesensitive=</span><span style="color: #766510">"0"</span> <span style="color: #354bb3">author=</span><span style="color: #766510">"Shane Wright (me@shanewright.co.uk)"</span> <span style="color: #354bb3">license=</span><span style="color: #766510">""</span><span style="color: #00702a">></span>
</div><div style="padding: 0 8px; margin: 0 4px; "> <span style="color: #00702a"><highlighting></span>
</div></div></div>
<div style="margin: 8px 0; padding: 0 12px;"><p style="padding: 0; margin: 8px;">kateversion="5.0" is required due to dsControlFlow.</p></div></div><br /><div style="border: 1px solid #C7CCD9; border-radius: 3px;"><div style="padding: 0; background: #F7F7F7; border-color: #e3e4e8; border-style: solid; border-width: 0 0 1px 0; margin: 0;"><div style="color: #74777d; background: #eff2f4; padding: 6px 8px; overflow: hidden;"><a style="float: right; text-decoration: none;" href="https://phabricator.kde.org/D11470#inline-61469">View Inline</a><span style="color: #4b4d51; font-weight: bold;">sql-oracle.xml:4</span></div>
<div style="font: 11px/15px "Menlo", "Consolas", "Monaco", monospace; white-space: pre-wrap; clear: both; padding: 4px 0; margin: 0;"><div style="padding: 0 8px; margin: 0 4px; "><span style="color: #74777d"><!-- Oracle SQL, syntax definition based on sql.xml by Yury Lebedev --></span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(251, 175, 175, .7);"><span style="color: #00702a"><language</span> <span style="color: #354bb3">name=</span><span style="color: #766510">"SQL (Oracle)"</span> <span style="color: #354bb3">version=</span><span style="color: #766510">"<span class="bright">4</span>"</span> <span style="color: #354bb3">kateversion=</span><span style="color: #766510">"2.4"</span> <span style="color: #354bb3">section=</span><span style="color: #766510">"Database"</span> <span style="color: #354bb3">extensions=</span><span style="color: #766510">"*.sql;*.SQL;*.ddl;*.DDL;*.trg;*.TRG;*.spc;*.SPC;*.bdy;*.DBY"</span> <span style="color: #354bb3">mimetype=</span><span style="color: #766510">"text/x-sql"</span> <span style="color: #354bb3">casesensitive=</span><span style="color: #766510">"0"</span> <span style="color: #354bb3">author=</span><span style="color: #766510">"Andrey Karepin (egdfree@opensuse.org)"</span> <span style="color: #354bb3">license=</span><span style="color: #766510">"LGPL"</span><span style="color: #00702a">></span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);"><span style="color: #00702a"><language</span> <span style="color: #354bb3">name=</span><span style="color: #766510">"SQL (Oracle)"</span> <span style="color: #354bb3">version=</span><span style="color: #766510">"<span class="bright">5</span>"</span> <span style="color: #354bb3">kateversion=</span><span style="color: #766510">"2.4"</span> <span style="color: #354bb3">section=</span><span style="color: #766510">"Database"</span> <span style="color: #354bb3">extensions=</span><span style="color: #766510">"*.sql;*.SQL;*.ddl;*.DDL;*.trg;*.TRG;*.spc;*.SPC;*.bdy;*.DBY"</span> <span style="color: #354bb3">mimetype=</span><span style="color: #766510">"text/x-sql"</span> <span style="color: #354bb3">casesensitive=</span><span style="color: #766510">"0"</span> <span style="color: #354bb3">author=</span><span style="color: #766510">"Andrey Karepin (egdfree@opensuse.org)"</span> <span style="color: #354bb3">license=</span><span style="color: #766510">"LGPL"</span><span style="color: #00702a">></span>
</div><div style="padding: 0 8px; margin: 0 4px; "> <span style="color: #00702a"><highlighting></span>
</div></div></div>
<div style="margin: 8px 0; padding: 0 12px;"><p style="padding: 0; margin: 8px;">Since you are using dsControlFlow and similar new itemDatas, you have to change kateversion="5.0".</p></div></div><br /><div style="border: 1px solid #C7CCD9; border-radius: 3px;"><div style="padding: 0; background: #F7F7F7; border-color: #e3e4e8; border-style: solid; border-width: 0 0 1px 0; margin: 0;"><div style="color: #74777d; background: #eff2f4; padding: 6px 8px; overflow: hidden;"><a style="float: right; text-decoration: none;" href="https://phabricator.kde.org/D11470#inline-61468">View Inline</a><span style="color: #4b4d51; font-weight: bold;">sql-oracle.xml:1873</span></div>
<div style="font: 11px/15px "Menlo", "Consolas", "Monaco", monospace; white-space: pre-wrap; clear: both; padding: 4px 0; margin: 0;"><div style="padding: 0 8px; margin: 0 4px; background: rgba(251, 175, 175, .7);"> <span style="color: #00702a"><<span class="bright">String</span>Detect</span> <span style="color: #354bb3">attribute=</span><span style="color: #766510">"<span class="bright">Keyword</span>"</span> <span style="color: #354bb3">context=</span><span style="color: #766510">"#stay"</span> <span style="color: #354bb3">String=</span><span style="color: #766510">"if"</span> <span style="color: #354bb3">beginRegion=</span><span style="color: #766510">"if_block"</span> <span style="color: #354bb3">insensitive=</span><span style="color: #766510">"true"</span><span style="color: #00702a">/></span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(251, 175, 175, .7);"> <span style="color: #00702a"><<span class="bright">RegExpr</span></span> <span style="color: #354bb3">attribute=</span><span style="color: #766510">"<span class="bright">Keyword</span>"</span> <span style="color: #354bb3">context=</span><span style="color: #766510">"#stay"</span> <span style="color: #354bb3">String=</span><span style="color: #766510">"end<span class="bright">\s+</span>if"</span> <span style="color: #354bb3">endRegion=</span><span style="color: #766510">"if_block"</span> <span style="color: #354bb3">insensitive=</span><span style="color: #766510">"true"</span><span style="color: #00702a">/></span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(251, 175, 175, .7);"> <span style="color: #00702a"><<span class="bright">String</span>Detect</span> <span style="color: #354bb3">attribute=</span><span style="color: #766510">"<span class="bright">Keyword</span>"</span> <span style="color: #354bb3">context=</span><span style="color: #766510">"#stay"</span> <span style="color: #354bb3">String=</span><span style="color: #766510">"case"</span> <span style="color: #354bb3">beginRegion=</span><span style="color: #766510">"case_block"</span> <span style="color: #354bb3">insensitive=</span><span style="color: #766510">"true"</span><span style="color: #00702a">/></span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);"> <span style="color: #00702a"><<span class="bright">Word</span>Detect</span> <span style="color: #354bb3">attribute=</span><span style="color: #766510">"<span class="bright">ControlFlow</span>"</span> <span style="color: #354bb3">context=</span><span style="color: #766510">"#stay"</span> <span style="color: #354bb3">String=</span><span style="color: #766510">"if"</span> <span style="color: #354bb3">beginRegion=</span><span style="color: #766510">"if_block"</span> <span style="color: #354bb3">insensitive=</span><span style="color: #766510">"true"</span><span style="color: #00702a">/></span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);"> <span style="color: #00702a"><<span class="bright">WordDetect</span></span> <span style="color: #354bb3">attribute=</span><span style="color: #766510">"<span class="bright">ControlFlow</span>"</span> <span style="color: #354bb3">context=</span><span style="color: #766510">"#stay"</span> <span style="color: #354bb3">String=</span><span style="color: #766510">"end<span class="bright"> </span>if"</span> <span style="color: #354bb3">endRegion=</span><span style="color: #766510">"if_block"</span> <span style="color: #354bb3">insensitive=</span><span style="color: #766510">"true"</span><span style="color: #00702a">/></span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);"> <span style="color: #00702a"><<span class="bright">Word</span>Detect</span> <span style="color: #354bb3">attribute=</span><span style="color: #766510">"<span class="bright">ControlFlow</span>"</span> <span style="color: #354bb3">context=</span><span style="color: #766510">"#stay"</span> <span style="color: #354bb3">String=</span><span style="color: #766510">"case"</span> <span style="color: #354bb3">beginRegion=</span><span style="color: #766510">"case_block"</span> <span style="color: #354bb3">insensitive=</span><span style="color: #766510">"true"</span><span style="color: #00702a">/></span>
</div></div></div>
<div style="margin: 8px 0; padding: 0 12px;"><p style="padding: 0; margin: 8px;">Hm, I can see that WordDetect is possibly faster than the RegExpr here. Still, I *assume* there are arbitrary many spaces allowed in "end if". If (and only if) this is true, then I would prefer to keep the RegExpr variant. Same for the others.</p>
<p style="padding: 0; margin: 8px;">The changes from StringDetect to WordDetect are certainly fine.</p></div></div><br /><div style="border: 1px solid #C7CCD9; border-radius: 3px;"><div style="padding: 0; background: #F7F7F7; border-color: #e3e4e8; border-style: solid; border-width: 0 0 1px 0; margin: 0;"><div style="color: #74777d; background: #eff2f4; padding: 6px 8px; overflow: hidden;"><a style="float: right; text-decoration: none;" href="https://phabricator.kde.org/D11470#inline-61471">View Inline</a><span style="color: #4b4d51; font-weight: bold;">sql-postgresql.xml:6</span></div>
<div style="font: 11px/15px "Menlo", "Consolas", "Monaco", monospace; white-space: pre-wrap; clear: both; padding: 4px 0; margin: 0;"><div style="padding: 0 8px; margin: 0 4px; "><span style="color: #74777d"> --></span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(251, 175, 175, .7);"><span style="color: #00702a"><language</span> <span style="color: #354bb3">name=</span><span style="color: #766510">"SQL (PostgreSQL)"</span> <span style="color: #354bb3">version=</span><span style="color: #766510">"<span class="bright">5</span>"</span> <span style="color: #354bb3">kateversion=</span><span style="color: #766510">"2.4"</span> <span style="color: #354bb3">section=</span><span style="color: #766510">"Database"</span> <span style="color: #354bb3">extensions=</span><span style="color: #766510">"*.sql;*.SQL;*.ddl;*.DDL"</span> <span style="color: #354bb3">mimetype=</span><span style="color: #766510">"text/x-sql"</span> <span style="color: #354bb3">casesensitive=</span><span style="color: #766510">"0"</span> <span style="color: #354bb3">author=</span><span style="color: #766510">"Shane Wright (me@shanewright.co.uk)"</span> <span style="color: #354bb3">license=</span><span style="color: #766510">""</span><span style="color: #00702a">></span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);"><span style="color: #00702a"><language</span> <span style="color: #354bb3">name=</span><span style="color: #766510">"SQL (PostgreSQL)"</span> <span style="color: #354bb3">version=</span><span style="color: #766510">"<span class="bright">6</span>"</span> <span style="color: #354bb3">kateversion=</span><span style="color: #766510">"2.4"</span> <span style="color: #354bb3">section=</span><span style="color: #766510">"Database"</span> <span style="color: #354bb3">extensions=</span><span style="color: #766510">"*.sql;*.SQL;*.ddl;*.DDL"</span> <span style="color: #354bb3">mimetype=</span><span style="color: #766510">"text/x-sql"</span> <span style="color: #354bb3">casesensitive=</span><span style="color: #766510">"0"</span> <span style="color: #354bb3">author=</span><span style="color: #766510">"Shane Wright (me@shanewright.co.uk)"</span> <span style="color: #354bb3">license=</span><span style="color: #766510">""</span><span style="color: #00702a">></span>
</div><div style="padding: 0 8px; margin: 0 4px; "> <span style="color: #00702a"><highlighting></span>
</div></div></div>
<div style="margin: 8px 0; padding: 0 12px;"><p style="padding: 0; margin: 8px;">kateversion="5.0" :-)</p></div></div><br /><div style="border: 1px solid #C7CCD9; border-radius: 3px;"><div style="padding: 0; background: #F7F7F7; border-color: #e3e4e8; border-style: solid; border-width: 0 0 1px 0; margin: 0;"><div style="color: #74777d; background: #eff2f4; padding: 6px 8px; overflow: hidden;"><a style="float: right; text-decoration: none;" href="https://phabricator.kde.org/D11470#inline-61472">View Inline</a><span style="color: #4b4d51; font-weight: bold;">sql.xml:8</span></div>
<div style="font: 11px/15px "Menlo", "Consolas", "Monaco", monospace; white-space: pre-wrap; clear: both; padding: 4px 0; margin: 0;"><div style="padding: 0 8px; margin: 0 4px; "><span style="color: #74777d"><!-- kate: space-indent on; indent-width 2; replace-tabs on; --></span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(251, 175, 175, .7);"><span style="color: #00702a"><language</span> <span style="color: #354bb3">name=</span><span style="color: #766510">"SQL"</span> <span style="color: #354bb3">version=</span><span style="color: #766510">"<span class="bright">3</span>"</span> <span style="color: #354bb3">kateversion=</span><span style="color: #766510">"2.4"</span> <span style="color: #354bb3">section=</span><span style="color: #766510">"Database"</span> <span style="color: #354bb3">extensions=</span><span style="color: #766510">"*.sql;*.SQL;*.ddl;*.DDL"</span> <span style="color: #354bb3">mimetype=</span><span style="color: #766510">"text/x-sql"</span> <span style="color: #354bb3">casesensitive=</span><span style="color: #766510">"0"</span> <span style="color: #354bb3">author=</span><span style="color: #766510">"Yury Lebedev (yurylebedev@mail.ru)"</span> <span style="color: #354bb3">license=</span><span style="color: #766510">"LGPL"</span><span style="color: #00702a">></span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);"><span style="color: #00702a"><language</span> <span style="color: #354bb3">name=</span><span style="color: #766510">"SQL"</span> <span style="color: #354bb3">version=</span><span style="color: #766510">"<span class="bright">4</span>"</span> <span style="color: #354bb3">kateversion=</span><span style="color: #766510">"2.4"</span> <span style="color: #354bb3">section=</span><span style="color: #766510">"Database"</span> <span style="color: #354bb3">extensions=</span><span style="color: #766510">"*.sql;*.SQL;*.ddl;*.DDL"</span> <span style="color: #354bb3">mimetype=</span><span style="color: #766510">"text/x-sql"</span> <span style="color: #354bb3">casesensitive=</span><span style="color: #766510">"0"</span> <span style="color: #354bb3">author=</span><span style="color: #766510">"Yury Lebedev (yurylebedev@mail.ru)"</span> <span style="color: #354bb3">license=</span><span style="color: #766510">"LGPL"</span><span style="color: #00702a">></span>
</div><div style="padding: 0 8px; margin: 0 4px; "> <span style="color: #00702a"><highlighting></span>
</div></div></div>
<div style="margin: 8px 0; padding: 0 12px;"><p style="padding: 0; margin: 8px;">kateversion="5.0"</p></div></div></div></div></div><br /><div><strong>REPOSITORY</strong><div><div>R216 Syntax Highlighting</div></div></div><br /><div><strong>REVISION DETAIL</strong><div><a href="https://phabricator.kde.org/D11470">https://phabricator.kde.org/D11470</a></div></div><br /><div><strong>To: </strong>jpoelen, Framework: Syntax Highlighting, dhaumann<br /><strong>Cc: </strong>Frameworks, michaelh, ngraham, bruns<br /></div>