<table><tr><td style="">kfunk requested changes to this revision.<br />kfunk added a reviewer: kfunk.<br />kfunk 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/D2925" rel="noreferrer">View Revision</a></tr></table><br /><div><div><p>Please add a unit test which calls <tt style="background: #ebebeb; font-size: 13px;">kdev_format_source</tt> on a few (simple) format files.</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/D2925#inline-11718" rel="noreferrer">View Inline</a><span style="color: #4b4d51; font-weight: bold;">kdev_format_source.cpp:52</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: #d0ffd0;"> <span class="n">QFile</span> <span style="color: #004012">formatFile</span><span class="p">(</span><span class="n">formatFileName</span><span class="p">);</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: #d0ffd0;"> <span style="color: #aa4000">if</span> <span class="p">(</span><span style="color: #aa2211">!</span><span class="n">formatFile</span><span class="p">.</span><span class="n">open</span><span class="p">(</span><span class="n">QIODevice</span><span style="color: #aa2211">::</span><span class="n">ReadOnly</span> <span style="color: #aa2211">|</span> <span class="n">QIODevice</span><span style="color: #aa2211">::</span><span class="n">Text</span><span class="p">))</span> <span class="p">{</span>
</div></div></div>
<div style="margin: 8px 0; padding: 0 12px;"><p style="padding: 0; margin: 8px;">Factor out the detection of the format file, e.g. <tt style="background: #ebebeb; font-size: 13px;">findFormatFile(...)</tt>. This also reduces the indent of the following lines.</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/D2925#inline-11717" rel="noreferrer">View Inline</a><span style="color: #4b4d51; font-weight: bold;">kdev_format_source.cpp:58</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: #d0ffd0;"> <span style="color: #aa4000">int</span> <span class="n">line_number</span> <span style="color: #aa2211">=</span> <span style="color: #601200">0</span><span class="p">;</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: #d0ffd0;"> <span style="color: #aa4000">bool</span> <span class="n">matched</span> <span style="color: #aa2211">=</span> <span style="color: #304a96">false</span><span class="p">;</span>
</div></div></div>
<div style="margin: 8px 0; padding: 0 12px;"><p style="padding: 0; margin: 8px;">Style: CamelCase</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/D2925#inline-11719" rel="noreferrer">View Inline</a><span style="color: #4b4d51; font-weight: bold;">kdev_format_source.cpp:64</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: #d0ffd0;"> <span style="color: #aa4000">while</span> <span class="p">(</span><span style="color: #aa2211">!</span><span class="n">formatFile</span><span class="p">.</span><span class="n">atEnd</span><span class="p">())</span> <span class="p">{</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: #d0ffd0;"> <span style="color: #aa2211">++</span><span class="n">line_number</span><span class="p">;</span>
</div></div></div>
<div style="margin: 8px 0; padding: 0 12px;"><p style="padding: 0; margin: 8px;">I'd try to separate the steps a) parsing the format file + b) executing the commands in the format file.</p>
<p style="padding: 0; margin: 8px;">For parsing, something simple as <tt style="background: #ebebeb; font-size: 13px;">QVector<FormatLine> parseFormatFile()</tt>, where <tt style="background: #ebebeb; font-size: 13px;">FormatLine</tt> is a <tt style="background: #ebebeb; font-size: 13px;">struct { QVector<QString> wildcards; QString command; }</tt>. Then use this function.</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/D2925#inline-11720" rel="noreferrer">View Inline</a><span style="color: #4b4d51; font-weight: bold;">kdev_format_source.cpp:108</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: #d0ffd0;"> <span style="color: #aa4000">if</span> <span class="p">(</span><span class="n">matched</span> <span style="color: #aa2211">&&</span> <span style="color: #aa2211">!</span><span class="n">command</span><span class="p">.</span><span class="n">isEmpty</span><span class="p">())</span> <span class="p">{</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: #d0ffd0;"> <span style="color: #aa4000">if</span> <span class="p">(</span><span class="n">wildcard</span><span class="p">.</span><span class="n">isEmpty</span><span class="p">())</span>
</div></div></div>
<div style="margin: 8px 0; padding: 0 12px;"><p style="padding: 0; margin: 8px;">Something's fishy here. This is not in the correct scope is it? If I understand correctly, then there can only be one call to <tt style="background: #ebebeb; font-size: 13px;">QProcess::execute(command)</tt> per run? This can't be correct as there may be multiple format lines in a format file; each of them executing a different command. Please check.</p></div></div></div></div></div><br /><div><strong>REPOSITORY</strong><div><div>rKDEVPLATFORM KDevPlatform</div></div></div><br /><div><strong>REVISION DETAIL</strong><div><a href="https://phabricator.kde.org/D2925" rel="noreferrer">https://phabricator.kde.org/D2925</a></div></div><br /><div><strong>EMAIL PREFERENCES</strong><div><a href="https://phabricator.kde.org/settings/panel/emailpreferences/" rel="noreferrer">https://phabricator.kde.org/settings/panel/emailpreferences/</a></div></div><br /><div><strong>To: </strong>antonanikin, KDevelop, kfunk<br /><strong>Cc: </strong>kfunk, apol, kdevelop-devel<br /></div>