1.1 --- a/PLSQL/Lexer/src/org/netbeans/modules/plsql/lexer/PlsqlBlockFactory.java	Mon May 20 13:13:42 2013 +0530
     1.2 +++ b/PLSQL/Lexer/src/org/netbeans/modules/plsql/lexer/PlsqlBlockFactory.java	Mon Aug 12 11:26:54 2013 +0530
     1.3 @@ -2524,6 +2524,10 @@
     1.4          ts.moveNext();
     1.5  
     1.6          //Calculate end offset
     1.7 +        if(commentEnd.id() == PlsqlTokenId.WHITESPACE ){
     1.8 +            ts.movePrevious();
     1.9 +            commentEnd = ts.token();
    1.10 +        }
    1.11          int endOffset = commentEnd.offset(tokenHierarchy) + commentEnd.length();
    1.12  
    1.13          return new PlsqlBlock(commentBegin.offset(tokenHierarchy),
    1.14 @@ -3870,7 +3874,7 @@
    1.15          Token<PlsqlTokenId> tmp = ts.token();
    1.16          LOG.log(Level.FINE, "getNextNonWhitespaceForComments, tmp.id()={0}, tmp.text()={1}", new Object[]{tmp.id(), tmp.text().toString()});
    1.17          while (moveNext) {
    1.18 -            if (tmp.id() == PlsqlTokenId.WHITESPACE && "\n".equals(tmp.text())) {
    1.19 +            if (tmp.id() == PlsqlTokenId.WHITESPACE && ("\n".equals(tmp.text()) || tmp.text().toString().contains("\n "))) {
    1.20                  moveNext = ts.moveNext();
    1.21                  tmp = ts.token();
    1.22              } else {