fivedev/harbour-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2012-08-20 16:30 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com)

Browse Source 
* contrib/hbide/edit.prg
    + Enhanced: Alignment of assigment opertaor ":=" on previous lines
       now honors SELF:instanceVariable := also. For Example,

         ::oBrw:nTop := 12
         ::oBrw:nBottom :=.
       =>
         ::oBrw:nTop    := 12
         ::oBrw:nBottom :=.
This commit is contained in:
Pritpal Bedi
2012-08-20 23:33:43 +00:00
parent c78710d2cc
commit 3dd29be785
2 changed files with 59 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
harbour/ChangeLog
View File

@@ -16,6 +16,17 @@
The license applies to all entries newer than 2009-04-28.
*/
2012-08-20 16:30 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com)
* contrib/hbide/edit.prg
+ Enhanced: Alignment of assigment opertaor ":=" on previous lines
now honors SELF:instanceVariable := also. For Example,
::oBrw:nTop := 12
::oBrw:nBottom :=.
=>
::oBrw:nTop := 12
::oBrw:nBottom :=.
2012-08-20 14:25 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com)
* contrib/hbide/edit.prg
! Refined: Alignment of assigment opertaor ":=" on previous lines

96
harbour/contrib/hbide/edit.prg
View File

@@ -2957,60 +2957,60 @@ STATIC FUNCTION hbide_alignAssignments( qCursor )
LOCAL lAssign := .F.
nIndent := hbide_getFrontSpacesAndWordsByCursor( qCursor, @aWords )
IF Len( aWords ) < 2
RETURN NIL
ENDIF
IF Len( aWords ) == 2 .AND. aWords[ 2 ] != ":="
RETURN NIL
ENDIF
IF Len( aWords ) >= 4 .AND. aWords[ 4 ] != ":="
RETURN NIL
ENDIF
IF Len( aWords ) >= 2
IF Len( aWords ) == 2 .AND. aWords[ 2 ] == ":=" .OR. ;
Len( aWords ) == 4 .AND. aWords[ 4 ] == ":=" .OR. ;
Len( aWords ) == 5 .AND. aWords[ 5 ] == ":=" .AND. aWords[ 1 ] == "::"
cCLine := qCursor:block():text()
nPostn := qCursor:position()
nAssgnAt := At( ":=", cCLine )
nCBlock := qCursor:blockNumber()
cCLine := qCursor:block():text()
nPostn := qCursor:position()
nAssgnAt := At( ":=", cCLine )
nCBlock := qCursor:blockNumber()
DO WHILE .T.
IF qCursor:movePosition( QTextCursor_PreviousBlock, QTextCursor_MoveAnchor )
IF ! Empty( cLine := qCursor:block():text() )
nCol := hbide_getFrontSpacesAndWordsByCursor( qCursor, @aWords )
IF nCol == nIndent .AND. Len( aWords ) >= 2 .AND. aWords[ 2 ] == ":="
nAssgnAt := Max( nAssgnAt, At( ":=", cLine ) )
lAssign := .T.
ELSEIF nCol == nIndent .AND. Len( aWords ) >= 4 .AND. aWords[ 2 ] == ":" .AND. aWords[ 4 ] == ":="
nAssgnAt := Max( nAssgnAt, At( ":=", cLine ) )
lAssign := .T.
DO WHILE .T.
IF qCursor:movePosition( QTextCursor_PreviousBlock, QTextCursor_MoveAnchor )
IF ! Empty( cLine := qCursor:block():text() )
nCol := hbide_getFrontSpacesAndWordsByCursor( qCursor, @aWords )
IF nCol == nIndent .AND. Len( aWords ) >= 2 .AND. aWords[ 2 ] == ":="
nAssgnAt := Max( nAssgnAt, At( ":=", cLine ) )
lAssign := .T.
ELSEIF nCol == nIndent .AND. Len( aWords ) >= 4 .AND. aWords[ 2 ] == ":" .AND. aWords[ 4 ] == ":="
nAssgnAt := Max( nAssgnAt, At( ":=", cLine ) )
lAssign := .T.
ELSEIF nCol == nIndent .AND. Len( aWords ) >= 5 .AND. aWords[ 1 ] == "::" .AND. aWords[ 3 ] == ":" .AND. aWords[ 5 ] == ":="
nAssgnAt := Max( nAssgnAt, At( ":=", cLine ) )
lAssign := .T.
ELSE
EXIT
ENDIF
ENDIF
ELSE
EXIT
ENDIF
ENDIF
ELSE
EXIT
ENDIF
ENDDO
/* Anyway we are TO move TO NEXT block */
qCursor:movePosition( QTextCursor_NextBlock, QTextCursor_MoveAnchor )
IF lAssign
DO WHILE .T.
cLine := qCursor:block():text()
IF ! Empty( cLine )
nCol := At( ":=", cLine )
cLine := Pad( Trim( SubStr( cLine, 1, nCol - 1 ) ), nAssgnAt - 1 ) + ":=" + Trim( SubStr( cLine, nCol + 2 ) )
qCursor:movePosition( QTextCursor_EndOfLine, QTextCursor_KeepAnchor )
qCursor:removeSelectedText()
qCursor:insertText( cLine )
ENDIF
IF qCursor:blockNumber() == nCBlock
EXIT
ENDIF
ENDDO
/* Anyway we are TO move TO NEXT block */
qCursor:movePosition( QTextCursor_NextBlock, QTextCursor_MoveAnchor )
ENDDO
/* We have reached on current line */
qCursor:movePosition( QTextCursor_EndOfBlock, QTextCursor_MoveAnchor )
ELSE
qCursor:setPosition( nPostn )
IF lAssign
DO WHILE .T.
cLine := qCursor:block():text()
IF ! Empty( cLine )
nCol := At( ":=", cLine )
cLine := Pad( Trim( SubStr( cLine, 1, nCol - 1 ) ), nAssgnAt - 1 ) + ":=" + Trim( SubStr( cLine, nCol + 2 ) )
qCursor:movePosition( QTextCursor_EndOfLine, QTextCursor_KeepAnchor )
qCursor:removeSelectedText()
qCursor:insertText( cLine )
ENDIF
IF qCursor:blockNumber() == nCBlock
EXIT
ENDIF
qCursor:movePosition( QTextCursor_NextBlock, QTextCursor_MoveAnchor )
ENDDO
/* We have reached on current line */
qCursor:movePosition( QTextCursor_EndOfBlock, QTextCursor_MoveAnchor )
ELSE
qCursor:setPosition( nPostn )
ENDIF
ENDIF
ENDIF
RETURN NIL