Parser: support for import types(wildcard, in and regular)

Parser: one line function with return statement (Fixes #9)
Added tests for added features and for property declaration

gen/com/intellij/plugins/haxe/lang/lexer/HaxeTokenTypes.java

@@ -1,3 +1,21 @@
+/*
+ * Copyright 2000-2013 JetBrains s.r.o.
+ * Copyright 2014-2014 AS3Boyan
+ * Copyright 2014-2014 Elias Ku
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 // This is a generated file. Not intended for manual editing.
 package com.intellij.plugins.haxe.lang.lexer;
 
@@ -62,6 +80,9 @@ public interface HaxeTokenTypes {
   IElementType IDENTIFIER = new HaxeElementType("IDENTIFIER");
   IElementType IF_STATEMENT = new HaxeElementType("IF_STATEMENT");
   IElementType IMPORT_STATEMENT = new HaxeElementType("IMPORT_STATEMENT");
+  IElementType IMPORT_STATEMENT_REGULAR = new HaxeElementType("IMPORT_STATEMENT_REGULAR");
+  IElementType IMPORT_STATEMENT_WITH_IN_SUPPORT = new HaxeElementType("IMPORT_STATEMENT_WITH_IN_SUPPORT");
+  IElementType IMPORT_STATEMENT_WITH_WILDCARD = new HaxeElementType("IMPORT_STATEMENT_WITH_WILDCARD");
   IElementType INHERIT = new HaxeElementType("INHERIT");
   IElementType INHERIT_LIST = new HaxeElementType("INHERIT_LIST");
   IElementType INTERFACE_BODY = new HaxeElementType("INTERFACE_BODY");
@@ -128,6 +149,7 @@ public interface HaxeTokenTypes {
   IElementType VAR_DECLARATION_PART = new HaxeElementType("VAR_DECLARATION_PART");
   IElementType VAR_INIT = new HaxeElementType("VAR_INIT");
   IElementType WHILE_STATEMENT = new HaxeElementType("WHILE_STATEMENT");
+  IElementType WILDCARD = new HaxeElementType("WILDCARD");
 
   IElementType CLOSING_QUOTE = new HaxeElementType("CLOSING_QUOTE");
   IElementType ID = new HaxeElementType("ID");
@@ -427,6 +449,15 @@ else if (type == IF_STATEMENT) {
       else if (type == IMPORT_STATEMENT) {
         return new HaxeImportStatementImpl(node);
       }
+      else if (type == IMPORT_STATEMENT_REGULAR) {
+        return new HaxeImportStatementRegularImpl(node);
+      }
+      else if (type == IMPORT_STATEMENT_WITH_IN_SUPPORT) {
+        return new HaxeImportStatementWithInSupportImpl(node);
+      }
+      else if (type == IMPORT_STATEMENT_WITH_WILDCARD) {
+        return new HaxeImportStatementWithWildcardImpl(node);
+      }
       else if (type == INHERIT) {
         return new HaxeInheritImpl(node);
       }
@@ -625,6 +656,9 @@ else if (type == VAR_INIT) {
       else if (type == WHILE_STATEMENT) {
         return new HaxeWhileStatementImpl(node);
       }
+      else if (type == WILDCARD) {
+        return new HaxeWildcardImpl(node);
+      }
       throw new AssertionError("Unknown element type: " + type);
     }
   }

gen/com/intellij/plugins/haxe/lang/psi/HaxeExternFunctionDeclaration.java

@@ -1,3 +1,21 @@
+/*
+ * Copyright 2000-2013 JetBrains s.r.o.
+ * Copyright 2014-2014 AS3Boyan
+ * Copyright 2014-2014 Elias Ku
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 // This is a generated file. Not intended for manual editing.
 package com.intellij.plugins.haxe.lang.psi;
 
@@ -50,7 +68,7 @@ public interface HaxeExternFunctionDeclaration extends HaxeComponentWithDeclarat
   List<HaxeRequireMeta> getRequireMetaList();
 
   @Nullable
-  HaxeReturnStatementWithoutSemicolon getReturnStatementWithoutSemicolon();
+  HaxeReturnStatement getReturnStatement();
 
   @NotNull
   List<HaxeSetterMeta> getSetterMetaList();

gen/com/intellij/plugins/haxe/lang/psi/HaxeFunctionDeclarationWithAttributes.java

@@ -1,3 +1,21 @@
+/*
+ * Copyright 2000-2013 JetBrains s.r.o.
+ * Copyright 2014-2014 AS3Boyan
+ * Copyright 2014-2014 Elias Ku
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 // This is a generated file. Not intended for manual editing.
 package com.intellij.plugins.haxe.lang.psi;
 
@@ -50,7 +68,7 @@ public interface HaxeFunctionDeclarationWithAttributes extends HaxeComponentWith
   List<HaxeRequireMeta> getRequireMetaList();
 
   @Nullable
-  HaxeReturnStatementWithoutSemicolon getReturnStatementWithoutSemicolon();
+  HaxeReturnStatement getReturnStatement();
 
   @NotNull
   List<HaxeSetterMeta> getSetterMetaList();

gen/com/intellij/plugins/haxe/lang/psi/HaxeFunctionLiteral.java

@@ -1,3 +1,21 @@
+/*
+ * Copyright 2000-2013 JetBrains s.r.o.
+ * Copyright 2014-2014 AS3Boyan
+ * Copyright 2014-2014 Elias Ku
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 // This is a generated file. Not intended for manual editing.
 package com.intellij.plugins.haxe.lang.psi;
 
@@ -17,7 +35,7 @@ public interface HaxeFunctionLiteral extends HaxeExpression {
   HaxeParameterList getParameterList();
 
   @Nullable
-  HaxeReturnStatementWithoutSemicolon getReturnStatementWithoutSemicolon();
+  HaxeReturnStatement getReturnStatement();
 
   @Nullable
   HaxeThrowStatement getThrowStatement();

gen/com/intellij/plugins/haxe/lang/psi/HaxeImportStatement.java

@@ -25,7 +25,13 @@
 
 public interface HaxeImportStatement extends HaxePsiCompositeElement {
 
-  @NotNull
-  List<HaxeReferenceExpression> getReferenceExpressionList();
+  @Nullable
+  HaxeImportStatementRegular getImportStatementRegular();
+
+  @Nullable
+  HaxeImportStatementWithInSupport getImportStatementWithInSupport();
+
+  @Nullable
+  HaxeImportStatementWithWildcard getImportStatementWithWildcard();
 
 }

gen/com/intellij/plugins/haxe/lang/psi/HaxeImportStatementRegular.java

@@ -0,0 +1,31 @@
+/*
+ * Copyright 2000-2013 JetBrains s.r.o.
+ * Copyright 2014-2014 AS3Boyan
+ * Copyright 2014-2014 Elias Ku
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// This is a generated file. Not intended for manual editing.
+package com.intellij.plugins.haxe.lang.psi;
+
+import java.util.List;
+import org.jetbrains.annotations.*;
+import com.intellij.psi.PsiElement;
+
+public interface HaxeImportStatementRegular extends HaxePsiCompositeElement {
+
+  @NotNull
+  HaxeReferenceExpression getReferenceExpression();
+
+}

gen/com/intellij/plugins/haxe/lang/psi/HaxeImportStatementWithInSupport.java

@@ -0,0 +1,31 @@
+/*
+ * Copyright 2000-2013 JetBrains s.r.o.
+ * Copyright 2014-2014 AS3Boyan
+ * Copyright 2014-2014 Elias Ku
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// This is a generated file. Not intended for manual editing.
+package com.intellij.plugins.haxe.lang.psi;
+
+import java.util.List;
+import org.jetbrains.annotations.*;
+import com.intellij.psi.PsiElement;
+
+public interface HaxeImportStatementWithInSupport extends HaxePsiCompositeElement {
+
+  @NotNull
+  List<HaxeReferenceExpression> getReferenceExpressionList();
+
+}

gen/com/intellij/plugins/haxe/lang/psi/HaxeImportStatementWithWildcard.java

@@ -0,0 +1,31 @@
+/*
+ * Copyright 2000-2013 JetBrains s.r.o.
+ * Copyright 2014-2014 AS3Boyan
+ * Copyright 2014-2014 Elias Ku
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// This is a generated file. Not intended for manual editing.
+package com.intellij.plugins.haxe.lang.psi;
+
+import java.util.List;
+import org.jetbrains.annotations.*;
+import com.intellij.psi.PsiElement;
+
+public interface HaxeImportStatementWithWildcard extends HaxePsiCompositeElement {
+
+  @NotNull
+  HaxeReferenceExpression getReferenceExpression();
+
+}

gen/com/intellij/plugins/haxe/lang/psi/HaxeLocalFunctionDeclaration.java

@@ -1,3 +1,21 @@
+/*
+ * Copyright 2000-2013 JetBrains s.r.o.
+ * Copyright 2014-2014 AS3Boyan
+ * Copyright 2014-2014 Elias Ku
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 // This is a generated file. Not intended for manual editing.
 package com.intellij.plugins.haxe.lang.psi;
 
@@ -23,7 +41,7 @@ public interface HaxeLocalFunctionDeclaration extends HaxeComponent {
   HaxeParameterList getParameterList();
 
   @Nullable
-  HaxeReturnStatementWithoutSemicolon getReturnStatementWithoutSemicolon();
+  HaxeReturnStatement getReturnStatement();
 
   @Nullable
   HaxeThrowStatement getThrowStatement();

gen/com/intellij/plugins/haxe/lang/psi/HaxeVisitor.java

@@ -1,3 +1,21 @@
+/*
+ * Copyright 2000-2013 JetBrains s.r.o.
+ * Copyright 2014-2014 AS3Boyan
+ * Copyright 2014-2014 Elias Ku
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 // This is a generated file. Not intended for manual editing.
 package com.intellij.plugins.haxe.lang.psi;
 
@@ -226,6 +244,18 @@ public void visitImportStatement(@NotNull HaxeImportStatement o) {
     visitPsiCompositeElement(o);
   }
 
+  public void visitImportStatementRegular(@NotNull HaxeImportStatementRegular o) {
+    visitPsiCompositeElement(o);
+  }
+
+  public void visitImportStatementWithInSupport(@NotNull HaxeImportStatementWithInSupport o) {
+    visitPsiCompositeElement(o);
+  }
+
+  public void visitImportStatementWithWildcard(@NotNull HaxeImportStatementWithWildcard o) {
+    visitPsiCompositeElement(o);
+  }
+
   public void visitInherit(@NotNull HaxeInherit o) {
     visitPsiCompositeElement(o);
   }
@@ -497,6 +527,10 @@ public void visitWhileStatement(@NotNull HaxeWhileStatement o) {
     visitPsiCompositeElement(o);
   }
 
+  public void visitWildcard(@NotNull HaxeWildcard o) {
+    visitPsiCompositeElement(o);
+  }
+
   public void visitClass(@NotNull HaxeClass o) {
     visitPsiCompositeElement(o);
   }

gen/com/intellij/plugins/haxe/lang/psi/HaxeWildcard.java

@@ -0,0 +1,31 @@
+/*
+ * Copyright 2000-2013 JetBrains s.r.o.
+ * Copyright 2014-2014 AS3Boyan
+ * Copyright 2014-2014 Elias Ku
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// This is a generated file. Not intended for manual editing.
+package com.intellij.plugins.haxe.lang.psi;
+
+import java.util.List;
+import org.jetbrains.annotations.*;
+import com.intellij.psi.PsiElement;
+
+public interface HaxeWildcard extends HaxePsiCompositeElement {
+
+  @NotNull
+  HaxeReferenceExpression getReferenceExpression();
+
+}