Join sections for the language embedded in the freemarker template, to get correct coloring for things like block comments.
authorJan Lahoda <jlahoda@netbeans.org>
Thu, 06 Oct 2011 18:45:11 +0200
changeset 17640d251da89203a
parent 17639 588407182672
child 17641 60444fe3bd4f
Join sections for the language embedded in the freemarker template, to get correct coloring for things like block comments.
freemarker/src/org/netbeans/modules/freemarker/TopLevelFreeMarkerTokenId.java
     1.1 --- a/freemarker/src/org/netbeans/modules/freemarker/TopLevelFreeMarkerTokenId.java	Thu Sep 29 09:58:22 2011 -0400
     1.2 +++ b/freemarker/src/org/netbeans/modules/freemarker/TopLevelFreeMarkerTokenId.java	Thu Oct 06 18:45:11 2011 +0200
     1.3 @@ -1,7 +1,7 @@
     1.4  /*
     1.5   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
     1.6   * 
     1.7 - * Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
     1.8 + * Copyright 1997-2011 Sun Microsystems, Inc. All rights reserved.
     1.9   * 
    1.10   * The contents of this file are subject to the terms of either the GNU
    1.11   * General Public License Version 2 only ("GPL") or the Common
    1.12 @@ -34,7 +34,7 @@
    1.13   * 
    1.14   * Contributor(s):
    1.15   * 
    1.16 - * Portions Copyrighted 2007 Sun Microsystems, Inc.
    1.17 + * Portions Copyrighted 2007-2011 Sun Microsystems, Inc.
    1.18   */
    1.19  
    1.20  package org.netbeans.modules.freemarker;
    1.21 @@ -104,7 +104,7 @@
    1.22                          Language<?> language = (Language) Language.find(embeddedMimeType);
    1.23  
    1.24                          if (language != null) {
    1.25 -                            return LanguageEmbedding.create(language, 0, 0);
    1.26 +                            return LanguageEmbedding.create(language, 0, 0, true);
    1.27                          }
    1.28                      }
    1.29  
    1.30 @@ -125,7 +125,6 @@
    1.31      }.language();
    1.32      
    1.33      public static Language<TopLevelFreeMarkerTokenId> language() {
    1.34 -        Thread.dumpStack();
    1.35          return language;
    1.36      }
    1.37  }