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:
斟酌 鵬兄 2018-07-25 20:01:45 +08:00
commit 5035d69b6b
4 changed files with 50 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -48,9 +48,19 @@
return i;
};
/** marker @type {Components.Vim.State.Marks} */
var MarkSelected = function( marker, PStart, PEnd )
var lineInfo = function( c )
{
return {
lineNum: c.getLine().lineNum
, aX: c.aX
};
};
/** marker @type {Components.Vim.State.Marks} */
var MarkSelected = function( marker, s, e )
{
marker.set( "<", s.lineNum, s.aX );
marker.set( ">", e.lineNum, e.aX );
};
/** @type {Components.Vim.IAction} */
@ -68,14 +78,12 @@
/** @type {Components.Vim.Cursor} */
this.__cursor = Cursor;
var s = {
lineNum: Cursor.getLine().lineNum
, X: Cursor.X
, aPos: Cursor.aPos
, pstart: Cursor.PStart
};
var s = lineInfo( Cursor );
s.aStart = s.aPos - Cursor.aX;
s.aPos = Cursor.aPos;
s.X = Cursor.X;
s.pStart = Cursor.PStart;
s.aStart = s.aPos - s.aX;
Cursor.suppressEvent();
Cursor.lineEnd( true );
@ -220,7 +228,7 @@
Action.dispose();
cur.unsuppressEvent();
startLine.pstart = cur.PStart;
startLine.pStart = cur.PStart;
return true;
}
@ -253,13 +261,13 @@
debug.Info( "Min aPos: " + minAp, "Max aPos: " + maxAp );
var pstart = startLine.X;
var pStart = startLine.X;
var nstart = cur.PStart;
// highlight from the start
if( startLine.aPos < minAp )
{
pstart = 0;
pStart = 0;
if( this.__mode == MODE_LINE )
{
@ -276,14 +284,14 @@
// highlight from the end
else if( maxAp < startLine.aPos )
{
pstart = -2;
pStart = -2;
var i = 0;
do
{
if( line.placeholder ) break;
if( i <= feeder.moreAt )
{
pstart += line.toString().length + 1;
pStart += line.toString().length + 1;
}
i ++;
}
@ -295,11 +303,11 @@
if( this.__mode == MODE_LINE )
{
cur.suppressEvent();
pstart = 0;
pStart = 0;
if( currAp < startLine.aPos )
{
pstart = -1;
pStart = -1;
l ++;
cur.lineStart();
@ -316,7 +324,7 @@
cur.lineStart();
nstart = cur.PStart;
cur.lineEnd( true );
pstart = cur.PStart;
pStart = cur.PStart;
l = line.lineNum;
}
@ -334,12 +342,12 @@
do
{
if( line.lineNum == l || line.placeholder ) break;
pstart += line.toString().length + 1;
pStart += line.toString().length + 1;
}
while( line = line.next );
}
var prevPos = pstart;
var prevPos = pStart;
var newPos = nstart;
var posDiff = newPos - prevPos;
@ -351,12 +359,14 @@
if( 0 <= posDiff )
{
newPos = newPos + 1;
MarkSelected( e.target.marks, startLine, lineInfo( cur ) );
}
// e<--s
else if( posDiff < 0 )
{
prevPos += posDiff;
newPos = pstart + 1;
newPos = pStart + 1;
MarkSelected( e.target.marks, lineInfo( cur ), startLine );
}
cur.PStart = prevPos;

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

@ -240,7 +240,7 @@
if( this.__content[ i + 1 ] == "\t" ) tabs ++;
i ++;
}
while( i < l )
while( i < l );
if( tabs )
{

20
botanjs/src/Components/Vim/State/Marks.js
View File

@ -6,7 +6,7 @@
var beep = __import( "Components.Vim.Beep" );
var Keys = "'ABCDEFGHIJKLMNOPQRSTUVWXYabcdefghijklmnopqrstuvwxy\"[]^.<>";
var Keys = "'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz\"[]^.<>";
var Marks = function()
{
@ -25,12 +25,28 @@
return true;
};
Marks.prototype.save = function()
{
var saved = {};
// A-z
for( var i = 1; i < 53; i ++ )
{
var k = Keys[ i ];
if( this.__marks[ k ] != undefined )
{
saved[ k ] = this.__marks[ k ];
}
}
return saved;
};
Marks.prototype.get = function( t )
{
return this.__marks[ t ];
};
__readOnly( Marks, "Keys", function() { return Keys; } );
__const( Marks, "Keys", Keys );
ns[ NS_EXPORT ]( EX_CLASS, "Marks", Marks );

1
botanjs/src/Components/Vim/VimArea.js
View File

@ -381,6 +381,7 @@
stage.element.value = this.content;
delete Insts[ this.__instIndex ];
stage.element.dispatchEvent( new Event( "change" ) );
};
__readOnly( VimArea.prototype, "index", function()