finished lexer

sebhoerl · Mar 10, 2011 · 3014c86 · 3014c86
1 parent 18b744d
commit 3014c86
Show file tree

Hide file tree

Showing 9 changed files with 280 additions and 59 deletions.
diff --git a/src/org/netbeans/php/twig/Bundle.properties b/src/org/netbeans/php/twig/Bundle.properties
@@ -2,3 +2,24 @@ LBL_Twig_loader_name=Twig Files
 OpenIDE-Module-Name=twig
 Services/MIMEResolver/TwigResolver.xml=Twig Files
 Templates/Other/TwigTemplate.twig=Empty Twig file
+
+text/x-simplejava=Twig
+
+COMMENT_START=Comment Start
+COMMENT_END=Comment End
+COMMENT=Comment
+
+BLOCK_START=Block Start
+BLOCK_END=Block End
+
+VAR_START=Variable Start
+VAR_END=Variable End
+
+TAG=Tag
+NAME=Name
+NUMBER=Number
+STRING=String
+OPERATOR=Operator
+PUNCTUATION=Punctuation
+WHITESPACE=Whitespace
+ERROR=Error
diff --git a/src/org/netbeans/php/twig/example.html.twig b/src/org/netbeans/php/twig/example.html.twig
@@ -0,0 +1,11 @@
+<html>
+    <body>
+        {# Twig example: for loop #}
+        <ul>
+        {% for user in users %}
+            <li>{{ user.name|title }} </li>
+        {% endfor %}
+        </ul>
+        Number: {% for i in 1..10 %} {{i}} {% endfor %}
+    </body>
+</html>
diff --git a/src/org/netbeans/php/twig/highlighting.xml b/src/org/netbeans/php/twig/highlighting.xml
@@ -3,16 +3,24 @@
 <!DOCTYPE fontscolors PUBLIC "-//NetBeans//DTD Editor Fonts and Colors settings 1.1//EN" "http://www.netbeans.org/dtds/EditorFontsColors-1_1.dtd">
 <fontscolors>
 
-    <fontcolor name="COMMENT_START" foreColor="gray" />
-    <fontcolor name="COMMENT" foreColor="gray" />
-    <fontcolor name="COMMENT_END" foreColor="gray" />
+    <fontcolor name="COMMENT_START" default="comment" />
+    <fontcolor name="COMMENT" default="comment" />
+    <fontcolor name="COMMENT_END" default="comment" />
 
-    <fontcolor name="BLOCK_START" foreColor="blue"><font style="bold" /></fontcolor>
-    <fontcolor name="_DEBUG_BLOCK" foreColor="orange" />
-    <fontcolor name="BLOCK_END" foreColor="blue"><font style="bold" /></fontcolor>
+    <fontcolor name="BLOCK_START" default="keyword"><font style="bold" /></fontcolor>
+    <fontcolor name="BLOCK_END" default="keyword"><font style="bold" /></fontcolor>
 
-    <fontcolor name="VAR_START" foreColor="blue"><font style="bold" /></fontcolor>
-    <fontcolor name="_DEBUG_VAR" foreColor="red" />
-    <fontcolor name="VAR_END" foreColor="blue"><font style="bold" /></fontcolor>
+    <fontcolor name="VAR_START" default="keyword"><font style="bold" /></fontcolor>
+    <fontcolor name="VAR_END" default="keyword"><font style="bold" /></fontcolor>
+
+    <fontcolor name="TAG" default="keyword" />
+    <fontcolor name="NAME" default="identifier" />
+    <fontcolor name="NUMBER" default="number" />
+    <fontcolor name="STRING" default="string" />
+    <fontcolor name="OPERATOR" default="keyword" />
+    <fontcolor name="PUNCTUATION" default="keyword" />
+    <fontcolor name="WHITESPACE" default="whitespace" />
+
+    <fontcolor name="ERROR" default="error" />
 
 </fontscolors>
diff --git a/src/org/netbeans/php/twig/layer.xml b/src/org/netbeans/php/twig/layer.xml
@@ -80,18 +80,29 @@
     <folder name="Editors">
         <folder name="text">
             <folder name="twig">
+                <file name="org-netbeans-modules-editor-NbEditorKit.instance"/>
                 <file name="language.instance">
                     <attr name="instanceCreate" methodvalue="org.netbeans.php.twig.lexer.NbTwigTokenId.getLanguage" />
                     <attr name="instanceOf" stringvalue="org.netbeans.api.lexer.Language" />
                 </file>
+                <attr name="SystemFileSystem.localizingBundle" stringvalue="org.netbeans.php.twig.Bundle"/>
                 <folder name="FontsColors">
                     <folder name="NetBeans">
                         <folder name="Defaults">
-                            <file name="highlighting.xml" url="highlighting.xml" />
+                            <file name="highlighting.xml" url="highlighting.xml">
+                                <attr name="SystemFileSystem.localizingBundle" stringvalue="org.netbeans.php.twig.Bundle"/>
+                            </file>
                         </folder>
                     </folder>
                 </folder>
             </folder>
         </folder>
     </folder>
-</filesystem>
+    <folder name="OptionsDialog">
+        <folder name="PreviewExamples">
+            <folder name="text">
+                <file name="twig" url="example.html.twig"/>
+            </folder>
+        </folder>
+    </folder>
+</filesystem>
diff --git a/src/org/netbeans/php/twig/lexer/NbTwigLexer.java b/src/org/netbeans/php/twig/lexer/NbTwigLexer.java
@@ -38,7 +38,7 @@ public void initializeLexer() {
 
         it = lexer.tokenize(
             input.readText().toString(),
-            ( info.state() == null ) ? null : (TwigLexer.State) info.state()
+            ( info.state() == null ) ? null : (TwigState) info.state()
         ).iterator();
 
         input.backup( input.readLengthEOF() );