<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/D7660" rel="noreferrer">View Revision</a></tr></table><br /><div><div><p>I think one further revision would be helpful, then the patch should be 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/D7660#inline-32500" rel="noreferrer">View Inline</a><span style="color: #4b4d51; font-weight: bold;">navigationconfigwidget.ui:138</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(151, 234, 151, .6);"> <property name="whatsThis">
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);"> <string>When selected, composed characters are removed with thier diacritics instead of only removing the base character. This is useful for Indic locales.</string>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);"> </property>
</div></div></div>
<div style="margin: 8px 0; padding: 0 12px;"><p style="padding: 0; margin: 8px;">Typo: their instead of thier.</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/D7660#inline-32501" rel="noreferrer">View Inline</a><span style="color: #4b4d51; font-weight: bold;">navigationconfigwidget.ui:141</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(151, 234, 151, .6);"> <property name="text">
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);"> <string>Backspace key removes character’s base with it’s diacritics</string>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);"> </property>
</div></div></div>
<div style="margin: 8px 0; padding: 0 12px;"><p style="padding: 0; margin: 8px;">Typo: its instead of it's</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/D7660#inline-32502" rel="noreferrer">View Inline</a><span style="color: #4b4d51; font-weight: bold;">katedocument.cpp:3172</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 class="n">KTextEditor</span><span style="color: #aa2211">::</span><span class="n">Cursor</span> <span class="n">beginCursor</span><span class="p">(</span><span class="n">line</span><span class="p">,</span> <span class="bright"></span><span class="n"><span class="bright">view</span></span><span class="bright"></span><span style="color: #aa2211"><span class="bright">-></span></span><span class="bright"></span><span class="n"><span class="bright">textLayout</span></span><span class="bright"></span><span class="p"><span class="bright">(</span></span><span class="bright"></span><span class="n"><span class="bright">c</span></span><span class="bright"></span><span class="p"><span class="bright">)</span></span><span class="bright"></span><span style="color: #aa2211"><span class="bright">-></span></span><span class="bright"></span><span class="n"><span class="bright">previousCursorPosition</span></span><span class="bright"></span><span class="p"><span class="bright">(</span></span><span class="bright"></span><span class="n"><span class="bright">c</span></span><span class="bright"></span><span class="p"><span class="bright">.</span></span><span class="bright"></span><span class="n"><span class="bright">column</span></span><span class="bright"></span><span class="p"><span class="bright">())</span>);</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);"> <span class="n">KTextEditor</span><span style="color: #aa2211">::</span><span class="n">Cursor</span> <span class="n">beginCursor</span><span class="p">(</span><span class="n">line</span><span class="p">,</span> <span class="bright"></span><span style="color: #601200"><span class="bright">0</span></span><span class="p">);</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);"> <span style="color: #aa4000">if</span> <span class="p">(</span><span style="color: #aa2211">!</span><span class="n">view</span><span style="color: #aa2211">-></span><span class="n">config</span><span class="p">()</span><span style="color: #aa2211">-></span><span class="n">backspaceRemoveComposed</span><span class="p">())</span> <span class="p">{</span> <span style="color: #74777d">// Normal backspace behavior</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);"> <span class="n">beginCursor</span><span class="p">.</span><span class="n">setColumn</span><span class="p">(</span><span class="n">col</span> <span style="color: #aa2211">-</span> <span style="color: #601200">1</span><span class="p">);</span>
</div></div></div>
<div style="margin: 8px 0; padding: 0 12px;"><p style="padding: 0; margin: 8px;">I would prefer to have this if() only once:</p>
<div class="remarkup-code-block" style="margin: 12px 0;" data-code-lang="text" data-sigil="remarkup-code-block"><pre class="remarkup-code" style="font: 11px/15px "Menlo", "Consolas", "Monaco", monospace; padding: 12px; margin: 0; background: rgba(71, 87, 120, 0.08);">KTextEditor::Cursor beginCursor(line, 0);
KTextEditor::Cursor endCursor(line, col);
if (!view->config()->backspaceRemoveComposed()) { // Normal backspace behavior
beginCursor.setColumn(col - 1);
// move to left of surrogate pair
if (!isValidTextPosition(beginCursor)) {
Q_ASSERT(col >= 2);
beginCursor.setColumn(col - 2);
}
} else {
beginCursor.setColumn(view->textLayout(c)->previousCursorPosition(c.column()));
}</pre></div></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/D7660#inline-32503" rel="noreferrer">View Inline</a><span style="color: #4b4d51; font-weight: bold;">katedocument.cpp:3208</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 class="p">}</span> <span style="color: #aa4000">else</span> <span class="p">{</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(251, 175, 175, .7);"> <span class="n">KTextEditor</span><span style="color: #aa2211">::</span><span class="n">Cursor</span> <span class="n">beginCursor</span><span class="p">(</span><span class="n">line</span><span class="p">,</span> <span class="bright"></span><span class="n"><span class="bright">view</span></span><span class="bright"></span><span style="color: #aa2211"><span class="bright">-></span></span><span class="bright"></span><span class="n"><span class="bright">textLayout</span></span><span class="bright"></span><span class="p"><span class="bright">(</span></span><span class="bright"></span><span class="n"><span class="bright">c</span></span><span class="bright"></span><span class="p"><span class="bright">)</span></span><span class="bright"></span><span style="color: #aa2211"><span class="bright">-></span></span><span class="bright"></span><span class="n"><span class="bright">previousCursorPosition</span></span><span class="bright"></span><span class="p"><span class="bright">(</span></span><span class="bright"></span><span class="n"><span class="bright">c</span></span><span class="bright"></span><span class="p"><span class="bright">.</span></span><span class="bright"></span><span class="n"><span class="bright">column</span></span><span class="bright"></span><span class="p"><span class="bright">())</span>);</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);"> <span class="n">KTextEditor</span><span style="color: #aa2211">::</span><span class="n">Cursor</span> <span class="n">beginCursor</span><span class="p">(</span><span class="n">line</span><span class="p">,</span> <span class="bright"></span><span style="color: #601200"><span class="bright">0</span></span><span class="p">);</span>
</div><div style="padding: 0 8px; margin: 0 4px; background: rgba(151, 234, 151, .6);"> <span style="color: #aa4000">if</span> <span class="p">(</span><span style="color: #aa2211">!</span><span class="n">view</span><span style="color: #aa2211">-></span><span class="n">config</span><span class="p">()</span><span style="color: #aa2211">-></span><span class="n">backspaceRemoveComposed</span><span class="p">())</span> <span class="p">{</span> <span style="color: #74777d">// Normal backspace behavior</span>
</div></div></div>
<div style="margin: 8px 0; padding: 0 12px;"><p style="padding: 0; margin: 8px;">Same here: Please if() case only once, which leads to less convoluted code.</p></div></div></div></div></div><br /><div><strong>REPOSITORY</strong><div><div>R39 KTextEditor</div></div></div><br /><div><strong>REVISION DETAIL</strong><div><a href="https://phabricator.kde.org/D7660" rel="noreferrer">https://phabricator.kde.org/D7660</a></div></div><br /><div><strong>To: </strong>safaalfulaij, KTextEditor, jgrulich, hein, dhaumann<br /><strong>Cc: </strong>jgrulich, dhaumann, hein, kwrite-devel, Frameworks<br /></div>