[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kwrite-devel
Subject:    Re: Review Request 114143: vi-mode: enable repeat for visual mode
From:       "Michal Humpula" <michal.humpula () hudrydum ! cz>
Date:       2013-11-26 21:17:28
Message-ID: 20131126211728.29558.82249 () vidsolbach ! de
[Download RAW message or body]

[Attachment #2 (multipart/alternative)]


> On Nov. 26, 2013, 8:38 p.m., Simon St James wrote:
> > part/vimode/katevinormalmode.cpp, line 536
> > <http://git.reviewboard.kde.org/r/114143/diff/1/?file=220613#file220613line536>
> > 
> > I'm thinking here we can ditch the whole DONT_CLEAN_HISTORY stuff and just check, \
> > within executeCommand, whether the command switched us to VisualLineMode i.e. in \
> > front of   cmd->execute();, have 
> > const ViMode originalViMode = m_viInputModeManager->getCurrentViMode();
> > 
> > and instead of if (cmd->cleanHistory()) { .. } have:
> > 
> > // Leave the command to switch to VisualLineMode in the logged current change \
> > keys: when we repeat via ".", we will re-enter Visual Mode and hopefully selected \
> > the correct original lines. const bool commandSwitchedToVisualLineMode = \
> > ((originalViMode == NormalMode) && m_viInputModeManager->isAnyVisualMode()); if \
> > (!commandSwitchedToVisualLineMode) {
> > m_viInputModeManager->clearCurrentChangeLog();
> > }
> > 
> > (the comment here will need tweaking, but we definitely need a comment of some \
> > kind!)
> 
> Simon St James wrote:
> Hmmm ... actually, as written, this should be commandSwitchedToVisualMode, since it \
> works for any Visual Mode.  Maybe add some tests for Visual Mode and Visual Block \
> mode, too? 
> I really like this functionality, BTW - to repeat an indent, I always used to do \
> e.g.  
> gv>
> 
> This is much better! :)

I put the suggested changes in second patch, but...

I'm not sure that this is correct way to do. Consider <esc> in replace mode. It \
directly launches the startNormalMode(). The same function that is executed trought \
KateViCommand (aka hitting command that results in changing modes) but have special \
handling in the KateViNormalMode::executeCommand. That seems like handling the \
transition between states on two different places (at least).


- Michal


-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
http://git.reviewboard.kde.org/r/114143/#review44534
-----------------------------------------------------------


On Nov. 26, 2013, 9:07 p.m., Michal Humpula wrote:
> 
> -----------------------------------------------------------
> This is an automatically generated e-mail. To reply, visit:
> http://git.reviewboard.kde.org/r/114143/
> -----------------------------------------------------------
> 
> (Updated Nov. 26, 2013, 9:07 p.m.)
> 
> 
> Review request for Kate.
> 
> 
> Repository: kate
> 
> 
> Description
> -------
> 
> make things like:
> 
> Vj>.
> Vj>jj.
> 
> just work. The patch probably solves even the line deletion.
> 
> It passes all the tests, which is kind of surprise considering how much special \
> paths it adds to the common paths. 
> 
> Diffs
> -----
> 
> part/vimode/katevicommand.h 960925d 
> part/vimode/katevimodebase.cpp 0311da2 
> part/vimode/katevinormalmode.cpp b71c8de 
> part/vimode/katevivisualmode.cpp c9d98d7 
> tests/vimode_test.cpp 1857b19 
> 
> Diff: http://git.reviewboard.kde.org/r/114143/diff/
> 
> 
> Testing
> -------
> 
> 
> Thanks,
> 
> Michal Humpula
> 
> 


[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/114143/">http://git.reviewboard.kde.org/r/114143/</a>
  </td>
    </tr>
   </table>
   <br />










<blockquote style="margin-left: 1em; border-left: 2px solid #d0d0d0; padding-left: \
10px;">  <p style="margin-top: 0;">On November 26th, 2013, 8:38 p.m. UTC, <b>Simon St \
James</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/114143/diff/1/?file=220613#file220613line536" \
style="color: black; font-weight: bold; text-decoration: \
underline;">part/vimode/katevinormalmode.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 \
KateViNormalMode::executeCommand( const KateViCommand* cmd )</pre></td>

  </tr>
 </tbody>



 
 

 <tbody>

  <tr>
    <th bgcolor="#e9eaa8" style="border-right: 1px solid #C0C0C0;" \
align="right"><font size="2">533</font></th>  <td bgcolor="#fdfebc" width="50%"><pre \
style="font-size: 8pt; line-height: 140%; margin: 0; ">    <span \
class="n">m_viInputModeManager</span><span class="o">-&gt;</span><span \
class="n">clearCurrentChangeLog</span><span class="p">();</span></pre></td>  <th \
bgcolor="#e9eaa8" style="border-left: 1px solid #C0C0C0; border-right: 1px solid \
#C0C0C0;" align="right"><font size="2">536</font></th>  <td bgcolor="#fdfebc" \
width="50%"><pre style="font-size: 8pt; line-height: 140%; margin: 0; ">    <span \
class="k">if</span> <span class="p">(</span> <span class="n">cmd</span><span \
class="o">-&gt;</span><span class="n">cleanHistory</span><span class="p">()</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;">I&#39;m thinking here we \
can ditch the whole DONT_CLEAN_HISTORY stuff and just check, within executeCommand, \
whether the command switched us to VisualLineMode i.e. in front of   \
cmd-&gt;execute();, have

  const ViMode originalViMode = m_viInputModeManager-&gt;getCurrentViMode();

and instead of if (cmd-&gt;cleanHistory()) { .. } have:

// Leave the command to switch to VisualLineMode in the logged current change keys: \
when we repeat via &quot;.&quot;, we will re-enter Visual Mode and hopefully selected \
the correct original lines.  const bool commandSwitchedToVisualLineMode = \
((originalViMode == NormalMode) &amp;&amp; \
m_viInputModeManager-&gt;isAnyVisualMode());  if (!commandSwitchedToVisualLineMode)
    {
      m_viInputModeManager-&gt;clearCurrentChangeLog();
    }

(the comment here will need tweaking, but we definitely need a comment of some \
kind!)</pre>  </blockquote>



 <p>On November 26th, 2013, 8:52 p.m. UTC, <b>Simon St James</b> wrote:</p>
 <blockquote style="margin-left: 1em; border-left: 2px solid #d0d0d0; padding-left: \
10px;">  <pre style="white-space: pre-wrap; white-space: -moz-pre-wrap; white-space: \
-pre-wrap; white-space: -o-pre-wrap; word-wrap: break-word;">Hmmm ... actually, as \
written, this should be commandSwitchedToVisualMode, since it works for any Visual \
Mode.  Maybe add some tests for Visual Mode and Visual Block mode, too?

I really like this functionality, BTW - to repeat an indent, I always used to do e.g. \


gv&gt;

This is much better! :)</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;">I put the \
suggested changes in second patch, but...

I&#39;m not sure that this is correct way to do. Consider &lt;esc&gt; in replace \
mode. It directly launches the startNormalMode(). The same function that is executed \
trought KateViCommand (aka hitting command that results in changing modes) but have \
special handling in the KateViNormalMode::executeCommand. That seems like handling \
the transition between states on two different places (at least).</pre> <br />




<p>- Michal</p>


<br />
<p>On November 26th, 2013, 9:07 p.m. UTC, Michal Humpula 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.</div>
<div>By Michal Humpula.</div>


<p style="color: grey;"><i>Updated Nov. 26, 2013, 9:07 p.m.</i></p>









<div style="margin-top: 1.5em;">
 <b style="color: #575012; font-size: 10pt;">Repository: </b>
kate
</div>


<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;">make things like:

Vj&gt;.
Vj&gt;jj.

just work. The patch probably solves even the line deletion.

It passes all the tests, which is kind of surprise considering how much special paths \
it adds to the common paths.</pre>  </td>
 </tr>
</table>



<h1 style="color: #575012; font-size: 10pt; margin-top: 1.5em;">Diffs</b> </h1>
<ul style="margin-left: 3em; padding-left: 0;">

 <li>part/vimode/katevicommand.h <span style="color: grey">(960925d)</span></li>

 <li>part/vimode/katevimodebase.cpp <span style="color: grey">(0311da2)</span></li>

 <li>part/vimode/katevinormalmode.cpp <span style="color: grey">(b71c8de)</span></li>

 <li>part/vimode/katevivisualmode.cpp <span style="color: grey">(c9d98d7)</span></li>

 <li>tests/vimode_test.cpp <span style="color: grey">(1857b19)</span></li>

</ul>

<p><a href="http://git.reviewboard.kde.org/r/114143/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