Permalink
Browse files

Solved the '%' issues. Closes #23.

  • Loading branch information...
Sebastian Hörl
Sebastian Hörl committed Jul 22, 2011
1 parent 01e3140 commit df555132edaa1eee2c2eead08e1dd9487781e554
@@ -1,8 +1,8 @@
-build.xml.data.CRC32=2a2fd444
+build.xml.data.CRC32=1fa78a6a
build.xml.script.CRC32=12d8ce43
build.xml.stylesheet.CRC32=a56c6a5b@1.45.1
# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
-nbproject/build-impl.xml.data.CRC32=2a2fd444
+nbproject/build-impl.xml.data.CRC32=1fa78a6a
nbproject/build-impl.xml.script.CRC32=0502fb72
nbproject/build-impl.xml.stylesheet.CRC32=238281d1@1.45.1
@@ -3,6 +3,7 @@ javac.compilerargs=-Xlint -Xlint:-serial
license.file=LICENSE
nbm.homepage=http://blogsh.de/twig-for-netbeans
nbm.module.author=Sebastian H\u00f6rl
+nbm.needs.restart=true
spec.version.base=1
keystore=nbproject/private/keystore
nbm_alias=blogsh
View
@@ -180,13 +180,7 @@
</run-dependency>
</dependency>
</module-dependencies>
- <public-packages>
- <package>org.netbeans.modules.php.twig.editor</package>
- <package>org.netbeans.modules.php.twig.editor.embedding</package>
- <package>org.netbeans.modules.php.twig.editor.gsf</package>
- <package>org.netbeans.modules.php.twig.editor.lexer</package>
- <package>org.netbeans.modules.php.twig.editor.parsing</package>
- </public-packages>
+ <public-packages/>
</data>
</configuration>
</project>
@@ -197,6 +197,11 @@ public TwigTokenId findNextToken() {
if ( c == '%' || c == '}' ) {
d = input.read();
+
+ if ( d == LexerInput.EOF ) {
+ return TwigTokenId.T_TWIG_OTHER;
+ }
+
int e = input.read();
if ( d == '}' && e == LexerInput.EOF ) {
@@ -84,6 +84,7 @@ public void parse( Snapshot snapshot, Task task, SourceModificationEvent sme ) t
if ( token.id() == TwigTokenId.T_TWIG_INSTRUCTION ) {
Instruction instruction = new Instruction();
+ instruction.function = "";
instruction.startTokenIndex = sequence.index();
instruction.endTokenIndex = sequence.index();
instruction.from = token.offset(tokenHierarchy);
@@ -16,14 +16,6 @@
<attr name="instanceOf" stringvalue="org.netbeans.api.lexer.Language"/>
</file>
- <!--<file name="org-netbeans-modules-php-twig-editor-parsing-TwigParser$Factory.instance">
- <attr name="instanceOf" stringvalue="org.netbeans.modules.parsing.spi.ParserFactory"/>
- </file>-->
-
- <!--<file name="org-netbeans-modules-php-twig-editor-parsing-TwigSyntaxValidationTask$Factory.instance">
- <attr name="instanceOf" stringvalue="org.netbeans.modules.parsing.spi.TaskFactory"/>
- </file>-->
-
<file name="org-netbeans-modules-php-twig-editor-embedding-TwigEmbeddingProvider$Factory.instance">
<attr name="instanceOf" stringvalue="org.netbeans.modules.parsing.spi.TaskFactory" />
</file>
@@ -42,7 +34,6 @@
<folder name="FoldManager">
<file name="org-netbeans-modules-csl-editor-fold-GsfFoldManagerFactory.instance"/>
- <!--<file name="org-netbeans-modules-php-twig-fold-TwigFoldManager$Factory.instance"/>-->
</folder>
<folder name="SideBar">

0 comments on commit df55513

Please sign in to comment.