azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Modifier list, annotations

Browse Source
This commit is contained in:
Maxim Shafirov
2011-01-04 16:39:06 +03:00
parent 1012c44961
commit dafd35478e
18 changed files with 148 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/jet/JetNodeTypes.java
+3 -3
View File
@@ -42,9 +42,9 @@ public interface JetNodeTypes {
JetNodeType IMPORT_DIRECTIVE = new JetNodeType("IMPORT_DIRECTIVE", JetImportDirective.class);
JetNodeType IMPORTED = new JetNodeType("IMPORTED");
JetNodeType NAMESPACE_BODY = new JetNodeType("NAMESPACE_BODY");
JetNodeType MODIFIER_LIST = new JetNodeType("MODIFIER_LIST");
JetNodeType ATTRIBUTE_ANNOTATION = new JetNodeType("ATTRIBUTE_ANNOTATION");
JetNodeType ATTRIBUTE = new JetNodeType("ATTRIBUTE");
JetNodeType MODIFIER_LIST = new JetNodeType("MODIFIER_LIST", JetModifierList.class);
JetNodeType ATTRIBUTE_ANNOTATION = new JetNodeType("ATTRIBUTE_ANNOTATION", JetAttributeAnnotation.class);
JetNodeType ATTRIBUTE = new JetNodeType("ATTRIBUTE", JetAttribute.class);
JetNodeType USER_TYPE = new JetNodeType("USER_TYPE");
JetNodeType TYPE_ARGUMENT_LIST = new JetNodeType("TYPE_ARGUMENT_LIST");
JetNodeType VALUE_ARGUMENT_LIST = new JetNodeType("VALUE_ARGUMENT_LIST");
idea/src/org/jetbrains/jet/lang/psi/JetAttribute.java
+18
View File
@@ -0,0 +1,18 @@
package org.jetbrains.jet.lang.psi;
import com.intellij.lang.ASTNode;
import org.jetbrains.annotations.NotNull;
/**
* @author max
*/
public class JetAttribute extends JetElement {
public JetAttribute(@NotNull ASTNode node) {
super(node);
}
@Override
public void accept(JetVisitor visitor) {
visitor.visitAttribute(this);
}
}
idea/src/org/jetbrains/jet/lang/psi/JetAttributeAnnotation.java
+25
View File
@@ -0,0 +1,25 @@
package org.jetbrains.jet.lang.psi;
import com.intellij.lang.ASTNode;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.jet.JetNodeTypes;
import java.util.List;
/**
* @author max
*/
public class JetAttributeAnnotation extends JetElement {
public JetAttributeAnnotation(@NotNull ASTNode node) {
super(node);
}
@Override
public void accept(JetVisitor visitor) {
visitor.visitAttributeAnnotation(this);
}
public List<JetAttribute> getAttributes() {
return findChildrenByType(JetNodeTypes.ATTRIBUTE);
}
}
idea/src/org/jetbrains/jet/lang/psi/JetClass.java
+2 -9
View File
@@ -1,8 +1,6 @@
package org.jetbrains.jet.lang.psi;
import com.intellij.lang.ASTNode;
import com.intellij.psi.PsiElement;
import com.intellij.psi.PsiElementVisitor;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.jet.JetNodeTypes;
@@ -25,12 +23,7 @@ public class JetClass extends JetNamedDeclaration{
}
@Override
public void accept(@NotNull PsiElementVisitor visitor) {
if (visitor instanceof JetVisitor) {
((JetVisitor) visitor).visitClass(this);
}
else {
visitor.visitElement(this);
}
public void accept(@NotNull JetVisitor visitor) {
visitor.visitClass(this);
}
}
idea/src/org/jetbrains/jet/lang/psi/JetClassBody.java
+2 -9
View File
@@ -1,8 +1,6 @@
package org.jetbrains.jet.lang.psi;
import com.intellij.lang.ASTNode;
import com.intellij.psi.PsiElementVisitor;
import com.intellij.psi.util.PsiTreeUtil;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.jet.JetNodeTypes;
@@ -21,12 +19,7 @@ public class JetClassBody extends JetElement {
}
@Override
public void accept(@NotNull PsiElementVisitor visitor) {
if (visitor instanceof JetVisitor) {
((JetVisitor) visitor).visitClassBody(this);
}
else {
visitor.visitElement(this);
}
public void accept(@NotNull JetVisitor visitor) {
visitor.visitClassBody(this);
}
}
idea/src/org/jetbrains/jet/lang/psi/JetClassObject.java
+2 -8
View File
@@ -1,7 +1,6 @@
package org.jetbrains.jet.lang.psi;
import com.intellij.lang.ASTNode;
import com.intellij.psi.PsiElementVisitor;
import org.jetbrains.annotations.NotNull;
/**
@@ -13,13 +12,8 @@ public class JetClassObject extends JetDeclaration {
}
@Override
public void accept(@NotNull PsiElementVisitor visitor) {
if (visitor instanceof JetVisitor) {
((JetVisitor) visitor).visitClassObject(this);
}
else {
visitor.visitElement(this);
}
public void accept(@NotNull JetVisitor visitor) {
visitor.visitClassObject(this);
}
}
idea/src/org/jetbrains/jet/lang/psi/JetConstructor.java
+2 -8
View File
@@ -1,7 +1,6 @@
package org.jetbrains.jet.lang.psi;
import com.intellij.lang.ASTNode;
import com.intellij.psi.PsiElementVisitor;
import org.jetbrains.annotations.NotNull;
/**
@@ -13,13 +12,8 @@ public class JetConstructor extends JetDeclaration {
}
@Override
public void accept(@NotNull PsiElementVisitor visitor) {
if (visitor instanceof JetVisitor) {
((JetVisitor) visitor).visitConstructor(this);
}
else {
visitor.visitElement(this);
}
public void accept(@NotNull JetVisitor visitor) {
visitor.visitConstructor(this);
}
}
idea/src/org/jetbrains/jet/lang/psi/JetDeclaration.java
+7
View File
@@ -3,6 +3,8 @@ package org.jetbrains.jet.lang.psi;
import com.intellij.lang.ASTNode;
import com.intellij.psi.PsiElementVisitor;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.JetNodeTypes;
/**
* @author max
@@ -11,4 +13,9 @@ public abstract class JetDeclaration extends JetElement {
public JetDeclaration(@NotNull ASTNode node) {
super(node);
}
@Nullable
public JetModifierList getModifierList() {
return (JetModifierList) findChildByType(JetNodeTypes.MODIFIER_LIST);
}
}
idea/src/org/jetbrains/jet/lang/psi/JetDecomposer.java
+2 -8
View File
@@ -1,7 +1,6 @@
package org.jetbrains.jet.lang.psi;
import com.intellij.lang.ASTNode;
import com.intellij.psi.PsiElementVisitor;
import org.jetbrains.annotations.NotNull;
/**
@@ -13,12 +12,7 @@ public class JetDecomposer extends JetNamedDeclaration {
}
@Override
public void accept(@NotNull PsiElementVisitor visitor) {
if (visitor instanceof JetVisitor) {
((JetVisitor) visitor).visitDecomposer(this);
}
else {
visitor.visitElement(this);
}
public void accept(@NotNull JetVisitor visitor) {
visitor.visitDecomposer(this);
}
}
idea/src/org/jetbrains/jet/lang/psi/JetElement.java
+15
View File
@@ -3,6 +3,7 @@ package org.jetbrains.jet.lang.psi;
import com.intellij.extapi.psi.ASTWrapperPsiElement;
import com.intellij.lang.ASTNode;
import com.intellij.lang.Language;
import com.intellij.psi.PsiElementVisitor;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.jet.lang.JetLanguage;
@@ -24,4 +25,18 @@ public class JetElement extends ASTWrapperPsiElement {
public String toString() {
return getNode().getElementType().toString();
}
@Override
public final void accept(@NotNull PsiElementVisitor visitor) {
if (visitor instanceof JetVisitor) {
accept((JetVisitor) visitor);
}
else {
visitor.visitElement(this);
}
}
public void accept(JetVisitor visitor) {
visitor.visitJetElement(this);
}
}
idea/src/org/jetbrains/jet/lang/psi/JetExtension.java
+2 -8
View File
@@ -1,7 +1,6 @@
package org.jetbrains.jet.lang.psi;
import com.intellij.lang.ASTNode;
import com.intellij.psi.PsiElementVisitor;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.jet.JetNodeTypes;
@@ -25,12 +24,7 @@ public class JetExtension extends JetNamedDeclaration {
@Override
public void accept(@NotNull PsiElementVisitor visitor) {
if (visitor instanceof JetVisitor) {
((JetVisitor) visitor).visitExtension(this);
}
else {
visitor.visitElement(this);
}
public void accept(@NotNull JetVisitor visitor) {
visitor.visitExtension(this);
}
}
idea/src/org/jetbrains/jet/lang/psi/JetFunction.java
+2 -8
View File
@@ -1,7 +1,6 @@
package org.jetbrains.jet.lang.psi;
import com.intellij.lang.ASTNode;
import com.intellij.psi.PsiElementVisitor;
import org.jetbrains.annotations.NotNull;
/**
@@ -13,12 +12,7 @@ public class JetFunction extends JetNamedDeclaration {
}
@Override
public void accept(@NotNull PsiElementVisitor visitor) {
if (visitor instanceof JetVisitor) {
((JetVisitor) visitor).visitFunction(this);
}
else {
visitor.visitElement(this);
}
public void accept(@NotNull JetVisitor visitor) {
visitor.visitFunction(this);
}
}
idea/src/org/jetbrains/jet/lang/psi/JetImportDirective.java
+2 -8
View File
@@ -1,7 +1,6 @@
package org.jetbrains.jet.lang.psi;
import com.intellij.lang.ASTNode;
import com.intellij.psi.PsiElementVisitor;
import org.jetbrains.annotations.NotNull;
/**
@@ -13,12 +12,7 @@ public class JetImportDirective extends JetElement {
}
@Override
public void accept(@NotNull PsiElementVisitor visitor) {
if (visitor instanceof JetVisitor) {
((JetVisitor) visitor).visitImportDirective(this);
}
else {
visitor.visitElement(this);
}
public void accept(@NotNull JetVisitor visitor) {
visitor.visitImportDirective(this);
}
}
idea/src/org/jetbrains/jet/lang/psi/JetModifierList.java
+46
View File
@@ -0,0 +1,46 @@
package org.jetbrains.jet.lang.psi;
import com.intellij.lang.ASTNode;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.jet.JetNodeTypes;
import org.jetbrains.jet.lexer.JetToken;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
/**
* @author max
*/
public class JetModifierList extends JetElement {
public JetModifierList(@NotNull ASTNode node) {
super(node);
}
@Override
public void accept(@NotNull JetVisitor visitor) {
visitor.visitModifierList(this);
}
public List<JetAttributeAnnotation> getAttributeAnnotations() {
return findChildrenByType(JetNodeTypes.ATTRIBUTE_ANNOTATION);
}
public List<JetAttribute> getAttributes() {
List<JetAttribute> answer = null;
for (JetAttributeAnnotation annotation : getAttributeAnnotations()) {
if (answer == null) answer = new ArrayList<JetAttribute>();
answer.addAll(annotation.getAttributes());
}
return answer != null ? answer : Collections.<JetAttribute>emptyList();
}
public boolean hasModifier(JetToken token) {
ASTNode node = getNode().getFirstChildNode();
while (node != null) {
if (node.getElementType() == token) return true;
node = node.getTreeNext();
}
return false;
}
}
idea/src/org/jetbrains/jet/lang/psi/JetNamespace.java
+2 -8
View File
@@ -2,7 +2,6 @@ package org.jetbrains.jet.lang.psi;
import com.intellij.lang.ASTNode;
import com.intellij.psi.PsiElement;
import com.intellij.psi.PsiElementVisitor;
import com.intellij.psi.util.PsiTreeUtil;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.jet.JetNodeTypes;
@@ -18,13 +17,8 @@ public class JetNamespace extends JetDeclaration {
}
@Override
public void accept(@NotNull PsiElementVisitor visitor) {
if (visitor instanceof JetVisitor) {
((JetVisitor) visitor).visitNamespace(this);
}
else {
visitor.visitElement(this);
}
public void accept(@NotNull JetVisitor visitor) {
visitor.visitNamespace(this);
}
public List<JetDeclaration> getDeclarations() {
idea/src/org/jetbrains/jet/lang/psi/JetProperty.java
+2 -9
View File
@@ -1,8 +1,6 @@
package org.jetbrains.jet.lang.psi;
import com.intellij.lang.ASTNode;
import com.intellij.psi.PsiElementVisitor;
import com.intellij.psi.PsiNameIdentifierOwner;
import org.jetbrains.annotations.NotNull;
/**
@@ -14,12 +12,7 @@ public class JetProperty extends JetNamedDeclaration {
}
@Override
public void accept(@NotNull PsiElementVisitor visitor) {
if (visitor instanceof JetVisitor) {
((JetVisitor) visitor).visitProperty(this);
}
else {
visitor.visitElement(this);
}
public void accept(@NotNull JetVisitor visitor) {
visitor.visitProperty(this);
}
}
idea/src/org/jetbrains/jet/lang/psi/JetTypedef.java
+2 -8
View File
@@ -1,7 +1,6 @@
package org.jetbrains.jet.lang.psi;
import com.intellij.lang.ASTNode;
import com.intellij.psi.PsiElementVisitor;
import org.jetbrains.annotations.NotNull;
/**
@@ -13,12 +12,7 @@ public class JetTypedef extends JetNamedDeclaration {
}
@Override
public void accept(@NotNull PsiElementVisitor visitor) {
if (visitor instanceof JetVisitor) {
((JetVisitor) visitor).visitTypedef(this);
}
else {
visitor.visitElement(this);
}
public void accept(@NotNull JetVisitor visitor) {
visitor.visitTypedef(this);
}
}
idea/src/org/jetbrains/jet/lang/psi/JetVisitor.java
+12
View File
@@ -61,4 +61,16 @@ public class JetVisitor extends PsiElementVisitor {
public void visitClassBody(JetClassBody classBody) {
visitJetElement(classBody);
}
public void visitModifierList(JetModifierList list) {
visitJetElement(list);
}
public void visitAttributeAnnotation(JetAttributeAnnotation annotation) {
visitJetElement(annotation);
}
public void visitAttribute(JetAttribute attribute) {
visitJetElement(attribute);
}
}