1.1 --- a/php.smarty/manifest.mf	Fri May 14 19:27:40 2010 -0400
     1.2 +++ b/php.smarty/manifest.mf	Mon May 17 11:04:06 2010 +0200
     1.3 @@ -2,5 +2,5 @@
     1.4  OpenIDE-Module: org.netbeans.modules.php.smarty
     1.5  OpenIDE-Module-Layer: org/netbeans/modules/php/smarty/resources/layer.xml
     1.6  OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/php/smarty/resources/Bundle.properties
     1.7 -OpenIDE-Module-Specification-Version: 1.25
     1.8 +OpenIDE-Module-Specification-Version: 1.26
     1.9  

     2.1 --- a/php.smarty/src/org/netbeans/modules/php/smarty/editor/embedding/TplEmbeddingProvider.java	Fri May 14 19:27:40 2010 -0400
     2.2 +++ b/php.smarty/src/org/netbeans/modules/php/smarty/editor/embedding/TplEmbeddingProvider.java	Mon May 17 11:04:06 2010 +0200
     2.3 @@ -66,6 +66,7 @@
     2.4  
     2.5          TokenHierarchy<CharSequence> th = TokenHierarchy.create(snapshot.getText(), TplTopTokenId.language());
     2.6          TokenSequence<TplTopTokenId> sequence = th.tokenSequence(TplTopTokenId.language());
     2.7 +//        boolean isPhpEnabled = false;
     2.8  
     2.9          if (sequence == null) {
    2.10              Logger.getLogger("TplEmbeddingProvider").warning(
    2.11 @@ -162,4 +163,4 @@
    2.12                  || (tokenId == TplTopTokenId.T_SMARTY_CLOSE_DELIMITER) || (tokenId == TplTopTokenId.T_SMARTY_OPEN_DELIMITER));
    2.13  
    2.14      }
    2.15 -}
    2.16 +}
    2.17 \ No newline at end of file

     3.1 --- a/php.smarty/src/org/netbeans/modules/php/smarty/editor/lexer/TplTopLexer.java	Fri May 14 19:27:40 2010 -0400
     3.2 +++ b/php.smarty/src/org/netbeans/modules/php/smarty/editor/lexer/TplTopLexer.java	Mon May 17 11:04:06 2010 +0200
     3.3 @@ -336,6 +336,9 @@
     3.4                      if (isSmartyOpenDelimiter(text)) {
     3.5                          state = State.OPEN_DELIMITER;
     3.6                          input.backup(openDelimiterLength);
     3.7 +                        if (input.readLength() > 0) {
     3.8 +                            return TplTopTokenId.T_HTML;
     3.9 +                        }
    3.10                      }
    3.11                      if (LexerUtils.isWS(c)) {
    3.12                          return TplTopTokenId.T_HTML;
    3.13 @@ -361,12 +364,12 @@
    3.14                             return TplTopTokenId.T_SMARTY;
    3.15                          case LexerInput.EOF:
    3.16                             return TplTopTokenId.T_SMARTY;
    3.17 -                        case '<':
    3.18 -                           state = State.OUTER;
    3.19 -                           input.backup(1);
    3.20 -                           if (input.readLength() > 1) {
    3.21 -                                return TplTopTokenId.T_SMARTY;
    3.22 -                           }
    3.23 +//                        case '<':
    3.24 +//                           state = State.OUTER;
    3.25 +//                           input.backup(1);
    3.26 +//                           if (input.readLength() > 1) {
    3.27 +//                                return TplTopTokenId.T_SMARTY;
    3.28 +//                           }
    3.29                      }
    3.30                      break;
    3.31                  }