From 55569463087014adb4bc161a10fc299e713eb563 Mon Sep 17 00:00:00 2001
From: Andrey Breslav <abreslav@abreslav-mac.labs.intellij.net>
Date: Tue, 25 Jan 2011 22:38:48 +0300
Subject: [PATCH] NPE in getter fixed

---
 .../org/jetbrains/jet/lang/psi/JetReferenceExpression.java   | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/idea/src/org/jetbrains/jet/lang/psi/JetReferenceExpression.java b/idea/src/org/jetbrains/jet/lang/psi/JetReferenceExpression.java
index 6cad14902e3..ea621cf5c52 100644
--- a/idea/src/org/jetbrains/jet/lang/psi/JetReferenceExpression.java
+++ b/idea/src/org/jetbrains/jet/lang/psi/JetReferenceExpression.java
@@ -1,6 +1,7 @@
 package org.jetbrains.jet.lang.psi;
 
 import com.intellij.lang.ASTNode;
+import com.intellij.psi.tree.TokenSet;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.jet.lexer.JetTokens;
@@ -9,6 +10,8 @@ import org.jetbrains.jet.lexer.JetTokens;
  * @author max
  */
 public class JetReferenceExpression extends JetExpression {
+    private static final TokenSet REFERENCE_TOKENS = TokenSet.create(JetTokens.IDENTIFIER, JetTokens.FIELD_IDENTIFIER);
+
     public JetReferenceExpression(@NotNull ASTNode node) {
         super(node);
     }
@@ -23,7 +26,7 @@ public class JetReferenceExpression extends JetExpression {
     }
 
     public String getReferencedName() {
-        return getNode().findChildByType(JetTokens.IDENTIFIER).getText();
+        return getNode().findChildByType(REFERENCE_TOKENS).getText();
     }
 
     @Override