penguin/AstroJS
1
0
Fork 0
forked from Botanical/BotanJS
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch 'vim/master' into Astro

Browse Source
This commit is contained in:
斟酌 鵬兄 2016-04-07 03:03:40 +08:00
commit 2e56b29a1e
3 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
botanjs/src/Components/Vim/Actions/DELETE.js
View File

@ -158,8 +158,7 @@
this.__nline = occurence( removed, "\n" ); this.__nline = occurence( removed, "\n" );
feeder.content = c.substring( 0, s ) + c.substring( e + 1 ); feeder.content = c.substring( 0, s ) + c.substring( e + 1 ) + "\n";
if( feeder.content === "" ) feeder.content = "\n";
// Try to keep the original panning if possible // Try to keep the original panning if possible
feeder.pan( undefined feeder.pan( undefined

14
botanjs/src/Components/Vim/Actions/VISUAL.js
View File

@ -233,6 +233,18 @@
if( startLine.aPos < minAp ) if( startLine.aPos < minAp )
{ {
pstart = 0; pstart = 0;
if( this.__mode == MODE_LINE )
{
cur.suppressEvent();
cur.lineEnd( true );
nstart = cur.PStart;
cur.moveTo( currAp, true );
cur.unsuppressEvent();
}
} }
// highlight from the end // highlight from the end
else if( maxAp < startLine.aPos ) else if( maxAp < startLine.aPos )
@ -309,7 +321,7 @@
// Sets the visual position // Sets the visual position
// s-->e // s-->e
if( 0 < posDiff ) if( 0 <= posDiff )
{ {
newPos = newPos + 1; newPos = newPos + 1;
} }

2
botanjs/src/Components/Vim/LineFeeder.js
View File

@ -217,7 +217,7 @@
if( tabs ) if( tabs )
{ {
tabStat = "-" + ( X + tabs.length * line.tabWidth ); tabStat = "-" + ( X + tabs.length * ( line.tabWidth - 1 ) );
} }
return ( line.lineNum + 1 ) + "," + X + tabStat; return ( line.lineNum + 1 ) + "," + X + tabStat;