Update version to 0.1.8; fix a structure view issue; reduce debug log

src/main/parser/AST.java

@@ -76,6 +76,7 @@ public interface AST
           AST_BASIC_ELE_BOOL, AST_BASIC_ELE_NUM, AST_BASIC_ELE_CHAR, AST_BASIC_ELE_STR,
           AST_BASIC_ELE_KEYWORD, AST_BASIC_ELE_PROCEDURE, AST_BASIC_ELE_SYMBOL,
           AST_ELE_VECTOR,
+          AST_BODY_OF_FORM,
           AST_FORM_DEFINE, AST_FORM_DEFINE_RECORD_TYPE, AST_FORM_DEFINE_SYNTAX,
           AST_FORM_PROCEDURE, AST_FORM_CALL_PROCEDURE, AST_FORM_LET, AST_FORM_SET, AST_FORM_QUOTE, AST_FORM_QUASIQUOTE,
           AST_FORM_CAR, AST_FORM_CDR, AST_FORM_CONS, AST_FORM_LIST,

src/main/parser/SchemePsiCreator.java

@@ -104,6 +104,10 @@ else if (elementType == AST.AST_FORM_DEFINE_SYNTAX)
     {
       return new SchemeFormDefineSyntax(node);
     }
+    else if (elementType == AST.AST_FORM_DO)
+    {
+      return new SchemeFormDo(node);
+    }
     else if (elementType == AST.AST_FORM_IF)
     {
       return new SchemeFormIf(node);
@@ -128,6 +132,18 @@ else if (elementType == AST.AST_FORM_OR)
     {
       return new SchemeFormOr(node);
     }
+    else if (elementType == AST.AST_FORM_QUASIQUOTE)
+    {
+      return new SchemeFormQuasiquote(node);
+    }
+    else if (elementType == AST.AST_FORM_QUASISYNTAX)
+    {
+      return new SchemeFormQuasisyntax(node);
+    }
+    else if (elementType == AST.AST_FORM_QUOTE)
+    {
+      return new SchemeFormQuote(node);
+    }
     else if (elementType == AST.AST_FORM_PROCEDURE)
     {
       return new SchemeFormProcedure(node);
@@ -136,10 +152,30 @@ else if (elementType == AST.AST_FORM_SET)
     {
       return new SchemeFormSet(node);
     }
+    else if (elementType == AST.AST_FORM_SYNTAX)
+    {
+      return new SchemeFormSyntax(node);
+    }
     else if (elementType == AST.AST_FORM_UNLESS)
     {
       return new SchemeFormUnless(node);
     }
+    else if (elementType == AST.AST_FORM_UNQUOTE)
+    {
+      return new SchemeFormUnquote(node);
+    }
+    else if (elementType == AST.AST_FORM_UNQUOTE_SPLICING)
+    {
+      return new SchemeFormUnquoteSplicing(node);
+    }
+    else if (elementType == AST.AST_FORM_UNSYNTAX)
+    {
+      return new SchemeFormUnsyntax(node);
+    }
+    else if (elementType == AST.AST_FORM_UNSYNTAX_SPLICING)
+    {
+      return new SchemeFormUnsyntaxSplicing(node);
+    }
     else if (elementType == AST.AST_FORM_WHEN)
     {
       return new SchemeFormWhen(node);
@@ -162,7 +198,7 @@ else if (elementType == AST.AST_FORM_CALL_PROCEDURE)
     }
     else
     {
-      System.out.println(">>> Unexpected AST Node Type: " + elementType.toString());
+      System.out.println(">>> Unexpected AST Node Type: " + elementType);
       return new SchemeUnrecognizedForm(node);
     }
 

src/main/psi/impl/SchemeFormQuasiquote.java

@@ -0,0 +1,11 @@
+package main.psi.impl;
+
+import com.intellij.lang.ASTNode;
+
+public class SchemeFormQuasiquote extends SchemePsiElementBase
+{
+    public SchemeFormQuasiquote(ASTNode node)
+    {
+        super(node, "SchemeFormQuasiquote");
+    }
+}

src/main/psi/impl/SchemeFormQuasisyntax.java

@@ -0,0 +1,11 @@
+package main.psi.impl;
+
+import com.intellij.lang.ASTNode;
+
+public class SchemeFormQuasisyntax extends SchemePsiElementBase
+{
+    public SchemeFormQuasisyntax(ASTNode node)
+    {
+        super(node, "SchemeFormQuasisyntax");
+    }
+}

src/main/psi/impl/SchemeFormQuote.java

@@ -0,0 +1,11 @@
+package main.psi.impl;
+
+import com.intellij.lang.ASTNode;
+
+public class SchemeFormQuote extends SchemePsiElementBase
+{
+    public SchemeFormQuote(ASTNode node)
+    {
+        super(node, "SchemeFormQuote");
+    }
+}

src/main/psi/impl/SchemeFormSyntax.java

@@ -0,0 +1,11 @@
+package main.psi.impl;
+
+import com.intellij.lang.ASTNode;
+
+public class SchemeFormSyntax extends SchemePsiElementBase
+{
+    public SchemeFormSyntax(ASTNode node)
+    {
+        super(node, "SchemeFormSyntax");
+    }
+}

src/main/psi/impl/SchemeFormUnquote.java

@@ -0,0 +1,11 @@
+package main.psi.impl;
+
+import com.intellij.lang.ASTNode;
+
+public class SchemeFormUnquote extends SchemePsiElementBase
+{
+    public SchemeFormUnquote(ASTNode node)
+    {
+        super(node, "SchemeFormUnquote");
+    }
+}

src/main/psi/impl/SchemeFormUnquoteSplicing.java

@@ -0,0 +1,11 @@
+package main.psi.impl;
+
+import com.intellij.lang.ASTNode;
+
+public class SchemeFormUnquoteSplicing extends SchemePsiElementBase
+{
+    public SchemeFormUnquoteSplicing(ASTNode node)
+    {
+        super(node, "SchemeFormUnquoteSplicing");
+    }
+}

src/main/psi/impl/SchemeFormUnsyntax.java

@@ -0,0 +1,11 @@
+package main.psi.impl;
+
+import com.intellij.lang.ASTNode;
+
+public class SchemeFormUnsyntax extends SchemePsiElementBase
+{
+    public SchemeFormUnsyntax(ASTNode node)
+    {
+        super(node, "SchemeFormUnsyntax");
+    }
+}

src/main/psi/impl/SchemeFormUnsyntaxSplicing.java

@@ -0,0 +1,11 @@
+package main.psi.impl;
+
+import com.intellij.lang.ASTNode;
+
+public class SchemeFormUnsyntaxSplicing extends SchemePsiElementBase
+{
+    public SchemeFormUnsyntaxSplicing(ASTNode node)
+    {
+        super(node, "SchemeFormUnquoteSplicing");
+    }
+}

src/main/structure/SchemeStructureViewElement.java

@@ -17,11 +17,14 @@
 public class SchemeStructureViewElement implements StructureViewTreeElement, SortableTreeElement
 {
   private final NavigatablePsiElement element;
-  private final NavigatablePsiElement nameChild;
+  private NavigatablePsiElement nameChild;
 
   public SchemeStructureViewElement(NavigatablePsiElement element)
   {
     nameChild = (NavigatablePsiElement)getDeclareNameChild(element);
+    if (nameChild == null) {
+      nameChild = element;
+    }
     this.element = element;
   }