1.1 --- a/php.smarty/src/org/netbeans/modules/php/smarty/editor/completion/CodeCompletionUtils.java	Mon Jun 14 14:35:44 2010 +0200
     1.2 +++ b/php.smarty/src/org/netbeans/modules/php/smarty/editor/completion/CodeCompletionUtils.java	Tue Jun 15 15:42:30 2010 +0200
     1.3 @@ -74,7 +74,7 @@
     1.4  
     1.5      public static int getLastWS(String area, String openDelimiter) {
     1.6          for (int i = area.length() - 1; i >= 0; i--) {
     1.7 -            if (LexerUtils.isWS(area.charAt(i))) {
     1.8 +            if (LexerUtils.isWS(area.charAt(i)) || area.charAt(i) == '|' || area.charAt(i) == '/') {
     1.9                  return area.length() - i - 1;
    1.10              } else if (area.substring(i).startsWith(openDelimiter)) {
    1.11                  return area.length() - i - openDelimiter.length();

     2.1 --- a/php.smarty/src/org/netbeans/modules/php/smarty/editor/lexer/TplTopLexer.java	Mon Jun 14 14:35:44 2010 +0200
     2.2 +++ b/php.smarty/src/org/netbeans/modules/php/smarty/editor/lexer/TplTopLexer.java	Tue Jun 15 15:42:30 2010 +0200
     2.3 @@ -203,9 +203,9 @@
     2.4                              return TplTopTokenId.T_HTML;
     2.5                          }
     2.6                      }
     2.7 -                    if (cc == '\n') {
     2.8 -                        return TplTopTokenId.T_HTML;
     2.9 -                    }
    2.10 +//                    if (cc == '\n') {
    2.11 +//                        return TplTopTokenId.T_HTML;
    2.12 +//                    }
    2.13                      break;
    2.14  
    2.15                  case OPEN_DELIMITER: