Match replaced with when

examples/src/BinaryTree.jetl

@@ -27,10 +27,10 @@ class BinaryTree<T> : IMutableSet<T> {
 
     fun contains(node : TreeNode, item : T) : Boolean {
       if (node == null) return false
-      compare(item, node.value) match {
-        case EQ => true
-        case LS => contains(node.left, item)
-        case GT => contains(node.right, item)
+      when (compare(item, node.value)) {
+        EQ => true
+        LS => contains(node.left, item)
+        GT => contains(node.right, item)
       }
     }
   }
@@ -50,10 +50,10 @@ class BinaryTree<T> : IMutableSet<T> {
         node = TreeNode(item, parent)
         return true
       }
-      compare(item, node.value) match {
-        case EQ => false
-        case LS => add(ref node.left, node)
-        case GT => add(ref node.right, node)
+      when (compare(item, node.value)) {
+        EQ => false
+        LS => add(ref node.left, node)
+        GT => add(ref node.right, node)
       }
     }
 
@@ -63,14 +63,14 @@ class BinaryTree<T> : IMutableSet<T> {
         root = TreeNode(item, null)
         return true
       }
-      compare(item, node.value) match {
-        case EQ => return false
-        case LS =>
+      when (compare(item, node.value)) {
+        EQ => return false
+        LS =>
           if (node.left == null) {
             node.left = TreeNode(item, node)
             return true
           } else return add(node.left)
-        case GT => 
+        GT =>
           if (node.right == null) {
             node.right = TreeNode(item, node)
             return true
@@ -89,20 +89,20 @@ class BinaryTree<T> : IMutableSet<T> {
 
     fun find(node : TreeNode) : TreeNode {
       if (node == null) return null
-      compare(item, node.value) match {
-        case EQ => node
-        case LS => find(node.left)
-        case GT => find(node.right)
+      when (compare(item, node.value)) {
+        EQ => node
+        LS => find(node.left)
+        GT => find(node.right)
       }
     }
   }
 
   private fun remove(node : TreeNode) {
-    node match {
-      case TreeNode(null, null) => replace(node, null)
-      case TreeNode(null, right) => replace(node, right)
-      case TreeNode(left, null) => replace(node, left)
-      case TreeNode(left, right) => {
+    when (node) {
+      is TreeNode(null, null) => replace(node, null)
+      is TreeNode(null, ?right) => replace(node, right)
+      is TreeNode(?left, null) => replace(node, left)
+      is TreeNode(?left, ?right) => {
         val min = min(node.right)
         node.value = min.value
         remove(min)

grammar/src/expressions.grm

@@ -13,7 +13,6 @@ Decreasing precedence:
   equalityOperation
   "&&"
   "||"
-  "match"
   "->"
   assignmentOperator
 */
@@ -24,12 +23,7 @@ expression
   ;
 
 arrowTupleExpression
-  : match ("->" match)*
-  ;
-
-// ATTENTION
-match
-  : conjunction ("match" "{" matchEntry+ "}")*
+  : assignmentOperator ("->" assignmentOperator)*
   ;
 
 disjunction
@@ -49,7 +43,9 @@ comparison
   ;
 
 namedInfixOrTypeExpression
-  : elvisOperation (namedInfixOrTypeOperation elvisOperation)*
+  : elvisOperation (inOperation elvisOperation)*
+  : elvisOperation (isOperation isRHS)?
+  : elvisOperation (typeOperation type)?
   ;
 
 elvisOperation
@@ -87,6 +83,7 @@ atomicExpression
   : tupleLiteral
   : "this" ("<" type ">")?
   : if
+  : when
   : try
   : "typeof" "(" expression ")"
   : "new" constructorInvocation // TODO: Do we need "new"?, see factory methods
@@ -109,6 +106,10 @@ literalConstant
   : "null"
   ;
 
+isRHS
+  : pattern
+  ;
+
 declaration
   : function
   : property
@@ -125,8 +126,16 @@ additiveOperation
   : "+" : "-"
   ;
 
-namedInfixOrTypeOperation
-  : "in" : "is" : "!in" : "!is" : "as" : ":"
+inOperation
+  : "in" : "!in"
+  ;
+
+typeOperation
+  : "as" : ":"
+  ;
+
+isOPeration
+  : "is" : "!is"
   ;
 
 comparisonOperation

grammar/src/lexical.grm

@@ -57,11 +57,10 @@ if
 else
 while
 do
-match
+when
 out
 ref
 try
-case
 
 Soft:
 wraps -- in a class header

grammar/src/match.grm

@@ -1,28 +0,0 @@
-matchEntry
-  : attributes "case" pattern ("if" "(" expression ")")? "=>" expression SEMI?
-  ;
-
-pattern
-  : constantPattern // literal
-  : SimpleName // variable from the context
-  : tuplePattern
-  : bindingPattern // we allow non-linear patterns
-  : decomposerPattern // TODO: labeled components are allowed?
-  ;
-
-constantPattern
-  : literalConstant
-  ;
-
-
-tuplePattern
-  : "(" ((SimpleName "=")? pattern{","})? ")"
-  ;
-
-bindingPattern
-  : "?" SimpleName? (":" pattern)?
-  ;
-
-decomposerPattern
-  : userType tuplePattern?
-  ;

grammar/src/when.grm

@@ -0,0 +1,65 @@
+when
+  : "when" "(" (modifiers "val" SimpleName "=")? expression ")" "{"
+        whenEntry*
+    "}"
+  ;
+
+// TODO: attributes for when entries?
+whenEntry
+  : whenConditionIf{","} (when  | "=>" expression SEMI)
+  : "else" ("continue" | "=>" expression SEMI)
+  ;
+
+whenConditionIf
+  : whenCondition ("if" "(" expression ")")?
+  ;
+
+whenCondition
+  : expression
+  : ("in" | "!in") expression
+  : ("is" | "!is") isRHS
+  ;
+
+pattern
+  : attributes pattern
+  : type // '[a] T' is a type-pattern 'T' with an attribute '[a]', not a type-pattern '[a] T'
+         // this makes sense because is-chack may be different for a type with attributes
+  : tuplePattern
+  : decomposerPattern
+  : constantPattern
+  : bindingPattern
+  : expressionPattern
+  ;
+
+decomposerPattern
+  : type
+  : qualifiedName typeParameters? (tuplePattern)?
+  ;
+
+constantPattern
+  : literalConstant
+  ;
+
+tuplePattern
+  : "(" ((SimpleName "=")? pattern{","})? ")"
+  ;
+
+bindingPattern
+  : "?" SimpleName? binding?
+  ;
+
+binding
+  : "is" pattern
+  : "!is" pattern
+  : "in" expression
+  : "!in" expression
+  : "=" expression
+  ;
+
+qualifiedName
+  : ("namespace" ".")? SimpleName{","}
+  ;
+
+expressionPattern
+  : "=" expression
+  ;

idea/src/org/jetbrains/jet/JetNodeTypes.java

@@ -97,6 +97,7 @@ public interface JetNodeTypes {
     JetNodeType THIS_EXPRESSION           = new JetNodeType("THIS_EXPRESSION", JetThisExpression.class);
     JetNodeType BINARY_EXPRESSION         = new JetNodeType("BINARY_EXPRESSION", JetBinaryExpression.class);
     JetNodeType BINARY_WITH_TYPE          = new JetNodeType("BINARY_WITH_TYPE", JetBinaryExpressionWithTypeRHS.class);
+    JetNodeType BINARY_WITH_PATTERN       = new JetNodeType("BINARY_WITH_PATTERN", JetExpression.class); // TODO:
     JetNodeType MATCH_EXPRESSION          = new JetNodeType("MATCH_EXPRESSION", JetMatchExpression.class);
     JetNodeType PREFIX_EXPRESSION         = new JetNodeType("PREFIX_EXPRESSION", JetPrefixExpression.class);
     JetNodeType POSTFIX_EXPRESSION        = new JetNodeType("POSTFIX_EXPRESSION", JetPostfixExpression.class);
@@ -108,10 +109,19 @@ public interface JetNodeTypes {
     JetNodeType SAFE_ACCESS_EXPRESSION    = new JetNodeType("SAFE_ACCESS_EXPRESSION", JetSafeQualifiedExpression.class);
     JetNodeType MATCH_BLOCK               = new JetNodeType("MATCH_BLOCK", JetMatchBlock.class);
     JetNodeType MATCH_ENTRY               = new JetNodeType("MATCH_ENTRY");
-    JetNodeType PATTERN                   = new JetNodeType("PATTERN");
+    JetNodeType DECOMPOSER_PATTERN        = new JetNodeType("DECOMPOSER_PATTERN");
     JetNodeType TUPLE_PATTERN             = new JetNodeType("TUPLE_PATTERN");
     JetNodeType OBJECT_LITERAL            = new JetNodeType("OBJECT_LITERAL", JetObjectLiteralExpression.class);
     JetNodeType ROOT_NAMESPACE            = new JetNodeType("ROOT_NAMESPACE", JetRootNamespaceExpression.class);
+    JetNodeType DECOMPOSER_ARGUMENT_LIST  = new JetNodeType("DECOMPOSER_ARGUMENT_LIST");
+    JetNodeType DECOMPOSER_ARGUMENT       = new JetNodeType("DECOMPOSER_ARGUMENT");
+    JetNodeType TYPE_PATTERN              = new JetNodeType("TYPE_PATTERN");
+    JetNodeType EXPRESSION_PATTERN        = new JetNodeType("EXPRESSION_PATTERN");
+    JetNodeType BINDING_PATTERN           = new JetNodeType("BINDING_PATTERN");
+    JetNodeType WHEN                      = new JetNodeType("WHEN");
+    JetNodeType WHEN_ENTRY                = new JetNodeType("WHEN_ENTRY");
+    JetNodeType WHEN_CONDITION            = new JetNodeType("WHEN_CONDITION");
+    JetNodeType TUPLE_PATTERN_ENTRY       = new JetNodeType("TUPLE_PATTERN_ENTRY");
 
     JetNodeType NAMESPACE_NAME = new JetNodeType("NAMESPACE_NAME", JetContainerNode.class);
 }

idea/src/org/jetbrains/jet/lang/parsing/AbstractJetParsing.java

@@ -199,10 +199,10 @@ import static org.jetbrains.jet.lexer.JetTokens.*;
         }
     }
 
-    protected void errorUntil(String mesage, TokenSet tokenSet) {
+    protected void errorUntil(String message, TokenSet tokenSet) {
         PsiBuilder.Marker error = mark();
         skipUntil(tokenSet);
-        error.error(mesage);
+        error.error(message);
     }
 
     protected void errorUntilOffset(String mesage, int offset) {

idea/src/org/jetbrains/jet/lang/parsing/JetExpressionParsing.java

@@ -13,20 +13,24 @@ import static org.jetbrains.jet.lexer.JetTokens.*;
  * @author abreslav
  */
 public class JetExpressionParsing extends AbstractJetParsing {
-    private final JetParsing myJetParsing;
+    private static final TokenSet WHEN_CONDITION_RECOVERY_SET = TokenSet.create(RBRACE, IN_KEYWORD, NOT_IN, IS_KEYWORD, NOT_IS, ELSE_KEYWORD);
+    private static final TokenSet WHEN_CONDITION_RECOVERY_SET_WITH_DOUBLE_ARROW = TokenSet.create(RBRACE, IN_KEYWORD, NOT_IN, IS_KEYWORD, NOT_IS, ELSE_KEYWORD, DOUBLE_ARROW);
+
     private static final TokenSet TYPE_ARGUMENT_LIST_STOPPERS = TokenSet.create(
             INTEGER_LITERAL, LONG_LITERAL, FLOAT_LITERAL, CHARACTER_LITERAL, STRING_LITERAL, RAW_STRING_LITERAL,
             NAMESPACE_KEYWORD, AS_KEYWORD, TYPE_KEYWORD, CLASS_KEYWORD, THIS_KEYWORD, VAL_KEYWORD, VAR_KEYWORD,
             FUN_KEYWORD, EXTENSION_KEYWORD, FOR_KEYWORD, NULL_KEYWORD, TYPEOF_KEYWORD,
             NEW_KEYWORD, TRUE_KEYWORD, FALSE_KEYWORD, IS_KEYWORD, THROW_KEYWORD, RETURN_KEYWORD, BREAK_KEYWORD,
             CONTINUE_KEYWORD, OBJECT_KEYWORD, IF_KEYWORD, TRY_KEYWORD, ELSE_KEYWORD, WHILE_KEYWORD, DO_KEYWORD,
-            MATCH_KEYWORD, RBRACKET, RBRACE, RPAR, PLUSPLUS, MINUSMINUS, MUL, PLUS, MINUS, EXCL, DIV, PERC, LTEQ,
+            WHEN_KEYWORD, RBRACKET, RBRACE, RPAR, PLUSPLUS, MINUSMINUS, MUL, PLUS, MINUS, EXCL, DIV, PERC, LTEQ,
             // TODO GTEQ,   foo<bar, baz>=x
             EQEQEQ, ARROW, DOUBLE_ARROW, EXCLEQEQEQ, EQEQ, EXCLEQ, ANDAND, OROR, SAFE_ACCESS, ELVIS, QUEST,
             SEMICOLON, RANGE, EQ, MULTEQ, DIVEQ, PERCEQ, PLUSEQ, MINUSEQ, NOT_IN, NOT_IS, HASH,
             COLON
     );
 
+    private final JetParsing myJetParsing;
+
     public JetExpressionParsing(SemanticWhitespaceAwarePsiBuilder builder, JetParsing jetParsing) {
         super(builder);
         myJetParsing = jetParsing;
@@ -34,13 +38,6 @@ public class JetExpressionParsing extends AbstractJetParsing {
 
     @SuppressWarnings({"UnusedDeclaration"})
     private enum Precedence {
-//        MEMBER_ACCESS(DOT, HASH, SAFE_ACCESS) {
-//            @Override
-//            public void parseHigherPrecedence(JetExpressionParsing parsing) {
-//                parsing.parseAtomicExpression();
-//            }
-//        },
-//
         POSTFIX(PLUSPLUS, MINUSMINUS), // typeArguments? valueArguments : typeArguments : arrayAccess
 
         PREFIX(MINUS, PLUS, MINUSMINUS, PLUSPLUS, EXCL) { // attributes
@@ -63,7 +60,7 @@ public class JetExpressionParsing extends AbstractJetParsing {
         SIMPLE_NAME(IDENTIFIER),
         ELVIS(JetTokens.ELVIS),
         // TODO : make same priority
-        WITH_TYPE_RHS(IS_KEYWORD, NOT_IS, AS_KEYWORD, COLON) {
+        WITH_TYPE_RHS(AS_KEYWORD, COLON) {
             @Override
             public void parseRightHandSide(JetExpressionParsing parsing) {
                 parsing.myJetParsing.parseTypeRef();
@@ -74,23 +71,22 @@ public class JetExpressionParsing extends AbstractJetParsing {
                 return BINARY_WITH_TYPE;
             }
         },
+        IS(IS_KEYWORD, NOT_IS) {
+            @Override
+            public void parseRightHandSide(JetExpressionParsing parsing) {
+                parsing.parsePattern();
+            }
+
+            @Override
+            public JetNodeType getProductType() {
+                return BINARY_WITH_PATTERN;
+            }
+        },
         NAMED_INFIX(IN_KEYWORD, NOT_IN),
         COMPARISON(LT, GT, LTEQ, GTEQ),
         EQUALITY(EQEQ, EXCLEQ, EQEQEQ, EXCLEQEQEQ),
         CONJUNCTION(ANDAND),
         DISJUNCTION(OROR),
-        MATCH(MATCH_KEYWORD) {
-            @Override
-            public void parseRightHandSide(JetExpressionParsing parsing) {
-                parsing.parseMatchBlock();
-            }
-
-            @Override
-            public JetNodeType getProductType() {
-                return MATCH_EXPRESSION;
-            }
-        },
-        // TODO: don't build a binary tree, build a tuple
         ARROW(JetTokens.ARROW),
         ASSIGNMENT(EQ, PLUSEQ, MINUSEQ, MULTEQ, DIVEQ, PERCEQ),
         ;
@@ -285,6 +281,7 @@ public class JetExpressionParsing extends AbstractJetParsing {
      *   : objectLiteral
      *   : jump
      *   : if
+     *   : when
      *   : try
      *   : loop
      *   : literalConstant
@@ -330,6 +327,9 @@ public class JetExpressionParsing extends AbstractJetParsing {
         else if (at(IF_KEYWORD)) {
             parseIf();
         }
+        else if (at(WHEN_KEYWORD)) {
+            parseWhen();
+        }
         else if (at(TRY_KEYWORD)) {
             parseTry();
         }
@@ -407,86 +407,259 @@ public class JetExpressionParsing extends AbstractJetParsing {
     }
 
     /*
-     * "{" matchEntry+ "}"
+     * when
+     *   : "when" "(" (modifiers "val" SimpleName "=")? expression ")" "{"
+     *         whenEntry*
+     *     "}"
+     *   ;
      */
-    private void parseMatchBlock() {
-        PsiBuilder.Marker mark = mark();
-        expect(LBRACE, "Expecting '{' to open a match block");
-        while (!eof() && !at(RBRACE)) {
-            if (at(CASE_KEYWORD) || at(LBRACKET)) {
-                parseMatchEntry();
-            } else {
-                errorUntil("Expecting 'case' to start pattern matching", TokenSet.create(RBRACE, LBRACKET, CASE_KEYWORD));
-            }
+    private void parseWhen() {
+        assert _at(WHEN_KEYWORD);
+
+        PsiBuilder.Marker when = mark();
+
+        advance(); // WHEN_KEYWORD
+
+        myBuilder.disableNewlines();
+        expect(LPAR, "Expecting '('");
+
+        int valPos = matchTokenStreamPredicate(new FirstBefore(new At(VAL_KEYWORD), new AtSet(RPAR, LBRACE, RBRACE, SEMICOLON, EQ)));
+        if (valPos >= 0) {
+            myJetParsing.parseProperty(true);
+        } else {
+            parseExpression();
         }
+
+        expect(RPAR, "Expecting ')'");
+        myBuilder.restoreNewlinesState();
+
+        myBuilder.enableNewlines();
+        expect(LBRACE, "Expecting '{'");
+
+        while (!eof() && !at(RBRACE)) {
+            parseWhenEntry();
+        }
+
         expect(RBRACE, "Expecting '}'");
-        mark.done(MATCH_BLOCK);
+        myBuilder.restoreNewlinesState();
+
+        when.done(WHEN);
     }
 
     /*
-     * matchEntry
-     *   : attributes "case" pattern ("if" "(" expression ")")? "=>" expression SEMI?
+     * TODO: attributes for when entries?
+     * whenEntry
+     *   : whenConditionIf{","} (when  | "=>" expression SEMI)
+     *   : "else" ("continue" | "=>" expression SEMI)
      *   ;
      */
-    private void parseMatchEntry() {
+    private void parseWhenEntry() {
         PsiBuilder.Marker entry = mark();
 
-        myJetParsing.parseAttributeList();
+        if (at(ELSE_KEYWORD)) {
+            advance(); // ELSE_KEYWORD
 
-        myBuilder.disableNewlines();
-        expect(CASE_KEYWORD, "Expecting 'case' to start pattern matching", TokenSet.create(RBRACE, IF_KEYWORD, DOUBLE_ARROW));
+            if (!at(CONTINUE_KEYWORD) && !at(DOUBLE_ARROW)) {
+                errorUntil("Expecting 'continue' or '=> expression'", TokenSet.create(CONTINUE_KEYWORD, DOUBLE_ARROW,
+                        RBRACE, EOL_OR_SEMICOLON));
+            }
 
-        parsePattern();
+            if (at(DOUBLE_ARROW)) {
+                advance(); // DOUBLE_ARROW
+
+                if (atSet(WHEN_CONDITION_RECOVERY_SET)) {
+                    error("Expecting an expression");
+                } else {
+                    parseExpression();
+                }
+            } else if (at(CONTINUE_KEYWORD)) {
+                advance(); // CONTINUE_KEYWORD
+            } else if (!atSet(WHEN_CONDITION_RECOVERY_SET)) {
+                 errorAndAdvance("Expecting 'continue' or '=> expression'");
+            }
+        } else {
+            parseWhenEntryNotElse();
+        }
+
+        entry.done(WHEN_ENTRY);
+        consumeIf(SEMICOLON);
+    }
+
+    /*
+     * : whenConditionIf{","} (when  | "=>" expression SEMI)
+     */
+    private void parseWhenEntryNotElse() {
+        while (true) {
+            while (at(COMMA)) errorAndAdvance("Expecting a when-condition");
+            parseWhenConditionIf();
+            if (!at(COMMA)) break;
+            advance(); // COMMA
+        }
+        if (at(WHEN_KEYWORD)) {
+            parseWhen();
+        } else {
+            expect(DOUBLE_ARROW, "Expecting '=>' or 'when'", WHEN_CONDITION_RECOVERY_SET);
+            if (atSet(WHEN_CONDITION_RECOVERY_SET)) {
+                error("Expecting an expression");
+            } else {
+                parseExpression();
+            }
+            // SEMI is consumed in parseWhenEntry
+        }
+    }
+
+    /*
+     * whenConditionIf
+     *   : pattern ("if" "(" expression ")")?
+     *   ;
+     */
+    private void parseWhenConditionIf() {
+        parseWhenCondition();
 
         if (at(IF_KEYWORD)) {
             advance(); // IF_KEYWORD
 
-            parseCondition();
+            // TODO : allow omitting these parentheses
+            myBuilder.disableNewlines();
+            expect(LPAR, "Expecting '('");
+
+            parseExpression();
+
+            expect(RPAR, "Expecting ')'");
+            myBuilder.restoreNewlinesState();
         }
+    }
 
-        expect(DOUBLE_ARROW, "Expecting '=>'", TokenSet.create(RBRACE));
-        myBuilder.restoreNewlinesState();
+    /*
+     * whenCondition
+     *   : expression
+     *   : ("in" | "!in") expression
+     *   : ("is" | "!is") isRHS
+     *   ;
+     */
+    private void parseWhenCondition() {
+        PsiBuilder.Marker condition = mark();
+        if (at(IN_KEYWORD) || at(NOT_IN)) {
+            advance(); // IN_KEYWORD or NOT_IN
 
-        parseExpression();
+            if (atSet(WHEN_CONDITION_RECOVERY_SET_WITH_DOUBLE_ARROW)) {
+                error("Expecting an expression");
+            } else {
+                parseExpression();
+            }
+        } else if (at(IS_KEYWORD) || at(NOT_IS)) {
+            advance(); // IS_KEYWORD or NOT_IS
 
-        consumeIf(SEMICOLON);
-
-        entry.done(MATCH_ENTRY);
+            if (atSet(WHEN_CONDITION_RECOVERY_SET_WITH_DOUBLE_ARROW)) {
+                error("Expecting a type or a decomposer pattern");
+            } else {
+                parsePattern();
+            }
+        } else {
+            if (atSet(WHEN_CONDITION_RECOVERY_SET_WITH_DOUBLE_ARROW)) {
+                error("Expecting an expression, is-condition or in-condition");
+            } else {
+                parseExpression();
+            }
+        }
+        condition.done(WHEN_CONDITION);
     }
 
     /*
      * pattern
-     *   : constantPattern // literal
-     *   : variablePattern // variable from the context
-     *   : tuplePattern
-     *   : bindingPattern // we allow non-linear patterns
-     *   : decomposerPattern // TODO: labeled components are allowed?
+     *  : attributes pattern
+     *  : type // '[a] T' is a type-pattern 'T' with an attribute '[a]', not a type-pattern '[a] T'
+     *         // this makes sense because is-chack may be different for a type with attributes
+     *  : tuplePattern
+     *  : decomposerPattern
+     *  : constantPattern
+     *  : bindingPattern
+     *  : expressionPattern
      *   ;
      */
     private void parsePattern() {
         PsiBuilder.Marker pattern = mark();
 
-        if (at(IDENTIFIER) || at(NAMESPACE_KEYWORD)) {
+        myJetParsing.parseAttributeList();
+
+        if (at(NAMESPACE_KEYWORD) || at(IDENTIFIER)) {
             myJetParsing.parseUserType();
             if (at(LPAR)) {
-                parseTuplePattern();
+                PsiBuilder.Marker list = mark();
+                parseTuplePattern(DECOMPOSER_ARGUMENT);
+                list.done(DECOMPOSER_ARGUMENT_LIST);
+                pattern.done(DECOMPOSER_PATTERN);
+            } else {
+                pattern.done(TYPE_PATTERN);
             }
-        }
-        else if (at(LPAR)) {
-            parseTuplePattern();
+        } else if (at(LPAR)) {
+            parseTuplePattern(TUPLE_PATTERN_ENTRY);
+            pattern.done(TUPLE_PATTERN);
+        } else if (at(LBRACE) || at(CAPITALIZED_THIS_KEYWORD)) {
+            myJetParsing.parseTypeRef();
+            pattern.done(TYPE_PATTERN);
         }
         else if (at(QUEST)) {
             parseBindingPattern();
-        } else if (!parseLiteralConstant()) {
+            pattern.done(BINDING_PATTERN);
+        } else if (at(EQ)) {
+            advance(); // EQ
+            parseExpression();
+            pattern.done(EXPRESSION_PATTERN);
+        } else if (parseLiteralConstant()) {
+            pattern.done(EXPRESSION_PATTERN);
+        } else {
             errorUntil("Pattern expected", TokenSet.create(RBRACE, DOUBLE_ARROW));
+            pattern.drop();
+        }
+    }
+
+    /*
+     * tuplePattern
+     *  : "(" ((SimpleName "=")? pattern){","}? ")"
+     *  ;
+     */
+    private void parseTuplePattern(JetNodeType entryType) {
+        assert _at(LPAR);
+
+        myBuilder.disableNewlines();
+        advance(); // LPAR
+
+        if (!at(RPAR)) {
+            while (true) {
+                while (at(COMMA)) errorAndAdvance("Expecting a pattern");
+                if (at(RPAR)) {
+                    error("Expecting a pattern");
+                    break;
+                }
+                PsiBuilder.Marker entry = mark();
+                if (at(IDENTIFIER) && lookahead(1) == EQ) {
+                    advance(); // IDENTIFIER
+                    advance(); // EQ
+                }
+                parsePattern();
+                entry.done(entryType);
+                if (!at(COMMA)) break;
+
+                advance(); // COMMA
+            }
         }
 
-        pattern.done(PATTERN);
+        expect(RPAR, "Expecting ')'");
+        myBuilder.restoreNewlinesState();
     }
 
     /*
      * bindingPattern
-     *   : "?" SimpleName? (":" pattern)?
+     *   : "?" SimpleName? binding?
+     *   ;
+     *
+     * binding
+     *   : "is" pattern
+     *   : "!is" pattern
+     *   : "in" expression
+     *   : "!in" expression
+     *   : "=" expression
      *   ;
      */
     private void parseBindingPattern() {
@@ -496,43 +669,44 @@ public class JetExpressionParsing extends AbstractJetParsing {
 
         consumeIf(IDENTIFIER);
 
-        if (at(COLON)) {
-            advance(); // COLON
+        if (at(IS_KEYWORD) || at(NOT_IS)) {
+            advance(); // IS_KEYWORD or NOT_IS
 
             parsePattern();
+        } else if (at(IN_KEYWORD) || at(NOT_IN)) {
+            advance(); // IN_KEYWORD ot NOT_IN
+
+            parseExpression();
+        } else if (at(EQ)) {
+            advance(); // EQ
+
+            parseExpression();
         }
     }
 
     /*
-     * tuplePattern
-     *   : "(" ((SimpleName "=")? pattern{","})? ")"
+     * qualifiedName
+     *   : ("namespace" ".")? SimpleName{","}
      *   ;
      */
-    private void parseTuplePattern() {
-        assert _at(LPAR);
+    private void parseQualifiedName() {
+        PsiBuilder.Marker mark = mark();
 
-        PsiBuilder.Marker pattern = mark();
-        advance(); // LPAR
+        if (at(NAMESPACE_KEYWORD)) {
+            advance(); // NAMESPACE_KEYWORD
+            mark.done(REFERENCE_EXPRESSION);
+            mark = mark.precede();
 
-        if (!at(RPAR)) {
-            while (true) {
-                while (at(COMMA)) errorAndAdvance("Expecting a pattern");
-                if (at(IDENTIFIER) && lookahead(1) == EQ) {
-                    advance(); // IDENTIFIER
-                    advance(); // EQ
-                }
-                parsePattern();
-                if (!at(COMMA)) break;
-                advance(); // COMMA
-                if (at(RPAR)) {
-                    error("Expecting a pattern");
-                    break;
-                }
-            }
+            expect(DOT, "Expecting '.'");
         }
-
-        expect(RPAR, "Expecting ')'");
-        pattern.done(TUPLE_PATTERN);
+        while (true) {
+            expect(IDENTIFIER, "Expecting an indetifier", TokenSet.create(DOT));
+            mark.done(REFERENCE_EXPRESSION);
+            mark = mark.precede();
+            if (!at(DOT)) break;
+            advance(); // DOT
+        }
+        mark.drop();
     }
 
     /*
@@ -621,8 +795,8 @@ public class JetExpressionParsing extends AbstractJetParsing {
             int lastDot = matchTokenStreamPredicate(new LastBefore(new At(DOT), new AtOffset(doubleArrowPos)));
             if (lastDot >= 0) { // There is a receiver type
                 createTruncatedBuilder(lastDot).parseTypeRef();
-                assert _at(DOT);
-                advance(); // DOT;
+
+                expect(DOT, "Expecting '.'");
 
                 if (!at(LPAR)) {
                     int firstLParPos = matchTokenStreamPredicate(new FirstBefore(new At(LPAR), new AtOffset(doubleArrowPos)));

idea/src/org/jetbrains/jet/lang/parsing/JetParsing.java

@@ -40,6 +40,7 @@ public class JetParsing extends AbstractJetParsing {
     /*package*/ static final TokenSet TYPE_REF_FIRST = TokenSet.create(LBRACKET, IDENTIFIER, LBRACE, LPAR);
 
     public static JetParsing createForTopLevel(SemanticWhitespaceAwarePsiBuilder builder) {
+        builder.setDebugMode(true);
         JetParsing jetParsing = new JetParsing(builder);
         jetParsing.myExpressionParsing = new JetExpressionParsing(builder, jetParsing);
         return jetParsing;
@@ -307,7 +308,10 @@ public class JetParsing extends AbstractJetParsing {
      */
     private void parseAttribute() {
         PsiBuilder.Marker attribute = mark();
+
+        PsiBuilder.Marker typeReference = mark();
         parseUserType();
+        typeReference.done(TYPE_REFERENCE);
         if (at(LPAR)) {
             myExpressionParsing.parseValueArgumentList();
         } else if (at(EQ)) {
@@ -679,9 +683,11 @@ public class JetParsing extends AbstractJetParsing {
     public JetNodeType parseProperty(boolean local) {
         // TODO: how to write an extension ptoperty for a generic type? (val List<T>.i -- what is T?!)
 
-        assert _at(VAL_KEYWORD) || _at(VAR_KEYWORD);
-
-        advance(); // VAL_KEYWORD or VAR_KEYWORD
+        if (at(VAL_KEYWORD) || at(VAR_KEYWORD)) {
+            advance(); // VAL_KEYWORD or VAR_KEYWORD
+        } else {
+            errorAndAdvance("Expecting 'val' or 'var'");
+        }
 
         TokenSet propertyNameFollow = TokenSet.create(COLON, EQ, LBRACE, SEMICOLON);
 
@@ -1201,12 +1207,12 @@ public class JetParsing extends AbstractJetParsing {
             parseTypeArgumentList();
 
             if (!at(DOT)) break;
-            type.done(USER_TYPE);
+            type.done(REFERENCE_EXPRESSION);
             type = type.precede();
             advance(); // DOT
         }
 
-        type.done(USER_TYPE);
+        type.done(REFERENCE_EXPRESSION);
     }
 
     /*

idea/src/org/jetbrains/jet/lang/psi/JetAttribute.java

@@ -22,8 +22,8 @@ public class JetAttribute extends JetElement {
     }
 
     @Nullable @IfNotParsed
-    public JetUserType getTypeReference() {
-        return (JetUserType) findChildByType(JetNodeTypes.USER_TYPE);
+    public JetTypeReference getTypeReference() {
+        return (JetTypeReference) findChildByType(JetNodeTypes.TYPE_REFERENCE);
     }
 
     @Nullable

idea/src/org/jetbrains/jet/lexer/Jet.flex

@@ -96,12 +96,11 @@ RAW_STRING_LITERAL = {THREE_QUO} {QUO_STRING_CHAR}* {THREE_QUO}?
 <YYINITIAL> "while"      { return JetTokens.WHILE_KEYWORD ;}
 <YYINITIAL> "break"      { return JetTokens.BREAK_KEYWORD ;}
 <YYINITIAL> "class"      { return JetTokens.CLASS_KEYWORD ;}
-<YYINITIAL> "match"      { return JetTokens.MATCH_KEYWORD ;}
 <YYINITIAL> "throw"      { return JetTokens.THROW_KEYWORD ;}
 <YYINITIAL> "false"      { return JetTokens.FALSE_KEYWORD ;}
+<YYINITIAL> "when"       { return JetTokens.WHEN_KEYWORD ;}
 <YYINITIAL> "true"       { return JetTokens.TRUE_KEYWORD ;}
 <YYINITIAL> "type"       { return JetTokens.TYPE_KEYWORD ;}
-<YYINITIAL> "case"       { return JetTokens.CASE_KEYWORD ;}
 <YYINITIAL> "this"       { return JetTokens.THIS_KEYWORD ;}
 <YYINITIAL> "null"       { return JetTokens.NULL_KEYWORD ;}
 <YYINITIAL> "else"       { return JetTokens.ELSE_KEYWORD ;}

idea/src/org/jetbrains/jet/lexer/JetTokens.java

@@ -50,8 +50,7 @@ public interface JetTokens {
     JetKeywordToken ELSE_KEYWORD             = JetKeywordToken.keyword("else");
     JetKeywordToken WHILE_KEYWORD            = JetKeywordToken.keyword("while");
     JetKeywordToken DO_KEYWORD               = JetKeywordToken.keyword("do");
-    JetKeywordToken MATCH_KEYWORD            = JetKeywordToken.keyword("match");
-    JetKeywordToken CASE_KEYWORD             = JetKeywordToken.keyword("case");
+    JetKeywordToken WHEN_KEYWORD            = JetKeywordToken.keyword("when");
     // TODO: Discuss "This" keyword
     JetKeywordToken CAPITALIZED_THIS_KEYWORD = JetKeywordToken.keyword("This");
 
@@ -136,7 +135,7 @@ public interface JetTokens {
             THIS_KEYWORD, VAL_KEYWORD, VAR_KEYWORD, FUN_KEYWORD, EXTENSION_KEYWORD, FOR_KEYWORD,
             NULL_KEYWORD, TYPEOF_KEYWORD, NEW_KEYWORD, TRUE_KEYWORD, FALSE_KEYWORD, IS_KEYWORD,
             IN_KEYWORD, THROW_KEYWORD, RETURN_KEYWORD, BREAK_KEYWORD, CONTINUE_KEYWORD, OBJECT_KEYWORD, IF_KEYWORD,
-            ELSE_KEYWORD, WHILE_KEYWORD, DO_KEYWORD, MATCH_KEYWORD, TRY_KEYWORD, CASE_KEYWORD,
+            ELSE_KEYWORD, WHILE_KEYWORD, DO_KEYWORD, TRY_KEYWORD, WHEN_KEYWORD,
             NOT_IN, NOT_IS, CAPITALIZED_THIS_KEYWORD
     );
 
@@ -159,5 +158,5 @@ public interface JetTokens {
     TokenSet OPERATIONS = TokenSet.create(AS_KEYWORD, IS_KEYWORD, IN_KEYWORD, DOT, PLUSPLUS, MINUSMINUS, MUL, PLUS,
             MINUS, EXCL, DIV, PERC, LT, GT, LTEQ, GTEQ, EQEQEQ, ARROW, EXCLEQEQEQ, EQEQ, EXCLEQ, ANDAND, OROR,
             SAFE_ACCESS, ELVIS, MAP, FILTER, QUEST, COLON, SEMICOLON, RANGE, EQ, MULTEQ, DIVEQ, PERCEQ, PLUSEQ, MINUSEQ,
-            NOT_IN, NOT_IS, HASH, IDENTIFIER, MATCH_KEYWORD);
+            NOT_IN, NOT_IS, HASH, IDENTIFIER);
 }

idea/testData/psi/AnnotatedExpressions.txt

@@ -17,8 +17,9 @@ JetFile: AnnotatedExpressions.jet
           ATTRIBUTE_ANNOTATION
             PsiElement(LBRACKET)('[')
             ATTRIBUTE
-              USER_TYPE
-                PsiElement(IDENTIFIER)('a')
+              TYPE_REFERENCE
+                REFERENCE_EXPRESSION
+                  PsiElement(IDENTIFIER)('a')
             PsiElement(RBRACKET)(']')
           PsiWhiteSpace(' ')
           REFERENCE_EXPRESSION
@@ -31,8 +32,9 @@ JetFile: AnnotatedExpressions.jet
           ATTRIBUTE_ANNOTATION
             PsiElement(LBRACKET)('[')
             ATTRIBUTE
-              USER_TYPE
-                PsiElement(IDENTIFIER)('a')
+              TYPE_REFERENCE
+                REFERENCE_EXPRESSION
+                  PsiElement(IDENTIFIER)('a')
             PsiElement(RBRACKET)(']')
           PsiWhiteSpace(' ')
           THIS_EXPRESSION

idea/testData/psi/Attributes.txt

@@ -40,19 +40,20 @@ JetFile: Attributes.jet
         ATTRIBUTE_ANNOTATION
           PsiElement(LBRACKET)('[')
           ATTRIBUTE
-            USER_TYPE
-              PsiElement(IDENTIFIER)('foo')
-              TYPE_ARGUMENT_LIST
-                PsiElement(LT)('<')
-                TYPE_REFERENCE
-                  USER_TYPE
-                    PsiElement(IDENTIFIER)('A')
-                PsiElement(COMMA)(',')
-                PsiWhiteSpace(' ')
-                TYPE_REFERENCE
-                  USER_TYPE
-                    PsiElement(IDENTIFIER)('B')
-                PsiElement(GT)('>')
+            TYPE_REFERENCE
+              REFERENCE_EXPRESSION
+                PsiElement(IDENTIFIER)('foo')
+                TYPE_ARGUMENT_LIST
+                  PsiElement(LT)('<')
+                  TYPE_REFERENCE
+                    REFERENCE_EXPRESSION
+                      PsiElement(IDENTIFIER)('A')
+                  PsiElement(COMMA)(',')
+                  PsiWhiteSpace(' ')
+                  TYPE_REFERENCE
+                    REFERENCE_EXPRESSION
+                      PsiElement(IDENTIFIER)('B')
+                  PsiElement(GT)('>')
             VALUE_ARGUMENT_LIST
               PsiElement(LPAR)('(')
               VALUE_ARGUMENT
@@ -66,51 +67,54 @@ JetFile: Attributes.jet
               PsiElement(RPAR)(')')
           PsiElement(COMMA)(',')
           ATTRIBUTE
-            USER_TYPE
-              PsiElement(IDENTIFIER)('ina')
+            TYPE_REFERENCE
+              REFERENCE_EXPRESSION
+                PsiElement(IDENTIFIER)('ina')
           PsiElement(COMMA)(',')
           ATTRIBUTE
-            USER_TYPE
-              USER_TYPE
-                USER_TYPE
-                  USER_TYPE
-                    USER_TYPE
-                      USER_TYPE
-                        PsiElement(IDENTIFIER)('foo')
+            TYPE_REFERENCE
+              REFERENCE_EXPRESSION
+                REFERENCE_EXPRESSION
+                  REFERENCE_EXPRESSION
+                    REFERENCE_EXPRESSION
+                      REFERENCE_EXPRESSION
+                        REFERENCE_EXPRESSION
+                          PsiElement(IDENTIFIER)('foo')
+                        PsiElement(DOT)('.')
+                        PsiElement(IDENTIFIER)('bar')
                       PsiElement(DOT)('.')
-                      PsiElement(IDENTIFIER)('bar')
+                      PsiElement(IDENTIFIER)('goo')
                     PsiElement(DOT)('.')
-                    PsiElement(IDENTIFIER)('goo')
+                    PsiElement(IDENTIFIER)('doo')
+                    TYPE_ARGUMENT_LIST
+                      PsiElement(LT)('<')
+                      TYPE_REFERENCE
+                        REFERENCE_EXPRESSION
+                          PsiElement(IDENTIFIER)('f')
+                      PsiElement(GT)('>')
                   PsiElement(DOT)('.')
-                  PsiElement(IDENTIFIER)('doo')
+                  PsiElement(IDENTIFIER)('foo')
                   TYPE_ARGUMENT_LIST
                     PsiElement(LT)('<')
                     TYPE_REFERENCE
-                      USER_TYPE
-                        PsiElement(IDENTIFIER)('f')
+                      REFERENCE_EXPRESSION
+                        PsiElement(IDENTIFIER)('bar')
+                    PsiElement(COMMA)(',')
+                    PsiWhiteSpace(' ')
+                    TYPE_REFERENCE
+                      REFERENCE_EXPRESSION
+                        PsiElement(IDENTIFIER)('goo')
                     PsiElement(GT)('>')
                 PsiElement(DOT)('.')
                 PsiElement(IDENTIFIER)('foo')
-                TYPE_ARGUMENT_LIST
-                  PsiElement(LT)('<')
-                  TYPE_REFERENCE
-                    USER_TYPE
-                      PsiElement(IDENTIFIER)('bar')
-                  PsiElement(COMMA)(',')
-                  PsiWhiteSpace(' ')
-                  TYPE_REFERENCE
-                    USER_TYPE
-                      PsiElement(IDENTIFIER)('goo')
-                  PsiElement(GT)('>')
-              PsiElement(DOT)('.')
-              PsiElement(IDENTIFIER)('foo')
           PsiElement(RBRACKET)(']')
         PsiWhiteSpace('\n')
         ATTRIBUTE_ANNOTATION
           PsiElement(LBRACKET)('[')
           ATTRIBUTE
-            USER_TYPE
-              PsiElement(IDENTIFIER)('df')
+            TYPE_REFERENCE
+              REFERENCE_EXPRESSION
+                PsiElement(IDENTIFIER)('df')
           PsiElement(RBRACKET)(']')
         PsiWhiteSpace('\n')
         PsiElement(in)('in')
@@ -118,8 +122,9 @@ JetFile: Attributes.jet
         ATTRIBUTE_ANNOTATION
           PsiElement(LBRACKET)('[')
           ATTRIBUTE
-            USER_TYPE
-              PsiElement(IDENTIFIER)('sdfsdf')
+            TYPE_REFERENCE
+              REFERENCE_EXPRESSION
+                PsiElement(IDENTIFIER)('sdfsdf')
           PsiElement(RBRACKET)(']')
         PsiWhiteSpace('\n')
         PsiElement(out)('out')
@@ -140,8 +145,9 @@ JetFile: Attributes.jet
             ATTRIBUTE_ANNOTATION
               PsiElement(LBRACKET)('[')
               ATTRIBUTE
-                USER_TYPE
-                  PsiElement(IDENTIFIER)('sdfsdf')
+                TYPE_REFERENCE
+                  REFERENCE_EXPRESSION
+                    PsiElement(IDENTIFIER)('sdfsdf')
                 PsiElement(EQ)('=')
                 BINARY_EXPRESSION
                   INTEGER_CONSTANT
@@ -152,15 +158,17 @@ JetFile: Attributes.jet
               PsiElement(COMMA)(',')
               PsiWhiteSpace(' ')
               ATTRIBUTE
-                USER_TYPE
-                  PsiElement(IDENTIFIER)('a')
+                TYPE_REFERENCE
+                  REFERENCE_EXPRESSION
+                    PsiElement(IDENTIFIER)('a')
               PsiElement(RBRACKET)(']')
             PsiWhiteSpace('\n')
             ATTRIBUTE_ANNOTATION
               PsiElement(LBRACKET)('[')
               ATTRIBUTE
-                USER_TYPE
-                  PsiElement(IDENTIFIER)('sdfsdf')
+                TYPE_REFERENCE
+                  REFERENCE_EXPRESSION
+                    PsiElement(IDENTIFIER)('sdfsdf')
                 PsiElement(EQ)('=')
                 BINARY_EXPRESSION
                   INTEGER_CONSTANT
@@ -173,16 +181,18 @@ JetFile: Attributes.jet
             ATTRIBUTE_ANNOTATION
               PsiElement(LBRACKET)('[')
               ATTRIBUTE
-                USER_TYPE
-                  PsiElement(IDENTIFIER)('a')
+                TYPE_REFERENCE
+                  REFERENCE_EXPRESSION
+                    PsiElement(IDENTIFIER)('a')
                 VALUE_ARGUMENT_LIST
                   PsiElement(LPAR)('(')
                   PsiElement(RPAR)(')')
               PsiElement(COMMA)(',')
               PsiWhiteSpace(' ')
               ATTRIBUTE
-                USER_TYPE
-                  PsiElement(IDENTIFIER)('sdfsdf')
+                TYPE_REFERENCE
+                  REFERENCE_EXPRESSION
+                    PsiElement(IDENTIFIER)('sdfsdf')
                 PsiElement(EQ)('=')
                 BINARY_EXPRESSION
                   INTEGER_CONSTANT
@@ -207,27 +217,30 @@ JetFile: Attributes.jet
             ATTRIBUTE_ANNOTATION
               PsiElement(LBRACKET)('[')
               ATTRIBUTE
-                USER_TYPE
-                  PsiElement(IDENTIFIER)('sdfsd')
+                TYPE_REFERENCE
+                  REFERENCE_EXPRESSION
+                    PsiElement(IDENTIFIER)('sdfsd')
               PsiElement(COMMA)(',')
               PsiWhiteSpace(' ')
               ATTRIBUTE
-                USER_TYPE
-                  PsiElement(IDENTIFIER)('sdfsd')
+                TYPE_REFERENCE
+                  REFERENCE_EXPRESSION
+                    PsiElement(IDENTIFIER)('sdfsd')
               PsiElement(COMMA)(',')
               PsiWhiteSpace(' ')
               ATTRIBUTE
-                USER_TYPE
-                  USER_TYPE
-                    USER_TYPE
-                      USER_TYPE
-                        PsiElement(IDENTIFIER)('a')
+                TYPE_REFERENCE
+                  REFERENCE_EXPRESSION
+                    REFERENCE_EXPRESSION
+                      REFERENCE_EXPRESSION
+                        REFERENCE_EXPRESSION
+                          PsiElement(IDENTIFIER)('a')
+                        PsiElement(DOT)('.')
+                        PsiElement(IDENTIFIER)('b')
                       PsiElement(DOT)('.')
-                      PsiElement(IDENTIFIER)('b')
+                      PsiElement(IDENTIFIER)('f')
                     PsiElement(DOT)('.')
-                    PsiElement(IDENTIFIER)('f')
-                  PsiElement(DOT)('.')
-                  PsiElement(IDENTIFIER)('c')
+                    PsiElement(IDENTIFIER)('c')
               PsiElement(RBRACKET)(']')
             PsiWhiteSpace('\n')
             PsiElement(private)('private')

idea/testData/psi/Attributes_ERR.txt

@@ -45,19 +45,20 @@ JetFile: Attributes_ERR.jet
       ATTRIBUTE_ANNOTATION
         PsiElement(LBRACKET)('[')
         ATTRIBUTE
-          USER_TYPE
-            PsiElement(IDENTIFIER)('foo')
-            TYPE_ARGUMENT_LIST
-              PsiElement(LT)('<')
-              TYPE_REFERENCE
-                USER_TYPE
-                  PsiElement(IDENTIFIER)('A')
-              PsiElement(COMMA)(',')
-              PsiWhiteSpace(' ')
-              TYPE_REFERENCE
-                USER_TYPE
-                  PsiElement(IDENTIFIER)('B')
-              PsiElement(GT)('>')
+          TYPE_REFERENCE
+            REFERENCE_EXPRESSION
+              PsiElement(IDENTIFIER)('foo')
+              TYPE_ARGUMENT_LIST
+                PsiElement(LT)('<')
+                TYPE_REFERENCE
+                  REFERENCE_EXPRESSION
+                    PsiElement(IDENTIFIER)('A')
+                PsiElement(COMMA)(',')
+                PsiWhiteSpace(' ')
+                TYPE_REFERENCE
+                  REFERENCE_EXPRESSION
+                    PsiElement(IDENTIFIER)('B')
+                PsiElement(GT)('>')
           VALUE_ARGUMENT_LIST
             PsiElement(LPAR)('(')
             VALUE_ARGUMENT
@@ -72,51 +73,54 @@ JetFile: Attributes_ERR.jet
         PsiElement(COMMA)(',')
         PsiWhiteSpace(' ')
         ATTRIBUTE
-          USER_TYPE
-            PsiElement(IDENTIFIER)('ina')
+          TYPE_REFERENCE
+            REFERENCE_EXPRESSION
+              PsiElement(IDENTIFIER)('ina')
         PsiElement(COMMA)(',')
         ATTRIBUTE
-          USER_TYPE
-            USER_TYPE
-              USER_TYPE
-                USER_TYPE
-                  USER_TYPE
-                    USER_TYPE
-                      PsiElement(IDENTIFIER)('foo')
+          TYPE_REFERENCE
+            REFERENCE_EXPRESSION
+              REFERENCE_EXPRESSION
+                REFERENCE_EXPRESSION
+                  REFERENCE_EXPRESSION
+                    REFERENCE_EXPRESSION
+                      REFERENCE_EXPRESSION
+                        PsiElement(IDENTIFIER)('foo')
+                      PsiElement(DOT)('.')
+                      PsiElement(IDENTIFIER)('bar')
                     PsiElement(DOT)('.')
-                    PsiElement(IDENTIFIER)('bar')
+                    PsiElement(IDENTIFIER)('goo')
                   PsiElement(DOT)('.')
-                  PsiElement(IDENTIFIER)('goo')
+                  PsiElement(IDENTIFIER)('doo')
+                  TYPE_ARGUMENT_LIST
+                    PsiElement(LT)('<')
+                    TYPE_REFERENCE
+                      REFERENCE_EXPRESSION
+                        PsiElement(IDENTIFIER)('f')
+                    PsiElement(GT)('>')
                 PsiElement(DOT)('.')
-                PsiElement(IDENTIFIER)('doo')
+                PsiElement(IDENTIFIER)('foo')
                 TYPE_ARGUMENT_LIST
                   PsiElement(LT)('<')
                   TYPE_REFERENCE
-                    USER_TYPE
-                      PsiElement(IDENTIFIER)('f')
+                    REFERENCE_EXPRESSION
+                      PsiElement(IDENTIFIER)('bar')
+                  PsiElement(COMMA)(',')
+                  PsiWhiteSpace(' ')
+                  TYPE_REFERENCE
+                    REFERENCE_EXPRESSION
+                      PsiElement(IDENTIFIER)('goo')
                   PsiElement(GT)('>')
               PsiElement(DOT)('.')
               PsiElement(IDENTIFIER)('foo')
-              TYPE_ARGUMENT_LIST
-                PsiElement(LT)('<')
-                TYPE_REFERENCE
-                  USER_TYPE
-                    PsiElement(IDENTIFIER)('bar')
-                PsiElement(COMMA)(',')
-                PsiWhiteSpace(' ')
-                TYPE_REFERENCE
-                  USER_TYPE
-                    PsiElement(IDENTIFIER)('goo')
-                PsiElement(GT)('>')
-            PsiElement(DOT)('.')
-            PsiElement(IDENTIFIER)('foo')
         PsiElement(RBRACKET)(']')
       PsiWhiteSpace('\n')
       ATTRIBUTE_ANNOTATION
         PsiElement(LBRACKET)('[')
         ATTRIBUTE
-          USER_TYPE
-            PsiElement(IDENTIFIER)('df')
+          TYPE_REFERENCE
+            REFERENCE_EXPRESSION
+              PsiElement(IDENTIFIER)('df')
         PsiElement(RBRACKET)(']')
       PsiWhiteSpace('\n')
       PsiElement(in)('in')
@@ -124,8 +128,9 @@ JetFile: Attributes_ERR.jet
       ATTRIBUTE_ANNOTATION
         PsiElement(LBRACKET)('[')
         ATTRIBUTE
-          USER_TYPE
-            PsiElement(IDENTIFIER)('sdfsdf')
+          TYPE_REFERENCE
+            REFERENCE_EXPRESSION
+              PsiElement(IDENTIFIER)('sdfsdf')
         PsiElement(COMMA)(',')
         PsiErrorElement:Expecting a comma-separated list of attributes
           <empty list>
@@ -134,12 +139,14 @@ JetFile: Attributes_ERR.jet
       ATTRIBUTE_ANNOTATION
         PsiElement(LBRACKET)('[')
         ATTRIBUTE
-          USER_TYPE
-            PsiElement(IDENTIFIER)('s')
+          TYPE_REFERENCE
+            REFERENCE_EXPRESSION
+              PsiElement(IDENTIFIER)('s')
         PsiElement(COMMA)(',')
         ATTRIBUTE
-          USER_TYPE
-            PsiElement(IDENTIFIER)('fd')
+          TYPE_REFERENCE
+            REFERENCE_EXPRESSION
+              PsiElement(IDENTIFIER)('fd')
         PsiErrorElement:Expecting ']' to close an attribute annotation
           <empty list>
     PsiWhiteSpace(' ')
@@ -180,27 +187,30 @@ JetFile: Attributes_ERR.jet
             ATTRIBUTE_ANNOTATION
               PsiElement(LBRACKET)('[')
               ATTRIBUTE
-                USER_TYPE
-                  PsiElement(IDENTIFIER)('sdfsd')
+                TYPE_REFERENCE
+                  REFERENCE_EXPRESSION
+                    PsiElement(IDENTIFIER)('sdfsd')
               PsiElement(COMMA)(',')
               PsiWhiteSpace(' ')
               ATTRIBUTE
-                USER_TYPE
-                  PsiElement(IDENTIFIER)('sdfsd')
+                TYPE_REFERENCE
+                  REFERENCE_EXPRESSION
+                    PsiElement(IDENTIFIER)('sdfsd')
               PsiElement(COMMA)(',')
               PsiWhiteSpace(' ')
               ATTRIBUTE
-                USER_TYPE
-                  USER_TYPE
-                    USER_TYPE
-                      USER_TYPE
-                        PsiElement(IDENTIFIER)('a')
+                TYPE_REFERENCE
+                  REFERENCE_EXPRESSION
+                    REFERENCE_EXPRESSION
+                      REFERENCE_EXPRESSION
+                        REFERENCE_EXPRESSION
+                          PsiElement(IDENTIFIER)('a')
+                        PsiElement(DOT)('.')
+                        PsiElement(IDENTIFIER)('b')
                       PsiElement(DOT)('.')
-                      PsiElement(IDENTIFIER)('b')
+                      PsiElement(IDENTIFIER)('f')
                     PsiElement(DOT)('.')
-                    PsiElement(IDENTIFIER)('f')
-                  PsiElement(DOT)('.')
-                  PsiElement(IDENTIFIER)('c')
+                    PsiElement(IDENTIFIER)('c')
               PsiElement(RBRACKET)(']')
             PsiWhiteSpace('\n')
             PsiElement(private)('private')

idea/testData/psi/BabySteps.txt

@@ -25,7 +25,7 @@ JetFile: BabySteps.jet
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('doo')
           PsiWhiteSpace(' ')
           PsiElement(EQ)('=')
@@ -39,7 +39,7 @@ JetFile: BabySteps.jet
       DELEGATION_SPECIFIER_LIST
         DELEGATOR_SUPER_CALL
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('foo')
           VALUE_ARGUMENT_LIST
             PsiElement(LPAR)('(')
@@ -53,7 +53,7 @@ JetFile: BabySteps.jet
         PsiWhiteSpace(' ')
         DELEGATOR_BY
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('bar')
           PsiWhiteSpace(' ')
           PsiElement(by)('by')
@@ -64,7 +64,7 @@ JetFile: BabySteps.jet
         PsiWhiteSpace(' ')
         DELEGATOR_SUPER_CLASS
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('bar')
       PsiWhiteSpace(' ')
       CLASS_BODY

idea/testData/psi/BabySteps_ERR.txt

@@ -25,7 +25,7 @@ JetFile: BabySteps_ERR.jet
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('doo')
           PsiWhiteSpace(' ')
           PsiElement(EQ)('=')
@@ -39,7 +39,7 @@ JetFile: BabySteps_ERR.jet
       DELEGATION_SPECIFIER_LIST
         DELEGATOR_SUPER_CALL
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('foo')
           VALUE_ARGUMENT_LIST
             PsiElement(LPAR)('(')
@@ -55,7 +55,7 @@ JetFile: BabySteps_ERR.jet
           PsiElement(COMMA)(',')
         DELEGATOR_BY
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('bar')
           PsiWhiteSpace(' ')
           PsiElement(by)('by')
@@ -66,7 +66,7 @@ JetFile: BabySteps_ERR.jet
         PsiWhiteSpace(' ')
         DELEGATOR_SUPER_CLASS
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('bar')
       PsiWhiteSpace(' ')
       CLASS_BODY

idea/testData/psi/ByCaluses.txt

@@ -12,7 +12,7 @@ JetFile: ByCaluses.jet
       DELEGATION_SPECIFIER_LIST
         DELEGATOR_BY
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('b')
           PsiWhiteSpace(' ')
           PsiElement(by)('by')
@@ -47,7 +47,7 @@ JetFile: ByCaluses.jet
       DELEGATION_SPECIFIER_LIST
         DELEGATOR_BY
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('b')
           PsiWhiteSpace(' ')
           PsiElement(by)('by')
@@ -98,7 +98,7 @@ JetFile: ByCaluses.jet
       DELEGATION_SPECIFIER_LIST
         DELEGATOR_BY
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('b')
           PsiWhiteSpace(' ')
           PsiElement(by)('by')
@@ -136,7 +136,7 @@ JetFile: ByCaluses.jet
       DELEGATION_SPECIFIER_LIST
         DELEGATOR_BY
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('b')
           PsiWhiteSpace(' ')
           PsiElement(by)('by')
@@ -181,7 +181,7 @@ JetFile: ByCaluses.jet
       DELEGATION_SPECIFIER_LIST
         DELEGATOR_BY
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('b')
           PsiWhiteSpace(' ')
           PsiElement(by)('by')
@@ -229,7 +229,7 @@ JetFile: ByCaluses.jet
       DELEGATION_SPECIFIER_LIST
         DELEGATOR_BY
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('b')
           PsiWhiteSpace(' ')
           PsiElement(by)('by')
@@ -278,7 +278,7 @@ JetFile: ByCaluses.jet
       DELEGATION_SPECIFIER_LIST
         DELEGATOR_BY
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('b')
           PsiWhiteSpace(' ')
           PsiElement(by)('by')

idea/testData/psi/Constructors.txt

@@ -41,12 +41,12 @@ JetFile: Constructors.jet
             PsiWhiteSpace(' ')
             DELEGATOR_SUPER_CALL
               TYPE_REFERENCE
-                USER_TYPE
+                REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('Foo')
                   TYPE_ARGUMENT_LIST
                     PsiElement(LT)('<')
                     TYPE_REFERENCE
-                      USER_TYPE
+                      REFERENCE_EXPRESSION
                         PsiElement(IDENTIFIER)('T')
                     PsiElement(GT)('>')
               VALUE_ARGUMENT_LIST
@@ -66,7 +66,7 @@ JetFile: Constructors.jet
               PsiElement(COLON)(':')
               PsiWhiteSpace(' ')
               TYPE_REFERENCE
-                USER_TYPE
+                REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('bar')
             PsiElement(RPAR)(')')
           PsiWhiteSpace(' ')
@@ -95,12 +95,12 @@ JetFile: Constructors.jet
             PsiWhiteSpace(' ')
             DELEGATOR_SUPER_CALL
               TYPE_REFERENCE
-                USER_TYPE
+                REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('Foo')
                   TYPE_ARGUMENT_LIST
                     PsiElement(LT)('<')
                     TYPE_REFERENCE
-                      USER_TYPE
+                      REFERENCE_EXPRESSION
                         PsiElement(IDENTIFIER)('T')
                     PsiElement(GT)('>')
               VALUE_ARGUMENT_LIST

idea/testData/psi/ControlStructures.txt

@@ -15,7 +15,7 @@ JetFile: ControlStructures.jet
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('foo')
           PsiWhiteSpace(' ')
           PsiElement(EQ)('=')
@@ -27,7 +27,7 @@ JetFile: ControlStructures.jet
               PsiElement(new)('new')
               PsiWhiteSpace(' ')
               TYPE_REFERENCE
-                USER_TYPE
+                REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('Foo')
         PsiElement(COMMA)(',')
         PsiWhiteSpace('\n    ')
@@ -37,7 +37,7 @@ JetFile: ControlStructures.jet
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('foo')
           PsiWhiteSpace(' ')
           PsiElement(EQ)('=')
@@ -55,7 +55,7 @@ JetFile: ControlStructures.jet
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('foo')
           PsiWhiteSpace(' ')
           PsiElement(EQ)('=')
@@ -70,7 +70,7 @@ JetFile: ControlStructures.jet
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('foo')
           PsiWhiteSpace(' ')
           PsiElement(EQ)('=')
@@ -87,7 +87,7 @@ JetFile: ControlStructures.jet
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('foo')
           PsiWhiteSpace(' ')
           PsiElement(EQ)('=')
@@ -102,7 +102,7 @@ JetFile: ControlStructures.jet
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('foo')
           PsiWhiteSpace(' ')
           PsiElement(EQ)('=')
@@ -119,7 +119,7 @@ JetFile: ControlStructures.jet
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('foo')
           PsiWhiteSpace(' ')
           PsiElement(EQ)('=')
@@ -150,7 +150,7 @@ JetFile: ControlStructures.jet
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('foo')
           PsiWhiteSpace(' ')
           PsiElement(EQ)('=')
@@ -277,7 +277,7 @@ JetFile: ControlStructures.jet
                 PsiElement(COLON)(':')
                 PsiWhiteSpace(' ')
                 TYPE_REFERENCE
-                  USER_TYPE
+                  REFERENCE_EXPRESSION
                     PsiElement(IDENTIFIER)('Bar')
               PsiElement(RPAR)(')')
             PsiWhiteSpace(' ')
@@ -305,7 +305,7 @@ JetFile: ControlStructures.jet
                 PsiElement(COLON)(':')
                 PsiWhiteSpace(' ')
                 TYPE_REFERENCE
-                  USER_TYPE
+                  REFERENCE_EXPRESSION
                     PsiElement(IDENTIFIER)('Bar')
               PsiElement(RPAR)(')')
             PsiWhiteSpace(' ')
@@ -325,7 +325,7 @@ JetFile: ControlStructures.jet
                 PsiElement(COLON)(':')
                 PsiWhiteSpace(' ')
                 TYPE_REFERENCE
-                  USER_TYPE
+                  REFERENCE_EXPRESSION
                     PsiElement(IDENTIFIER)('Bar')
               PsiElement(RPAR)(')')
             PsiWhiteSpace(' ')
@@ -345,7 +345,7 @@ JetFile: ControlStructures.jet
                 PsiElement(COLON)(':')
                 PsiWhiteSpace(' ')
                 TYPE_REFERENCE
-                  USER_TYPE
+                  REFERENCE_EXPRESSION
                     PsiElement(IDENTIFIER)('Bar')
               PsiElement(RPAR)(')')
             PsiWhiteSpace(' ')
@@ -373,7 +373,7 @@ JetFile: ControlStructures.jet
                 PsiElement(COLON)(':')
                 PsiWhiteSpace(' ')
                 TYPE_REFERENCE
-                  USER_TYPE
+                  REFERENCE_EXPRESSION
                     PsiElement(IDENTIFIER)('Bar')
               PsiElement(RPAR)(')')
             PsiWhiteSpace(' ')
@@ -393,7 +393,7 @@ JetFile: ControlStructures.jet
                 PsiElement(COLON)(':')
                 PsiWhiteSpace(' ')
                 TYPE_REFERENCE
-                  USER_TYPE
+                  REFERENCE_EXPRESSION
                     PsiElement(IDENTIFIER)('Bar')
               PsiElement(RPAR)(')')
             PsiWhiteSpace(' ')
@@ -476,7 +476,7 @@ JetFile: ControlStructures.jet
             PsiElement(COLON)(':')
             PsiWhiteSpace(' ')
             TYPE_REFERENCE
-              USER_TYPE
+              REFERENCE_EXPRESSION
                 PsiElement(IDENTIFIER)('Int')
           PsiWhiteSpace(' ')
           PsiElement(in)('in')
@@ -500,7 +500,7 @@ JetFile: ControlStructures.jet
             PsiElement(COLON)(':')
             PsiWhiteSpace(' ')
             TYPE_REFERENCE
-              USER_TYPE
+              REFERENCE_EXPRESSION
                 PsiElement(IDENTIFIER)('Int')
           PsiWhiteSpace(' ')
           PsiElement(in)('in')

idea/testData/psi/EOLsOnRollback.txt

@@ -40,7 +40,7 @@ JetFile: EOLsOnRollback.jet
           PsiElement(for)('for')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('boo')
         PsiWhiteSpace('\n\n    ')
         TYPEDEF
@@ -53,7 +53,7 @@ JetFile: EOLsOnRollback.jet
           PsiElement(EQ)('=')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('t')
         PsiWhiteSpace('\n    ')
         PROPERTY
@@ -66,8 +66,9 @@ JetFile: EOLsOnRollback.jet
             ATTRIBUTE_ANNOTATION
               PsiElement(LBRACKET)('[')
               ATTRIBUTE
-                USER_TYPE
-                  PsiElement(IDENTIFIER)('a')
+                TYPE_REFERENCE
+                  REFERENCE_EXPRESSION
+                    PsiElement(IDENTIFIER)('a')
               PsiElement(RBRACKET)(']')
           PsiWhiteSpace(' ')
           PsiElement(var)('var')
@@ -87,8 +88,9 @@ JetFile: EOLsOnRollback.jet
             ATTRIBUTE_ANNOTATION
               PsiElement(LBRACKET)('[')
               ATTRIBUTE
-                USER_TYPE
-                  PsiElement(IDENTIFIER)('a')
+                TYPE_REFERENCE
+                  REFERENCE_EXPRESSION
+                    PsiElement(IDENTIFIER)('a')
               PsiElement(RBRACKET)(']')
           PsiWhiteSpace(' ')
           PsiElement(val)('val')

idea/testData/psi/Enums.txt

@@ -19,7 +19,7 @@ JetFile: Enums.jet
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('Int')
         PsiElement(RPAR)(')')
       PsiWhiteSpace(' ')
@@ -36,7 +36,7 @@ JetFile: Enums.jet
           INITIALIZER_LIST
             DELEGATOR_SUPER_CALL
               TYPE_REFERENCE
-                USER_TYPE
+                REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('Color')
               VALUE_ARGUMENT_LIST
                 PsiElement(LPAR)('(')
@@ -55,7 +55,7 @@ JetFile: Enums.jet
           INITIALIZER_LIST
             DELEGATOR_SUPER_CALL
               TYPE_REFERENCE
-                USER_TYPE
+                REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('Color')
               VALUE_ARGUMENT_LIST
                 PsiElement(LPAR)('(')
@@ -74,7 +74,7 @@ JetFile: Enums.jet
           INITIALIZER_LIST
             DELEGATOR_SUPER_CALL
               TYPE_REFERENCE
-                USER_TYPE
+                REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('Color')
               VALUE_ARGUMENT_LIST
                 PsiElement(LPAR)('(')
@@ -110,7 +110,7 @@ JetFile: Enums.jet
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('Int')
         PsiElement(RPAR)(')')
       PsiWhiteSpace(' ')
@@ -127,12 +127,12 @@ JetFile: Enums.jet
           INITIALIZER_LIST
             DELEGATOR_SUPER_CALL
               TYPE_REFERENCE
-                USER_TYPE
+                REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('List')
                   TYPE_ARGUMENT_LIST
                     PsiElement(LT)('<')
                     TYPE_REFERENCE
-                      USER_TYPE
+                      REFERENCE_EXPRESSION
                         PsiElement(IDENTIFIER)('Nothing')
                     PsiElement(GT)('>')
               VALUE_ARGUMENT_LIST
@@ -159,7 +159,7 @@ JetFile: Enums.jet
               PsiElement(COLON)(':')
               PsiWhiteSpace(' ')
               TYPE_REFERENCE
-                USER_TYPE
+                REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('T')
             PsiElement(COMMA)(',')
             PsiWhiteSpace(' ')
@@ -171,12 +171,12 @@ JetFile: Enums.jet
               PsiElement(COLON)(':')
               PsiWhiteSpace(' ')
               TYPE_REFERENCE
-                USER_TYPE
+                REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('List')
                   TYPE_ARGUMENT_LIST
                     PsiElement(LT)('<')
                     TYPE_REFERENCE
-                      USER_TYPE
+                      REFERENCE_EXPRESSION
                         PsiElement(IDENTIFIER)('T')
                     PsiElement(GT)('>')
             PsiElement(RPAR)(')')
@@ -186,12 +186,12 @@ JetFile: Enums.jet
           INITIALIZER_LIST
             DELEGATOR_SUPER_CALL
               TYPE_REFERENCE
-                USER_TYPE
+                REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('List')
                   TYPE_ARGUMENT_LIST
                     PsiElement(LT)('<')
                     TYPE_REFERENCE
-                      USER_TYPE
+                      REFERENCE_EXPRESSION
                         PsiElement(IDENTIFIER)('T')
                     PsiElement(GT)('>')
               VALUE_ARGUMENT_LIST
@@ -210,7 +210,7 @@ JetFile: Enums.jet
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('Bool')
           PsiWhiteSpace('\n      ')
           PROPERTY_ACCESSOR

idea/testData/psi/Extensions.txt

@@ -8,7 +8,7 @@ JetFile: Extensions.jet
       PsiElement(for)('for')
       PsiWhiteSpace(' ')
       TYPE_REFERENCE
-        USER_TYPE
+        REFERENCE_EXPRESSION
           PsiElement(IDENTIFIER)('bar')
     PsiWhiteSpace('\n')
     EXTENSION
@@ -21,7 +21,7 @@ JetFile: Extensions.jet
       PsiElement(for)('for')
       PsiWhiteSpace(' ')
       TYPE_REFERENCE
-        USER_TYPE
+        REFERENCE_EXPRESSION
           PsiElement(IDENTIFIER)('bar')
     PsiWhiteSpace('\n')
     EXTENSION
@@ -36,7 +36,7 @@ JetFile: Extensions.jet
       PsiElement(for)('for')
       PsiWhiteSpace(' ')
       TYPE_REFERENCE
-        USER_TYPE
+        REFERENCE_EXPRESSION
           PsiElement(IDENTIFIER)('bar')
     PsiWhiteSpace('\n')
     EXTENSION
@@ -52,7 +52,7 @@ JetFile: Extensions.jet
       PsiElement(for)('for')
       PsiWhiteSpace(' ')
       TYPE_REFERENCE
-        USER_TYPE
+        REFERENCE_EXPRESSION
           PsiElement(IDENTIFIER)('bar')
     PsiWhiteSpace('\n')
     EXTENSION
@@ -90,7 +90,7 @@ JetFile: Extensions.jet
       PsiElement(for)('for')
       PsiWhiteSpace(' ')
       TYPE_REFERENCE
-        USER_TYPE
+        REFERENCE_EXPRESSION
           PsiElement(IDENTIFIER)('bar')
       PsiElement(SEMICOLON)(';')
     PsiWhiteSpace('\n')
@@ -104,7 +104,7 @@ JetFile: Extensions.jet
       PsiElement(for)('for')
       PsiWhiteSpace(' ')
       TYPE_REFERENCE
-        USER_TYPE
+        REFERENCE_EXPRESSION
           PsiElement(IDENTIFIER)('bar')
       PsiElement(SEMICOLON)(';')
     PsiWhiteSpace('\n')
@@ -120,7 +120,7 @@ JetFile: Extensions.jet
       PsiElement(for)('for')
       PsiWhiteSpace(' ')
       TYPE_REFERENCE
-        USER_TYPE
+        REFERENCE_EXPRESSION
           PsiElement(IDENTIFIER)('bar')
       PsiElement(SEMICOLON)(';')
     PsiWhiteSpace('\n')
@@ -137,7 +137,7 @@ JetFile: Extensions.jet
       PsiElement(for)('for')
       PsiWhiteSpace(' ')
       TYPE_REFERENCE
-        USER_TYPE
+        REFERENCE_EXPRESSION
           PsiElement(IDENTIFIER)('bar')
       PsiElement(SEMICOLON)(';')
     PsiWhiteSpace('\n')
@@ -177,7 +177,7 @@ JetFile: Extensions.jet
       PsiElement(for)('for')
       PsiWhiteSpace(' ')
       TYPE_REFERENCE
-        USER_TYPE
+        REFERENCE_EXPRESSION
           PsiElement(IDENTIFIER)('bar')
       PsiWhiteSpace(' ')
       CLASS_BODY
@@ -194,7 +194,7 @@ JetFile: Extensions.jet
       PsiElement(for)('for')
       PsiWhiteSpace(' ')
       TYPE_REFERENCE
-        USER_TYPE
+        REFERENCE_EXPRESSION
           PsiElement(IDENTIFIER)('bar')
       PsiWhiteSpace(' ')
       CLASS_BODY
@@ -213,7 +213,7 @@ JetFile: Extensions.jet
       PsiElement(for)('for')
       PsiWhiteSpace(' ')
       TYPE_REFERENCE
-        USER_TYPE
+        REFERENCE_EXPRESSION
           PsiElement(IDENTIFIER)('bar')
       PsiWhiteSpace(' ')
       CLASS_BODY
@@ -233,7 +233,7 @@ JetFile: Extensions.jet
       PsiElement(for)('for')
       PsiWhiteSpace(' ')
       TYPE_REFERENCE
-        USER_TYPE
+        REFERENCE_EXPRESSION
           PsiElement(IDENTIFIER)('bar')
       PsiWhiteSpace(' ')
       CLASS_BODY

idea/testData/psi/Extensions_ERR.txt

@@ -20,7 +20,7 @@ JetFile: Extensions_ERR.jet
       PsiErrorElement:Expecting 'for' to specify the type that is being extended
         <empty list>
       TYPE_REFERENCE
-        USER_TYPE
+        REFERENCE_EXPRESSION
           PsiElement(IDENTIFIER)('bar')
     PsiWhiteSpace('\n')
     EXTENSION
@@ -36,7 +36,7 @@ JetFile: Extensions_ERR.jet
       PsiElement(for)('for')
       PsiWhiteSpace(' ')
       TYPE_REFERENCE
-        USER_TYPE
+        REFERENCE_EXPRESSION
           PsiElement(IDENTIFIER)('bar')
     PsiWhiteSpace('\n')
     EXTENSION

idea/testData/psi/FunctionCalls.txt

@@ -29,7 +29,7 @@ JetFile: FunctionCalls.jet
           TYPE_ARGUMENT_LIST
             PsiElement(LT)('<')
             TYPE_REFERENCE
-              USER_TYPE
+              REFERENCE_EXPRESSION
                 PsiElement(IDENTIFIER)('foo')
             PsiElement(GT)('>')
           VALUE_ARGUMENT_LIST
@@ -45,7 +45,7 @@ JetFile: FunctionCalls.jet
           TYPE_ARGUMENT_LIST
             PsiElement(LT)('<')
             TYPE_REFERENCE
-              USER_TYPE
+              REFERENCE_EXPRESSION
                 PsiElement(IDENTIFIER)('foo')
             PsiElement(GT)('>')
         PsiWhiteSpace('\n  ')
@@ -133,7 +133,7 @@ JetFile: FunctionCalls.jet
           TYPE_ARGUMENT_LIST
             PsiElement(LT)('<')
             TYPE_REFERENCE
-              USER_TYPE
+              REFERENCE_EXPRESSION
                 PsiElement(IDENTIFIER)('a')
             PsiElement(GT)('>')
           VALUE_ARGUMENT_LIST
@@ -158,7 +158,7 @@ JetFile: FunctionCalls.jet
           TYPE_ARGUMENT_LIST
             PsiElement(LT)('<')
             TYPE_REFERENCE
-              USER_TYPE
+              REFERENCE_EXPRESSION
                 PsiElement(IDENTIFIER)('a')
             PsiElement(GT)('>')
           VALUE_ARGUMENT_LIST
@@ -189,12 +189,12 @@ JetFile: FunctionCalls.jet
                 TYPE_ARGUMENT_LIST
                   PsiElement(LT)('<')
                   TYPE_REFERENCE
-                    USER_TYPE
+                    REFERENCE_EXPRESSION
                       PsiElement(IDENTIFIER)('a')
                   PsiElement(COMMA)(',')
                   PsiWhiteSpace(' ')
                   TYPE_REFERENCE
-                    USER_TYPE
+                    REFERENCE_EXPRESSION
                       PsiElement(IDENTIFIER)('b')
                   PsiElement(GT)('>')
             PsiElement(RPAR)(')')
@@ -211,12 +211,12 @@ JetFile: FunctionCalls.jet
                 TYPE_ARGUMENT_LIST
                   PsiElement(LT)('<')
                   TYPE_REFERENCE
-                    USER_TYPE
+                    REFERENCE_EXPRESSION
                       PsiElement(IDENTIFIER)('a')
                   PsiElement(COMMA)(',')
                   PsiWhiteSpace(' ')
                   TYPE_REFERENCE
-                    USER_TYPE
+                    REFERENCE_EXPRESSION
                       PsiElement(IDENTIFIER)('b')
                   PsiElement(GT)('>')
                 VALUE_ARGUMENT_LIST

idea/testData/psi/FunctionLiterals.txt

@@ -63,7 +63,7 @@ JetFile: FunctionLiterals.jet
               PsiElement(COLON)(':')
               PsiWhiteSpace(' ')
               TYPE_REFERENCE
-                USER_TYPE
+                REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('A')
             PsiElement(RPAR)(')')
           PsiWhiteSpace(' ')
@@ -84,14 +84,14 @@ JetFile: FunctionLiterals.jet
               PsiElement(COLON)(':')
               PsiWhiteSpace(' ')
               TYPE_REFERENCE
-                USER_TYPE
+                REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('A')
             PsiElement(RPAR)(')')
           PsiWhiteSpace(' ')
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('T')
           PsiWhiteSpace(' ')
           PsiElement(DOUBLE_ARROW)('=>')
@@ -112,7 +112,7 @@ JetFile: FunctionLiterals.jet
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('T')
           PsiWhiteSpace(' ')
           PsiElement(DOUBLE_ARROW)('=>')
@@ -151,7 +151,7 @@ JetFile: FunctionLiterals.jet
               PsiElement(COLON)(':')
               PsiWhiteSpace(' ')
               TYPE_REFERENCE
-                USER_TYPE
+                REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('A')
             PsiElement(COMMA)(',')
             PsiWhiteSpace(' ')
@@ -161,7 +161,7 @@ JetFile: FunctionLiterals.jet
               PsiElement(COLON)(':')
               PsiWhiteSpace(' ')
               TYPE_REFERENCE
-                USER_TYPE
+                REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('B')
             PsiElement(RPAR)(')')
           PsiWhiteSpace(' ')
@@ -182,7 +182,7 @@ JetFile: FunctionLiterals.jet
               PsiElement(COLON)(':')
               PsiWhiteSpace(' ')
               TYPE_REFERENCE
-                USER_TYPE
+                REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('A')
             PsiElement(COMMA)(',')
             PsiWhiteSpace(' ')
@@ -193,7 +193,7 @@ JetFile: FunctionLiterals.jet
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('T')
           PsiWhiteSpace(' ')
           PsiElement(DOUBLE_ARROW)('=>')
@@ -217,14 +217,14 @@ JetFile: FunctionLiterals.jet
               PsiElement(COLON)(':')
               PsiWhiteSpace(' ')
               TYPE_REFERENCE
-                USER_TYPE
+                REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('B')
             PsiElement(RPAR)(')')
           PsiWhiteSpace(' ')
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('T')
           PsiWhiteSpace(' ')
           PsiElement(DOUBLE_ARROW)('=>')
@@ -269,7 +269,7 @@ JetFile: FunctionLiterals.jet
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('T')
           PsiWhiteSpace(' ')
           PsiElement(DOUBLE_ARROW)('=>')
@@ -288,7 +288,7 @@ JetFile: FunctionLiterals.jet
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('T')
           PsiWhiteSpace(' ')
           PsiElement(DOUBLE_ARROW)('=>')
@@ -301,7 +301,7 @@ JetFile: FunctionLiterals.jet
         FUNCTION_LITERAL
           PsiElement(LBRACE)('{')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('T')
           PsiElement(DOT)('.')
           VALUE_PARAMETER_LIST
@@ -320,7 +320,7 @@ JetFile: FunctionLiterals.jet
         FUNCTION_LITERAL
           PsiElement(LBRACE)('{')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('T')
           PsiElement(DOT)('.')
           VALUE_PARAMETER_LIST
@@ -331,7 +331,7 @@ JetFile: FunctionLiterals.jet
               PsiElement(COLON)(':')
               PsiWhiteSpace(' ')
               TYPE_REFERENCE
-                USER_TYPE
+                REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('A')
             PsiElement(RPAR)(')')
           PsiWhiteSpace(' ')
@@ -345,7 +345,7 @@ JetFile: FunctionLiterals.jet
         FUNCTION_LITERAL
           PsiElement(LBRACE)('{')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('T')
           PsiElement(DOT)('.')
           VALUE_PARAMETER_LIST
@@ -356,14 +356,14 @@ JetFile: FunctionLiterals.jet
               PsiElement(COLON)(':')
               PsiWhiteSpace(' ')
               TYPE_REFERENCE
-                USER_TYPE
+                REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('A')
             PsiElement(RPAR)(')')
           PsiWhiteSpace(' ')
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('T')
           PsiWhiteSpace(' ')
           PsiElement(DOUBLE_ARROW)('=>')
@@ -376,7 +376,7 @@ JetFile: FunctionLiterals.jet
         FUNCTION_LITERAL
           PsiElement(LBRACE)('{')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('T')
           PsiElement(DOT)('.')
           VALUE_PARAMETER_LIST
@@ -388,7 +388,7 @@ JetFile: FunctionLiterals.jet
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('T')
           PsiWhiteSpace(' ')
           PsiElement(DOUBLE_ARROW)('=>')

idea/testData/psi/FunctionLiterals_ERR.txt

@@ -89,7 +89,7 @@ JetFile: FunctionLiterals_ERR.jet
               PsiElement(COLON)(':')
               PsiWhiteSpace(' ')
               TYPE_REFERENCE
-                USER_TYPE
+                REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('A')
             PsiElement(RPAR)(')')
           PsiWhiteSpace(' ')
@@ -115,7 +115,7 @@ JetFile: FunctionLiterals_ERR.jet
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('T')
           PsiWhiteSpace(' ')
           PsiElement(DOUBLE_ARROW)('=>')
@@ -153,7 +153,7 @@ JetFile: FunctionLiterals_ERR.jet
               PsiElement(COLON)(':')
               PsiWhiteSpace(' ')
               TYPE_REFERENCE
-                USER_TYPE
+                REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('A')
             PsiElement(COMMA)(',')
             PsiWhiteSpace(' ')
@@ -166,7 +166,7 @@ JetFile: FunctionLiterals_ERR.jet
               PsiElement(COLON)(':')
               PsiWhiteSpace(' ')
               TYPE_REFERENCE
-                USER_TYPE
+                REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('B')
             PsiElement(RPAR)(')')
           PsiWhiteSpace(' ')
@@ -187,7 +187,7 @@ JetFile: FunctionLiterals_ERR.jet
               PsiElement(COLON)(':')
               PsiWhiteSpace(' ')
               TYPE_REFERENCE
-                USER_TYPE
+                REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('A')
             PsiElement(COMMA)(',')
             PsiWhiteSpace(' ')
@@ -206,7 +206,7 @@ JetFile: FunctionLiterals_ERR.jet
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('T')
           PsiWhiteSpace(' ')
           PsiElement(DOUBLE_ARROW)('=>')
@@ -219,7 +219,7 @@ JetFile: FunctionLiterals_ERR.jet
         FUNCTION_LITERAL
           PsiElement(LBRACE)('{')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('T')
           PsiElement(DOT)('.')
           PsiErrorElement:Expecting '('
@@ -240,7 +240,7 @@ JetFile: FunctionLiterals_ERR.jet
         FUNCTION_LITERAL
           PsiElement(LBRACE)('{')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('T')
           PsiElement(DOT)('.')
           PsiErrorElement:Expecting '('
@@ -255,7 +255,7 @@ JetFile: FunctionLiterals_ERR.jet
               PsiElement(COLON)(':')
               PsiWhiteSpace(' ')
               TYPE_REFERENCE
-                USER_TYPE
+                REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('A')
             PsiElement(RPAR)(')')
           PsiWhiteSpace(' ')
@@ -286,7 +286,7 @@ JetFile: FunctionLiterals_ERR.jet
         FUNCTION_LITERAL
           PsiElement(LBRACE)('{')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('T')
           PsiElement(DOT)('.')
           PsiErrorElement:To specify a receiver type, use the full notation: {ReceiverType.(parameters) [: ReturnType] => ...}

idea/testData/psi/FunctionTypes.txt

@@ -18,19 +18,20 @@ JetFile: FunctionTypes.jet
               ATTRIBUTE_ANNOTATION
                 PsiElement(LBRACKET)('[')
                 ATTRIBUTE
-                  USER_TYPE
-                    PsiElement(IDENTIFIER)('a')
+                  TYPE_REFERENCE
+                    REFERENCE_EXPRESSION
+                      PsiElement(IDENTIFIER)('a')
                 PsiElement(RBRACKET)(']')
             PsiWhiteSpace(' ')
             TYPE_REFERENCE
-              USER_TYPE
+              REFERENCE_EXPRESSION
                 PsiElement(IDENTIFIER)('a')
             PsiElement(RPAR)(')')
           PsiWhiteSpace(' ')
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('b')
           PsiElement(RBRACE)('}')
     PsiWhiteSpace('\n')
@@ -49,14 +50,14 @@ JetFile: FunctionTypes.jet
           VALUE_PARAMETER_LIST
             PsiElement(LPAR)('(')
             TYPE_REFERENCE
-              USER_TYPE
+              REFERENCE_EXPRESSION
                 PsiElement(IDENTIFIER)('a')
             PsiElement(RPAR)(')')
           PsiWhiteSpace(' ')
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('b')
           PsiElement(RBRACE)('}')
     PsiWhiteSpace('\n')
@@ -82,11 +83,12 @@ JetFile: FunctionTypes.jet
             ATTRIBUTE_ANNOTATION
               PsiElement(LBRACKET)('[')
               ATTRIBUTE
-                USER_TYPE
-                  PsiElement(IDENTIFIER)('x')
+                TYPE_REFERENCE
+                  REFERENCE_EXPRESSION
+                    PsiElement(IDENTIFIER)('x')
               PsiElement(RBRACKET)(']')
             PsiWhiteSpace(' ')
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('b')
           PsiElement(RBRACE)('}')
     PsiWhiteSpace('\n')
@@ -137,18 +139,19 @@ JetFile: FunctionTypes.jet
                 ATTRIBUTE_ANNOTATION
                   PsiElement(LBRACKET)('[')
                   ATTRIBUTE
-                    USER_TYPE
-                      PsiElement(IDENTIFIER)('a')
+                    TYPE_REFERENCE
+                      REFERENCE_EXPRESSION
+                        PsiElement(IDENTIFIER)('a')
                   PsiElement(RBRACKET)(']')
                 PsiWhiteSpace(' ')
-                USER_TYPE
+                REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('a')
             PsiElement(RPAR)(')')
           PsiWhiteSpace(' ')
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('b')
           PsiElement(RBRACE)('}')
     PsiWhiteSpace('\n')
@@ -172,14 +175,14 @@ JetFile: FunctionTypes.jet
               PsiElement(COLON)(':')
               PsiWhiteSpace(' ')
               TYPE_REFERENCE
-                USER_TYPE
+                REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('a')
             PsiElement(RPAR)(')')
           PsiWhiteSpace(' ')
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('b')
           PsiElement(RBRACE)('}')
     PsiWhiteSpace('\n')
@@ -202,7 +205,7 @@ JetFile: FunctionTypes.jet
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('b')
           PsiElement(RBRACE)('}')
     PsiWhiteSpace('\n')
@@ -253,16 +256,17 @@ JetFile: FunctionTypes.jet
                 ATTRIBUTE_ANNOTATION
                   PsiElement(LBRACKET)('[')
                   ATTRIBUTE
-                    USER_TYPE
-                      PsiElement(IDENTIFIER)('a')
+                    TYPE_REFERENCE
+                      REFERENCE_EXPRESSION
+                        PsiElement(IDENTIFIER)('a')
                   PsiElement(RBRACKET)(']')
                 PsiWhiteSpace(' ')
-                USER_TYPE
+                REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('a')
             PsiElement(COMMA)(',')
             PsiWhiteSpace(' ')
             TYPE_REFERENCE
-              USER_TYPE
+              REFERENCE_EXPRESSION
                 PsiElement(IDENTIFIER)('foo')
             PsiElement(COMMA)(',')
             PsiWhiteSpace(' ')
@@ -272,14 +276,14 @@ JetFile: FunctionTypes.jet
               PsiElement(COLON)(':')
               PsiWhiteSpace(' ')
               TYPE_REFERENCE
-                USER_TYPE
+                REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('bar')
             PsiElement(RPAR)(')')
           PsiWhiteSpace(' ')
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('b')
           PsiElement(RBRACE)('}')
     PsiWhiteSpace('\n')
@@ -298,7 +302,7 @@ JetFile: FunctionTypes.jet
           VALUE_PARAMETER_LIST
             PsiElement(LPAR)('(')
             TYPE_REFERENCE
-              USER_TYPE
+              REFERENCE_EXPRESSION
                 PsiElement(IDENTIFIER)('foo')
             PsiElement(COMMA)(',')
             PsiWhiteSpace(' ')
@@ -308,14 +312,14 @@ JetFile: FunctionTypes.jet
               PsiElement(COLON)(':')
               PsiWhiteSpace(' ')
               TYPE_REFERENCE
-                USER_TYPE
+                REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('a')
             PsiElement(RPAR)(')')
           PsiWhiteSpace(' ')
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('b')
           PsiElement(RBRACE)('}')
     PsiWhiteSpace('\n')
@@ -334,7 +338,7 @@ JetFile: FunctionTypes.jet
           VALUE_PARAMETER_LIST
             PsiElement(LPAR)('(')
             TYPE_REFERENCE
-              USER_TYPE
+              REFERENCE_EXPRESSION
                 PsiElement(IDENTIFIER)('foo')
             PsiElement(COMMA)(',')
             PsiWhiteSpace(' ')
@@ -349,14 +353,14 @@ JetFile: FunctionTypes.jet
                   VALUE_PARAMETER_LIST
                     PsiElement(LPAR)('(')
                     TYPE_REFERENCE
-                      USER_TYPE
+                      REFERENCE_EXPRESSION
                         PsiElement(IDENTIFIER)('a')
                     PsiElement(RPAR)(')')
                   PsiWhiteSpace(' ')
                   PsiElement(COLON)(':')
                   PsiWhiteSpace(' ')
                   TYPE_REFERENCE
-                    USER_TYPE
+                    REFERENCE_EXPRESSION
                       PsiElement(IDENTIFIER)('b')
                   PsiElement(RBRACE)('}')
             PsiElement(RPAR)(')')
@@ -364,7 +368,7 @@ JetFile: FunctionTypes.jet
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('b')
           PsiElement(RBRACE)('}')
     PsiWhiteSpace('\n')
@@ -383,7 +387,7 @@ JetFile: FunctionTypes.jet
           VALUE_PARAMETER_LIST
             PsiElement(LPAR)('(')
             TYPE_REFERENCE
-              USER_TYPE
+              REFERENCE_EXPRESSION
                 PsiElement(IDENTIFIER)('foo')
             PsiElement(COMMA)(',')
             PsiWhiteSpace(' ')
@@ -398,14 +402,14 @@ JetFile: FunctionTypes.jet
                   VALUE_PARAMETER_LIST
                     PsiElement(LPAR)('(')
                     TYPE_REFERENCE
-                      USER_TYPE
+                      REFERENCE_EXPRESSION
                         PsiElement(IDENTIFIER)('a')
                     PsiElement(RPAR)(')')
                   PsiWhiteSpace(' ')
                   PsiElement(COLON)(':')
                   PsiWhiteSpace(' ')
                   TYPE_REFERENCE
-                    USER_TYPE
+                    REFERENCE_EXPRESSION
                       PsiElement(IDENTIFIER)('b')
                   PsiElement(RBRACE)('}')
             PsiElement(RPAR)(')')
@@ -446,7 +450,7 @@ JetFile: FunctionTypes.jet
               PsiElement(lazy)('lazy')
             PsiWhiteSpace(' ')
             TYPE_REFERENCE
-              USER_TYPE
+              REFERENCE_EXPRESSION
                 PsiElement(IDENTIFIER)('foo')
             PsiElement(COMMA)(',')
             PsiWhiteSpace(' ')
@@ -467,14 +471,14 @@ JetFile: FunctionTypes.jet
                       PsiElement(ref)('ref')
                     PsiWhiteSpace(' ')
                     TYPE_REFERENCE
-                      USER_TYPE
+                      REFERENCE_EXPRESSION
                         PsiElement(IDENTIFIER)('a')
                     PsiElement(RPAR)(')')
                   PsiWhiteSpace(' ')
                   PsiElement(COLON)(':')
                   PsiWhiteSpace(' ')
                   TYPE_REFERENCE
-                    USER_TYPE
+                    REFERENCE_EXPRESSION
                       PsiElement(IDENTIFIER)('b')
                   PsiElement(RBRACE)('}')
             PsiElement(RPAR)(')')
@@ -510,7 +514,7 @@ JetFile: FunctionTypes.jet
         FUNCTION_TYPE
           PsiElement(LBRACE)('{')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('T')
           PsiElement(DOT)('.')
           VALUE_PARAMETER_LIST
@@ -538,8 +542,8 @@ JetFile: FunctionTypes.jet
         FUNCTION_TYPE
           PsiElement(LBRACE)('{')
           TYPE_REFERENCE
-            USER_TYPE
-              USER_TYPE
+            REFERENCE_EXPRESSION
+              REFERENCE_EXPRESSION
                 PsiElement(IDENTIFIER)('T')
               PsiElement(DOT)('.')
               PsiElement(IDENTIFIER)('T')
@@ -569,18 +573,18 @@ JetFile: FunctionTypes.jet
         FUNCTION_TYPE
           PsiElement(LBRACE)('{')
           TYPE_REFERENCE
-            USER_TYPE
-              USER_TYPE
+            REFERENCE_EXPRESSION
+              REFERENCE_EXPRESSION
                 PsiElement(IDENTIFIER)('T')
                 TYPE_ARGUMENT_LIST
                   PsiElement(LT)('<')
                   TYPE_REFERENCE
-                    USER_TYPE
+                    REFERENCE_EXPRESSION
                       PsiElement(IDENTIFIER)('A')
                   PsiElement(COMMA)(',')
                   PsiWhiteSpace(' ')
                   TYPE_REFERENCE
-                    USER_TYPE
+                    REFERENCE_EXPRESSION
                       PsiElement(IDENTIFIER)('B')
                   PsiElement(GT)('>')
               PsiElement(DOT)('.')
@@ -588,7 +592,7 @@ JetFile: FunctionTypes.jet
               TYPE_ARGUMENT_LIST
                 PsiElement(LT)('<')
                 TYPE_REFERENCE
-                  USER_TYPE
+                  REFERENCE_EXPRESSION
                     PsiElement(IDENTIFIER)('x')
                 PsiElement(GT)('>')
           PsiElement(DOT)('.')
@@ -623,7 +627,7 @@ JetFile: FunctionTypes.jet
                 TUPLE_TYPE
                   PsiElement(LPAR)('(')
                   TYPE_REFERENCE
-                    USER_TYPE
+                    REFERENCE_EXPRESSION
                       PsiElement(IDENTIFIER)('S')
                   PsiElement(RPAR)(')')
               PsiElement(DOT)('.')
@@ -667,7 +671,7 @@ JetFile: FunctionTypes.jet
             FUNCTION_TYPE
               PsiElement(LBRACE)('{')
               TYPE_REFERENCE
-                USER_TYPE
+                REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('T')
               PsiElement(DOT)('.')
               VALUE_PARAMETER_LIST
@@ -710,8 +714,8 @@ JetFile: FunctionTypes.jet
             FUNCTION_TYPE
               PsiElement(LBRACE)('{')
               TYPE_REFERENCE
-                USER_TYPE
-                  USER_TYPE
+                REFERENCE_EXPRESSION
+                  REFERENCE_EXPRESSION
                     PsiElement(IDENTIFIER)('T')
                   PsiElement(DOT)('.')
                   PsiElement(IDENTIFIER)('T')
@@ -756,18 +760,18 @@ JetFile: FunctionTypes.jet
             FUNCTION_TYPE
               PsiElement(LBRACE)('{')
               TYPE_REFERENCE
-                USER_TYPE
-                  USER_TYPE
+                REFERENCE_EXPRESSION
+                  REFERENCE_EXPRESSION
                     PsiElement(IDENTIFIER)('T')
                     TYPE_ARGUMENT_LIST
                       PsiElement(LT)('<')
                       TYPE_REFERENCE
-                        USER_TYPE
+                        REFERENCE_EXPRESSION
                           PsiElement(IDENTIFIER)('A')
                       PsiElement(COMMA)(',')
                       PsiWhiteSpace(' ')
                       TYPE_REFERENCE
-                        USER_TYPE
+                        REFERENCE_EXPRESSION
                           PsiElement(IDENTIFIER)('B')
                       PsiElement(GT)('>')
                   PsiElement(DOT)('.')
@@ -775,7 +779,7 @@ JetFile: FunctionTypes.jet
                   TYPE_ARGUMENT_LIST
                     PsiElement(LT)('<')
                     TYPE_REFERENCE
-                      USER_TYPE
+                      REFERENCE_EXPRESSION
                         PsiElement(IDENTIFIER)('x')
                     PsiElement(GT)('>')
               PsiElement(DOT)('.')
@@ -822,7 +826,7 @@ JetFile: FunctionTypes.jet
                 TUPLE_TYPE
                   PsiElement(LPAR)('(')
                   TYPE_REFERENCE
-                    USER_TYPE
+                    REFERENCE_EXPRESSION
                       PsiElement(IDENTIFIER)('S')
                   PsiElement(RPAR)(')')
               PsiElement(DOT)('.')
@@ -863,14 +867,15 @@ JetFile: FunctionTypes.jet
         ATTRIBUTE_ANNOTATION
           PsiElement(LBRACKET)('[')
           ATTRIBUTE
-            USER_TYPE
-              PsiElement(IDENTIFIER)('a')
+            TYPE_REFERENCE
+              REFERENCE_EXPRESSION
+                PsiElement(IDENTIFIER)('a')
           PsiElement(RBRACKET)(']')
         PsiWhiteSpace(' ')
         FUNCTION_TYPE
           PsiElement(LBRACE)('{')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('T')
           PsiElement(DOT)('.')
           VALUE_PARAMETER_LIST
@@ -898,15 +903,16 @@ JetFile: FunctionTypes.jet
         ATTRIBUTE_ANNOTATION
           PsiElement(LBRACKET)('[')
           ATTRIBUTE
-            USER_TYPE
-              PsiElement(IDENTIFIER)('a')
+            TYPE_REFERENCE
+              REFERENCE_EXPRESSION
+                PsiElement(IDENTIFIER)('a')
           PsiElement(RBRACKET)(']')
         PsiWhiteSpace(' ')
         FUNCTION_TYPE
           PsiElement(LBRACE)('{')
           TYPE_REFERENCE
-            USER_TYPE
-              USER_TYPE
+            REFERENCE_EXPRESSION
+              REFERENCE_EXPRESSION
                 PsiElement(IDENTIFIER)('T')
               PsiElement(DOT)('.')
               PsiElement(IDENTIFIER)('T')
@@ -936,25 +942,26 @@ JetFile: FunctionTypes.jet
         ATTRIBUTE_ANNOTATION
           PsiElement(LBRACKET)('[')
           ATTRIBUTE
-            USER_TYPE
-              PsiElement(IDENTIFIER)('a')
+            TYPE_REFERENCE
+              REFERENCE_EXPRESSION
+                PsiElement(IDENTIFIER)('a')
           PsiElement(RBRACKET)(']')
         PsiWhiteSpace(' ')
         FUNCTION_TYPE
           PsiElement(LBRACE)('{')
           TYPE_REFERENCE
-            USER_TYPE
-              USER_TYPE
+            REFERENCE_EXPRESSION
+              REFERENCE_EXPRESSION
                 PsiElement(IDENTIFIER)('T')
                 TYPE_ARGUMENT_LIST
                   PsiElement(LT)('<')
                   TYPE_REFERENCE
-                    USER_TYPE
+                    REFERENCE_EXPRESSION
                       PsiElement(IDENTIFIER)('A')
                   PsiElement(COMMA)(',')
                   PsiWhiteSpace(' ')
                   TYPE_REFERENCE
-                    USER_TYPE
+                    REFERENCE_EXPRESSION
                       PsiElement(IDENTIFIER)('B')
                   PsiElement(GT)('>')
               PsiElement(DOT)('.')
@@ -962,7 +969,7 @@ JetFile: FunctionTypes.jet
               TYPE_ARGUMENT_LIST
                 PsiElement(LT)('<')
                 TYPE_REFERENCE
-                  USER_TYPE
+                  REFERENCE_EXPRESSION
                     PsiElement(IDENTIFIER)('x')
                 PsiElement(GT)('>')
           PsiElement(DOT)('.')
@@ -991,8 +998,9 @@ JetFile: FunctionTypes.jet
         ATTRIBUTE_ANNOTATION
           PsiElement(LBRACKET)('[')
           ATTRIBUTE
-            USER_TYPE
-              PsiElement(IDENTIFIER)('a')
+            TYPE_REFERENCE
+              REFERENCE_EXPRESSION
+                PsiElement(IDENTIFIER)('a')
           PsiElement(RBRACKET)(']')
         PsiWhiteSpace(' ')
         FUNCTION_TYPE
@@ -1001,8 +1009,9 @@ JetFile: FunctionTypes.jet
             ATTRIBUTE_ANNOTATION
               PsiElement(LBRACKET)('[')
               ATTRIBUTE
-                USER_TYPE
-                  PsiElement(IDENTIFIER)('a')
+                TYPE_REFERENCE
+                  REFERENCE_EXPRESSION
+                    PsiElement(IDENTIFIER)('a')
               PsiElement(RBRACKET)(']')
             PsiWhiteSpace(' ')
             FUNCTION_TYPE
@@ -1011,7 +1020,7 @@ JetFile: FunctionTypes.jet
                 TUPLE_TYPE
                   PsiElement(LPAR)('(')
                   TYPE_REFERENCE
-                    USER_TYPE
+                    REFERENCE_EXPRESSION
                       PsiElement(IDENTIFIER)('S')
                   PsiElement(RPAR)(')')
               PsiElement(DOT)('.')
@@ -1052,8 +1061,9 @@ JetFile: FunctionTypes.jet
         ATTRIBUTE_ANNOTATION
           PsiElement(LBRACKET)('[')
           ATTRIBUTE
-            USER_TYPE
-              PsiElement(IDENTIFIER)('a')
+            TYPE_REFERENCE
+              REFERENCE_EXPRESSION
+                PsiElement(IDENTIFIER)('a')
           PsiElement(RBRACKET)(']')
         PsiWhiteSpace(' ')
         FUNCTION_TYPE
@@ -1062,14 +1072,15 @@ JetFile: FunctionTypes.jet
             ATTRIBUTE_ANNOTATION
               PsiElement(LBRACKET)('[')
               ATTRIBUTE
-                USER_TYPE
-                  PsiElement(IDENTIFIER)('a')
+                TYPE_REFERENCE
+                  REFERENCE_EXPRESSION
+                    PsiElement(IDENTIFIER)('a')
               PsiElement(RBRACKET)(']')
             PsiWhiteSpace(' ')
             FUNCTION_TYPE
               PsiElement(LBRACE)('{')
               TYPE_REFERENCE
-                USER_TYPE
+                REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('T')
               PsiElement(DOT)('.')
               VALUE_PARAMETER_LIST
@@ -1109,8 +1120,9 @@ JetFile: FunctionTypes.jet
         ATTRIBUTE_ANNOTATION
           PsiElement(LBRACKET)('[')
           ATTRIBUTE
-            USER_TYPE
-              PsiElement(IDENTIFIER)('a')
+            TYPE_REFERENCE
+              REFERENCE_EXPRESSION
+                PsiElement(IDENTIFIER)('a')
           PsiElement(RBRACKET)(']')
         PsiWhiteSpace(' ')
         FUNCTION_TYPE
@@ -1119,15 +1131,16 @@ JetFile: FunctionTypes.jet
             ATTRIBUTE_ANNOTATION
               PsiElement(LBRACKET)('[')
               ATTRIBUTE
-                USER_TYPE
-                  PsiElement(IDENTIFIER)('a')
+                TYPE_REFERENCE
+                  REFERENCE_EXPRESSION
+                    PsiElement(IDENTIFIER)('a')
               PsiElement(RBRACKET)(']')
             PsiWhiteSpace(' ')
             FUNCTION_TYPE
               PsiElement(LBRACE)('{')
               TYPE_REFERENCE
-                USER_TYPE
-                  USER_TYPE
+                REFERENCE_EXPRESSION
+                  REFERENCE_EXPRESSION
                     PsiElement(IDENTIFIER)('T')
                   PsiElement(DOT)('.')
                   PsiElement(IDENTIFIER)('T')
@@ -1169,8 +1182,9 @@ JetFile: FunctionTypes.jet
         ATTRIBUTE_ANNOTATION
           PsiElement(LBRACKET)('[')
           ATTRIBUTE
-            USER_TYPE
-              PsiElement(IDENTIFIER)('a')
+            TYPE_REFERENCE
+              REFERENCE_EXPRESSION
+                PsiElement(IDENTIFIER)('a')
           PsiElement(RBRACKET)(']')
         PsiWhiteSpace(' ')
         FUNCTION_TYPE
@@ -1179,25 +1193,26 @@ JetFile: FunctionTypes.jet
             ATTRIBUTE_ANNOTATION
               PsiElement(LBRACKET)('[')
               ATTRIBUTE
-                USER_TYPE
-                  PsiElement(IDENTIFIER)('a')
+                TYPE_REFERENCE
+                  REFERENCE_EXPRESSION
+                    PsiElement(IDENTIFIER)('a')
               PsiElement(RBRACKET)(']')
             PsiWhiteSpace(' ')
             FUNCTION_TYPE
               PsiElement(LBRACE)('{')
               TYPE_REFERENCE
-                USER_TYPE
-                  USER_TYPE
+                REFERENCE_EXPRESSION
+                  REFERENCE_EXPRESSION
                     PsiElement(IDENTIFIER)('T')
                     TYPE_ARGUMENT_LIST
                       PsiElement(LT)('<')
                       TYPE_REFERENCE
-                        USER_TYPE
+                        REFERENCE_EXPRESSION
                           PsiElement(IDENTIFIER)('A')
                       PsiElement(COMMA)(',')
                       PsiWhiteSpace(' ')
                       TYPE_REFERENCE
-                        USER_TYPE
+                        REFERENCE_EXPRESSION
                           PsiElement(IDENTIFIER)('B')
                       PsiElement(GT)('>')
                   PsiElement(DOT)('.')
@@ -1205,7 +1220,7 @@ JetFile: FunctionTypes.jet
                   TYPE_ARGUMENT_LIST
                     PsiElement(LT)('<')
                     TYPE_REFERENCE
-                      USER_TYPE
+                      REFERENCE_EXPRESSION
                         PsiElement(IDENTIFIER)('x')
                     PsiElement(GT)('>')
               PsiElement(DOT)('.')
@@ -1246,8 +1261,9 @@ JetFile: FunctionTypes.jet
         ATTRIBUTE_ANNOTATION
           PsiElement(LBRACKET)('[')
           ATTRIBUTE
-            USER_TYPE
-              PsiElement(IDENTIFIER)('a')
+            TYPE_REFERENCE
+              REFERENCE_EXPRESSION
+                PsiElement(IDENTIFIER)('a')
           PsiElement(RBRACKET)(']')
         PsiWhiteSpace(' ')
         FUNCTION_TYPE
@@ -1256,8 +1272,9 @@ JetFile: FunctionTypes.jet
             ATTRIBUTE_ANNOTATION
               PsiElement(LBRACKET)('[')
               ATTRIBUTE
-                USER_TYPE
-                  PsiElement(IDENTIFIER)('a')
+                TYPE_REFERENCE
+                  REFERENCE_EXPRESSION
+                    PsiElement(IDENTIFIER)('a')
               PsiElement(RBRACKET)(']')
             PsiWhiteSpace(' ')
             FUNCTION_TYPE
@@ -1266,7 +1283,7 @@ JetFile: FunctionTypes.jet
                 TUPLE_TYPE
                   PsiElement(LPAR)('(')
                   TYPE_REFERENCE
-                    USER_TYPE
+                    REFERENCE_EXPRESSION
                       PsiElement(IDENTIFIER)('S')
                   PsiElement(RPAR)(')')
               PsiElement(DOT)('.')

idea/testData/psi/FunctionTypes_ERR.txt

@@ -18,19 +18,20 @@ JetFile: FunctionTypes_ERR.jet
               ATTRIBUTE_ANNOTATION
                 PsiElement(LBRACKET)('[')
                 ATTRIBUTE
-                  USER_TYPE
-                    PsiElement(IDENTIFIER)('a')
+                  TYPE_REFERENCE
+                    REFERENCE_EXPRESSION
+                      PsiElement(IDENTIFIER)('a')
                 PsiElement(RBRACKET)(']')
             PsiWhiteSpace(' ')
             TYPE_REFERENCE
-              USER_TYPE
+              REFERENCE_EXPRESSION
                 PsiElement(IDENTIFIER)('a')
             PsiElement(RPAR)(')')
           PsiErrorElement:Expecting ':' followed by a return type
             <empty list>
           PsiWhiteSpace('  ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('b')
           PsiElement(RBRACE)('}')
     PsiWhiteSpace('\n')
@@ -49,7 +50,7 @@ JetFile: FunctionTypes_ERR.jet
           VALUE_PARAMETER_LIST
             PsiElement(LPAR)('(')
             TYPE_REFERENCE
-              USER_TYPE
+              REFERENCE_EXPRESSION
                 PsiElement(IDENTIFIER)('a')
             PsiElement(COMMA)(',')
             PsiErrorElement:Expecting a parameter declaration
@@ -60,6 +61,6 @@ JetFile: FunctionTypes_ERR.jet
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('b')
           PsiElement(RBRACE)('}')

idea/testData/psi/Functions.txt

@@ -16,8 +16,9 @@ JetFile: Functions.jet
       ATTRIBUTE_ANNOTATION
         PsiElement(LBRACKET)('[')
         ATTRIBUTE
-          USER_TYPE
-            PsiElement(IDENTIFIER)('a')
+          TYPE_REFERENCE
+            REFERENCE_EXPRESSION
+              PsiElement(IDENTIFIER)('a')
         PsiElement(RBRACKET)(']')
       PsiWhiteSpace(' ')
       PsiElement(IDENTIFIER)('foo')
@@ -34,11 +35,12 @@ JetFile: Functions.jet
         ATTRIBUTE_ANNOTATION
           PsiElement(LBRACKET)('[')
           ATTRIBUTE
-            USER_TYPE
-              PsiElement(IDENTIFIER)('a')
+            TYPE_REFERENCE
+              REFERENCE_EXPRESSION
+                PsiElement(IDENTIFIER)('a')
           PsiElement(RBRACKET)(']')
         PsiWhiteSpace(' ')
-        USER_TYPE
+        REFERENCE_EXPRESSION
           PsiElement(IDENTIFIER)('T')
       PsiElement(DOT)('.')
       PsiElement(IDENTIFIER)('foo')
@@ -58,28 +60,29 @@ JetFile: Functions.jet
             ATTRIBUTE_ANNOTATION
               PsiElement(LBRACKET)('[')
               ATTRIBUTE
-                USER_TYPE
-                  PsiElement(IDENTIFIER)('a')
+                TYPE_REFERENCE
+                  REFERENCE_EXPRESSION
+                    PsiElement(IDENTIFIER)('a')
               PsiElement(RBRACKET)(']')
             PsiWhiteSpace(' ')
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('T')
               TYPE_ARGUMENT_LIST
                 PsiElement(LT)('<')
                 TYPE_REFERENCE
-                  USER_TYPE
+                  REFERENCE_EXPRESSION
                     PsiElement(IDENTIFIER)('T')
                 PsiElement(GT)('>')
           PsiElement(DOT)('.')
           VALUE_PARAMETER_LIST
             PsiElement(LPAR)('(')
             TYPE_REFERENCE
-              USER_TYPE
+              REFERENCE_EXPRESSION
                 PsiElement(IDENTIFIER)('A')
                 TYPE_ARGUMENT_LIST
                   PsiElement(LT)('<')
                   TYPE_REFERENCE
-                    USER_TYPE
+                    REFERENCE_EXPRESSION
                       PsiElement(IDENTIFIER)('B')
                   PsiElement(GT)('>')
             PsiElement(RPAR)(')')
@@ -106,11 +109,12 @@ JetFile: Functions.jet
         ATTRIBUTE_ANNOTATION
           PsiElement(LBRACKET)('[')
           ATTRIBUTE
-            USER_TYPE
-              PsiElement(IDENTIFIER)('a')
+            TYPE_REFERENCE
+              REFERENCE_EXPRESSION
+                PsiElement(IDENTIFIER)('a')
           PsiElement(RBRACKET)(']')
         PsiWhiteSpace(' ')
-        USER_TYPE
+        REFERENCE_EXPRESSION
           PsiElement(IDENTIFIER)('T')
       PsiElement(DOT)('.')
       PsiElement(IDENTIFIER)('foo')
@@ -124,14 +128,14 @@ JetFile: Functions.jet
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('foo')
         PsiElement(RPAR)(')')
       PsiWhiteSpace(' ')
       PsiElement(COLON)(':')
       PsiWhiteSpace(' ')
       TYPE_REFERENCE
-        USER_TYPE
+        REFERENCE_EXPRESSION
           PsiElement(IDENTIFIER)('bar')
     PsiWhiteSpace('\n')
     FUN
@@ -141,14 +145,15 @@ JetFile: Functions.jet
         ATTRIBUTE_ANNOTATION
           PsiElement(LBRACKET)('[')
           ATTRIBUTE
-            USER_TYPE
-              PsiElement(IDENTIFIER)('a')
+            TYPE_REFERENCE
+              REFERENCE_EXPRESSION
+                PsiElement(IDENTIFIER)('a')
             VALUE_ARGUMENT_LIST
               PsiElement(LPAR)('(')
               PsiElement(RPAR)(')')
           PsiElement(RBRACKET)(']')
         PsiWhiteSpace(' ')
-        USER_TYPE
+        REFERENCE_EXPRESSION
           PsiElement(IDENTIFIER)('T')
       PsiElement(DOT)('.')
       PsiElement(IDENTIFIER)('foo')
@@ -165,14 +170,14 @@ JetFile: Functions.jet
               VALUE_PARAMETER_LIST
                 PsiElement(LPAR)('(')
                 TYPE_REFERENCE
-                  USER_TYPE
+                  REFERENCE_EXPRESSION
                     PsiElement(IDENTIFIER)('a')
                 PsiElement(RPAR)(')')
               PsiWhiteSpace(' ')
               PsiElement(COLON)(':')
               PsiWhiteSpace(' ')
               TYPE_REFERENCE
-                USER_TYPE
+                REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('b')
               PsiElement(RBRACE)('}')
         PsiElement(GT)('>')
@@ -184,14 +189,14 @@ JetFile: Functions.jet
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('foo')
         PsiElement(RPAR)(')')
       PsiWhiteSpace(' ')
       PsiElement(COLON)(':')
       PsiWhiteSpace(' ')
       TYPE_REFERENCE
-        USER_TYPE
+        REFERENCE_EXPRESSION
           PsiElement(IDENTIFIER)('bar')
     PsiWhiteSpace('\n\n')
     FUN
@@ -211,8 +216,9 @@ JetFile: Functions.jet
       ATTRIBUTE_ANNOTATION
         PsiElement(LBRACKET)('[')
         ATTRIBUTE
-          USER_TYPE
-            PsiElement(IDENTIFIER)('a')
+          TYPE_REFERENCE
+            REFERENCE_EXPRESSION
+              PsiElement(IDENTIFIER)('a')
         PsiElement(RBRACKET)(']')
       PsiWhiteSpace(' ')
       PsiElement(IDENTIFIER)('foo')
@@ -230,11 +236,12 @@ JetFile: Functions.jet
         ATTRIBUTE_ANNOTATION
           PsiElement(LBRACKET)('[')
           ATTRIBUTE
-            USER_TYPE
-              PsiElement(IDENTIFIER)('a')
+            TYPE_REFERENCE
+              REFERENCE_EXPRESSION
+                PsiElement(IDENTIFIER)('a')
           PsiElement(RBRACKET)(']')
         PsiWhiteSpace(' ')
-        USER_TYPE
+        REFERENCE_EXPRESSION
           PsiElement(IDENTIFIER)('T')
       PsiElement(DOT)('.')
       PsiElement(IDENTIFIER)('foo')
@@ -255,28 +262,29 @@ JetFile: Functions.jet
             ATTRIBUTE_ANNOTATION
               PsiElement(LBRACKET)('[')
               ATTRIBUTE
-                USER_TYPE
-                  PsiElement(IDENTIFIER)('a')
+                TYPE_REFERENCE
+                  REFERENCE_EXPRESSION
+                    PsiElement(IDENTIFIER)('a')
               PsiElement(RBRACKET)(']')
             PsiWhiteSpace(' ')
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('T')
               TYPE_ARGUMENT_LIST
                 PsiElement(LT)('<')
                 TYPE_REFERENCE
-                  USER_TYPE
+                  REFERENCE_EXPRESSION
                     PsiElement(IDENTIFIER)('T')
                 PsiElement(GT)('>')
           PsiElement(DOT)('.')
           VALUE_PARAMETER_LIST
             PsiElement(LPAR)('(')
             TYPE_REFERENCE
-              USER_TYPE
+              REFERENCE_EXPRESSION
                 PsiElement(IDENTIFIER)('A')
                 TYPE_ARGUMENT_LIST
                   PsiElement(LT)('<')
                   TYPE_REFERENCE
-                    USER_TYPE
+                    REFERENCE_EXPRESSION
                       PsiElement(IDENTIFIER)('B')
                   PsiElement(GT)('>')
             PsiElement(RPAR)(')')
@@ -304,11 +312,12 @@ JetFile: Functions.jet
         ATTRIBUTE_ANNOTATION
           PsiElement(LBRACKET)('[')
           ATTRIBUTE
-            USER_TYPE
-              PsiElement(IDENTIFIER)('a')
+            TYPE_REFERENCE
+              REFERENCE_EXPRESSION
+                PsiElement(IDENTIFIER)('a')
           PsiElement(RBRACKET)(']')
         PsiWhiteSpace(' ')
-        USER_TYPE
+        REFERENCE_EXPRESSION
           PsiElement(IDENTIFIER)('T')
       PsiElement(DOT)('.')
       PsiElement(IDENTIFIER)('foo')
@@ -322,14 +331,14 @@ JetFile: Functions.jet
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('foo')
         PsiElement(RPAR)(')')
       PsiWhiteSpace(' ')
       PsiElement(COLON)(':')
       PsiWhiteSpace(' ')
       TYPE_REFERENCE
-        USER_TYPE
+        REFERENCE_EXPRESSION
           PsiElement(IDENTIFIER)('bar')
       PsiElement(SEMICOLON)(';')
     PsiWhiteSpace('\n')
@@ -340,14 +349,15 @@ JetFile: Functions.jet
         ATTRIBUTE_ANNOTATION
           PsiElement(LBRACKET)('[')
           ATTRIBUTE
-            USER_TYPE
-              PsiElement(IDENTIFIER)('a')
+            TYPE_REFERENCE
+              REFERENCE_EXPRESSION
+                PsiElement(IDENTIFIER)('a')
             VALUE_ARGUMENT_LIST
               PsiElement(LPAR)('(')
               PsiElement(RPAR)(')')
           PsiElement(RBRACKET)(']')
         PsiWhiteSpace(' ')
-        USER_TYPE
+        REFERENCE_EXPRESSION
           PsiElement(IDENTIFIER)('T')
       PsiElement(DOT)('.')
       PsiElement(IDENTIFIER)('foo')
@@ -364,14 +374,14 @@ JetFile: Functions.jet
               VALUE_PARAMETER_LIST
                 PsiElement(LPAR)('(')
                 TYPE_REFERENCE
-                  USER_TYPE
+                  REFERENCE_EXPRESSION
                     PsiElement(IDENTIFIER)('a')
                 PsiElement(RPAR)(')')
               PsiWhiteSpace(' ')
               PsiElement(COLON)(':')
               PsiWhiteSpace(' ')
               TYPE_REFERENCE
-                USER_TYPE
+                REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('b')
               PsiElement(RBRACE)('}')
         PsiElement(GT)('>')
@@ -383,14 +393,14 @@ JetFile: Functions.jet
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('foo')
         PsiElement(RPAR)(')')
       PsiWhiteSpace(' ')
       PsiElement(COLON)(':')
       PsiWhiteSpace(' ')
       TYPE_REFERENCE
-        USER_TYPE
+        REFERENCE_EXPRESSION
           PsiElement(IDENTIFIER)('bar')
       PsiElement(SEMICOLON)(';')
     PsiWhiteSpace('\n\n')
@@ -414,8 +424,9 @@ JetFile: Functions.jet
       ATTRIBUTE_ANNOTATION
         PsiElement(LBRACKET)('[')
         ATTRIBUTE
-          USER_TYPE
-            PsiElement(IDENTIFIER)('a')
+          TYPE_REFERENCE
+            REFERENCE_EXPRESSION
+              PsiElement(IDENTIFIER)('a')
         PsiElement(RBRACKET)(']')
       PsiWhiteSpace(' ')
       PsiElement(IDENTIFIER)('foo')
@@ -436,11 +447,12 @@ JetFile: Functions.jet
         ATTRIBUTE_ANNOTATION
           PsiElement(LBRACKET)('[')
           ATTRIBUTE
-            USER_TYPE
-              PsiElement(IDENTIFIER)('a')
+            TYPE_REFERENCE
+              REFERENCE_EXPRESSION
+                PsiElement(IDENTIFIER)('a')
           PsiElement(RBRACKET)(']')
         PsiWhiteSpace(' ')
-        USER_TYPE
+        REFERENCE_EXPRESSION
           PsiElement(IDENTIFIER)('T')
       PsiElement(DOT)('.')
       PsiElement(IDENTIFIER)('foo')
@@ -464,28 +476,29 @@ JetFile: Functions.jet
             ATTRIBUTE_ANNOTATION
               PsiElement(LBRACKET)('[')
               ATTRIBUTE
-                USER_TYPE
-                  PsiElement(IDENTIFIER)('a')
+                TYPE_REFERENCE
+                  REFERENCE_EXPRESSION
+                    PsiElement(IDENTIFIER)('a')
               PsiElement(RBRACKET)(']')
             PsiWhiteSpace(' ')
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('T')
               TYPE_ARGUMENT_LIST
                 PsiElement(LT)('<')
                 TYPE_REFERENCE
-                  USER_TYPE
+                  REFERENCE_EXPRESSION
                     PsiElement(IDENTIFIER)('T')
                 PsiElement(GT)('>')
           PsiElement(DOT)('.')
           VALUE_PARAMETER_LIST
             PsiElement(LPAR)('(')
             TYPE_REFERENCE
-              USER_TYPE
+              REFERENCE_EXPRESSION
                 PsiElement(IDENTIFIER)('A')
                 TYPE_ARGUMENT_LIST
                   PsiElement(LT)('<')
                   TYPE_REFERENCE
-                    USER_TYPE
+                    REFERENCE_EXPRESSION
                       PsiElement(IDENTIFIER)('B')
                   PsiElement(GT)('>')
             PsiElement(RPAR)(')')
@@ -516,11 +529,12 @@ JetFile: Functions.jet
         ATTRIBUTE_ANNOTATION
           PsiElement(LBRACKET)('[')
           ATTRIBUTE
-            USER_TYPE
-              PsiElement(IDENTIFIER)('a')
+            TYPE_REFERENCE
+              REFERENCE_EXPRESSION
+                PsiElement(IDENTIFIER)('a')
           PsiElement(RBRACKET)(']')
         PsiWhiteSpace(' ')
-        USER_TYPE
+        REFERENCE_EXPRESSION
           PsiElement(IDENTIFIER)('T')
       PsiElement(DOT)('.')
       PsiElement(IDENTIFIER)('foo')
@@ -534,14 +548,14 @@ JetFile: Functions.jet
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('foo')
         PsiElement(RPAR)(')')
       PsiWhiteSpace(' ')
       PsiElement(COLON)(':')
       PsiWhiteSpace(' ')
       TYPE_REFERENCE
-        USER_TYPE
+        REFERENCE_EXPRESSION
           PsiElement(IDENTIFIER)('bar')
       PsiWhiteSpace(' ')
       BLOCK
@@ -555,14 +569,15 @@ JetFile: Functions.jet
         ATTRIBUTE_ANNOTATION
           PsiElement(LBRACKET)('[')
           ATTRIBUTE
-            USER_TYPE
-              PsiElement(IDENTIFIER)('a')
+            TYPE_REFERENCE
+              REFERENCE_EXPRESSION
+                PsiElement(IDENTIFIER)('a')
             VALUE_ARGUMENT_LIST
               PsiElement(LPAR)('(')
               PsiElement(RPAR)(')')
           PsiElement(RBRACKET)(']')
         PsiWhiteSpace(' ')
-        USER_TYPE
+        REFERENCE_EXPRESSION
           PsiElement(IDENTIFIER)('T')
       PsiElement(DOT)('.')
       PsiElement(IDENTIFIER)('foo')
@@ -579,14 +594,14 @@ JetFile: Functions.jet
               VALUE_PARAMETER_LIST
                 PsiElement(LPAR)('(')
                 TYPE_REFERENCE
-                  USER_TYPE
+                  REFERENCE_EXPRESSION
                     PsiElement(IDENTIFIER)('a')
                 PsiElement(RPAR)(')')
               PsiWhiteSpace(' ')
               PsiElement(COLON)(':')
               PsiWhiteSpace(' ')
               TYPE_REFERENCE
-                USER_TYPE
+                REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('b')
               PsiElement(RBRACE)('}')
         PsiElement(GT)('>')
@@ -598,14 +613,14 @@ JetFile: Functions.jet
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('foo')
         PsiElement(RPAR)(')')
       PsiWhiteSpace(' ')
       PsiElement(COLON)(':')
       PsiWhiteSpace(' ')
       TYPE_REFERENCE
-        USER_TYPE
+        REFERENCE_EXPRESSION
           PsiElement(IDENTIFIER)('bar')
       PsiWhiteSpace(' ')
       BLOCK
@@ -619,8 +634,9 @@ JetFile: Functions.jet
         ATTRIBUTE_ANNOTATION
           PsiElement(LBRACKET)('[')
           ATTRIBUTE
-            USER_TYPE
-              PsiElement(IDENTIFIER)('a')
+            TYPE_REFERENCE
+              REFERENCE_EXPRESSION
+                PsiElement(IDENTIFIER)('a')
           PsiElement(RBRACKET)(']')
         PsiWhiteSpace(' ')
         FUNCTION_TYPE
@@ -629,28 +645,29 @@ JetFile: Functions.jet
             ATTRIBUTE_ANNOTATION
               PsiElement(LBRACKET)('[')
               ATTRIBUTE
-                USER_TYPE
-                  PsiElement(IDENTIFIER)('a')
+                TYPE_REFERENCE
+                  REFERENCE_EXPRESSION
+                    PsiElement(IDENTIFIER)('a')
               PsiElement(RBRACKET)(']')
             PsiWhiteSpace(' ')
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('T')
               TYPE_ARGUMENT_LIST
                 PsiElement(LT)('<')
                 TYPE_REFERENCE
-                  USER_TYPE
+                  REFERENCE_EXPRESSION
                     PsiElement(IDENTIFIER)('T')
                 PsiElement(GT)('>')
           PsiElement(DOT)('.')
           VALUE_PARAMETER_LIST
             PsiElement(LPAR)('(')
             TYPE_REFERENCE
-              USER_TYPE
+              REFERENCE_EXPRESSION
                 PsiElement(IDENTIFIER)('A')
                 TYPE_ARGUMENT_LIST
                   PsiElement(LT)('<')
                   TYPE_REFERENCE
-                    USER_TYPE
+                    REFERENCE_EXPRESSION
                       PsiElement(IDENTIFIER)('B')
                   PsiElement(GT)('>')
             PsiElement(RPAR)(')')
@@ -681,14 +698,15 @@ JetFile: Functions.jet
         ATTRIBUTE_ANNOTATION
           PsiElement(LBRACKET)('[')
           ATTRIBUTE
-            USER_TYPE
-              PsiElement(IDENTIFIER)('a')
+            TYPE_REFERENCE
+              REFERENCE_EXPRESSION
+                PsiElement(IDENTIFIER)('a')
             VALUE_ARGUMENT_LIST
               PsiElement(LPAR)('(')
               PsiElement(RPAR)(')')
           PsiElement(RBRACKET)(']')
         PsiWhiteSpace(' ')
-        USER_TYPE
+        REFERENCE_EXPRESSION
           PsiElement(IDENTIFIER)('T')
       PsiElement(DOT)('.')
       PsiElement(IDENTIFIER)('foo')
@@ -703,8 +721,9 @@ JetFile: Functions.jet
             ATTRIBUTE_ANNOTATION
               PsiElement(LBRACKET)('[')
               ATTRIBUTE
-                USER_TYPE
-                  PsiElement(IDENTIFIER)('a')
+                TYPE_REFERENCE
+                  REFERENCE_EXPRESSION
+                    PsiElement(IDENTIFIER)('a')
               PsiElement(RBRACKET)(']')
             PsiWhiteSpace(' ')
             FUNCTION_TYPE
@@ -712,14 +731,14 @@ JetFile: Functions.jet
               VALUE_PARAMETER_LIST
                 PsiElement(LPAR)('(')
                 TYPE_REFERENCE
-                  USER_TYPE
+                  REFERENCE_EXPRESSION
                     PsiElement(IDENTIFIER)('a')
                 PsiElement(RPAR)(')')
               PsiWhiteSpace(' ')
               PsiElement(COLON)(':')
               PsiWhiteSpace(' ')
               TYPE_REFERENCE
-                USER_TYPE
+                REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('b')
               PsiElement(RBRACE)('}')
         PsiElement(GT)('>')
@@ -731,14 +750,14 @@ JetFile: Functions.jet
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('foo')
         PsiElement(RPAR)(')')
       PsiWhiteSpace(' ')
       PsiElement(COLON)(':')
       PsiWhiteSpace(' ')
       TYPE_REFERENCE
-        USER_TYPE
+        REFERENCE_EXPRESSION
           PsiElement(IDENTIFIER)('bar')
       PsiWhiteSpace(' ')
       BLOCK

idea/testData/psi/Functions_ERR.txt

@@ -17,8 +17,9 @@ JetFile: Functions_ERR.jet
       ATTRIBUTE_ANNOTATION
         PsiElement(LBRACKET)('[')
         ATTRIBUTE
-          USER_TYPE
-            PsiElement(IDENTIFIER)('a')
+          TYPE_REFERENCE
+            REFERENCE_EXPRESSION
+              PsiElement(IDENTIFIER)('a')
         PsiElement(RBRACKET)(']')
       PsiWhiteSpace(' ')
       PsiElement(IDENTIFIER)('f')
@@ -42,11 +43,12 @@ JetFile: Functions_ERR.jet
         ATTRIBUTE_ANNOTATION
           PsiElement(LBRACKET)('[')
           ATTRIBUTE
-            USER_TYPE
-              PsiElement(IDENTIFIER)('a')
+            TYPE_REFERENCE
+              REFERENCE_EXPRESSION
+                PsiElement(IDENTIFIER)('a')
           PsiElement(RBRACKET)(']')
         PsiWhiteSpace(' ')
-        USER_TYPE
+        REFERENCE_EXPRESSION
           PsiElement(IDENTIFIER)('T')
       PsiElement(DOT)('.')
       PsiElement(IDENTIFIER)('foo')
@@ -67,7 +69,7 @@ JetFile: Functions_ERR.jet
       PsiElement(COLON)(':')
       PsiWhiteSpace(' ')
       TYPE_REFERENCE
-        USER_TYPE
+        REFERENCE_EXPRESSION
           PsiElement(IDENTIFIER)('bar')
     PsiWhiteSpace('\n')
     FUN
@@ -77,14 +79,15 @@ JetFile: Functions_ERR.jet
         ATTRIBUTE_ANNOTATION
           PsiElement(LBRACKET)('[')
           ATTRIBUTE
-            USER_TYPE
-              PsiElement(IDENTIFIER)('a')
+            TYPE_REFERENCE
+              REFERENCE_EXPRESSION
+                PsiElement(IDENTIFIER)('a')
             VALUE_ARGUMENT_LIST
               PsiElement(LPAR)('(')
               PsiElement(RPAR)(')')
           PsiElement(RBRACKET)(']')
         PsiWhiteSpace(' ')
-        USER_TYPE
+        REFERENCE_EXPRESSION
           PsiElement(IDENTIFIER)('T')
       PsiElement(DOT)('.')
       PsiElement(IDENTIFIER)('foo')
@@ -101,14 +104,14 @@ JetFile: Functions_ERR.jet
               VALUE_PARAMETER_LIST
                 PsiElement(LPAR)('(')
                 TYPE_REFERENCE
-                  USER_TYPE
+                  REFERENCE_EXPRESSION
                     PsiElement(IDENTIFIER)('a')
                 PsiElement(RPAR)(')')
               PsiWhiteSpace(' ')
               PsiElement(COLON)(':')
               PsiWhiteSpace(' ')
               TYPE_REFERENCE
-                USER_TYPE
+                REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('b')
               PsiErrorElement:Expecting '}
                 <empty list>
@@ -121,14 +124,14 @@ JetFile: Functions_ERR.jet
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('foo')
         PsiElement(RPAR)(')')
       PsiWhiteSpace(' ')
       PsiElement(COLON)(':')
       PsiWhiteSpace(' ')
       TYPE_REFERENCE
-        USER_TYPE
+        REFERENCE_EXPRESSION
           PsiElement(IDENTIFIER)('bar')
     PsiWhiteSpace('\n')
     FUN
@@ -138,14 +141,15 @@ JetFile: Functions_ERR.jet
         ATTRIBUTE_ANNOTATION
           PsiElement(LBRACKET)('[')
           ATTRIBUTE
-            USER_TYPE
-              PsiElement(IDENTIFIER)('a')
+            TYPE_REFERENCE
+              REFERENCE_EXPRESSION
+                PsiElement(IDENTIFIER)('a')
             VALUE_ARGUMENT_LIST
               PsiElement(LPAR)('(')
               PsiElement(RPAR)(')')
           PsiElement(RBRACKET)(']')
         PsiWhiteSpace(' ')
-        USER_TYPE
+        REFERENCE_EXPRESSION
           PsiElement(IDENTIFIER)('T')
       PsiElement(DOT)('.')
       PsiElement(IDENTIFIER)('foo')
@@ -162,14 +166,14 @@ JetFile: Functions_ERR.jet
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('foo')
         PsiElement(RPAR)(')')
       PsiWhiteSpace(' ')
       PsiElement(COLON)(':')
       PsiWhiteSpace(' ')
       TYPE_REFERENCE
-        USER_TYPE
+        REFERENCE_EXPRESSION
           PsiElement(IDENTIFIER)('bar')
     PsiWhiteSpace('\n')
     FUN
@@ -179,14 +183,15 @@ JetFile: Functions_ERR.jet
         ATTRIBUTE_ANNOTATION
           PsiElement(LBRACKET)('[')
           ATTRIBUTE
-            USER_TYPE
-              PsiElement(IDENTIFIER)('a')
+            TYPE_REFERENCE
+              REFERENCE_EXPRESSION
+                PsiElement(IDENTIFIER)('a')
             VALUE_ARGUMENT_LIST
               PsiElement(LPAR)('(')
               PsiElement(RPAR)(')')
           PsiElement(RBRACKET)(']')
         PsiWhiteSpace(' ')
-        USER_TYPE
+        REFERENCE_EXPRESSION
           PsiElement(IDENTIFIER)('T')
       PsiElement(DOT)('.')
       PsiElement(IDENTIFIER)('foo')
@@ -210,14 +215,14 @@ JetFile: Functions_ERR.jet
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('foo')
         PsiElement(RPAR)(')')
       PsiWhiteSpace(' ')
       PsiElement(COLON)(':')
       PsiWhiteSpace(' ')
       TYPE_REFERENCE
-        USER_TYPE
+        REFERENCE_EXPRESSION
           PsiElement(IDENTIFIER)('bar')
     PsiWhiteSpace('\n')
     FUN
@@ -227,14 +232,15 @@ JetFile: Functions_ERR.jet
         ATTRIBUTE_ANNOTATION
           PsiElement(LBRACKET)('[')
           ATTRIBUTE
-            USER_TYPE
-              PsiElement(IDENTIFIER)('a')
+            TYPE_REFERENCE
+              REFERENCE_EXPRESSION
+                PsiElement(IDENTIFIER)('a')
             VALUE_ARGUMENT_LIST
               PsiElement(LPAR)('(')
               PsiElement(RPAR)(')')
           PsiElement(RBRACKET)(']')
         PsiWhiteSpace(' ')
-        USER_TYPE
+        REFERENCE_EXPRESSION
           PsiElement(IDENTIFIER)('T')
       PsiElement(DOT)('.')
       PsiElement(IDENTIFIER)('foo')
@@ -261,14 +267,14 @@ JetFile: Functions_ERR.jet
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('foo')
         PsiElement(RPAR)(')')
       PsiWhiteSpace(' ')
       PsiElement(COLON)(':')
       PsiWhiteSpace(' ')
       TYPE_REFERENCE
-        USER_TYPE
+        REFERENCE_EXPRESSION
           PsiElement(IDENTIFIER)('bar')
     PsiWhiteSpace('\n')
     FUN
@@ -278,14 +284,15 @@ JetFile: Functions_ERR.jet
         ATTRIBUTE_ANNOTATION
           PsiElement(LBRACKET)('[')
           ATTRIBUTE
-            USER_TYPE
-              PsiElement(IDENTIFIER)('a')
+            TYPE_REFERENCE
+              REFERENCE_EXPRESSION
+                PsiElement(IDENTIFIER)('a')
             VALUE_ARGUMENT_LIST
               PsiElement(LPAR)('(')
               PsiElement(RPAR)(')')
           PsiElement(RBRACKET)(']')
         PsiWhiteSpace(' ')
-        USER_TYPE
+        REFERENCE_EXPRESSION
           PsiElement(IDENTIFIER)('T')
       PsiElement(DOT)('.')
       PsiElement(IDENTIFIER)('foo')
@@ -309,7 +316,7 @@ JetFile: Functions_ERR.jet
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('foo')
         PsiElement(COMMA)(',')
         PsiWhiteSpace(' ')
@@ -321,14 +328,14 @@ JetFile: Functions_ERR.jet
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('b')
         PsiElement(RPAR)(')')
       PsiWhiteSpace(' ')
       PsiElement(COLON)(':')
       PsiWhiteSpace(' ')
       TYPE_REFERENCE
-        USER_TYPE
+        REFERENCE_EXPRESSION
           PsiElement(IDENTIFIER)('bar')
     PsiWhiteSpace('\n\n')
     FUN
@@ -362,28 +369,29 @@ JetFile: Functions_ERR.jet
             ATTRIBUTE_ANNOTATION
               PsiElement(LBRACKET)('[')
               ATTRIBUTE
-                USER_TYPE
-                  PsiElement(IDENTIFIER)('a')
+                TYPE_REFERENCE
+                  REFERENCE_EXPRESSION
+                    PsiElement(IDENTIFIER)('a')
               PsiElement(RBRACKET)(']')
             PsiWhiteSpace(' ')
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('T')
               TYPE_ARGUMENT_LIST
                 PsiElement(LT)('<')
                 TYPE_REFERENCE
-                  USER_TYPE
+                  REFERENCE_EXPRESSION
                     PsiElement(IDENTIFIER)('T')
                 PsiElement(GT)('>')
           PsiElement(DOT)('.')
           VALUE_PARAMETER_LIST
             PsiElement(LPAR)('(')
             TYPE_REFERENCE
-              USER_TYPE
+              REFERENCE_EXPRESSION
                 PsiElement(IDENTIFIER)('A')
                 TYPE_ARGUMENT_LIST
                   PsiElement(LT)('<')
                   TYPE_REFERENCE
-                    USER_TYPE
+                    REFERENCE_EXPRESSION
                       PsiElement(IDENTIFIER)('B')
                   PsiElement(GT)('>')
             PsiElement(RPAR)(')')

idea/testData/psi/LocalDeclarations.txt

@@ -24,8 +24,9 @@ JetFile: LocalDeclarations.jet
             ATTRIBUTE_ANNOTATION
               PsiElement(LBRACKET)('[')
               ATTRIBUTE
-                USER_TYPE
-                  PsiElement(IDENTIFIER)('a')
+                TYPE_REFERENCE
+                  REFERENCE_EXPRESSION
+                    PsiElement(IDENTIFIER)('a')
               PsiElement(RBRACKET)(']')
             PsiWhiteSpace(' ')
             PsiElement(abstract)('abstract')
@@ -47,8 +48,9 @@ JetFile: LocalDeclarations.jet
             ATTRIBUTE_ANNOTATION
               PsiElement(LBRACKET)('[')
               ATTRIBUTE
-                USER_TYPE
-                  PsiElement(IDENTIFIER)('a')
+                TYPE_REFERENCE
+                  REFERENCE_EXPRESSION
+                    PsiElement(IDENTIFIER)('a')
               PsiElement(RBRACKET)(']')
           PsiWhiteSpace(' ')
           PsiElement(class)('class')
@@ -79,8 +81,9 @@ JetFile: LocalDeclarations.jet
             ATTRIBUTE_ANNOTATION
               PsiElement(LBRACKET)('[')
               ATTRIBUTE
-                USER_TYPE
-                  PsiElement(IDENTIFIER)('a')
+                TYPE_REFERENCE
+                  REFERENCE_EXPRESSION
+                    PsiElement(IDENTIFIER)('a')
               PsiElement(RBRACKET)(']')
           PsiWhiteSpace(' ')
           PsiElement(var)('var')
@@ -105,7 +108,7 @@ JetFile: LocalDeclarations.jet
             FUNCTION_TYPE
               PsiElement(LBRACE)('{')
               TYPE_REFERENCE
-                USER_TYPE
+                REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('T')
               PsiElement(DOT)('.')
               VALUE_PARAMETER_LIST
@@ -133,7 +136,7 @@ JetFile: LocalDeclarations.jet
           PsiElement(for)('for')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('bar')
           PsiWhiteSpace(' ')
           CLASS_BODY

idea/testData/psi/Match.jet

@@ -1,41 +0,0 @@
-fun foo() {
-  return false
-
-  fun a() = {a match { case a => b }}
-
-  // foo
-  fun b() {}
-
-}
-
-fun foo() {
-  e match {
-
-  }
-  e match {
-    case a => foo
-  }
-  e match {
-    case Tree(a, b) => foo
-    case Tree(a, b) if (a > 5) => foo
-    case null => foo
-    case 1 => foo
-    case A.b => foo
-    case 1l => foo
-    case 1.0 => foo
-    case 'c' => foo
-    case "sadfsa" => foo
-    case """ddd""" => foo
-    case ? => foo
-    case ? : Foo => foo
-    case ?a : Foo => foo
-    case (?a : Foo, b) => foo
-  }
-  e match {
-
-  } match {
-
-  } match {
-
-  }
-}

idea/testData/psi/Match.txt

@@ -1,396 +0,0 @@
-JetFile: Match.jet
-  NAMESPACE
-    FUN
-      PsiElement(fun)('fun')
-      PsiWhiteSpace(' ')
-      PsiElement(IDENTIFIER)('foo')
-      TYPE_PARAMETER_LIST
-        <empty list>
-      VALUE_PARAMETER_LIST
-        PsiElement(LPAR)('(')
-        PsiElement(RPAR)(')')
-      PsiWhiteSpace(' ')
-      BLOCK
-        PsiElement(LBRACE)('{')
-        PsiWhiteSpace('\n  ')
-        RETURN
-          PsiElement(return)('return')
-          PsiWhiteSpace(' ')
-          BOOLEAN_CONSTANT
-            PsiElement(false)('false')
-        PsiWhiteSpace('\n\n  ')
-        FUN
-          PsiElement(fun)('fun')
-          PsiWhiteSpace(' ')
-          PsiElement(IDENTIFIER)('a')
-          TYPE_PARAMETER_LIST
-            <empty list>
-          VALUE_PARAMETER_LIST
-            PsiElement(LPAR)('(')
-            PsiElement(RPAR)(')')
-          PsiWhiteSpace(' ')
-          PsiElement(EQ)('=')
-          PsiWhiteSpace(' ')
-          FUNCTION_LITERAL
-            PsiElement(LBRACE)('{')
-            BODY
-              MATCH_EXPRESSION
-                REFERENCE_EXPRESSION
-                  PsiElement(IDENTIFIER)('a')
-                PsiWhiteSpace(' ')
-                PsiElement(match)('match')
-                PsiWhiteSpace(' ')
-                MATCH_BLOCK
-                  PsiElement(LBRACE)('{')
-                  PsiWhiteSpace(' ')
-                  MATCH_ENTRY
-                    PsiElement(case)('case')
-                    PsiWhiteSpace(' ')
-                    PATTERN
-                      USER_TYPE
-                        PsiElement(IDENTIFIER)('a')
-                    PsiWhiteSpace(' ')
-                    PsiElement(DOUBLE_ARROW)('=>')
-                    PsiWhiteSpace(' ')
-                    REFERENCE_EXPRESSION
-                      PsiElement(IDENTIFIER)('b')
-                  PsiWhiteSpace(' ')
-                  PsiElement(RBRACE)('}')
-            PsiElement(RBRACE)('}')
-        PsiWhiteSpace('\n\n  ')
-        PsiComment(EOL_COMMENT)('// foo')
-        PsiWhiteSpace('\n  ')
-        FUN
-          PsiElement(fun)('fun')
-          PsiWhiteSpace(' ')
-          PsiElement(IDENTIFIER)('b')
-          TYPE_PARAMETER_LIST
-            <empty list>
-          VALUE_PARAMETER_LIST
-            PsiElement(LPAR)('(')
-            PsiElement(RPAR)(')')
-          PsiWhiteSpace(' ')
-          BLOCK
-            PsiElement(LBRACE)('{')
-            PsiElement(RBRACE)('}')
-        PsiWhiteSpace('\n\n')
-        PsiElement(RBRACE)('}')
-    PsiWhiteSpace('\n\n')
-    FUN
-      PsiElement(fun)('fun')
-      PsiWhiteSpace(' ')
-      PsiElement(IDENTIFIER)('foo')
-      TYPE_PARAMETER_LIST
-        <empty list>
-      VALUE_PARAMETER_LIST
-        PsiElement(LPAR)('(')
-        PsiElement(RPAR)(')')
-      PsiWhiteSpace(' ')
-      BLOCK
-        PsiElement(LBRACE)('{')
-        PsiWhiteSpace('\n  ')
-        MATCH_EXPRESSION
-          REFERENCE_EXPRESSION
-            PsiElement(IDENTIFIER)('e')
-          PsiWhiteSpace(' ')
-          PsiElement(match)('match')
-          PsiWhiteSpace(' ')
-          MATCH_BLOCK
-            PsiElement(LBRACE)('{')
-            PsiWhiteSpace('\n\n  ')
-            PsiElement(RBRACE)('}')
-        PsiWhiteSpace('\n  ')
-        MATCH_EXPRESSION
-          REFERENCE_EXPRESSION
-            PsiElement(IDENTIFIER)('e')
-          PsiWhiteSpace(' ')
-          PsiElement(match)('match')
-          PsiWhiteSpace(' ')
-          MATCH_BLOCK
-            PsiElement(LBRACE)('{')
-            PsiWhiteSpace('\n    ')
-            MATCH_ENTRY
-              PsiElement(case)('case')
-              PsiWhiteSpace(' ')
-              PATTERN
-                USER_TYPE
-                  PsiElement(IDENTIFIER)('a')
-              PsiWhiteSpace(' ')
-              PsiElement(DOUBLE_ARROW)('=>')
-              PsiWhiteSpace(' ')
-              REFERENCE_EXPRESSION
-                PsiElement(IDENTIFIER)('foo')
-            PsiWhiteSpace('\n  ')
-            PsiElement(RBRACE)('}')
-        PsiWhiteSpace('\n  ')
-        MATCH_EXPRESSION
-          REFERENCE_EXPRESSION
-            PsiElement(IDENTIFIER)('e')
-          PsiWhiteSpace(' ')
-          PsiElement(match)('match')
-          PsiWhiteSpace(' ')
-          MATCH_BLOCK
-            PsiElement(LBRACE)('{')
-            PsiWhiteSpace('\n    ')
-            MATCH_ENTRY
-              PsiElement(case)('case')
-              PsiWhiteSpace(' ')
-              PATTERN
-                USER_TYPE
-                  PsiElement(IDENTIFIER)('Tree')
-                TUPLE_PATTERN
-                  PsiElement(LPAR)('(')
-                  PATTERN
-                    USER_TYPE
-                      PsiElement(IDENTIFIER)('a')
-                  PsiElement(COMMA)(',')
-                  PsiWhiteSpace(' ')
-                  PATTERN
-                    USER_TYPE
-                      PsiElement(IDENTIFIER)('b')
-                  PsiElement(RPAR)(')')
-              PsiWhiteSpace(' ')
-              PsiElement(DOUBLE_ARROW)('=>')
-              PsiWhiteSpace(' ')
-              REFERENCE_EXPRESSION
-                PsiElement(IDENTIFIER)('foo')
-            PsiWhiteSpace('\n    ')
-            MATCH_ENTRY
-              PsiElement(case)('case')
-              PsiWhiteSpace(' ')
-              PATTERN
-                USER_TYPE
-                  PsiElement(IDENTIFIER)('Tree')
-                TUPLE_PATTERN
-                  PsiElement(LPAR)('(')
-                  PATTERN
-                    USER_TYPE
-                      PsiElement(IDENTIFIER)('a')
-                  PsiElement(COMMA)(',')
-                  PsiWhiteSpace(' ')
-                  PATTERN
-                    USER_TYPE
-                      PsiElement(IDENTIFIER)('b')
-                  PsiElement(RPAR)(')')
-              PsiWhiteSpace(' ')
-              PsiElement(if)('if')
-              PsiWhiteSpace(' ')
-              PsiElement(LPAR)('(')
-              CONDITION
-                BINARY_EXPRESSION
-                  REFERENCE_EXPRESSION
-                    PsiElement(IDENTIFIER)('a')
-                  PsiWhiteSpace(' ')
-                  PsiElement(GT)('>')
-                  PsiWhiteSpace(' ')
-                  INTEGER_CONSTANT
-                    PsiElement(INTEGER_LITERAL)('5')
-              PsiElement(RPAR)(')')
-              PsiWhiteSpace(' ')
-              PsiElement(DOUBLE_ARROW)('=>')
-              PsiWhiteSpace(' ')
-              REFERENCE_EXPRESSION
-                PsiElement(IDENTIFIER)('foo')
-            PsiWhiteSpace('\n    ')
-            MATCH_ENTRY
-              PsiElement(case)('case')
-              PsiWhiteSpace(' ')
-              PATTERN
-                NULL
-                  PsiElement(null)('null')
-              PsiWhiteSpace(' ')
-              PsiElement(DOUBLE_ARROW)('=>')
-              PsiWhiteSpace(' ')
-              REFERENCE_EXPRESSION
-                PsiElement(IDENTIFIER)('foo')
-            PsiWhiteSpace('\n    ')
-            MATCH_ENTRY
-              PsiElement(case)('case')
-              PsiWhiteSpace(' ')
-              PATTERN
-                INTEGER_CONSTANT
-                  PsiElement(INTEGER_LITERAL)('1')
-              PsiWhiteSpace(' ')
-              PsiElement(DOUBLE_ARROW)('=>')
-              PsiWhiteSpace(' ')
-              REFERENCE_EXPRESSION
-                PsiElement(IDENTIFIER)('foo')
-            PsiWhiteSpace('\n    ')
-            MATCH_ENTRY
-              PsiElement(case)('case')
-              PsiWhiteSpace(' ')
-              PATTERN
-                USER_TYPE
-                  USER_TYPE
-                    PsiElement(IDENTIFIER)('A')
-                  PsiElement(DOT)('.')
-                  PsiElement(IDENTIFIER)('b')
-              PsiWhiteSpace(' ')
-              PsiElement(DOUBLE_ARROW)('=>')
-              PsiWhiteSpace(' ')
-              REFERENCE_EXPRESSION
-                PsiElement(IDENTIFIER)('foo')
-            PsiWhiteSpace('\n    ')
-            MATCH_ENTRY
-              PsiElement(case)('case')
-              PsiWhiteSpace(' ')
-              PATTERN
-                LONG_CONSTANT
-                  PsiElement(LONG_LITERAL)('1l')
-              PsiWhiteSpace(' ')
-              PsiElement(DOUBLE_ARROW)('=>')
-              PsiWhiteSpace(' ')
-              REFERENCE_EXPRESSION
-                PsiElement(IDENTIFIER)('foo')
-            PsiWhiteSpace('\n    ')
-            MATCH_ENTRY
-              PsiElement(case)('case')
-              PsiWhiteSpace(' ')
-              PATTERN
-                FLOAT_CONSTANT
-                  PsiElement(FLOAT_CONSTANT)('1.0')
-              PsiWhiteSpace(' ')
-              PsiElement(DOUBLE_ARROW)('=>')
-              PsiWhiteSpace(' ')
-              REFERENCE_EXPRESSION
-                PsiElement(IDENTIFIER)('foo')
-            PsiWhiteSpace('\n    ')
-            MATCH_ENTRY
-              PsiElement(case)('case')
-              PsiWhiteSpace(' ')
-              PATTERN
-                CHARACTER_CONSTANT
-                  PsiElement(CHARACTER_LITERAL)(''c'')
-              PsiWhiteSpace(' ')
-              PsiElement(DOUBLE_ARROW)('=>')
-              PsiWhiteSpace(' ')
-              REFERENCE_EXPRESSION
-                PsiElement(IDENTIFIER)('foo')
-            PsiWhiteSpace('\n    ')
-            MATCH_ENTRY
-              PsiElement(case)('case')
-              PsiWhiteSpace(' ')
-              PATTERN
-                STRING_CONSTANT
-                  PsiElement(STRING_LITERAL)('"sadfsa"')
-              PsiWhiteSpace(' ')
-              PsiElement(DOUBLE_ARROW)('=>')
-              PsiWhiteSpace(' ')
-              REFERENCE_EXPRESSION
-                PsiElement(IDENTIFIER)('foo')
-            PsiWhiteSpace('\n    ')
-            MATCH_ENTRY
-              PsiElement(case)('case')
-              PsiWhiteSpace(' ')
-              PATTERN
-                STRING_CONSTANT
-                  PsiElement(RAW_STRING_LITERAL)('"""ddd"""')
-              PsiWhiteSpace(' ')
-              PsiElement(DOUBLE_ARROW)('=>')
-              PsiWhiteSpace(' ')
-              REFERENCE_EXPRESSION
-                PsiElement(IDENTIFIER)('foo')
-            PsiWhiteSpace('\n    ')
-            MATCH_ENTRY
-              PsiElement(case)('case')
-              PsiWhiteSpace(' ')
-              PATTERN
-                PsiElement(QUEST)('?')
-              PsiWhiteSpace(' ')
-              PsiElement(DOUBLE_ARROW)('=>')
-              PsiWhiteSpace(' ')
-              REFERENCE_EXPRESSION
-                PsiElement(IDENTIFIER)('foo')
-            PsiWhiteSpace('\n    ')
-            MATCH_ENTRY
-              PsiElement(case)('case')
-              PsiWhiteSpace(' ')
-              PATTERN
-                PsiElement(QUEST)('?')
-                PsiWhiteSpace(' ')
-                PsiElement(COLON)(':')
-                PsiWhiteSpace(' ')
-                PATTERN
-                  USER_TYPE
-                    PsiElement(IDENTIFIER)('Foo')
-              PsiWhiteSpace(' ')
-              PsiElement(DOUBLE_ARROW)('=>')
-              PsiWhiteSpace(' ')
-              REFERENCE_EXPRESSION
-                PsiElement(IDENTIFIER)('foo')
-            PsiWhiteSpace('\n    ')
-            MATCH_ENTRY
-              PsiElement(case)('case')
-              PsiWhiteSpace(' ')
-              PATTERN
-                PsiElement(QUEST)('?')
-                PsiElement(IDENTIFIER)('a')
-                PsiWhiteSpace(' ')
-                PsiElement(COLON)(':')
-                PsiWhiteSpace(' ')
-                PATTERN
-                  USER_TYPE
-                    PsiElement(IDENTIFIER)('Foo')
-              PsiWhiteSpace(' ')
-              PsiElement(DOUBLE_ARROW)('=>')
-              PsiWhiteSpace(' ')
-              REFERENCE_EXPRESSION
-                PsiElement(IDENTIFIER)('foo')
-            PsiWhiteSpace('\n    ')
-            MATCH_ENTRY
-              PsiElement(case)('case')
-              PsiWhiteSpace(' ')
-              PATTERN
-                TUPLE_PATTERN
-                  PsiElement(LPAR)('(')
-                  PATTERN
-                    PsiElement(QUEST)('?')
-                    PsiElement(IDENTIFIER)('a')
-                    PsiWhiteSpace(' ')
-                    PsiElement(COLON)(':')
-                    PsiWhiteSpace(' ')
-                    PATTERN
-                      USER_TYPE
-                        PsiElement(IDENTIFIER)('Foo')
-                  PsiElement(COMMA)(',')
-                  PsiWhiteSpace(' ')
-                  PATTERN
-                    USER_TYPE
-                      PsiElement(IDENTIFIER)('b')
-                  PsiElement(RPAR)(')')
-              PsiWhiteSpace(' ')
-              PsiElement(DOUBLE_ARROW)('=>')
-              PsiWhiteSpace(' ')
-              REFERENCE_EXPRESSION
-                PsiElement(IDENTIFIER)('foo')
-            PsiWhiteSpace('\n  ')
-            PsiElement(RBRACE)('}')
-        PsiWhiteSpace('\n  ')
-        MATCH_EXPRESSION
-          MATCH_EXPRESSION
-            MATCH_EXPRESSION
-              REFERENCE_EXPRESSION
-                PsiElement(IDENTIFIER)('e')
-              PsiWhiteSpace(' ')
-              PsiElement(match)('match')
-              PsiWhiteSpace(' ')
-              MATCH_BLOCK
-                PsiElement(LBRACE)('{')
-                PsiWhiteSpace('\n\n  ')
-                PsiElement(RBRACE)('}')
-            PsiWhiteSpace(' ')
-            PsiElement(match)('match')
-            PsiWhiteSpace(' ')
-            MATCH_BLOCK
-              PsiElement(LBRACE)('{')
-              PsiWhiteSpace('\n\n  ')
-              PsiElement(RBRACE)('}')
-          PsiWhiteSpace(' ')
-          PsiElement(match)('match')
-          PsiWhiteSpace(' ')
-          MATCH_BLOCK
-            PsiElement(LBRACE)('{')
-            PsiWhiteSpace('\n\n  ')
-            PsiElement(RBRACE)('}')
-        PsiWhiteSpace('\n')
-        PsiElement(RBRACE)('}')

idea/testData/psi/Match_ERR.jet

@@ -1,24 +0,0 @@
-fun foo() {
-  e match {
-
-  }
-  e match {
-    case  => foo
-  }
-  e match {
-    case  => ;
-  }
-  e match {
-    foo bar
-    case a => foo
-  }
-  e match {
-    foo bar
-  }
-  e match {
-    case - => foo
-    case (, , 1, , ) => foo
-  } match {
-
-  }
-}

idea/testData/psi/Match_ERR.txt

@@ -1,177 +0,0 @@
-JetFile: Match_ERR.jet
-  NAMESPACE
-    FUN
-      PsiElement(fun)('fun')
-      PsiWhiteSpace(' ')
-      PsiElement(IDENTIFIER)('foo')
-      TYPE_PARAMETER_LIST
-        <empty list>
-      VALUE_PARAMETER_LIST
-        PsiElement(LPAR)('(')
-        PsiElement(RPAR)(')')
-      PsiWhiteSpace(' ')
-      BLOCK
-        PsiElement(LBRACE)('{')
-        PsiWhiteSpace('\n  ')
-        MATCH_EXPRESSION
-          REFERENCE_EXPRESSION
-            PsiElement(IDENTIFIER)('e')
-          PsiWhiteSpace(' ')
-          PsiElement(match)('match')
-          PsiWhiteSpace(' ')
-          MATCH_BLOCK
-            PsiElement(LBRACE)('{')
-            PsiWhiteSpace('\n\n  ')
-            PsiElement(RBRACE)('}')
-        PsiWhiteSpace('\n  ')
-        MATCH_EXPRESSION
-          REFERENCE_EXPRESSION
-            PsiElement(IDENTIFIER)('e')
-          PsiWhiteSpace(' ')
-          PsiElement(match)('match')
-          PsiWhiteSpace(' ')
-          MATCH_BLOCK
-            PsiElement(LBRACE)('{')
-            PsiWhiteSpace('\n    ')
-            MATCH_ENTRY
-              PsiElement(case)('case')
-              PsiWhiteSpace('  ')
-              PATTERN
-                PsiErrorElement:Pattern expected
-                  <empty list>
-              PsiElement(DOUBLE_ARROW)('=>')
-              PsiWhiteSpace(' ')
-              REFERENCE_EXPRESSION
-                PsiElement(IDENTIFIER)('foo')
-            PsiWhiteSpace('\n  ')
-            PsiElement(RBRACE)('}')
-        PsiWhiteSpace('\n  ')
-        MATCH_EXPRESSION
-          REFERENCE_EXPRESSION
-            PsiElement(IDENTIFIER)('e')
-          PsiWhiteSpace(' ')
-          PsiElement(match)('match')
-          PsiWhiteSpace(' ')
-          MATCH_BLOCK
-            PsiElement(LBRACE)('{')
-            PsiWhiteSpace('\n    ')
-            MATCH_ENTRY
-              PsiElement(case)('case')
-              PsiWhiteSpace('  ')
-              PATTERN
-                PsiErrorElement:Pattern expected
-                  <empty list>
-              PsiElement(DOUBLE_ARROW)('=>')
-              PsiWhiteSpace(' ')
-              PsiErrorElement:Expecting an expression
-                PsiElement(SEMICOLON)(';')
-            PsiWhiteSpace('\n  ')
-            PsiElement(RBRACE)('}')
-        PsiWhiteSpace('\n  ')
-        MATCH_EXPRESSION
-          REFERENCE_EXPRESSION
-            PsiElement(IDENTIFIER)('e')
-          PsiWhiteSpace(' ')
-          PsiElement(match)('match')
-          PsiWhiteSpace(' ')
-          MATCH_BLOCK
-            PsiElement(LBRACE)('{')
-            PsiWhiteSpace('\n    ')
-            PsiErrorElement:Expecting 'case' to start pattern matching
-              PsiElement(IDENTIFIER)('foo')
-              PsiWhiteSpace(' ')
-              PsiElement(IDENTIFIER)('bar')
-            PsiWhiteSpace('\n    ')
-            MATCH_ENTRY
-              PsiElement(case)('case')
-              PsiWhiteSpace(' ')
-              PATTERN
-                USER_TYPE
-                  PsiElement(IDENTIFIER)('a')
-              PsiWhiteSpace(' ')
-              PsiElement(DOUBLE_ARROW)('=>')
-              PsiWhiteSpace(' ')
-              REFERENCE_EXPRESSION
-                PsiElement(IDENTIFIER)('foo')
-            PsiWhiteSpace('\n  ')
-            PsiElement(RBRACE)('}')
-        PsiWhiteSpace('\n  ')
-        MATCH_EXPRESSION
-          REFERENCE_EXPRESSION
-            PsiElement(IDENTIFIER)('e')
-          PsiWhiteSpace(' ')
-          PsiElement(match)('match')
-          PsiWhiteSpace(' ')
-          MATCH_BLOCK
-            PsiElement(LBRACE)('{')
-            PsiWhiteSpace('\n    ')
-            PsiErrorElement:Expecting 'case' to start pattern matching
-              PsiElement(IDENTIFIER)('foo')
-              PsiWhiteSpace(' ')
-              PsiElement(IDENTIFIER)('bar')
-            PsiWhiteSpace('\n  ')
-            PsiElement(RBRACE)('}')
-        PsiWhiteSpace('\n  ')
-        MATCH_EXPRESSION
-          MATCH_EXPRESSION
-            REFERENCE_EXPRESSION
-              PsiElement(IDENTIFIER)('e')
-            PsiWhiteSpace(' ')
-            PsiElement(match)('match')
-            PsiWhiteSpace(' ')
-            MATCH_BLOCK
-              PsiElement(LBRACE)('{')
-              PsiWhiteSpace('\n    ')
-              MATCH_ENTRY
-                PsiElement(case)('case')
-                PsiWhiteSpace(' ')
-                PATTERN
-                  PsiErrorElement:Pattern expected
-                    PsiElement(MINUS)('-')
-                PsiWhiteSpace(' ')
-                PsiElement(DOUBLE_ARROW)('=>')
-                PsiWhiteSpace(' ')
-                REFERENCE_EXPRESSION
-                  PsiElement(IDENTIFIER)('foo')
-              PsiWhiteSpace('\n    ')
-              MATCH_ENTRY
-                PsiElement(case)('case')
-                PsiWhiteSpace(' ')
-                PATTERN
-                  TUPLE_PATTERN
-                    PsiElement(LPAR)('(')
-                    PsiErrorElement:Expecting a pattern
-                      PsiElement(COMMA)(',')
-                    PsiWhiteSpace(' ')
-                    PsiErrorElement:Expecting a pattern
-                      PsiElement(COMMA)(',')
-                    PsiWhiteSpace(' ')
-                    PATTERN
-                      INTEGER_CONSTANT
-                        PsiElement(INTEGER_LITERAL)('1')
-                    PsiElement(COMMA)(',')
-                    PsiWhiteSpace(' ')
-                    PsiErrorElement:Expecting a pattern
-                      PsiElement(COMMA)(',')
-                    PsiWhiteSpace(' ')
-                    PATTERN
-                      PsiErrorElement:Pattern expected
-                        PsiElement(RPAR)(')')
-                    PsiErrorElement:Expecting ')'
-                      <empty list>
-                PsiWhiteSpace(' ')
-                PsiElement(DOUBLE_ARROW)('=>')
-                PsiWhiteSpace(' ')
-                REFERENCE_EXPRESSION
-                  PsiElement(IDENTIFIER)('foo')
-              PsiWhiteSpace('\n  ')
-              PsiElement(RBRACE)('}')
-          PsiWhiteSpace(' ')
-          PsiElement(match)('match')
-          PsiWhiteSpace(' ')
-          MATCH_BLOCK
-            PsiElement(LBRACE)('{')
-            PsiWhiteSpace('\n\n  ')
-            PsiElement(RBRACE)('}')
-        PsiWhiteSpace('\n')
-        PsiElement(RBRACE)('}')

idea/testData/psi/NamespaceModifiers.txt

@@ -6,8 +6,9 @@ JetFile: NamespaceModifiers.jet
       ATTRIBUTE_ANNOTATION
         PsiElement(LBRACKET)('[')
         ATTRIBUTE
-          USER_TYPE
-            PsiElement(IDENTIFIER)('a')
+          TYPE_REFERENCE
+            REFERENCE_EXPRESSION
+              PsiElement(IDENTIFIER)('a')
         PsiElement(RBRACKET)(']')
     PsiWhiteSpace(' ')
     PsiElement(namespace)('namespace')
@@ -21,8 +22,9 @@ JetFile: NamespaceModifiers.jet
         ATTRIBUTE_ANNOTATION
           PsiElement(LBRACKET)('[')
           ATTRIBUTE
-            USER_TYPE
-              PsiElement(IDENTIFIER)('a')
+            TYPE_REFERENCE
+              REFERENCE_EXPRESSION
+                PsiElement(IDENTIFIER)('a')
           PsiElement(RBRACKET)(']')
       PsiWhiteSpace(' ')
       PsiElement(namespace)('namespace')

idea/testData/psi/Precedence.txt

@@ -59,17 +59,17 @@ JetFile: Precedence.jet
                 TYPE_ARGUMENT_LIST
                   PsiElement(LT)('<')
                   TYPE_REFERENCE
-                    USER_TYPE
+                    REFERENCE_EXPRESSION
                       PsiElement(IDENTIFIER)('a')
                   PsiElement(COMMA)(',')
                   PsiWhiteSpace(' ')
                   TYPE_REFERENCE
-                    USER_TYPE
+                    REFERENCE_EXPRESSION
                       PsiElement(IDENTIFIER)('a')
                   PsiElement(COMMA)(',')
                   PsiWhiteSpace(' ')
                   TYPE_REFERENCE
-                    USER_TYPE
+                    REFERENCE_EXPRESSION
                       PsiElement(IDENTIFIER)('b')
                   PsiElement(GT)('>')
                 VALUE_ARGUMENT_LIST
@@ -192,12 +192,12 @@ JetFile: Precedence.jet
                 TYPE_ARGUMENT_LIST
                   PsiElement(LT)('<')
                   TYPE_REFERENCE
-                    USER_TYPE
+                    REFERENCE_EXPRESSION
                       PsiElement(IDENTIFIER)('a')
                   PsiElement(COMMA)(',')
                   PsiWhiteSpace(' ')
                   TYPE_REFERENCE
-                    USER_TYPE
+                    REFERENCE_EXPRESSION
                       PsiElement(IDENTIFIER)('b')
                   PsiElement(GT)('>')
                 VALUE_ARGUMENT_LIST
@@ -526,7 +526,7 @@ JetFile: Precedence.jet
               PsiElement(COLON)(':')
               PsiWhiteSpace(' ')
               TYPE_REFERENCE
-                USER_TYPE
+                REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('b')
             PsiElement(RPAR)(')')
           PsiWhiteSpace(' ')
@@ -539,7 +539,7 @@ JetFile: Precedence.jet
             PsiElement(COLON)(':')
             PsiWhiteSpace(' ')
             TYPE_REFERENCE
-              USER_TYPE
+              REFERENCE_EXPRESSION
                 PsiElement(IDENTIFIER)('c')
         PsiWhiteSpace('\n  ')
         BINARY_EXPRESSION
@@ -622,84 +622,5 @@ JetFile: Precedence.jet
             PsiWhiteSpace(' ')
             REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('c')
-        PsiWhiteSpace('\n  ')
-        BINARY_EXPRESSION
-          REFERENCE_EXPRESSION
-            PsiElement(IDENTIFIER)('a')
-          PsiWhiteSpace(' ')
-          PsiElement(EQ)('=')
-          PsiWhiteSpace(' ')
-          MATCH_EXPRESSION
-            MATCH_EXPRESSION
-              BINARY_EXPRESSION
-                REFERENCE_EXPRESSION
-                  PsiElement(IDENTIFIER)('b')
-                PsiWhiteSpace(' ')
-                PsiElement(OROR)('||')
-                PsiWhiteSpace(' ')
-                REFERENCE_EXPRESSION
-                  PsiElement(IDENTIFIER)('c')
-              PsiWhiteSpace(' ')
-              PsiElement(match)('match')
-              PsiWhiteSpace(' ')
-              MATCH_BLOCK
-                PsiElement(LBRACE)('{')
-                PsiElement(RBRACE)('}')
-            PsiWhiteSpace(' ')
-            PsiElement(match)('match')
-            PsiWhiteSpace(' ')
-            MATCH_BLOCK
-              PsiElement(LBRACE)('{')
-              PsiElement(RBRACE)('}')
-        PsiWhiteSpace('\n  ')
-        BINARY_EXPRESSION
-          REFERENCE_EXPRESSION
-            PsiElement(IDENTIFIER)('a')
-          PsiWhiteSpace(' ')
-          PsiElement(EQ)('=')
-          PsiWhiteSpace(' ')
-          MATCH_EXPRESSION
-            BINARY_EXPRESSION
-              REFERENCE_EXPRESSION
-                PsiElement(IDENTIFIER)('b')
-              PsiWhiteSpace(' ')
-              PsiElement(OROR)('||')
-              PsiWhiteSpace(' ')
-              REFERENCE_EXPRESSION
-                PsiElement(IDENTIFIER)('c')
-            PsiWhiteSpace(' ')
-            PsiElement(match)('match')
-            PsiWhiteSpace(' ')
-            MATCH_BLOCK
-              PsiElement(LBRACE)('{')
-              PsiElement(RBRACE)('}')
-        PsiWhiteSpace('\n  ')
-        BINARY_EXPRESSION
-          REFERENCE_EXPRESSION
-            PsiElement(IDENTIFIER)('a')
-          PsiWhiteSpace(' ')
-          PsiElement(EQ)('=')
-          PsiWhiteSpace(' ')
-          BINARY_EXPRESSION
-            BINARY_EXPRESSION
-              REFERENCE_EXPRESSION
-                PsiElement(IDENTIFIER)('a')
-              PsiWhiteSpace(' ')
-              PsiElement(ARROW)('->')
-              PsiWhiteSpace(' ')
-              MATCH_EXPRESSION
-                REFERENCE_EXPRESSION
-                  PsiElement(IDENTIFIER)('c')
-                PsiWhiteSpace(' ')
-                PsiElement(match)('match')
-                PsiWhiteSpace(' ')
-                MATCH_BLOCK
-                  PsiElement(LBRACE)('{')
-                  PsiElement(RBRACE)('}')
-            PsiWhiteSpace(' ')
-            PsiElement(ARROW)('->')
-            PsiWhiteSpace(' ')
-            REFERENCE_EXPRESSION
-              PsiElement(IDENTIFIER)('c')
         PsiWhiteSpace('\n')
         PsiElement(RBRACE)('}')

idea/testData/psi/Properties.txt

@@ -29,8 +29,9 @@ JetFile: Properties.jet
       ATTRIBUTE_ANNOTATION
         PsiElement(LBRACKET)('[')
         ATTRIBUTE
-          USER_TYPE
-            PsiElement(IDENTIFIER)('a')
+          TYPE_REFERENCE
+            REFERENCE_EXPRESSION
+              PsiElement(IDENTIFIER)('a')
         PsiElement(RBRACKET)(']')
       PsiWhiteSpace(' ')
       PsiElement(IDENTIFIER)('foo')
@@ -39,7 +40,7 @@ JetFile: Properties.jet
       PsiElement(val)('val')
       PsiWhiteSpace(' ')
       TYPE_REFERENCE
-        USER_TYPE
+        REFERENCE_EXPRESSION
           PsiElement(IDENTIFIER)('foo')
       PsiElement(DOT)('.')
       PsiElement(IDENTIFIER)('bar')
@@ -71,8 +72,8 @@ JetFile: Properties.jet
         FUNCTION_TYPE
           PsiElement(LBRACE)('{')
           TYPE_REFERENCE
-            USER_TYPE
-              USER_TYPE
+            REFERENCE_EXPRESSION
+              REFERENCE_EXPRESSION
                 PsiElement(IDENTIFIER)('foo')
               PsiElement(DOT)('.')
               PsiElement(IDENTIFIER)('bar')
@@ -99,7 +100,7 @@ JetFile: Properties.jet
       PsiElement(COLON)(':')
       PsiWhiteSpace(' ')
       TYPE_REFERENCE
-        USER_TYPE
+        REFERENCE_EXPRESSION
           PsiElement(IDENTIFIER)('T')
     PsiWhiteSpace('\n')
     PROPERTY
@@ -108,8 +109,9 @@ JetFile: Properties.jet
       ATTRIBUTE_ANNOTATION
         PsiElement(LBRACKET)('[')
         ATTRIBUTE
-          USER_TYPE
-            PsiElement(IDENTIFIER)('a')
+          TYPE_REFERENCE
+            REFERENCE_EXPRESSION
+              PsiElement(IDENTIFIER)('a')
         PsiElement(RBRACKET)(']')
       PsiWhiteSpace(' ')
       PsiElement(IDENTIFIER)('foo')
@@ -123,7 +125,7 @@ JetFile: Properties.jet
       PsiElement(val)('val')
       PsiWhiteSpace(' ')
       TYPE_REFERENCE
-        USER_TYPE
+        REFERENCE_EXPRESSION
           PsiElement(IDENTIFIER)('foo')
       PsiElement(DOT)('.')
       PsiElement(IDENTIFIER)('bar')
@@ -156,8 +158,8 @@ JetFile: Properties.jet
         FUNCTION_TYPE
           PsiElement(LBRACE)('{')
           TYPE_REFERENCE
-            USER_TYPE
-              USER_TYPE
+            REFERENCE_EXPRESSION
+              REFERENCE_EXPRESSION
                 PsiElement(IDENTIFIER)('foo')
               PsiElement(DOT)('.')
               PsiElement(IDENTIFIER)('bar')
@@ -208,8 +210,8 @@ JetFile: Properties.jet
         FUNCTION_TYPE
           PsiElement(LBRACE)('{')
           TYPE_REFERENCE
-            USER_TYPE
-              USER_TYPE
+            REFERENCE_EXPRESSION
+              REFERENCE_EXPRESSION
                 PsiElement(IDENTIFIER)('foo')
               PsiElement(DOT)('.')
               PsiElement(IDENTIFIER)('bar')
@@ -241,7 +243,7 @@ JetFile: Properties.jet
         PsiElement(COLON)(':')
         PsiWhiteSpace(' ')
         TYPE_REFERENCE
-          USER_TYPE
+          REFERENCE_EXPRESSION
             PsiElement(IDENTIFIER)('Foo')
         PsiWhiteSpace(' ')
         BLOCK
@@ -266,8 +268,8 @@ JetFile: Properties.jet
         FUNCTION_TYPE
           PsiElement(LBRACE)('{')
           TYPE_REFERENCE
-            USER_TYPE
-              USER_TYPE
+            REFERENCE_EXPRESSION
+              REFERENCE_EXPRESSION
                 PsiElement(IDENTIFIER)('foo')
               PsiElement(DOT)('.')
               PsiElement(IDENTIFIER)('bar')
@@ -289,7 +291,7 @@ JetFile: Properties.jet
       PsiElement(COLON)(':')
       PsiWhiteSpace(' ')
       TYPE_REFERENCE
-        USER_TYPE
+        REFERENCE_EXPRESSION
           PsiElement(IDENTIFIER)('bar')
       PsiWhiteSpace(' ')
       PsiElement(EQ)('=')
@@ -302,8 +304,9 @@ JetFile: Properties.jet
           ATTRIBUTE_ANNOTATION
             PsiElement(LBRACKET)('[')
             ATTRIBUTE
-              USER_TYPE
-                PsiElement(IDENTIFIER)('a')
+              TYPE_REFERENCE
+                REFERENCE_EXPRESSION
+                  PsiElement(IDENTIFIER)('a')
             PsiElement(RBRACKET)(']')
           PsiWhiteSpace(' ')
           PsiElement(public)('public')
@@ -328,7 +331,7 @@ JetFile: Properties.jet
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('b')
         PsiElement(RPAR)(')')
         PsiWhiteSpace(' ')
@@ -343,8 +346,8 @@ JetFile: Properties.jet
         FUNCTION_TYPE
           PsiElement(LBRACE)('{')
           TYPE_REFERENCE
-            USER_TYPE
-              USER_TYPE
+            REFERENCE_EXPRESSION
+              REFERENCE_EXPRESSION
                 PsiElement(IDENTIFIER)('foo')
               PsiElement(DOT)('.')
               PsiElement(IDENTIFIER)('bar')
@@ -366,7 +369,7 @@ JetFile: Properties.jet
       PsiElement(COLON)(':')
       PsiWhiteSpace(' ')
       TYPE_REFERENCE
-        USER_TYPE
+        REFERENCE_EXPRESSION
           PsiElement(IDENTIFIER)('bar')
       PsiWhiteSpace(' ')
       PsiElement(EQ)('=')
@@ -386,7 +389,7 @@ JetFile: Properties.jet
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('b')
         PsiElement(RPAR)(')')
         PsiWhiteSpace(' ')
@@ -401,8 +404,8 @@ JetFile: Properties.jet
         FUNCTION_TYPE
           PsiElement(LBRACE)('{')
           TYPE_REFERENCE
-            USER_TYPE
-              USER_TYPE
+            REFERENCE_EXPRESSION
+              REFERENCE_EXPRESSION
                 PsiElement(IDENTIFIER)('foo')
               PsiElement(DOT)('.')
               PsiElement(IDENTIFIER)('bar')
@@ -424,7 +427,7 @@ JetFile: Properties.jet
       PsiElement(COLON)(':')
       PsiWhiteSpace(' ')
       TYPE_REFERENCE
-        USER_TYPE
+        REFERENCE_EXPRESSION
           PsiElement(IDENTIFIER)('bar')
       PsiWhiteSpace(' ')
       PsiElement(EQ)('=')
@@ -437,8 +440,9 @@ JetFile: Properties.jet
           ATTRIBUTE_ANNOTATION
             PsiElement(LBRACKET)('[')
             ATTRIBUTE
-              USER_TYPE
-                PsiElement(IDENTIFIER)('a')
+              TYPE_REFERENCE
+                REFERENCE_EXPRESSION
+                  PsiElement(IDENTIFIER)('a')
             PsiElement(RBRACKET)(']')
           PsiWhiteSpace(' ')
           PsiElement(public)('public')
@@ -485,7 +489,7 @@ JetFile: Properties.jet
       PsiElement(val)('val')
       PsiWhiteSpace(' ')
       TYPE_REFERENCE
-        USER_TYPE
+        REFERENCE_EXPRESSION
           PsiElement(IDENTIFIER)('foo')
       PsiElement(DOT)('.')
       PsiElement(IDENTIFIER)('bar')
@@ -506,7 +510,7 @@ JetFile: Properties.jet
       PsiElement(val)('val')
       PsiWhiteSpace(' ')
       TYPE_REFERENCE
-        USER_TYPE
+        REFERENCE_EXPRESSION
           PsiElement(IDENTIFIER)('foo')
       PsiElement(DOT)('.')
       PsiElement(IDENTIFIER)('bar')
@@ -579,7 +583,7 @@ JetFile: Properties.jet
       PsiElement(val)('val')
       PsiWhiteSpace(' ')
       TYPE_REFERENCE
-        USER_TYPE
+        REFERENCE_EXPRESSION
           PsiElement(IDENTIFIER)('foo')
       PsiElement(DOT)('.')
       PsiElement(IDENTIFIER)('bar')
@@ -605,7 +609,7 @@ JetFile: Properties.jet
       PsiElement(val)('val')
       PsiWhiteSpace(' ')
       TYPE_REFERENCE
-        USER_TYPE
+        REFERENCE_EXPRESSION
           PsiElement(IDENTIFIER)('foo')
       PsiElement(DOT)('.')
       PsiElement(IDENTIFIER)('bar')
@@ -680,7 +684,7 @@ JetFile: Properties.jet
                   PsiElement(COLON)(':')
                   PsiWhiteSpace(' ')
                   TYPE_REFERENCE
-                    USER_TYPE
+                    REFERENCE_EXPRESSION
                       PsiElement(IDENTIFIER)('x')
               PsiElement(RPAR)(')')
           PsiWhiteSpace(' ')
@@ -695,12 +699,12 @@ JetFile: Properties.jet
       PsiElement(val)('val')
       PsiWhiteSpace(' ')
       TYPE_REFERENCE
-        USER_TYPE
+        REFERENCE_EXPRESSION
           PsiElement(IDENTIFIER)('IList')
           TYPE_ARGUMENT_LIST
             PsiElement(LT)('<')
             TYPE_REFERENCE
-              USER_TYPE
+              REFERENCE_EXPRESSION
                 PsiElement(IDENTIFIER)('T')
             PsiElement(GT)('>')
       PsiElement(DOT)('.')
@@ -709,7 +713,7 @@ JetFile: Properties.jet
       PsiElement(COLON)(':')
       PsiWhiteSpace(' ')
       TYPE_REFERENCE
-        USER_TYPE
+        REFERENCE_EXPRESSION
           PsiElement(IDENTIFIER)('Int')
       PsiWhiteSpace('\n  ')
       PROPERTY_ACCESSOR

idea/testData/psi/Properties_ERR.txt

@@ -47,8 +47,9 @@ JetFile: Properties_ERR.jet
       ATTRIBUTE_ANNOTATION
         PsiElement(LBRACKET)('[')
         ATTRIBUTE
-          USER_TYPE
-            PsiElement(IDENTIFIER)('a')
+          TYPE_REFERENCE
+            REFERENCE_EXPRESSION
+              PsiElement(IDENTIFIER)('a')
         PsiErrorElement:Expecting ']' to close an attribute annotation
           <empty list>
       PsiWhiteSpace(' ')
@@ -63,7 +64,7 @@ JetFile: Properties_ERR.jet
       PsiElement(val)('val')
       PsiWhiteSpace(' ')
       TYPE_REFERENCE
-        USER_TYPE
+        REFERENCE_EXPRESSION
           PsiElement(IDENTIFIER)('foo')
       PsiElement(DOT)('.')
       PsiElement(IDENTIFIER)('bar')
@@ -76,8 +77,9 @@ JetFile: Properties_ERR.jet
       ATTRIBUTE_ANNOTATION
         PsiElement(LBRACKET)('[')
         ATTRIBUTE
-          USER_TYPE
-            PsiElement(IDENTIFIER)('a')
+          TYPE_REFERENCE
+            REFERENCE_EXPRESSION
+              PsiElement(IDENTIFIER)('a')
         PsiElement(RBRACKET)(']')
       PsiWhiteSpace(' ')
       PsiElement(IDENTIFIER)('foo')
@@ -96,7 +98,7 @@ JetFile: Properties_ERR.jet
       PsiElement(val)('val')
       PsiWhiteSpace(' ')
       TYPE_REFERENCE
-        USER_TYPE
+        REFERENCE_EXPRESSION
           PsiElement(IDENTIFIER)('foo')
       PsiElement(DOT)('.')
       PsiElement(IDENTIFIER)('bar')
@@ -132,8 +134,8 @@ JetFile: Properties_ERR.jet
         FUNCTION_TYPE
           PsiElement(LBRACE)('{')
           TYPE_REFERENCE
-            USER_TYPE
-              USER_TYPE
+            REFERENCE_EXPRESSION
+              REFERENCE_EXPRESSION
                 PsiElement(IDENTIFIER)('foo')
               PsiElement(DOT)('.')
               PsiElement(IDENTIFIER)('bar')
@@ -186,8 +188,8 @@ JetFile: Properties_ERR.jet
         FUNCTION_TYPE
           PsiElement(LBRACE)('{')
           TYPE_REFERENCE
-            USER_TYPE
-              USER_TYPE
+            REFERENCE_EXPRESSION
+              REFERENCE_EXPRESSION
                 PsiElement(IDENTIFIER)('foo')
               PsiElement(DOT)('.')
               PsiElement(IDENTIFIER)('bar')
@@ -250,7 +252,7 @@ JetFile: Properties_ERR.jet
       PsiElement(val)('val')
       PsiWhiteSpace(' ')
       TYPE_REFERENCE
-        USER_TYPE
+        REFERENCE_EXPRESSION
           PsiElement(IDENTIFIER)('f')
       PsiElement(DOT)('.')
       PsiElement(IDENTIFIER)('d')

idea/testData/psi/QuotedIdentifiers.txt

@@ -5,8 +5,9 @@ JetFile: QuotedIdentifiers.jet
         ATTRIBUTE_ANNOTATION
           PsiElement(LBRACKET)('[')
           ATTRIBUTE
-            USER_TYPE
-              PsiElement(IDENTIFIER)('`return`')
+            TYPE_REFERENCE
+              REFERENCE_EXPRESSION
+                PsiElement(IDENTIFIER)('`return`')
           PsiElement(RBRACKET)(']')
       PsiWhiteSpace(' ')
       PsiElement(fun)('fun')

idea/testData/psi/RootNamespace.jet

@@ -6,8 +6,8 @@ namespace foo.bar {
   fun foo() {
     namespace.foo.bar.X
     new namespace.foo.bar.X()
-    e match {
-      case namespace.foo.bar.X(x) => {}
+    when (e) {
+      is namespace.foo.bar.X(x) => {}
     }
   }
 }

idea/testData/psi/RootNamespace.txt

@@ -58,9 +58,9 @@ JetFile: RootNamespace.jet
               PsiElement(new)('new')
               PsiWhiteSpace(' ')
               TYPE_REFERENCE
-                USER_TYPE
-                  USER_TYPE
-                    USER_TYPE
+                REFERENCE_EXPRESSION
+                  REFERENCE_EXPRESSION
+                    REFERENCE_EXPRESSION
                       PsiElement(namespace)('namespace')
                       PsiElement(DOT)('.')
                       PsiElement(IDENTIFIER)('foo')
@@ -72,22 +72,24 @@ JetFile: RootNamespace.jet
                 PsiElement(LPAR)('(')
                 PsiElement(RPAR)(')')
             PsiWhiteSpace('\n    ')
-            MATCH_EXPRESSION
+            WHEN
+              PsiElement(when)('when')
+              PsiWhiteSpace(' ')
+              PsiElement(LPAR)('(')
               REFERENCE_EXPRESSION
                 PsiElement(IDENTIFIER)('e')
+              PsiElement(RPAR)(')')
               PsiWhiteSpace(' ')
-              PsiElement(match)('match')
-              PsiWhiteSpace(' ')
-              MATCH_BLOCK
-                PsiElement(LBRACE)('{')
-                PsiWhiteSpace('\n      ')
-                MATCH_ENTRY
-                  PsiElement(case)('case')
+              PsiElement(LBRACE)('{')
+              PsiWhiteSpace('\n      ')
+              WHEN_ENTRY
+                WHEN_CONDITION
+                  PsiElement(is)('is')
                   PsiWhiteSpace(' ')
-                  PATTERN
-                    USER_TYPE
-                      USER_TYPE
-                        USER_TYPE
+                  DECOMPOSER_PATTERN
+                    REFERENCE_EXPRESSION
+                      REFERENCE_EXPRESSION
+                        REFERENCE_EXPRESSION
                           PsiElement(namespace)('namespace')
                           PsiElement(DOT)('.')
                           PsiElement(IDENTIFIER)('foo')
@@ -95,22 +97,23 @@ JetFile: RootNamespace.jet
                         PsiElement(IDENTIFIER)('bar')
                       PsiElement(DOT)('.')
                       PsiElement(IDENTIFIER)('X')
-                    TUPLE_PATTERN
+                    DECOMPOSER_ARGUMENT_LIST
                       PsiElement(LPAR)('(')
-                      PATTERN
-                        USER_TYPE
-                          PsiElement(IDENTIFIER)('x')
+                      DECOMPOSER_ARGUMENT
+                        TYPE_PATTERN
+                          REFERENCE_EXPRESSION
+                            PsiElement(IDENTIFIER)('x')
                       PsiElement(RPAR)(')')
-                  PsiWhiteSpace(' ')
-                  PsiElement(DOUBLE_ARROW)('=>')
-                  PsiWhiteSpace(' ')
-                  FUNCTION_LITERAL
-                    PsiElement(LBRACE)('{')
-                    BODY
-                      <empty list>
-                    PsiElement(RBRACE)('}')
-                PsiWhiteSpace('\n    ')
-                PsiElement(RBRACE)('}')
+                PsiWhiteSpace(' ')
+                PsiElement(DOUBLE_ARROW)('=>')
+                PsiWhiteSpace(' ')
+                FUNCTION_LITERAL
+                  PsiElement(LBRACE)('{')
+                  BODY
+                    <empty list>
+                  PsiElement(RBRACE)('}')
+              PsiWhiteSpace('\n    ')
+              PsiElement(RBRACE)('}')
             PsiWhiteSpace('\n  ')
             PsiElement(RBRACE)('}')
       PsiWhiteSpace('\n')

idea/testData/psi/SimpleClassMembers.txt

@@ -20,7 +20,7 @@ JetFile: SimpleClassMembers.jet
           PsiElement(for)('for')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('X')
           PsiWhiteSpace(' ')
           CLASS_BODY
@@ -36,7 +36,7 @@ JetFile: SimpleClassMembers.jet
               PsiElement(for)('for')
               PsiWhiteSpace(' ')
               TYPE_REFERENCE
-                USER_TYPE
+                REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('X')
               PsiWhiteSpace(' ')
               CLASS_BODY
@@ -85,7 +85,7 @@ JetFile: SimpleClassMembers.jet
               PsiElement(EQ)('=')
               PsiWhiteSpace(' ')
               TYPE_REFERENCE
-                USER_TYPE
+                REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('bar')
             PsiWhiteSpace('\n\n        ')
             CONSTRUCTOR
@@ -119,12 +119,12 @@ JetFile: SimpleClassMembers.jet
                 PsiWhiteSpace(' ')
                 DELEGATOR_SUPER_CALL
                   TYPE_REFERENCE
-                    USER_TYPE
+                    REFERENCE_EXPRESSION
                       PsiElement(IDENTIFIER)('Foo')
                       TYPE_ARGUMENT_LIST
                         PsiElement(LT)('<')
                         TYPE_REFERENCE
-                          USER_TYPE
+                          REFERENCE_EXPRESSION
                             PsiElement(IDENTIFIER)('T')
                         PsiElement(GT)('>')
                   VALUE_ARGUMENT_LIST
@@ -156,7 +156,7 @@ JetFile: SimpleClassMembers.jet
               PsiElement(for)('for')
               PsiWhiteSpace(' ')
               TYPE_REFERENCE
-                USER_TYPE
+                REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('X')
               PsiWhiteSpace(' ')
               CLASS_BODY
@@ -199,7 +199,7 @@ JetFile: SimpleClassMembers.jet
                     DELEGATION_SPECIFIER_LIST
                       DELEGATOR_SUPER_CLASS
                         TYPE_REFERENCE
-                          USER_TYPE
+                          REFERENCE_EXPRESSION
                             PsiElement(IDENTIFIER)('Fooo')
                     PsiWhiteSpace(' ')
                     CLASS_BODY
@@ -219,13 +219,13 @@ JetFile: SimpleClassMembers.jet
                     DELEGATION_SPECIFIER_LIST
                       DELEGATOR_SUPER_CLASS
                         TYPE_REFERENCE
-                          USER_TYPE
+                          REFERENCE_EXPRESSION
                             PsiElement(IDENTIFIER)('Fooo')
                       PsiElement(COMMA)(',')
                       PsiWhiteSpace(' ')
                       DELEGATOR_BY
                         TYPE_REFERENCE
-                          USER_TYPE
+                          REFERENCE_EXPRESSION
                             PsiElement(IDENTIFIER)('Bar')
                         PsiWhiteSpace(' ')
                         PsiElement(by)('by')
@@ -250,13 +250,13 @@ JetFile: SimpleClassMembers.jet
                     DELEGATION_SPECIFIER_LIST
                       DELEGATOR_SUPER_CLASS
                         TYPE_REFERENCE
-                          USER_TYPE
+                          REFERENCE_EXPRESSION
                             PsiElement(IDENTIFIER)('Fooo')
                       PsiElement(COMMA)(',')
                       PsiWhiteSpace(' ')
                       DELEGATOR_BY
                         TYPE_REFERENCE
-                          USER_TYPE
+                          REFERENCE_EXPRESSION
                             PsiElement(IDENTIFIER)('Bar')
                         PsiWhiteSpace(' ')
                         PsiElement(by)('by')
@@ -267,7 +267,7 @@ JetFile: SimpleClassMembers.jet
                       PsiWhiteSpace(' ')
                       DELEGATOR_SUPER_CALL
                         TYPE_REFERENCE
-                          USER_TYPE
+                          REFERENCE_EXPRESSION
                             PsiElement(IDENTIFIER)('Goo')
                         VALUE_ARGUMENT_LIST
                           PsiElement(LPAR)('(')
@@ -316,7 +316,7 @@ JetFile: SimpleClassMembers.jet
               PsiElement(EQ)('=')
               PsiWhiteSpace(' ')
               TYPE_REFERENCE
-                USER_TYPE
+                REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('bar')
             PsiWhiteSpace('\n\n        ')
             CONSTRUCTOR
@@ -350,12 +350,12 @@ JetFile: SimpleClassMembers.jet
                 PsiWhiteSpace(' ')
                 DELEGATOR_SUPER_CALL
                   TYPE_REFERENCE
-                    USER_TYPE
+                    REFERENCE_EXPRESSION
                       PsiElement(IDENTIFIER)('Foo')
                       TYPE_ARGUMENT_LIST
                         PsiElement(LT)('<')
                         TYPE_REFERENCE
-                          USER_TYPE
+                          REFERENCE_EXPRESSION
                             PsiElement(IDENTIFIER)('T')
                         PsiElement(GT)('>')
                   VALUE_ARGUMENT_LIST
@@ -397,7 +397,7 @@ JetFile: SimpleClassMembers.jet
           PsiElement(EQ)('=')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('bar')
         PsiWhiteSpace('\n\n    ')
         CONSTRUCTOR
@@ -431,12 +431,12 @@ JetFile: SimpleClassMembers.jet
             PsiWhiteSpace(' ')
             DELEGATOR_SUPER_CALL
               TYPE_REFERENCE
-                USER_TYPE
+                REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('Foo')
                   TYPE_ARGUMENT_LIST
                     PsiElement(LT)('<')
                     TYPE_REFERENCE
-                      USER_TYPE
+                      REFERENCE_EXPRESSION
                         PsiElement(IDENTIFIER)('T')
                     PsiElement(GT)('>')
               VALUE_ARGUMENT_LIST
@@ -477,12 +477,12 @@ JetFile: SimpleClassMembers.jet
             PsiWhiteSpace(' ')
             DELEGATOR_SUPER_CALL
               TYPE_REFERENCE
-                USER_TYPE
+                REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('Foo')
                   TYPE_ARGUMENT_LIST
                     PsiElement(LT)('<')
                     TYPE_REFERENCE
-                      USER_TYPE
+                      REFERENCE_EXPRESSION
                         PsiElement(IDENTIFIER)('T')
                     PsiElement(GT)('>')
               VALUE_ARGUMENT_LIST
@@ -534,7 +534,7 @@ JetFile: SimpleClassMembers.jet
             DELEGATION_SPECIFIER_LIST
               DELEGATOR_SUPER_CLASS
                 TYPE_REFERENCE
-                  USER_TYPE
+                  REFERENCE_EXPRESSION
                     PsiElement(IDENTIFIER)('Fooo')
             PsiWhiteSpace(' ')
             CLASS_BODY
@@ -554,13 +554,13 @@ JetFile: SimpleClassMembers.jet
             DELEGATION_SPECIFIER_LIST
               DELEGATOR_SUPER_CLASS
                 TYPE_REFERENCE
-                  USER_TYPE
+                  REFERENCE_EXPRESSION
                     PsiElement(IDENTIFIER)('Fooo')
               PsiElement(COMMA)(',')
               PsiWhiteSpace(' ')
               DELEGATOR_BY
                 TYPE_REFERENCE
-                  USER_TYPE
+                  REFERENCE_EXPRESSION
                     PsiElement(IDENTIFIER)('Bar')
                 PsiWhiteSpace(' ')
                 PsiElement(by)('by')
@@ -585,13 +585,13 @@ JetFile: SimpleClassMembers.jet
             DELEGATION_SPECIFIER_LIST
               DELEGATOR_SUPER_CLASS
                 TYPE_REFERENCE
-                  USER_TYPE
+                  REFERENCE_EXPRESSION
                     PsiElement(IDENTIFIER)('Fooo')
               PsiElement(COMMA)(',')
               PsiWhiteSpace(' ')
               DELEGATOR_BY
                 TYPE_REFERENCE
-                  USER_TYPE
+                  REFERENCE_EXPRESSION
                     PsiElement(IDENTIFIER)('Bar')
                 PsiWhiteSpace(' ')
                 PsiElement(by)('by')
@@ -602,7 +602,7 @@ JetFile: SimpleClassMembers.jet
               PsiWhiteSpace(' ')
               DELEGATOR_SUPER_CALL
                 TYPE_REFERENCE
-                  USER_TYPE
+                  REFERENCE_EXPRESSION
                     PsiElement(IDENTIFIER)('Goo')
                 VALUE_ARGUMENT_LIST
                   PsiElement(LPAR)('(')

idea/testData/psi/SimpleClassMembers_ERR.txt

@@ -20,7 +20,7 @@ JetFile: SimpleClassMembers_ERR.jet
           PsiElement(for)('for')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('X')
           PsiWhiteSpace(' ')
           CLASS_BODY
@@ -111,12 +111,12 @@ JetFile: SimpleClassMembers_ERR.jet
             PsiWhiteSpace(' ')
             DELEGATOR_SUPER_CALL
               TYPE_REFERENCE
-                USER_TYPE
+                REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('Foo')
                   TYPE_ARGUMENT_LIST
                     PsiElement(LT)('<')
                     TYPE_REFERENCE
-                      USER_TYPE
+                      REFERENCE_EXPRESSION
                         PsiElement(IDENTIFIER)('T')
                     PsiErrorElement:Expecting a '>'
                       <empty list>
@@ -158,12 +158,12 @@ JetFile: SimpleClassMembers_ERR.jet
             PsiWhiteSpace(' ')
             DELEGATOR_SUPER_CALL
               TYPE_REFERENCE
-                USER_TYPE
+                REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('Foo')
                   TYPE_ARGUMENT_LIST
                     PsiElement(LT)('<')
                     TYPE_REFERENCE
-                      USER_TYPE
+                      REFERENCE_EXPRESSION
                         PsiElement(IDENTIFIER)('T')
                     PsiElement(GT)('>')
               VALUE_ARGUMENT_LIST

idea/testData/psi/SimpleExpressions.txt

@@ -15,7 +15,7 @@ JetFile: SimpleExpressions.jet
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('foo')
           PsiWhiteSpace(' ')
           PsiElement(EQ)('=')
@@ -31,7 +31,7 @@ JetFile: SimpleExpressions.jet
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('foo')
           PsiWhiteSpace(' ')
           PsiElement(EQ)('=')
@@ -46,7 +46,7 @@ JetFile: SimpleExpressions.jet
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('foo')
           PsiWhiteSpace(' ')
           PsiElement(EQ)('=')
@@ -61,7 +61,7 @@ JetFile: SimpleExpressions.jet
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('foo')
           PsiWhiteSpace(' ')
           PsiElement(EQ)('=')
@@ -76,7 +76,7 @@ JetFile: SimpleExpressions.jet
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('foo')
           PsiWhiteSpace(' ')
           PsiElement(EQ)('=')
@@ -91,7 +91,7 @@ JetFile: SimpleExpressions.jet
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('foo')
           PsiWhiteSpace(' ')
           PsiElement(EQ)('=')
@@ -106,7 +106,7 @@ JetFile: SimpleExpressions.jet
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('foo')
           PsiWhiteSpace(' ')
           PsiElement(EQ)('=')
@@ -121,7 +121,7 @@ JetFile: SimpleExpressions.jet
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('foo')
           PsiWhiteSpace(' ')
           PsiElement(EQ)('=')
@@ -136,7 +136,7 @@ JetFile: SimpleExpressions.jet
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('foo')
           PsiWhiteSpace(' ')
           PsiElement(EQ)('=')
@@ -151,7 +151,7 @@ JetFile: SimpleExpressions.jet
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('foo')
           PsiWhiteSpace(' ')
           PsiElement(EQ)('=')
@@ -166,7 +166,7 @@ JetFile: SimpleExpressions.jet
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('foo')
           PsiWhiteSpace(' ')
           PsiElement(EQ)('=')
@@ -181,7 +181,7 @@ JetFile: SimpleExpressions.jet
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('foo')
           PsiWhiteSpace(' ')
           PsiElement(EQ)('=')
@@ -196,7 +196,7 @@ JetFile: SimpleExpressions.jet
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('foo')
           PsiWhiteSpace(' ')
           PsiElement(EQ)('=')
@@ -211,7 +211,7 @@ JetFile: SimpleExpressions.jet
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('foo')
           PsiWhiteSpace(' ')
           PsiElement(EQ)('=')
@@ -226,7 +226,7 @@ JetFile: SimpleExpressions.jet
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('foo')
           PsiWhiteSpace(' ')
           PsiElement(EQ)('=')
@@ -241,7 +241,7 @@ JetFile: SimpleExpressions.jet
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('foo')
           PsiWhiteSpace(' ')
           PsiElement(EQ)('=')
@@ -250,7 +250,7 @@ JetFile: SimpleExpressions.jet
             PsiElement(this)('this')
             PsiElement(LT)('<')
             TYPE_REFERENCE
-              USER_TYPE
+              REFERENCE_EXPRESSION
                 PsiElement(IDENTIFIER)('sdf')
             PsiElement(GT)('>')
         PsiElement(COMMA)(',')
@@ -261,7 +261,7 @@ JetFile: SimpleExpressions.jet
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('foo')
           PsiWhiteSpace(' ')
           PsiElement(EQ)('=')
@@ -279,7 +279,7 @@ JetFile: SimpleExpressions.jet
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('foo')
           PsiWhiteSpace(' ')
           PsiElement(EQ)('=')
@@ -305,7 +305,7 @@ JetFile: SimpleExpressions.jet
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('foo')
           PsiWhiteSpace(' ')
           PsiElement(EQ)('=')
@@ -324,7 +324,7 @@ JetFile: SimpleExpressions.jet
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('foo')
           PsiWhiteSpace(' ')
           PsiElement(EQ)('=')
@@ -333,7 +333,7 @@ JetFile: SimpleExpressions.jet
             PsiElement(new)('new')
             PsiWhiteSpace(' ')
             TYPE_REFERENCE
-              USER_TYPE
+              REFERENCE_EXPRESSION
                 PsiElement(IDENTIFIER)('Foo')
             VALUE_ARGUMENT_LIST
               PsiElement(LPAR)('(')
@@ -349,7 +349,7 @@ JetFile: SimpleExpressions.jet
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('foo')
           PsiWhiteSpace(' ')
           PsiElement(EQ)('=')
@@ -358,12 +358,12 @@ JetFile: SimpleExpressions.jet
             PsiElement(new)('new')
             PsiWhiteSpace(' ')
             TYPE_REFERENCE
-              USER_TYPE
+              REFERENCE_EXPRESSION
                 PsiElement(IDENTIFIER)('Foo')
                 TYPE_ARGUMENT_LIST
                   PsiElement(LT)('<')
                   TYPE_REFERENCE
-                    USER_TYPE
+                    REFERENCE_EXPRESSION
                       PsiElement(IDENTIFIER)('A')
                   PsiElement(GT)('>')
             VALUE_ARGUMENT_LIST
@@ -380,7 +380,7 @@ JetFile: SimpleExpressions.jet
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('foo')
           PsiWhiteSpace(' ')
           PsiElement(EQ)('=')
@@ -389,7 +389,7 @@ JetFile: SimpleExpressions.jet
             PsiElement(new)('new')
             PsiWhiteSpace(' ')
             TYPE_REFERENCE
-              USER_TYPE
+              REFERENCE_EXPRESSION
                 PsiElement(IDENTIFIER)('Foo')
         PsiElement(COMMA)(',')
         PsiWhiteSpace('\n    ')
@@ -399,7 +399,7 @@ JetFile: SimpleExpressions.jet
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('foo')
           PsiWhiteSpace(' ')
           PsiElement(EQ)('=')
@@ -408,12 +408,12 @@ JetFile: SimpleExpressions.jet
             PsiElement(new)('new')
             PsiWhiteSpace(' ')
             TYPE_REFERENCE
-              USER_TYPE
+              REFERENCE_EXPRESSION
                 PsiElement(IDENTIFIER)('Foo')
                 TYPE_ARGUMENT_LIST
                   PsiElement(LT)('<')
                   TYPE_REFERENCE
-                    USER_TYPE
+                    REFERENCE_EXPRESSION
                       PsiElement(IDENTIFIER)('bar')
                   PsiElement(GT)('>')
         PsiElement(COMMA)(',')
@@ -424,7 +424,7 @@ JetFile: SimpleExpressions.jet
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('foo')
           PsiWhiteSpace(' ')
           PsiElement(EQ)('=')
@@ -435,7 +435,7 @@ JetFile: SimpleExpressions.jet
             DELEGATION_SPECIFIER_LIST
               DELEGATOR_SUPER_CLASS
                 TYPE_REFERENCE
-                  USER_TYPE
+                  REFERENCE_EXPRESSION
                     PsiElement(IDENTIFIER)('Foo')
             CLASS_BODY
               PsiElement(LBRACE)('{')
@@ -448,7 +448,7 @@ JetFile: SimpleExpressions.jet
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('foo')
           PsiWhiteSpace(' ')
           PsiElement(EQ)('=')
@@ -460,7 +460,7 @@ JetFile: SimpleExpressions.jet
               PsiElement(new)('new')
               PsiWhiteSpace(' ')
               TYPE_REFERENCE
-                USER_TYPE
+                REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('Foo')
         PsiElement(COMMA)(',')
         PsiWhiteSpace('\n    ')
@@ -470,7 +470,7 @@ JetFile: SimpleExpressions.jet
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('foo')
           PsiWhiteSpace(' ')
           PsiElement(EQ)('=')
@@ -488,7 +488,7 @@ JetFile: SimpleExpressions.jet
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('foo')
           PsiWhiteSpace(' ')
           PsiElement(EQ)('=')
@@ -503,7 +503,7 @@ JetFile: SimpleExpressions.jet
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('foo')
           PsiWhiteSpace(' ')
           PsiElement(EQ)('=')
@@ -520,7 +520,7 @@ JetFile: SimpleExpressions.jet
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('foo')
           PsiWhiteSpace(' ')
           PsiElement(EQ)('=')
@@ -535,7 +535,7 @@ JetFile: SimpleExpressions.jet
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('foo')
           PsiWhiteSpace(' ')
           PsiElement(EQ)('=')
@@ -552,7 +552,7 @@ JetFile: SimpleExpressions.jet
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('foo')
           PsiWhiteSpace(' ')
           PsiElement(EQ)('=')
@@ -567,7 +567,7 @@ JetFile: SimpleExpressions.jet
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('foo')
           PsiWhiteSpace(' ')
           PsiElement(EQ)('=')
@@ -582,7 +582,7 @@ JetFile: SimpleExpressions.jet
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('foo')
           PsiWhiteSpace(' ')
           PsiElement(EQ)('=')
@@ -597,7 +597,7 @@ JetFile: SimpleExpressions.jet
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('foo')
           PsiWhiteSpace(' ')
           PsiElement(EQ)('=')

idea/testData/psi/SoftKeywords.txt

@@ -74,7 +74,7 @@ JetFile: SoftKeywords.jet
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('T')
         PsiElement(COMMA)(',')
         PsiWhiteSpace(' ')
@@ -135,7 +135,7 @@ JetFile: SoftKeywords.jet
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('B')
         PsiElement(RPAR)(')')
       PsiWhiteSpace(' ')
@@ -144,7 +144,7 @@ JetFile: SoftKeywords.jet
       DELEGATION_SPECIFIER_LIST
         DELEGATOR_BY
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('A')
           PsiWhiteSpace(' ')
           PsiElement(by)('by')
@@ -298,7 +298,7 @@ JetFile: SoftKeywords.jet
               PsiElement(COLON)(':')
               PsiWhiteSpace(' ')
               TYPE_REFERENCE
-                USER_TYPE
+                REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('s')
             PsiElement(RPAR)(')')
             PsiWhiteSpace(' ')
@@ -329,7 +329,7 @@ JetFile: SoftKeywords.jet
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('abstract')
         PsiWhiteSpace('\n    ')
         FUN
@@ -346,7 +346,7 @@ JetFile: SoftKeywords.jet
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('virtual')
         PsiWhiteSpace('\n    ')
         FUN
@@ -363,7 +363,7 @@ JetFile: SoftKeywords.jet
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('enum')
         PsiWhiteSpace('\n    ')
         FUN
@@ -380,7 +380,7 @@ JetFile: SoftKeywords.jet
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('open')
         PsiWhiteSpace('\n    ')
         FUN
@@ -397,7 +397,7 @@ JetFile: SoftKeywords.jet
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('attribute')
         PsiWhiteSpace('\n    ')
         FUN
@@ -414,7 +414,7 @@ JetFile: SoftKeywords.jet
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('override')
         PsiWhiteSpace('\n    ')
         FUN
@@ -431,7 +431,7 @@ JetFile: SoftKeywords.jet
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('virtual')
         PsiWhiteSpace('\n    ')
         FUN
@@ -448,7 +448,7 @@ JetFile: SoftKeywords.jet
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('abstract')
         PsiWhiteSpace('\n    ')
         FUN
@@ -465,7 +465,7 @@ JetFile: SoftKeywords.jet
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('private')
         PsiWhiteSpace('\n    ')
         FUN
@@ -482,7 +482,7 @@ JetFile: SoftKeywords.jet
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('protected')
         PsiWhiteSpace('\n    ')
         FUN
@@ -499,7 +499,7 @@ JetFile: SoftKeywords.jet
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('public')
         PsiWhiteSpace('\n    ')
         FUN
@@ -516,7 +516,7 @@ JetFile: SoftKeywords.jet
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('internal')
         PsiWhiteSpace('\n    ')
         FUN
@@ -533,7 +533,7 @@ JetFile: SoftKeywords.jet
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('lazy')
         PsiWhiteSpace('\n    ')
         FUN
@@ -550,7 +550,7 @@ JetFile: SoftKeywords.jet
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('wraps')
         PsiWhiteSpace('\n    ')
         FUN
@@ -567,7 +567,7 @@ JetFile: SoftKeywords.jet
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('import')
         PsiWhiteSpace('\n    ')
         FUN
@@ -584,7 +584,7 @@ JetFile: SoftKeywords.jet
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('where')
         PsiWhiteSpace('\n    ')
         FUN
@@ -601,7 +601,7 @@ JetFile: SoftKeywords.jet
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('by')
         PsiWhiteSpace('\n    ')
         FUN
@@ -618,7 +618,7 @@ JetFile: SoftKeywords.jet
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('get')
         PsiWhiteSpace('\n    ')
         FUN
@@ -635,7 +635,7 @@ JetFile: SoftKeywords.jet
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('set')
         PsiWhiteSpace('\n    ')
         FUN
@@ -652,7 +652,7 @@ JetFile: SoftKeywords.jet
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('public')
         PsiWhiteSpace('\n    ')
         FUN
@@ -669,7 +669,7 @@ JetFile: SoftKeywords.jet
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('private')
         PsiWhiteSpace('\n    ')
         FUN
@@ -686,7 +686,7 @@ JetFile: SoftKeywords.jet
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('protected')
         PsiWhiteSpace('\n    ')
         FUN
@@ -703,7 +703,7 @@ JetFile: SoftKeywords.jet
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('internal')
         PsiWhiteSpace('\n\n    ')
         FUN
@@ -721,7 +721,7 @@ JetFile: SoftKeywords.jet
               PsiElement(COLON)(':')
               PsiWhiteSpace(' ')
               TYPE_REFERENCE
-                USER_TYPE
+                REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('t')
             PsiElement(COMMA)(',')
             PsiWhiteSpace('\n        ')
@@ -731,7 +731,7 @@ JetFile: SoftKeywords.jet
               PsiElement(COLON)(':')
               PsiWhiteSpace(' ')
               TYPE_REFERENCE
-                USER_TYPE
+                REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('t')
             PsiElement(COMMA)(',')
             PsiWhiteSpace('\n        ')
@@ -741,7 +741,7 @@ JetFile: SoftKeywords.jet
               PsiElement(COLON)(':')
               PsiWhiteSpace(' ')
               TYPE_REFERENCE
-                USER_TYPE
+                REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('t')
             PsiElement(COMMA)(',')
             PsiWhiteSpace('\n        ')
@@ -751,7 +751,7 @@ JetFile: SoftKeywords.jet
               PsiElement(COLON)(':')
               PsiWhiteSpace(' ')
               TYPE_REFERENCE
-                USER_TYPE
+                REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('t')
             PsiElement(COMMA)(',')
             PsiWhiteSpace('\n        ')
@@ -761,7 +761,7 @@ JetFile: SoftKeywords.jet
               PsiElement(COLON)(':')
               PsiWhiteSpace(' ')
               TYPE_REFERENCE
-                USER_TYPE
+                REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('t')
             PsiElement(COMMA)(',')
             PsiWhiteSpace('\n        ')
@@ -771,7 +771,7 @@ JetFile: SoftKeywords.jet
               PsiElement(COLON)(':')
               PsiWhiteSpace(' ')
               TYPE_REFERENCE
-                USER_TYPE
+                REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('t')
             PsiElement(COMMA)(',')
             PsiWhiteSpace('\n        ')
@@ -781,7 +781,7 @@ JetFile: SoftKeywords.jet
               PsiElement(COLON)(':')
               PsiWhiteSpace(' ')
               TYPE_REFERENCE
-                USER_TYPE
+                REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('t')
             PsiElement(COMMA)(',')
             PsiWhiteSpace('\n        ')
@@ -791,7 +791,7 @@ JetFile: SoftKeywords.jet
               PsiElement(COLON)(':')
               PsiWhiteSpace(' ')
               TYPE_REFERENCE
-                USER_TYPE
+                REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('t')
             PsiElement(COMMA)(',')
             PsiWhiteSpace('\n        ')
@@ -801,7 +801,7 @@ JetFile: SoftKeywords.jet
               PsiElement(COLON)(':')
               PsiWhiteSpace(' ')
               TYPE_REFERENCE
-                USER_TYPE
+                REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('t')
             PsiElement(COMMA)(',')
             PsiWhiteSpace('\n        ')
@@ -811,7 +811,7 @@ JetFile: SoftKeywords.jet
               PsiElement(COLON)(':')
               PsiWhiteSpace(' ')
               TYPE_REFERENCE
-                USER_TYPE
+                REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('t')
             PsiElement(COMMA)(',')
             PsiWhiteSpace('\n        ')
@@ -821,7 +821,7 @@ JetFile: SoftKeywords.jet
               PsiElement(COLON)(':')
               PsiWhiteSpace(' ')
               TYPE_REFERENCE
-                USER_TYPE
+                REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('t')
             PsiElement(COMMA)(',')
             PsiWhiteSpace('\n        ')
@@ -831,7 +831,7 @@ JetFile: SoftKeywords.jet
               PsiElement(COLON)(':')
               PsiWhiteSpace(' ')
               TYPE_REFERENCE
-                USER_TYPE
+                REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('t')
             PsiElement(COMMA)(',')
             PsiWhiteSpace('\n        ')
@@ -841,7 +841,7 @@ JetFile: SoftKeywords.jet
               PsiElement(COLON)(':')
               PsiWhiteSpace(' ')
               TYPE_REFERENCE
-                USER_TYPE
+                REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('t')
             PsiElement(COMMA)(',')
             PsiWhiteSpace('\n        ')
@@ -851,7 +851,7 @@ JetFile: SoftKeywords.jet
               PsiElement(COLON)(':')
               PsiWhiteSpace(' ')
               TYPE_REFERENCE
-                USER_TYPE
+                REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('t')
             PsiElement(COMMA)(',')
             PsiWhiteSpace('\n        ')
@@ -861,7 +861,7 @@ JetFile: SoftKeywords.jet
               PsiElement(COLON)(':')
               PsiWhiteSpace(' ')
               TYPE_REFERENCE
-                USER_TYPE
+                REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('t')
             PsiElement(COMMA)(',')
             PsiWhiteSpace('\n        ')
@@ -871,7 +871,7 @@ JetFile: SoftKeywords.jet
               PsiElement(COLON)(':')
               PsiWhiteSpace(' ')
               TYPE_REFERENCE
-                USER_TYPE
+                REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('t')
             PsiElement(COMMA)(',')
             PsiWhiteSpace('\n        ')
@@ -881,7 +881,7 @@ JetFile: SoftKeywords.jet
               PsiElement(COLON)(':')
               PsiWhiteSpace(' ')
               TYPE_REFERENCE
-                USER_TYPE
+                REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('t')
             PsiElement(COMMA)(',')
             PsiWhiteSpace('\n        ')
@@ -891,7 +891,7 @@ JetFile: SoftKeywords.jet
               PsiElement(COLON)(':')
               PsiWhiteSpace(' ')
               TYPE_REFERENCE
-                USER_TYPE
+                REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('t')
             PsiElement(COMMA)(',')
             PsiWhiteSpace('\n        ')
@@ -901,7 +901,7 @@ JetFile: SoftKeywords.jet
               PsiElement(COLON)(':')
               PsiWhiteSpace(' ')
               TYPE_REFERENCE
-                USER_TYPE
+                REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('t')
             PsiElement(COMMA)(',')
             PsiWhiteSpace('\n        ')
@@ -911,7 +911,7 @@ JetFile: SoftKeywords.jet
               PsiElement(COLON)(':')
               PsiWhiteSpace(' ')
               TYPE_REFERENCE
-                USER_TYPE
+                REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('t')
             PsiElement(COMMA)(',')
             PsiWhiteSpace('\n        ')
@@ -921,7 +921,7 @@ JetFile: SoftKeywords.jet
               PsiElement(COLON)(':')
               PsiWhiteSpace(' ')
               TYPE_REFERENCE
-                USER_TYPE
+                REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('t')
             PsiElement(COMMA)(',')
             PsiWhiteSpace('\n        ')
@@ -931,7 +931,7 @@ JetFile: SoftKeywords.jet
               PsiElement(COLON)(':')
               PsiWhiteSpace(' ')
               TYPE_REFERENCE
-                USER_TYPE
+                REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('t')
             PsiElement(COMMA)(',')
             PsiWhiteSpace('\n        ')
@@ -941,7 +941,7 @@ JetFile: SoftKeywords.jet
               PsiElement(COLON)(':')
               PsiWhiteSpace(' ')
               TYPE_REFERENCE
-                USER_TYPE
+                REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('t')
             PsiElement(COMMA)(',')
             PsiWhiteSpace('\n    ')
@@ -986,7 +986,7 @@ JetFile: SoftKeywords.jet
               PsiElement(COLON)(':')
               PsiWhiteSpace(' ')
               TYPE_REFERENCE
-                USER_TYPE
+                REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('t')
             PsiWhiteSpace('\n\n     ')
             PsiElement(RPAR)(')')
@@ -1009,7 +1009,7 @@ JetFile: SoftKeywords.jet
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('bar')
         PsiElement(COMMA)(',')
         PsiWhiteSpace('\n        ')
@@ -1019,7 +1019,7 @@ JetFile: SoftKeywords.jet
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('t')
         PsiElement(COMMA)(',')
         PsiWhiteSpace('\n        ')
@@ -1029,7 +1029,7 @@ JetFile: SoftKeywords.jet
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('t')
         PsiElement(COMMA)(',')
         PsiWhiteSpace('\n        ')
@@ -1039,7 +1039,7 @@ JetFile: SoftKeywords.jet
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('t')
         PsiElement(COMMA)(',')
         PsiWhiteSpace('\n        ')
@@ -1049,7 +1049,7 @@ JetFile: SoftKeywords.jet
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('t')
         PsiElement(COMMA)(',')
         PsiWhiteSpace('\n        ')
@@ -1059,7 +1059,7 @@ JetFile: SoftKeywords.jet
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('t')
         PsiElement(COMMA)(',')
         PsiWhiteSpace('\n        ')
@@ -1069,7 +1069,7 @@ JetFile: SoftKeywords.jet
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('t')
         PsiElement(COMMA)(',')
         PsiWhiteSpace('\n        ')
@@ -1079,7 +1079,7 @@ JetFile: SoftKeywords.jet
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('t')
         PsiElement(COMMA)(',')
         PsiWhiteSpace('\n        ')
@@ -1089,7 +1089,7 @@ JetFile: SoftKeywords.jet
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('t')
         PsiElement(COMMA)(',')
         PsiWhiteSpace('\n        ')
@@ -1099,7 +1099,7 @@ JetFile: SoftKeywords.jet
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('t')
         PsiElement(COMMA)(',')
         PsiWhiteSpace('\n        ')
@@ -1109,7 +1109,7 @@ JetFile: SoftKeywords.jet
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('t')
         PsiElement(COMMA)(',')
         PsiWhiteSpace('\n        ')
@@ -1119,7 +1119,7 @@ JetFile: SoftKeywords.jet
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('t')
         PsiElement(COMMA)(',')
         PsiWhiteSpace('\n        ')
@@ -1129,7 +1129,7 @@ JetFile: SoftKeywords.jet
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('t')
         PsiElement(COMMA)(',')
         PsiWhiteSpace('\n        ')
@@ -1139,7 +1139,7 @@ JetFile: SoftKeywords.jet
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('t')
         PsiElement(COMMA)(',')
         PsiWhiteSpace('\n        ')
@@ -1149,7 +1149,7 @@ JetFile: SoftKeywords.jet
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('t')
         PsiElement(COMMA)(',')
         PsiWhiteSpace('\n        ')
@@ -1159,7 +1159,7 @@ JetFile: SoftKeywords.jet
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('t')
         PsiElement(COMMA)(',')
         PsiWhiteSpace('\n        ')
@@ -1169,7 +1169,7 @@ JetFile: SoftKeywords.jet
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('t')
         PsiElement(COMMA)(',')
         PsiWhiteSpace('\n        ')
@@ -1179,7 +1179,7 @@ JetFile: SoftKeywords.jet
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('t')
         PsiElement(COMMA)(',')
         PsiWhiteSpace('\n        ')
@@ -1189,7 +1189,7 @@ JetFile: SoftKeywords.jet
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('t')
         PsiElement(COMMA)(',')
         PsiWhiteSpace('\n        ')
@@ -1199,7 +1199,7 @@ JetFile: SoftKeywords.jet
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('t')
         PsiElement(COMMA)(',')
         PsiWhiteSpace('\n        ')
@@ -1209,7 +1209,7 @@ JetFile: SoftKeywords.jet
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('t')
         PsiElement(COMMA)(',')
         PsiWhiteSpace('\n        ')
@@ -1219,7 +1219,7 @@ JetFile: SoftKeywords.jet
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('t')
         PsiElement(COMMA)(',')
         PsiWhiteSpace('\n        ')
@@ -1229,7 +1229,7 @@ JetFile: SoftKeywords.jet
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('t')
         PsiElement(COMMA)(',')
         PsiWhiteSpace('\n        ')
@@ -1239,7 +1239,7 @@ JetFile: SoftKeywords.jet
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('t')
         PsiElement(COMMA)(',')
         PsiWhiteSpace('\n    ')
@@ -1284,7 +1284,7 @@ JetFile: SoftKeywords.jet
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('b')
         PsiWhiteSpace('\n')
         PsiElement(RPAR)(')')

idea/testData/psi/ThisType.txt

@@ -12,7 +12,7 @@ JetFile: ThisType.jet
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('List')
               TYPE_ARGUMENT_LIST
                 PsiElement(LT)('<')
@@ -39,7 +39,7 @@ JetFile: ThisType.jet
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('bar')
               TYPE_ARGUMENT_LIST
                 PsiElement(LT)('<')
@@ -54,7 +54,7 @@ JetFile: ThisType.jet
       DELEGATION_SPECIFIER_LIST
         DELEGATOR_BY
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('List')
               TYPE_ARGUMENT_LIST
                 PsiElement(LT)('<')
@@ -72,7 +72,7 @@ JetFile: ThisType.jet
             PsiElement(as)('as')
             PsiWhiteSpace(' ')
             TYPE_REFERENCE
-              USER_TYPE
+              REFERENCE_EXPRESSION
                 PsiElement(IDENTIFIER)('List')
                 TYPE_ARGUMENT_LIST
                   PsiElement(LT)('<')
@@ -128,7 +128,7 @@ JetFile: ThisType.jet
                 PsiElement(new)('new')
                 PsiWhiteSpace(' ')
                 TYPE_REFERENCE
-                  USER_TYPE
+                  REFERENCE_EXPRESSION
                     PsiElement(IDENTIFIER)('Foo')
                     TYPE_ARGUMENT_LIST
                       PsiElement(LT)('<')

idea/testData/psi/TupleTypes.txt

@@ -29,7 +29,7 @@ JetFile: TupleTypes.jet
             TUPLE_TYPE
               PsiElement(LPAR)('(')
               TYPE_REFERENCE
-                USER_TYPE
+                REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('X')
               PsiElement(RPAR)(')')
         PsiElement(COMMA)(',')
@@ -43,12 +43,12 @@ JetFile: TupleTypes.jet
             TUPLE_TYPE
               PsiElement(LPAR)('(')
               TYPE_REFERENCE
-                USER_TYPE
+                REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('A')
               PsiElement(COMMA)(',')
               PsiWhiteSpace(' ')
               TYPE_REFERENCE
-                USER_TYPE
+                REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('B')
               PsiElement(RPAR)(')')
         PsiElement(COMMA)(',')
@@ -67,7 +67,7 @@ JetFile: TupleTypes.jet
                 PsiElement(COLON)(':')
                 PsiWhiteSpace(' ')
                 TYPE_REFERENCE
-                  USER_TYPE
+                  REFERENCE_EXPRESSION
                     PsiElement(IDENTIFIER)('Int')
               PsiElement(COMMA)(',')
               PsiWhiteSpace(' ')
@@ -77,7 +77,7 @@ JetFile: TupleTypes.jet
                 PsiElement(COLON)(':')
                 PsiWhiteSpace(' ')
                 TYPE_REFERENCE
-                  USER_TYPE
+                  REFERENCE_EXPRESSION
                     PsiElement(IDENTIFIER)('Int')
               PsiElement(RPAR)(')')
         PsiElement(COMMA)(',')
@@ -91,8 +91,9 @@ JetFile: TupleTypes.jet
             ATTRIBUTE_ANNOTATION
               PsiElement(LBRACKET)('[')
               ATTRIBUTE
-                USER_TYPE
-                  PsiElement(IDENTIFIER)('x')
+                TYPE_REFERENCE
+                  REFERENCE_EXPRESSION
+                    PsiElement(IDENTIFIER)('x')
               PsiElement(RBRACKET)(']')
             PsiWhiteSpace(' ')
             TUPLE_TYPE
@@ -109,8 +110,9 @@ JetFile: TupleTypes.jet
             ATTRIBUTE_ANNOTATION
               PsiElement(LBRACKET)('[')
               ATTRIBUTE
-                USER_TYPE
-                  PsiElement(IDENTIFIER)('x')
+                TYPE_REFERENCE
+                  REFERENCE_EXPRESSION
+                    PsiElement(IDENTIFIER)('x')
               PsiElement(RBRACKET)(']')
             TUPLE_TYPE
               PsiElement(LPAR)('(')
@@ -118,11 +120,12 @@ JetFile: TupleTypes.jet
                 ATTRIBUTE_ANNOTATION
                   PsiElement(LBRACKET)('[')
                   ATTRIBUTE
-                    USER_TYPE
-                      PsiElement(IDENTIFIER)('x')
+                    TYPE_REFERENCE
+                      REFERENCE_EXPRESSION
+                        PsiElement(IDENTIFIER)('x')
                   PsiElement(RBRACKET)(']')
                 PsiWhiteSpace(' ')
-                USER_TYPE
+                REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('X')
               PsiElement(RPAR)(')')
         PsiElement(COMMA)(',')
@@ -136,8 +139,9 @@ JetFile: TupleTypes.jet
             ATTRIBUTE_ANNOTATION
               PsiElement(LBRACKET)('[')
               ATTRIBUTE
-                USER_TYPE
-                  PsiElement(IDENTIFIER)('x')
+                TYPE_REFERENCE
+                  REFERENCE_EXPRESSION
+                    PsiElement(IDENTIFIER)('x')
               PsiElement(RBRACKET)(']')
             PsiWhiteSpace(' ')
             TUPLE_TYPE
@@ -146,11 +150,12 @@ JetFile: TupleTypes.jet
                 ATTRIBUTE_ANNOTATION
                   PsiElement(LBRACKET)('[')
                   ATTRIBUTE
-                    USER_TYPE
-                      PsiElement(IDENTIFIER)('x')
+                    TYPE_REFERENCE
+                      REFERENCE_EXPRESSION
+                        PsiElement(IDENTIFIER)('x')
                   PsiElement(RBRACKET)(']')
                 PsiWhiteSpace(' ')
-                USER_TYPE
+                REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('A')
               PsiElement(COMMA)(',')
               PsiWhiteSpace(' ')
@@ -158,10 +163,11 @@ JetFile: TupleTypes.jet
                 ATTRIBUTE_ANNOTATION
                   PsiElement(LBRACKET)('[')
                   ATTRIBUTE
-                    USER_TYPE
-                      PsiElement(IDENTIFIER)('x')
+                    TYPE_REFERENCE
+                      REFERENCE_EXPRESSION
+                        PsiElement(IDENTIFIER)('x')
                   PsiElement(RBRACKET)(']')
-                USER_TYPE
+                REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('B')
               PsiElement(RPAR)(')')
         PsiElement(COMMA)(',')
@@ -175,8 +181,9 @@ JetFile: TupleTypes.jet
             ATTRIBUTE_ANNOTATION
               PsiElement(LBRACKET)('[')
               ATTRIBUTE
-                USER_TYPE
-                  PsiElement(IDENTIFIER)('x')
+                TYPE_REFERENCE
+                  REFERENCE_EXPRESSION
+                    PsiElement(IDENTIFIER)('x')
               PsiElement(RBRACKET)(']')
             PsiWhiteSpace(' ')
             TUPLE_TYPE
@@ -190,11 +197,12 @@ JetFile: TupleTypes.jet
                   ATTRIBUTE_ANNOTATION
                     PsiElement(LBRACKET)('[')
                     ATTRIBUTE
-                      USER_TYPE
-                        PsiElement(IDENTIFIER)('x')
+                      TYPE_REFERENCE
+                        REFERENCE_EXPRESSION
+                          PsiElement(IDENTIFIER)('x')
                     PsiElement(RBRACKET)(']')
                   PsiWhiteSpace(' ')
-                  USER_TYPE
+                  REFERENCE_EXPRESSION
                     PsiElement(IDENTIFIER)('Int')
               PsiElement(COMMA)(',')
               PsiWhiteSpace(' ')
@@ -207,11 +215,12 @@ JetFile: TupleTypes.jet
                   ATTRIBUTE_ANNOTATION
                     PsiElement(LBRACKET)('[')
                     ATTRIBUTE
-                      USER_TYPE
-                        PsiElement(IDENTIFIER)('x')
+                      TYPE_REFERENCE
+                        REFERENCE_EXPRESSION
+                          PsiElement(IDENTIFIER)('x')
                     PsiElement(RBRACKET)(']')
                   PsiWhiteSpace(' ')
-                  USER_TYPE
+                  REFERENCE_EXPRESSION
                     PsiElement(IDENTIFIER)('Int')
               PsiElement(RPAR)(')')
         PsiWhiteSpace('\n    ')

idea/testData/psi/TupleTypes_ERR.txt

@@ -29,7 +29,7 @@ JetFile: TupleTypes_ERR.jet
             TUPLE_TYPE
               PsiElement(LPAR)('(')
               TYPE_REFERENCE
-                USER_TYPE
+                REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('X')
               PsiElement(RPAR)(')')
         PsiElement(COMMA)(',')
@@ -43,7 +43,7 @@ JetFile: TupleTypes_ERR.jet
             TUPLE_TYPE
               PsiElement(LPAR)('(')
               TYPE_REFERENCE
-                USER_TYPE
+                REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('A')
               PsiElement(COMMA)(',')
               PsiErrorElement:Type expected
@@ -74,7 +74,7 @@ JetFile: TupleTypes_ERR.jet
                 PsiElement(COLON)(':')
               PsiWhiteSpace(' ')
               TYPE_REFERENCE
-                USER_TYPE
+                REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('Int')
               PsiElement(RPAR)(')')
         PsiElement(COMMA)(',')
@@ -88,8 +88,9 @@ JetFile: TupleTypes_ERR.jet
             ATTRIBUTE_ANNOTATION
               PsiElement(LBRACKET)('[')
               ATTRIBUTE
-                USER_TYPE
-                  PsiElement(IDENTIFIER)('x')
+                TYPE_REFERENCE
+                  REFERENCE_EXPRESSION
+                    PsiElement(IDENTIFIER)('x')
               PsiElement(RBRACKET)(']')
             PsiWhiteSpace(' ')
             TUPLE_TYPE
@@ -106,8 +107,9 @@ JetFile: TupleTypes_ERR.jet
             ATTRIBUTE_ANNOTATION
               PsiElement(LBRACKET)('[')
               ATTRIBUTE
-                USER_TYPE
-                  PsiElement(IDENTIFIER)('x')
+                TYPE_REFERENCE
+                  REFERENCE_EXPRESSION
+                    PsiElement(IDENTIFIER)('x')
               PsiElement(RBRACKET)(']')
             TUPLE_TYPE
               PsiElement(LPAR)('(')
@@ -115,12 +117,13 @@ JetFile: TupleTypes_ERR.jet
                 ATTRIBUTE_ANNOTATION
                   PsiElement(LBRACKET)('[')
                   ATTRIBUTE
-                    USER_TYPE
-                      PsiElement(IDENTIFIER)('x')
+                    TYPE_REFERENCE
+                      REFERENCE_EXPRESSION
+                        PsiElement(IDENTIFIER)('x')
                   PsiErrorElement:Expecting ']' to close an attribute annotation
                     <empty list>
                 PsiWhiteSpace(' ')
-                USER_TYPE
+                REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('X')
               PsiElement(RPAR)(')')
         PsiElement(COMMA)(',')
@@ -134,8 +137,9 @@ JetFile: TupleTypes_ERR.jet
             ATTRIBUTE_ANNOTATION
               PsiElement(LBRACKET)('[')
               ATTRIBUTE
-                USER_TYPE
-                  PsiElement(IDENTIFIER)('x')
+                TYPE_REFERENCE
+                  REFERENCE_EXPRESSION
+                    PsiElement(IDENTIFIER)('x')
               PsiElement(RBRACKET)(']')
             PsiWhiteSpace(' ')
             TUPLE_TYPE
@@ -144,11 +148,12 @@ JetFile: TupleTypes_ERR.jet
                 ATTRIBUTE_ANNOTATION
                   PsiElement(LBRACKET)('[')
                   ATTRIBUTE
-                    USER_TYPE
-                      PsiElement(IDENTIFIER)('x')
+                    TYPE_REFERENCE
+                      REFERENCE_EXPRESSION
+                        PsiElement(IDENTIFIER)('x')
                   PsiElement(RBRACKET)(']')
                 PsiWhiteSpace(' ')
-                USER_TYPE
+                REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('A')
               PsiElement(COMMA)(',')
               PsiWhiteSpace(' ')
@@ -156,10 +161,11 @@ JetFile: TupleTypes_ERR.jet
                 ATTRIBUTE_ANNOTATION
                   PsiElement(LBRACKET)('[')
                   ATTRIBUTE
-                    USER_TYPE
-                      PsiElement(IDENTIFIER)('x')
+                    TYPE_REFERENCE
+                      REFERENCE_EXPRESSION
+                        PsiElement(IDENTIFIER)('x')
                   PsiElement(RBRACKET)(']')
-                USER_TYPE
+                REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('B')
               PsiElement(RPAR)(')')
         PsiElement(COMMA)(',')
@@ -173,8 +179,9 @@ JetFile: TupleTypes_ERR.jet
             ATTRIBUTE_ANNOTATION
               PsiElement(LBRACKET)('[')
               ATTRIBUTE
-                USER_TYPE
-                  PsiElement(IDENTIFIER)('x')
+                TYPE_REFERENCE
+                  REFERENCE_EXPRESSION
+                    PsiElement(IDENTIFIER)('x')
               PsiElement(RBRACKET)(']')
             PsiWhiteSpace(' ')
             TUPLE_TYPE
@@ -188,11 +195,12 @@ JetFile: TupleTypes_ERR.jet
                   ATTRIBUTE_ANNOTATION
                     PsiElement(LBRACKET)('[')
                     ATTRIBUTE
-                      USER_TYPE
-                        PsiElement(IDENTIFIER)('x')
+                      TYPE_REFERENCE
+                        REFERENCE_EXPRESSION
+                          PsiElement(IDENTIFIER)('x')
                     PsiElement(RBRACKET)(']')
                   PsiWhiteSpace(' ')
-                  USER_TYPE
+                  REFERENCE_EXPRESSION
                     PsiElement(IDENTIFIER)('Int')
               PsiElement(COMMA)(',')
               PsiWhiteSpace(' ')
@@ -205,11 +213,12 @@ JetFile: TupleTypes_ERR.jet
                   ATTRIBUTE_ANNOTATION
                     PsiElement(LBRACKET)('[')
                     ATTRIBUTE
-                      USER_TYPE
-                        PsiElement(IDENTIFIER)('x')
+                      TYPE_REFERENCE
+                        REFERENCE_EXPRESSION
+                          PsiElement(IDENTIFIER)('x')
                     PsiElement(RBRACKET)(']')
                   PsiWhiteSpace(' ')
-                  USER_TYPE
+                  REFERENCE_EXPRESSION
                     PsiElement(IDENTIFIER)('Int')
               PsiElement(RPAR)(')')
         PsiWhiteSpace('\n    ')

idea/testData/psi/TypeAnnotations.txt

@@ -17,18 +17,20 @@ JetFile: TypeAnnotations.jet
             ATTRIBUTE_ANNOTATION
               PsiElement(LBRACKET)('[')
               ATTRIBUTE
-                USER_TYPE
-                  PsiElement(IDENTIFIER)('a')
+                TYPE_REFERENCE
+                  REFERENCE_EXPRESSION
+                    PsiElement(IDENTIFIER)('a')
               PsiElement(RBRACKET)(']')
             PsiWhiteSpace(' ')
             ATTRIBUTE_ANNOTATION
               PsiElement(LBRACKET)('[')
               ATTRIBUTE
-                USER_TYPE
-                  PsiElement(IDENTIFIER)('b')
+                TYPE_REFERENCE
+                  REFERENCE_EXPRESSION
+                    PsiElement(IDENTIFIER)('b')
               PsiElement(RBRACKET)(']')
             PsiWhiteSpace(' ')
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('B')
         PsiElement(RPAR)(')')
     PsiWhiteSpace('\n\n')
@@ -45,18 +47,20 @@ JetFile: TypeAnnotations.jet
         ATTRIBUTE_ANNOTATION
           PsiElement(LBRACKET)('[')
           ATTRIBUTE
-            USER_TYPE
-              PsiElement(IDENTIFIER)('b')
+            TYPE_REFERENCE
+              REFERENCE_EXPRESSION
+                PsiElement(IDENTIFIER)('b')
           PsiElement(RBRACKET)(']')
         PsiWhiteSpace(' ')
         ATTRIBUTE_ANNOTATION
           PsiElement(LBRACKET)('[')
           ATTRIBUTE
-            USER_TYPE
-              PsiElement(IDENTIFIER)('x')
+            TYPE_REFERENCE
+              REFERENCE_EXPRESSION
+                PsiElement(IDENTIFIER)('x')
           PsiElement(RBRACKET)(']')
         PsiWhiteSpace(' ')
-        USER_TYPE
+        REFERENCE_EXPRESSION
           PsiElement(IDENTIFIER)('F')
           TYPE_ARGUMENT_LIST
             PsiElement(LT)('<')
@@ -64,16 +68,17 @@ JetFile: TypeAnnotations.jet
               ATTRIBUTE_ANNOTATION
                 PsiElement(LBRACKET)('[')
                 ATTRIBUTE
-                  USER_TYPE
-                    PsiElement(IDENTIFIER)('x')
+                  TYPE_REFERENCE
+                    REFERENCE_EXPRESSION
+                      PsiElement(IDENTIFIER)('x')
                 PsiElement(RBRACKET)(']')
             PsiWhiteSpace(' ')
             TYPE_REFERENCE
-              USER_TYPE
+              REFERENCE_EXPRESSION
                 PsiElement(IDENTIFIER)('A')
             PsiElement(COMMA)(',')
             PsiWhiteSpace(' ')
             TYPE_REFERENCE
-              USER_TYPE
+              REFERENCE_EXPRESSION
                 PsiElement(IDENTIFIER)('B')
             PsiElement(GT)('>')

idea/testData/psi/TypeConstraints.txt

@@ -15,13 +15,13 @@ JetFile: TypeConstraints.jet
         TYPE_CONSTRAINT_LIST
           TYPE_CONSTRAINT
             TYPE_REFERENCE
-              USER_TYPE
+              REFERENCE_EXPRESSION
                 PsiElement(IDENTIFIER)('T')
             PsiWhiteSpace(' ')
             PsiElement(COLON)(':')
             PsiWhiteSpace(' ')
             TYPE_REFERENCE
-              USER_TYPE
+              REFERENCE_EXPRESSION
                 PsiElement(IDENTIFIER)('T')
           PsiElement(COMMA)(',')
           PsiWhiteSpace(' ')
@@ -31,13 +31,13 @@ JetFile: TypeConstraints.jet
             PsiElement(object)('object')
             PsiWhiteSpace(' ')
             TYPE_REFERENCE
-              USER_TYPE
+              REFERENCE_EXPRESSION
                 PsiElement(IDENTIFIER)('T')
             PsiWhiteSpace(' ')
             PsiElement(COLON)(':')
             PsiWhiteSpace(' ')
             TYPE_REFERENCE
-              USER_TYPE
+              REFERENCE_EXPRESSION
                 PsiElement(IDENTIFIER)('T')
       PsiWhiteSpace(' ')
       CLASS_BODY

idea/testData/psi/TypeDef.txt

@@ -19,7 +19,7 @@ JetFile: TypeDef.jet
       PsiElement(EQ)('=')
       PsiWhiteSpace(' ')
       TYPE_REFERENCE
-        USER_TYPE
+        REFERENCE_EXPRESSION
           PsiElement(IDENTIFIER)('bar')
     PsiWhiteSpace('\n')
     TYPEDEF
@@ -35,7 +35,7 @@ JetFile: TypeDef.jet
       PsiElement(EQ)('=')
       PsiWhiteSpace(' ')
       TYPE_REFERENCE
-        USER_TYPE
+        REFERENCE_EXPRESSION
           PsiElement(IDENTIFIER)('bar')
     PsiWhiteSpace('\n')
     TYPEDEF
@@ -50,14 +50,14 @@ JetFile: TypeDef.jet
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('foo')
         PsiElement(GT)('>')
       PsiWhiteSpace(' ')
       PsiElement(EQ)('=')
       PsiWhiteSpace(' ')
       TYPE_REFERENCE
-        USER_TYPE
+        REFERENCE_EXPRESSION
           PsiElement(IDENTIFIER)('bar')
     PsiWhiteSpace('\n')
     TYPEDEF
@@ -77,7 +77,7 @@ JetFile: TypeDef.jet
       PsiElement(EQ)('=')
       PsiWhiteSpace(' ')
       TYPE_REFERENCE
-        USER_TYPE
+        REFERENCE_EXPRESSION
           PsiElement(IDENTIFIER)('bar')
     PsiWhiteSpace('\n')
     TYPEDEF
@@ -96,14 +96,14 @@ JetFile: TypeDef.jet
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('A')
         PsiElement(GT)('>')
       PsiWhiteSpace(' ')
       PsiElement(EQ)('=')
       PsiWhiteSpace(' ')
       TYPE_REFERENCE
-        USER_TYPE
+        REFERENCE_EXPRESSION
           PsiElement(IDENTIFIER)('bar')
     PsiWhiteSpace('\n\n')
     TYPEDEF
@@ -116,7 +116,7 @@ JetFile: TypeDef.jet
       PsiElement(EQ)('=')
       PsiWhiteSpace(' ')
       TYPE_REFERENCE
-        USER_TYPE
+        REFERENCE_EXPRESSION
           PsiElement(IDENTIFIER)('bar')
       PsiWhiteSpace(' ')
       PsiElement(SEMICOLON)(';')
@@ -134,7 +134,7 @@ JetFile: TypeDef.jet
       PsiElement(EQ)('=')
       PsiWhiteSpace(' ')
       TYPE_REFERENCE
-        USER_TYPE
+        REFERENCE_EXPRESSION
           PsiElement(IDENTIFIER)('bar')
       PsiWhiteSpace(' ')
       PsiElement(SEMICOLON)(';')
@@ -151,14 +151,14 @@ JetFile: TypeDef.jet
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('foo')
         PsiElement(GT)('>')
       PsiWhiteSpace(' ')
       PsiElement(EQ)('=')
       PsiWhiteSpace(' ')
       TYPE_REFERENCE
-        USER_TYPE
+        REFERENCE_EXPRESSION
           PsiElement(IDENTIFIER)('bar')
       PsiWhiteSpace(' ')
       PsiElement(SEMICOLON)(';')
@@ -180,7 +180,7 @@ JetFile: TypeDef.jet
       PsiElement(EQ)('=')
       PsiWhiteSpace(' ')
       TYPE_REFERENCE
-        USER_TYPE
+        REFERENCE_EXPRESSION
           PsiElement(IDENTIFIER)('bar')
       PsiWhiteSpace(' ')
       PsiElement(SEMICOLON)(';')
@@ -201,14 +201,14 @@ JetFile: TypeDef.jet
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('A')
         PsiElement(GT)('>')
       PsiWhiteSpace(' ')
       PsiElement(EQ)('=')
       PsiWhiteSpace(' ')
       TYPE_REFERENCE
-        USER_TYPE
+        REFERENCE_EXPRESSION
           PsiElement(IDENTIFIER)('bar')
       PsiWhiteSpace(' ')
       PsiElement(SEMICOLON)(';')

idea/testData/psi/TypeDef_ERR.txt

@@ -84,7 +84,7 @@ JetFile: TypeDef_ERR.jet
       PsiElement(EQ)('=')
       PsiWhiteSpace(' ')
       TYPE_REFERENCE
-        USER_TYPE
+        REFERENCE_EXPRESSION
           PsiElement(IDENTIFIER)('foo')
     PsiWhiteSpace('\n')
     TYPEDEF
@@ -109,7 +109,7 @@ JetFile: TypeDef_ERR.jet
       PsiElement(EQ)('=')
       PsiWhiteSpace(' ')
       TYPE_REFERENCE
-        USER_TYPE
+        REFERENCE_EXPRESSION
           PsiElement(IDENTIFIER)('foo')
       PsiWhiteSpace(' ')
       PsiElement(SEMICOLON)(';')
@@ -141,7 +141,7 @@ JetFile: TypeDef_ERR.jet
       PsiElement(EQ)('=')
       PsiWhiteSpace(' ')
       TYPE_REFERENCE
-        USER_TYPE
+        REFERENCE_EXPRESSION
           PsiElement(IDENTIFIER)('bar')
     PsiWhiteSpace('\n')
     TYPEDEF
@@ -161,7 +161,7 @@ JetFile: TypeDef_ERR.jet
       PsiElement(EQ)('=')
       PsiWhiteSpace(' ')
       TYPE_REFERENCE
-        USER_TYPE
+        REFERENCE_EXPRESSION
           PsiElement(IDENTIFIER)('bar')
     PsiWhiteSpace('\n')
     TYPEDEF
@@ -187,7 +187,7 @@ JetFile: TypeDef_ERR.jet
       PsiElement(EQ)('=')
       PsiWhiteSpace(' ')
       TYPE_REFERENCE
-        USER_TYPE
+        REFERENCE_EXPRESSION
           PsiElement(IDENTIFIER)('bar')
     PsiWhiteSpace('\n\n')
     CLASS
@@ -207,5 +207,5 @@ JetFile: TypeDef_ERR.jet
       PsiElement(EQ)('=')
       PsiWhiteSpace(' ')
       TYPE_REFERENCE
-        USER_TYPE
+        REFERENCE_EXPRESSION
           PsiElement(IDENTIFIER)('bar')

idea/testData/psi/TypeExpressionAmbiguities_ERR.txt

@@ -25,17 +25,17 @@ JetFile: TypeExpressionAmbiguities_ERR.jet
                 TYPE_ARGUMENT_LIST
                   PsiElement(LT)('<')
                   TYPE_REFERENCE
-                    USER_TYPE
+                    REFERENCE_EXPRESSION
                       PsiElement(IDENTIFIER)('a')
                   PsiElement(COMMA)(',')
                   PsiWhiteSpace(' ')
                   TYPE_REFERENCE
-                    USER_TYPE
+                    REFERENCE_EXPRESSION
                       PsiElement(IDENTIFIER)('b')
                   PsiElement(COMMA)(',')
                   PsiWhiteSpace(' ')
                   TYPE_REFERENCE
-                    USER_TYPE
+                    REFERENCE_EXPRESSION
                       PsiElement(IDENTIFIER)('c')
                   PsiElement(GT)('>')
                 VALUE_ARGUMENT_LIST
@@ -138,7 +138,7 @@ JetFile: TypeExpressionAmbiguities_ERR.jet
                 PsiElement(COLON)(':')
                 PsiWhiteSpace(' ')
                 TYPE_REFERENCE
-                  USER_TYPE
+                  REFERENCE_EXPRESSION
                     PsiElement(IDENTIFIER)('b')
             PsiElement(COMMA)(',')
             PsiWhiteSpace(' ')
@@ -161,14 +161,14 @@ JetFile: TypeExpressionAmbiguities_ERR.jet
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('b')
               PsiWhiteSpace(' ')
               TYPE_ARGUMENT_LIST
                 PsiElement(LT)('<')
                 PsiWhiteSpace(' ')
                 TYPE_REFERENCE
-                  USER_TYPE
+                  REFERENCE_EXPRESSION
                     PsiElement(IDENTIFIER)('c')
                 PsiErrorElement:Expecting a '>'
                   <empty list>
@@ -180,33 +180,33 @@ JetFile: TypeExpressionAmbiguities_ERR.jet
           PsiElement(as)('as')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('Foo')
               PsiWhiteSpace(' ')
               TYPE_ARGUMENT_LIST
                 PsiElement(LT)('<')
                 PsiWhiteSpace(' ')
                 TYPE_REFERENCE
-                  USER_TYPE
+                  REFERENCE_EXPRESSION
                     PsiElement(IDENTIFIER)('bar')
                 PsiErrorElement:Expecting a '>'
                   <empty list>
         PsiWhiteSpace('\n    ')
-        BINARY_WITH_TYPE
+        BINARY_WITH_PATTERN
           REFERENCE_EXPRESSION
             PsiElement(IDENTIFIER)('x')
           PsiWhiteSpace(' ')
           PsiElement(is)('is')
           PsiWhiteSpace(' ')
-          TYPE_REFERENCE
-            USER_TYPE
+          TYPE_PATTERN
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('Foo')
               PsiWhiteSpace(' ')
               TYPE_ARGUMENT_LIST
                 PsiElement(LT)('<')
                 PsiWhiteSpace(' ')
                 TYPE_REFERENCE
-                  USER_TYPE
+                  REFERENCE_EXPRESSION
                     PsiElement(IDENTIFIER)('bar')
                 PsiErrorElement:Expecting a '>'
                   <empty list>

idea/testData/psi/When.jet

@@ -0,0 +1,76 @@
+fun foo() {
+  return false
+
+  fun a() = {when(x) { is a => b }}
+
+  // foo
+  fun b() {}
+
+}
+
+fun foo() {
+  when (e) {
+
+  }
+  when (e) {
+    is a => foo
+  }
+  when (e) {
+    is Tree(a, b) => foo
+    is Tree(a, b) if (a > 5) => foo
+    is null => foo
+    is 1 => foo
+    is A.b => foo
+    is 1l => foo
+    is 1.0 => foo
+    is 'c' => foo
+    is "sadfsa" => foo
+    is """ddd""" => foo
+    is ? => foo
+    is ? is Foo => foo
+    is ?a is Foo => foo
+    is (?a is Foo, b) => foo
+  }
+  when (when(when (e) {
+
+  }) {
+
+  }) {
+
+  }
+}
+
+fun foo() {
+  when (val a = e) {
+    is Tree => c
+    is Tree(null, ?r) => c
+    is a(a, b) => c
+    is a(a, b) => c
+    is a.a(a, b) => c
+    is a.a(foo = a, bar = b) => c
+    is namespace.a.a(a, b) => c
+    is a(?a is T, b) => c
+    is a(b, 1) => c
+    in 1..2 => dsf
+    !in 2 => sd
+    !is t => d
+    is {(foo) : Bar} => fgpp
+    is (1, ?a is Foo, ?, ? is Foo, bar) => d
+    is (Foo, ?a in 1..2, ?, ? !is Foo, ?bar = foo.bar<a>(a)) => d
+    is (Int, Int) => 2
+    else => foo
+    else continue
+  }
+}
+
+fun foo() {
+  when (val a = e) {
+    is Tree,
+    is Tree(null, ?r),
+    is a(a, b) => c
+    1, foo(), bar, 2 + 3,
+    is a(a, b) => c
+    is a.a(=a + 3, b) => c
+  }
+}
+

idea/testData/psi/When_ERR.jet

@@ -0,0 +1,26 @@
+fun foo() {
+  when (e) {
+  }
+  when (e) {
+    is  => foo
+    !is  => foo
+    in  => foo
+    !in  => foo
+    => foo
+    else
+  }
+  when (e) {
+    is  =>
+    !is  =>
+    in  =>
+    !in  =>
+    !in  => ;
+    =>
+    else
+    else =>
+  }
+  when (e) {
+    is - => foo
+    is (, , 1, , ) => foo
+  }
+}

idea/testData/psi/When_ERR.txt

@@ -0,0 +1,235 @@
+JetFile: When_ERR.jet
+  NAMESPACE
+    FUN
+      PsiElement(fun)('fun')
+      PsiWhiteSpace(' ')
+      PsiElement(IDENTIFIER)('foo')
+      TYPE_PARAMETER_LIST
+        <empty list>
+      VALUE_PARAMETER_LIST
+        PsiElement(LPAR)('(')
+        PsiElement(RPAR)(')')
+      PsiWhiteSpace(' ')
+      BLOCK
+        PsiElement(LBRACE)('{')
+        PsiWhiteSpace('\n  ')
+        WHEN
+          PsiElement(when)('when')
+          PsiWhiteSpace(' ')
+          PsiElement(LPAR)('(')
+          REFERENCE_EXPRESSION
+            PsiElement(IDENTIFIER)('e')
+          PsiElement(RPAR)(')')
+          PsiWhiteSpace(' ')
+          PsiElement(LBRACE)('{')
+          PsiWhiteSpace('\n  ')
+          PsiElement(RBRACE)('}')
+        PsiWhiteSpace('\n  ')
+        WHEN
+          PsiElement(when)('when')
+          PsiWhiteSpace(' ')
+          PsiElement(LPAR)('(')
+          REFERENCE_EXPRESSION
+            PsiElement(IDENTIFIER)('e')
+          PsiElement(RPAR)(')')
+          PsiWhiteSpace(' ')
+          PsiElement(LBRACE)('{')
+          PsiWhiteSpace('\n    ')
+          WHEN_ENTRY
+            WHEN_CONDITION
+              PsiElement(is)('is')
+              PsiErrorElement:Expecting a type or a decomposer pattern
+                <empty list>
+            PsiWhiteSpace('  ')
+            PsiElement(DOUBLE_ARROW)('=>')
+            PsiWhiteSpace(' ')
+            REFERENCE_EXPRESSION
+              PsiElement(IDENTIFIER)('foo')
+          PsiWhiteSpace('\n    ')
+          WHEN_ENTRY
+            WHEN_CONDITION
+              PsiElement(NOT_IS)('!is')
+              PsiErrorElement:Expecting a type or a decomposer pattern
+                <empty list>
+            PsiWhiteSpace('  ')
+            PsiElement(DOUBLE_ARROW)('=>')
+            PsiWhiteSpace(' ')
+            REFERENCE_EXPRESSION
+              PsiElement(IDENTIFIER)('foo')
+          PsiWhiteSpace('\n    ')
+          WHEN_ENTRY
+            WHEN_CONDITION
+              PsiElement(in)('in')
+              PsiErrorElement:Expecting an expression
+                <empty list>
+            PsiWhiteSpace('  ')
+            PsiElement(DOUBLE_ARROW)('=>')
+            PsiWhiteSpace(' ')
+            REFERENCE_EXPRESSION
+              PsiElement(IDENTIFIER)('foo')
+          PsiWhiteSpace('\n    ')
+          WHEN_ENTRY
+            WHEN_CONDITION
+              PsiElement(NOT_IN)('!in')
+              PsiErrorElement:Expecting an expression
+                <empty list>
+            PsiWhiteSpace('  ')
+            PsiElement(DOUBLE_ARROW)('=>')
+            PsiWhiteSpace(' ')
+            REFERENCE_EXPRESSION
+              PsiElement(IDENTIFIER)('foo')
+          PsiWhiteSpace('\n    ')
+          WHEN_ENTRY
+            WHEN_CONDITION
+              PsiErrorElement:Expecting an expression, is-condition or in-condition
+                <empty list>
+            PsiElement(DOUBLE_ARROW)('=>')
+            PsiWhiteSpace(' ')
+            REFERENCE_EXPRESSION
+              PsiElement(IDENTIFIER)('foo')
+          PsiWhiteSpace('\n    ')
+          WHEN_ENTRY
+            PsiElement(else)('else')
+            PsiErrorElement:Expecting 'continue' or '=> expression'
+              <empty list>
+          PsiWhiteSpace('\n  ')
+          PsiElement(RBRACE)('}')
+        PsiWhiteSpace('\n  ')
+        WHEN
+          PsiElement(when)('when')
+          PsiWhiteSpace(' ')
+          PsiElement(LPAR)('(')
+          REFERENCE_EXPRESSION
+            PsiElement(IDENTIFIER)('e')
+          PsiElement(RPAR)(')')
+          PsiWhiteSpace(' ')
+          PsiElement(LBRACE)('{')
+          PsiWhiteSpace('\n    ')
+          WHEN_ENTRY
+            WHEN_CONDITION
+              PsiElement(is)('is')
+              PsiErrorElement:Expecting a type or a decomposer pattern
+                <empty list>
+            PsiWhiteSpace('  ')
+            PsiElement(DOUBLE_ARROW)('=>')
+            PsiErrorElement:Expecting an expression
+              <empty list>
+          PsiWhiteSpace('\n    ')
+          WHEN_ENTRY
+            WHEN_CONDITION
+              PsiElement(NOT_IS)('!is')
+              PsiErrorElement:Expecting a type or a decomposer pattern
+                <empty list>
+            PsiWhiteSpace('  ')
+            PsiElement(DOUBLE_ARROW)('=>')
+            PsiErrorElement:Expecting an expression
+              <empty list>
+          PsiWhiteSpace('\n    ')
+          WHEN_ENTRY
+            WHEN_CONDITION
+              PsiElement(in)('in')
+              PsiErrorElement:Expecting an expression
+                <empty list>
+            PsiWhiteSpace('  ')
+            PsiElement(DOUBLE_ARROW)('=>')
+            PsiErrorElement:Expecting an expression
+              <empty list>
+          PsiWhiteSpace('\n    ')
+          WHEN_ENTRY
+            WHEN_CONDITION
+              PsiElement(NOT_IN)('!in')
+              PsiErrorElement:Expecting an expression
+                <empty list>
+            PsiWhiteSpace('  ')
+            PsiElement(DOUBLE_ARROW)('=>')
+            PsiErrorElement:Expecting an expression
+              <empty list>
+          PsiWhiteSpace('\n    ')
+          WHEN_ENTRY
+            WHEN_CONDITION
+              PsiElement(NOT_IN)('!in')
+              PsiErrorElement:Expecting an expression
+                <empty list>
+            PsiWhiteSpace('  ')
+            PsiElement(DOUBLE_ARROW)('=>')
+            PsiWhiteSpace(' ')
+            PsiErrorElement:Expecting an expression
+              PsiElement(SEMICOLON)(';')
+          PsiWhiteSpace('\n    ')
+          WHEN_ENTRY
+            WHEN_CONDITION
+              PsiErrorElement:Expecting an expression, is-condition or in-condition
+                <empty list>
+            PsiElement(DOUBLE_ARROW)('=>')
+            PsiErrorElement:Expecting an expression
+              <empty list>
+          PsiWhiteSpace('\n    ')
+          WHEN_ENTRY
+            PsiElement(else)('else')
+            PsiErrorElement:Expecting 'continue' or '=> expression'
+              <empty list>
+          PsiWhiteSpace('\n    ')
+          WHEN_ENTRY
+            PsiElement(else)('else')
+            PsiWhiteSpace(' ')
+            PsiElement(DOUBLE_ARROW)('=>')
+            PsiErrorElement:Expecting an expression
+              <empty list>
+          PsiWhiteSpace('\n  ')
+          PsiElement(RBRACE)('}')
+        PsiWhiteSpace('\n  ')
+        WHEN
+          PsiElement(when)('when')
+          PsiWhiteSpace(' ')
+          PsiElement(LPAR)('(')
+          REFERENCE_EXPRESSION
+            PsiElement(IDENTIFIER)('e')
+          PsiElement(RPAR)(')')
+          PsiWhiteSpace(' ')
+          PsiElement(LBRACE)('{')
+          PsiWhiteSpace('\n    ')
+          WHEN_ENTRY
+            WHEN_CONDITION
+              PsiElement(is)('is')
+              PsiWhiteSpace(' ')
+              PsiErrorElement:Pattern expected
+                PsiElement(MINUS)('-')
+            PsiWhiteSpace(' ')
+            PsiElement(DOUBLE_ARROW)('=>')
+            PsiWhiteSpace(' ')
+            REFERENCE_EXPRESSION
+              PsiElement(IDENTIFIER)('foo')
+          PsiWhiteSpace('\n    ')
+          WHEN_ENTRY
+            WHEN_CONDITION
+              PsiElement(is)('is')
+              PsiWhiteSpace(' ')
+              TUPLE_PATTERN
+                PsiElement(LPAR)('(')
+                PsiErrorElement:Expecting a pattern
+                  PsiElement(COMMA)(',')
+                PsiWhiteSpace(' ')
+                PsiErrorElement:Expecting a pattern
+                  PsiElement(COMMA)(',')
+                PsiWhiteSpace(' ')
+                TUPLE_PATTERN_ENTRY
+                  EXPRESSION_PATTERN
+                    INTEGER_CONSTANT
+                      PsiElement(INTEGER_LITERAL)('1')
+                PsiElement(COMMA)(',')
+                PsiWhiteSpace(' ')
+                PsiErrorElement:Expecting a pattern
+                  PsiElement(COMMA)(',')
+                PsiErrorElement:Expecting a pattern
+                  <empty list>
+                PsiWhiteSpace(' ')
+                PsiElement(RPAR)(')')
+            PsiWhiteSpace(' ')
+            PsiElement(DOUBLE_ARROW)('=>')
+            PsiWhiteSpace(' ')
+            REFERENCE_EXPRESSION
+              PsiElement(IDENTIFIER)('foo')
+          PsiWhiteSpace('\n  ')
+          PsiElement(RBRACE)('}')
+        PsiWhiteSpace('\n')
+        PsiElement(RBRACE)('}')

idea/testData/psi/examples/AnonymousObjects.txt

@@ -25,7 +25,7 @@ JetFile: AnonymousObjects.jet
                 DELEGATION_SPECIFIER_LIST
                   DELEGATOR_SUPER_CALL
                     TYPE_REFERENCE
-                      USER_TYPE
+                      REFERENCE_EXPRESSION
                         PsiElement(IDENTIFIER)('MouseAdapter')
                     VALUE_ARGUMENT_LIST
                       PsiElement(LPAR)('(')
@@ -65,7 +65,7 @@ JetFile: AnonymousObjects.jet
                         PsiElement(COLON)(':')
                         PsiWhiteSpace(' ')
                         TYPE_REFERENCE
-                          USER_TYPE
+                          REFERENCE_EXPRESSION
                             PsiElement(IDENTIFIER)('MouseEvent')
                       PsiElement(RPAR)(')')
                     PsiWhiteSpace(' ')
@@ -172,7 +172,7 @@ JetFile: AnonymousObjects.jet
                     PsiElement(COLON)(':')
                     PsiWhiteSpace(' ')
                     TYPE_REFERENCE
-                      USER_TYPE
+                      REFERENCE_EXPRESSION
                         PsiElement(IDENTIFIER)('GodMEssage')
                   PsiElement(RPAR)(')')
                 PsiWhiteSpace(' ')
@@ -185,7 +185,7 @@ JetFile: AnonymousObjects.jet
                     PsiElement(new)('new')
                     PsiWhiteSpace(' ')
                     TYPE_REFERENCE
-                      USER_TYPE
+                      REFERENCE_EXPRESSION
                         PsiElement(IDENTIFIER)('RuntimeException')
                     VALUE_ARGUMENT_LIST
                       PsiElement(LPAR)('(')

idea/testData/psi/examples/BinaryTree.jet

@@ -27,10 +27,10 @@ class BinaryTree<T> : IMutableSet<T> {
 
     fun contains(node : TreeNode, item : T) : Boolean {
       if (node == null) return false
-      compare(item, node.value) match {
-        case EQ => true
-        case LS => contains(node.left, item)
-        case GT => contains(node.right, item)
+      when(compare(item, node.value)) {
+        EQ => true
+        LS => contains(node.left, item)
+        GT => contains(node.right, item)
       }
     }
   }
@@ -50,10 +50,10 @@ class BinaryTree<T> : IMutableSet<T> {
         node = TreeNode(item, parent)
         return true
       }
-      compare(item, node.value) match {
-        case EQ => false
-        case LS => add(ref node.left, node)
-        case GT => add(ref node.right, node)
+      when (compare(item, node.value)) {
+        EQ => false
+        LS => add(ref node.left, node)
+        GT => add(ref node.right, node)
       }
     }
 
@@ -63,14 +63,14 @@ class BinaryTree<T> : IMutableSet<T> {
         root = TreeNode(item, null)
         return true
       }
-      compare(item, node.value) match {
-        case EQ => return false
-        case LS =>
+      when (compare(item, node.value)) {
+        EQ => return false
+        LS =>
           if (node.left == null) {
             node.left = TreeNode(item, node)
             return true
           } else return add(node.left)
-        case GT => 
+        GT =>
           if (node.right == null) {
             node.right = TreeNode(item, node)
             return true
@@ -89,20 +89,20 @@ class BinaryTree<T> : IMutableSet<T> {
 
     fun find(node : TreeNode) : TreeNode {
       if (node == null) return null
-      compare(item, node.value) match {
-        case EQ => node
-        case LS => find(node.left)
-        case GT => find(node.right)
+      when (compare(item, node.value)) {
+        EQ => node
+        LS => find(node.left)
+        GT => find(node.right)
       }
     }
   }
 
   private fun remove(node : TreeNode) {
-    node match {
-      case TreeNode(null, null) => replace(node, null)
-      case TreeNode(null, right) => replace(node, right)
-      case TreeNode(left, null) => replace(node, left)
-      case TreeNode(left, right) => {
+    when (node) {
+      is TreeNode(null, null) => replace(node, null)
+      is TreeNode(null, right) => replace(node, right)
+      is TreeNode(left, null) => replace(node, left)
+      is TreeNode(left, right) => {
         val min = min(node.right)
         node.value = min.value
         remove(min)

idea/testData/psi/examples/BitArith.txt

@@ -14,7 +14,7 @@ JetFile: BitArith.jet
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('Int')
         PsiElement(RPAR)(')')
       PsiWhiteSpace(' ')
@@ -43,7 +43,7 @@ JetFile: BitArith.jet
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('Int')
         PsiElement(COMMA)(',')
         PsiWhiteSpace(' ')
@@ -53,7 +53,7 @@ JetFile: BitArith.jet
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('Int')
         PsiElement(RPAR)(')')
       PsiWhiteSpace(' ')
@@ -89,7 +89,7 @@ JetFile: BitArith.jet
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('Int')
         PsiElement(COMMA)(',')
         PsiWhiteSpace(' ')
@@ -99,7 +99,7 @@ JetFile: BitArith.jet
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('Int')
         PsiElement(RPAR)(')')
       PsiWhiteSpace(' ')
@@ -142,7 +142,7 @@ JetFile: BitArith.jet
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('Int')
         PsiElement(COMMA)(',')
         PsiWhiteSpace(' ')
@@ -152,7 +152,7 @@ JetFile: BitArith.jet
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('Int')
         PsiElement(RPAR)(')')
       PsiWhiteSpace(' ')
@@ -194,7 +194,7 @@ JetFile: BitArith.jet
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('Int')
         PsiElement(COMMA)(',')
         PsiWhiteSpace(' ')
@@ -204,7 +204,7 @@ JetFile: BitArith.jet
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('Int')
         PsiElement(RPAR)(')')
       PsiWhiteSpace(' ')
@@ -248,7 +248,7 @@ JetFile: BitArith.jet
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('INumber')
         PsiElement(RPAR)(')')
       PsiWhiteSpace(' ')
@@ -336,7 +336,7 @@ JetFile: BitArith.jet
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('INumber')
         PsiElement(RPAR)(')')
       PsiWhiteSpace(' ')
@@ -381,7 +381,7 @@ JetFile: BitArith.jet
         PsiElement(as)('as')
         PsiWhiteSpace(' ')
         TYPE_REFERENCE
-          USER_TYPE
+          REFERENCE_EXPRESSION
             PsiElement(IDENTIFIER)('Int')
     PsiWhiteSpace('\n\n')
     FUN
@@ -398,7 +398,7 @@ JetFile: BitArith.jet
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('INumber')
         PsiElement(RPAR)(')')
       PsiWhiteSpace(' ')
@@ -459,7 +459,7 @@ JetFile: BitArith.jet
       PsiElement(fun)('fun')
       PsiWhiteSpace(' ')
       TYPE_REFERENCE
-        USER_TYPE
+        REFERENCE_EXPRESSION
           PsiElement(IDENTIFIER)('Int')
       PsiElement(DOT)('.')
       PsiElement(IDENTIFIER)('matchMask')
@@ -473,7 +473,7 @@ JetFile: BitArith.jet
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('Int')
         PsiElement(RPAR)(')')
       PsiWhiteSpace(' ')
@@ -509,7 +509,7 @@ JetFile: BitArith.jet
       DELEGATION_SPECIFIER_LIST
         DELEGATOR_SUPER_CLASS
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('IComparable')
               TYPE_ARGUMENT_LIST
                 PsiElement(LT)('<')
@@ -529,7 +529,7 @@ JetFile: BitArith.jet
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('Int')
         PsiWhiteSpace('\n  ')
         FUN
@@ -537,8 +537,9 @@ JetFile: BitArith.jet
             ATTRIBUTE_ANNOTATION
               PsiElement(LBRACKET)('[')
               ATTRIBUTE
-                USER_TYPE
-                  PsiElement(IDENTIFIER)('operator')
+                TYPE_REFERENCE
+                  REFERENCE_EXPRESSION
+                    PsiElement(IDENTIFIER)('operator')
               PsiElement(RBRACKET)(']')
           PsiWhiteSpace(' ')
           PsiElement(fun)('fun')
@@ -569,8 +570,9 @@ JetFile: BitArith.jet
             ATTRIBUTE_ANNOTATION
               PsiElement(LBRACKET)('[')
               ATTRIBUTE
-                USER_TYPE
-                  PsiElement(IDENTIFIER)('operator')
+                TYPE_REFERENCE
+                  REFERENCE_EXPRESSION
+                    PsiElement(IDENTIFIER)('operator')
               PsiElement(RBRACKET)(']')
           PsiWhiteSpace(' ')
           PsiElement(fun)('fun')
@@ -586,7 +588,7 @@ JetFile: BitArith.jet
               PsiElement(COLON)(':')
               PsiWhiteSpace(' ')
               TYPE_REFERENCE
-                USER_TYPE
+                REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('Int')
             PsiElement(RPAR)(')')
           PsiWhiteSpace(' ')

idea/testData/psi/examples/Builder.txt

@@ -15,7 +15,7 @@ JetFile: Builder.jet
             DELEGATION_SPECIFIER_LIST
               DELEGATOR_SUPER_CALL
                 TYPE_REFERENCE
-                  USER_TYPE
+                  REFERENCE_EXPRESSION
                     PsiElement(IDENTIFIER)('AntBuilder')
                 VALUE_ARGUMENT_LIST
                   PsiElement(LPAR)('(')
@@ -79,7 +79,7 @@ JetFile: Builder.jet
                               PsiElement(new)('new')
                               PsiWhiteSpace(' ')
                               TYPE_REFERENCE
-                                USER_TYPE
+                                REFERENCE_EXPRESSION
                                   PsiElement(IDENTIFIER)('File')
                               VALUE_ARGUMENT_LIST
                                 PsiElement(LPAR)('(')
@@ -215,7 +215,7 @@ JetFile: Builder.jet
           DELEGATION_SPECIFIER_LIST
             DELEGATOR_SUPER_CLASS
               TYPE_REFERENCE
-                USER_TYPE
+                REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('ClassPathEntry')
           PsiWhiteSpace(' ')
           CLASS_BODY
@@ -235,7 +235,7 @@ JetFile: Builder.jet
                   PsiElement(COLON)(':')
                   PsiWhiteSpace(' ')
                   TYPE_REFERENCE
-                    USER_TYPE
+                    REFERENCE_EXPRESSION
                       PsiElement(IDENTIFIER)('ClassPathEntry')
                 PsiComment(BLOCK_COMMENT)('/*...*/')
                 PsiElement(RPAR)(')')
@@ -255,7 +255,7 @@ JetFile: Builder.jet
               PsiElement(COLON)(':')
               PsiWhiteSpace(' ')
               TYPE_REFERENCE
-                USER_TYPE
+                REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('String')
             PsiWhiteSpace('\n    ')
             FUN
@@ -272,7 +272,7 @@ JetFile: Builder.jet
                   PsiElement(COLON)(':')
                   PsiWhiteSpace(' ')
                   TYPE_REFERENCE
-                    USER_TYPE
+                    REFERENCE_EXPRESSION
                       PsiElement(IDENTIFIER)('String')
                 PsiElement(RPAR)(')')
               PsiWhiteSpace(' ')
@@ -297,7 +297,7 @@ JetFile: Builder.jet
           DELEGATION_SPECIFIER_LIST
             DELEGATOR_SUPER_CLASS
               TYPE_REFERENCE
-                USER_TYPE
+                REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('ClassPathEntry')
           PsiWhiteSpace(' ')
           CLASS_BODY
@@ -317,7 +317,7 @@ JetFile: Builder.jet
                   PsiElement(COLON)(':')
                   PsiWhiteSpace(' ')
                   TYPE_REFERENCE
-                    USER_TYPE
+                    REFERENCE_EXPRESSION
                       PsiElement(IDENTIFIER)('ClassPathEntry')
                 PsiComment(BLOCK_COMMENT)('/*...*/')
                 PsiElement(RPAR)(')')
@@ -349,7 +349,7 @@ JetFile: Builder.jet
                   PsiElement(LBRACE)('{')
                   PsiWhiteSpace(' ')
                   TYPE_REFERENCE
-                    USER_TYPE
+                    REFERENCE_EXPRESSION
                       PsiElement(IDENTIFIER)('Library')
                   PsiElement(DOT)('.')
                   VALUE_PARAMETER_LIST
@@ -359,7 +359,7 @@ JetFile: Builder.jet
                   PsiElement(COLON)(':')
                   PsiWhiteSpace(' ')
                   TYPE_REFERENCE
-                    USER_TYPE
+                    REFERENCE_EXPRESSION
                       PsiElement(IDENTIFIER)('Library')
                   PsiElement(RBRACE)('}')
             PsiElement(RPAR)(')')
@@ -378,7 +378,7 @@ JetFile: Builder.jet
                 PsiElement(new)('new')
                 PsiWhiteSpace(' ')
                 TYPE_REFERENCE
-                  USER_TYPE
+                  REFERENCE_EXPRESSION
                     PsiElement(IDENTIFIER)('Library')
                 VALUE_ARGUMENT_LIST
                   PsiElement(LPAR)('(')

idea/testData/psi/examples/Color.txt

@@ -19,7 +19,7 @@ JetFile: Color.jet
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('Int')
         PsiElement(COMMA)(',')
         PsiWhiteSpace(' ')
@@ -31,7 +31,7 @@ JetFile: Color.jet
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('Int')
         PsiElement(COMMA)(',')
         PsiWhiteSpace(' ')
@@ -43,7 +43,7 @@ JetFile: Color.jet
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('Int')
         PsiElement(RPAR)(')')
       PsiWhiteSpace(' ')
@@ -60,7 +60,7 @@ JetFile: Color.jet
           INITIALIZER_LIST
             DELEGATOR_SUPER_CALL
               TYPE_REFERENCE
-                USER_TYPE
+                REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('Color')
               VALUE_ARGUMENT_LIST
                 PsiElement(LPAR)('(')
@@ -89,7 +89,7 @@ JetFile: Color.jet
           INITIALIZER_LIST
             DELEGATOR_SUPER_CALL
               TYPE_REFERENCE
-                USER_TYPE
+                REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('Color')
               VALUE_ARGUMENT_LIST
                 PsiElement(LPAR)('(')
@@ -118,7 +118,7 @@ JetFile: Color.jet
           INITIALIZER_LIST
             DELEGATOR_SUPER_CALL
               TYPE_REFERENCE
-                USER_TYPE
+                REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('Color')
               VALUE_ARGUMENT_LIST
                 PsiElement(LPAR)('(')

idea/testData/psi/examples/FunctionsAndTypes.txt

@@ -15,14 +15,14 @@ JetFile: FunctionsAndTypes.jet
           VALUE_PARAMETER_LIST
             PsiElement(LPAR)('(')
             TYPE_REFERENCE
-              USER_TYPE
+              REFERENCE_EXPRESSION
                 PsiElement(IDENTIFIER)('T')
             PsiElement(RPAR)(')')
           PsiWhiteSpace(' ')
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('X')
           PsiElement(RBRACE)('}')
     PsiWhiteSpace('\n')
@@ -43,19 +43,19 @@ JetFile: FunctionsAndTypes.jet
           VALUE_PARAMETER_LIST
             PsiElement(LPAR)('(')
             TYPE_REFERENCE
-              USER_TYPE
+              REFERENCE_EXPRESSION
                 PsiElement(IDENTIFIER)('T')
             PsiElement(COMMA)(',')
             PsiWhiteSpace(' ')
             TYPE_REFERENCE
-              USER_TYPE
+              REFERENCE_EXPRESSION
                 PsiElement(IDENTIFIER)('E')
             PsiElement(RPAR)(')')
           PsiWhiteSpace(' ')
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('X')
           PsiElement(RBRACE)('}')
     PsiWhiteSpace('\n')
@@ -79,12 +79,12 @@ JetFile: FunctionsAndTypes.jet
               TUPLE_TYPE
                 PsiElement(LPAR)('(')
                 TYPE_REFERENCE
-                  USER_TYPE
+                  REFERENCE_EXPRESSION
                     PsiElement(IDENTIFIER)('T')
                 PsiElement(COMMA)(',')
                 PsiWhiteSpace(' ')
                 TYPE_REFERENCE
-                  USER_TYPE
+                  REFERENCE_EXPRESSION
                     PsiElement(IDENTIFIER)('E')
                 PsiElement(RPAR)(')')
             PsiElement(RPAR)(')')
@@ -92,7 +92,7 @@ JetFile: FunctionsAndTypes.jet
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('X')
           PsiElement(RBRACE)('}')
     PsiWhiteSpace('\n')
@@ -114,7 +114,7 @@ JetFile: FunctionsAndTypes.jet
           VALUE_PARAMETER_LIST
             PsiElement(LPAR)('(')
             TYPE_REFERENCE
-              USER_TYPE
+              REFERENCE_EXPRESSION
                 PsiElement(IDENTIFIER)('X')
             PsiElement(RPAR)(')')
           PsiWhiteSpace(' ')
@@ -126,14 +126,14 @@ JetFile: FunctionsAndTypes.jet
               VALUE_PARAMETER_LIST
                 PsiElement(LPAR)('(')
                 TYPE_REFERENCE
-                  USER_TYPE
+                  REFERENCE_EXPRESSION
                     PsiElement(IDENTIFIER)('T')
                 PsiElement(RPAR)(')')
               PsiWhiteSpace(' ')
               PsiElement(COLON)(':')
               PsiWhiteSpace(' ')
               TYPE_REFERENCE
-                USER_TYPE
+                REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('Y')
               PsiElement(RBRACE)('}')
           PsiWhiteSpace(' ')
@@ -162,14 +162,14 @@ JetFile: FunctionsAndTypes.jet
                 VALUE_PARAMETER_LIST
                   PsiElement(LPAR)('(')
                   TYPE_REFERENCE
-                    USER_TYPE
+                    REFERENCE_EXPRESSION
                       PsiElement(IDENTIFIER)('X')
                   PsiElement(RPAR)(')')
                 PsiWhiteSpace(' ')
                 PsiElement(COLON)(':')
                 PsiWhiteSpace(' ')
                 TYPE_REFERENCE
-                  USER_TYPE
+                  REFERENCE_EXPRESSION
                     PsiElement(IDENTIFIER)('Y')
                 PsiElement(RBRACE)('}')
             PsiElement(RPAR)(')')
@@ -182,14 +182,14 @@ JetFile: FunctionsAndTypes.jet
               VALUE_PARAMETER_LIST
                 PsiElement(LPAR)('(')
                 TYPE_REFERENCE
-                  USER_TYPE
+                  REFERENCE_EXPRESSION
                     PsiElement(IDENTIFIER)('Y')
                 PsiElement(RPAR)(')')
               PsiWhiteSpace(' ')
               PsiElement(COLON)(':')
               PsiWhiteSpace(' ')
               TYPE_REFERENCE
-                USER_TYPE
+                REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('Z')
               PsiElement(RBRACE)('}')
           PsiWhiteSpace(' ')
@@ -223,7 +223,7 @@ JetFile: FunctionsAndTypes.jet
               PsiElement(COLON)(':')
               PsiWhiteSpace(' ')
               TYPE_REFERENCE
-                USER_TYPE
+                REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('T')
             PsiElement(COMMA)(',')
             PsiWhiteSpace(' ')
@@ -233,14 +233,14 @@ JetFile: FunctionsAndTypes.jet
               PsiElement(COLON)(':')
               PsiWhiteSpace(' ')
               TYPE_REFERENCE
-                USER_TYPE
+                REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('T')
             PsiElement(RPAR)(')')
           PsiWhiteSpace(' ')
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('Int')
           PsiElement(RBRACE)('}')
     PsiWhiteSpace('\n')
@@ -272,7 +272,7 @@ JetFile: FunctionsAndTypes.jet
               PsiElement(COLON)(':')
               PsiWhiteSpace(' ')
               TYPE_REFERENCE
-                USER_TYPE
+                REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('T')
             PsiElement(COMMA)(',')
             PsiWhiteSpace(' ')
@@ -282,14 +282,14 @@ JetFile: FunctionsAndTypes.jet
               PsiElement(COLON)(':')
               PsiWhiteSpace(' ')
               TYPE_REFERENCE
-                USER_TYPE
+                REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('T')
             PsiElement(RPAR)(')')
           PsiWhiteSpace(' ')
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('Boolean')
           PsiElement(RBRACE)('}')
     PsiWhiteSpace('\n')
@@ -321,14 +321,14 @@ JetFile: FunctionsAndTypes.jet
               PsiElement(COLON)(':')
               PsiWhiteSpace(' ')
               TYPE_REFERENCE
-                USER_TYPE
+                REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('T')
             PsiElement(RPAR)(')')
           PsiWhiteSpace(' ')
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('Int')
           PsiElement(RBRACE)('}')
     PsiWhiteSpace('\n')
@@ -393,14 +393,14 @@ JetFile: FunctionsAndTypes.jet
               PsiElement(COLON)(':')
               PsiWhiteSpace(' ')
               TYPE_REFERENCE
-                USER_TYPE
+                REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('T')
             PsiElement(RPAR)(')')
           PsiWhiteSpace(' ')
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('R')
           PsiElement(RBRACE)('}')
     PsiWhiteSpace('\n')
@@ -423,14 +423,14 @@ JetFile: FunctionsAndTypes.jet
             PsiElement(COLON)(':')
             PsiWhiteSpace(' ')
             TYPE_REFERENCE
-              USER_TYPE
+              REFERENCE_EXPRESSION
                 PsiElement(IDENTIFIER)('T')
           PsiElement(RPAR)(')')
         PsiWhiteSpace(' ')
         PsiElement(COLON)(':')
         PsiWhiteSpace(' ')
         TYPE_REFERENCE
-          USER_TYPE
+          REFERENCE_EXPRESSION
             PsiElement(IDENTIFIER)('X')
         PsiWhiteSpace(' ')
         PsiElement(DOUBLE_ARROW)('=>')
@@ -461,14 +461,14 @@ JetFile: FunctionsAndTypes.jet
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('T')
         PsiElement(RPAR)(')')
       PsiWhiteSpace(' ')
       PsiElement(COLON)(':')
       PsiWhiteSpace(' ')
       TYPE_REFERENCE
-        USER_TYPE
+        REFERENCE_EXPRESSION
           PsiElement(IDENTIFIER)('X')
       PsiWhiteSpace(' ')
       PsiElement(EQ)('=')
@@ -500,7 +500,7 @@ JetFile: FunctionsAndTypes.jet
             PsiElement(COLON)(':')
             PsiWhiteSpace(' ')
             TYPE_REFERENCE
-              USER_TYPE
+              REFERENCE_EXPRESSION
                 PsiElement(IDENTIFIER)('T')
           PsiElement(RPAR)(')')
         PsiWhiteSpace(' ')
@@ -536,7 +536,7 @@ JetFile: FunctionsAndTypes.jet
         PsiElement(COLON)(':')
         PsiWhiteSpace(' ')
         TYPE_REFERENCE
-          USER_TYPE
+          REFERENCE_EXPRESSION
             PsiElement(IDENTIFIER)('X')
         PsiWhiteSpace(' ')
         PsiElement(DOUBLE_ARROW)('=>')
@@ -613,14 +613,14 @@ JetFile: FunctionsAndTypes.jet
           VALUE_PARAMETER_LIST
             PsiElement(LPAR)('(')
             TYPE_REFERENCE
-              USER_TYPE
+              REFERENCE_EXPRESSION
                 PsiElement(IDENTIFIER)('T')
             PsiElement(RPAR)(')')
           PsiWhiteSpace(' ')
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('X')
           PsiElement(RBRACE)('}')
       PsiWhiteSpace(' ')

idea/testData/psi/examples/Graph.txt

@@ -19,7 +19,7 @@ JetFile: Graph.jet
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('V')
         PsiElement(RPAR)(')')
     PsiWhiteSpace('\n\n')
@@ -46,7 +46,7 @@ JetFile: Graph.jet
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('V')
         PsiElement(COMMA)(',')
         PsiWhiteSpace(' ')
@@ -58,7 +58,7 @@ JetFile: Graph.jet
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('E')
         PsiElement(COMMA)(',')
         PsiWhiteSpace(' ')
@@ -70,7 +70,7 @@ JetFile: Graph.jet
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('V')
         PsiElement(RPAR)(')')
     PsiWhiteSpace('\n\n')
@@ -105,22 +105,22 @@ JetFile: Graph.jet
             PsiElement(new)('new')
             PsiWhiteSpace(' ')
             TYPE_REFERENCE
-              USER_TYPE
+              REFERENCE_EXPRESSION
                 PsiElement(IDENTIFIER)('ArrayList')
                 TYPE_ARGUMENT_LIST
                   PsiElement(LT)('<')
                   TYPE_REFERENCE
-                    USER_TYPE
+                    REFERENCE_EXPRESSION
                       PsiElement(IDENTIFIER)('Edge')
                       TYPE_ARGUMENT_LIST
                         PsiElement(LT)('<')
                         TYPE_REFERENCE
-                          USER_TYPE
+                          REFERENCE_EXPRESSION
                             PsiElement(IDENTIFIER)('V')
                         PsiElement(COMMA)(',')
                         PsiWhiteSpace(' ')
                         TYPE_REFERENCE
-                          USER_TYPE
+                          REFERENCE_EXPRESSION
                             PsiElement(IDENTIFIER)('E')
                         PsiElement(GT)('>')
                   PsiElement(GT)('>')
@@ -146,17 +146,17 @@ JetFile: Graph.jet
             PsiElement(new)('new')
             PsiWhiteSpace(' ')
             TYPE_REFERENCE
-              USER_TYPE
+              REFERENCE_EXPRESSION
                 PsiElement(IDENTIFIER)('HashSet')
                 TYPE_ARGUMENT_LIST
                   PsiElement(LT)('<')
                   TYPE_REFERENCE
-                    USER_TYPE
+                    REFERENCE_EXPRESSION
                       PsiElement(IDENTIFIER)('Vertex')
                       TYPE_ARGUMENT_LIST
                         PsiElement(LT)('<')
                         TYPE_REFERENCE
-                          USER_TYPE
+                          REFERENCE_EXPRESSION
                             PsiElement(IDENTIFIER)('V')
                         PsiElement(GT)('>')
                   PsiElement(GT)('>')
@@ -172,22 +172,22 @@ JetFile: Graph.jet
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('IList')
               TYPE_ARGUMENT_LIST
                 PsiElement(LT)('<')
                 TYPE_REFERENCE
-                  USER_TYPE
+                  REFERENCE_EXPRESSION
                     PsiElement(IDENTIFIER)('Edge')
                     TYPE_ARGUMENT_LIST
                       PsiElement(LT)('<')
                       TYPE_REFERENCE
-                        USER_TYPE
+                        REFERENCE_EXPRESSION
                           PsiElement(IDENTIFIER)('V')
                       PsiElement(COMMA)(',')
                       PsiWhiteSpace(' ')
                       TYPE_REFERENCE
-                        USER_TYPE
+                        REFERENCE_EXPRESSION
                           PsiElement(IDENTIFIER)('E')
                       PsiElement(GT)('>')
                 PsiElement(GT)('>')
@@ -206,22 +206,22 @@ JetFile: Graph.jet
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('ISet')
               TYPE_ARGUMENT_LIST
                 PsiElement(LT)('<')
                 TYPE_REFERENCE
-                  USER_TYPE
+                  REFERENCE_EXPRESSION
                     PsiElement(IDENTIFIER)('Edge')
                     TYPE_ARGUMENT_LIST
                       PsiElement(LT)('<')
                       TYPE_REFERENCE
-                        USER_TYPE
+                        REFERENCE_EXPRESSION
                           PsiElement(IDENTIFIER)('V')
                       PsiElement(COMMA)(',')
                       PsiWhiteSpace(' ')
                       TYPE_REFERENCE
-                        USER_TYPE
+                        REFERENCE_EXPRESSION
                           PsiElement(IDENTIFIER)('E')
                       PsiElement(GT)('>')
                 PsiElement(GT)('>')
@@ -246,7 +246,7 @@ JetFile: Graph.jet
               PsiElement(COLON)(':')
               PsiWhiteSpace(' ')
               TYPE_REFERENCE
-                USER_TYPE
+                REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('V')
             PsiElement(COMMA)(',')
             PsiWhiteSpace(' ')
@@ -256,7 +256,7 @@ JetFile: Graph.jet
               PsiElement(COLON)(':')
               PsiWhiteSpace(' ')
               TYPE_REFERENCE
-                USER_TYPE
+                REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('E')
             PsiElement(COMMA)(',')
             PsiWhiteSpace(' ')
@@ -266,7 +266,7 @@ JetFile: Graph.jet
               PsiElement(COLON)(':')
               PsiWhiteSpace(' ')
               TYPE_REFERENCE
-                USER_TYPE
+                REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('V')
             PsiElement(RPAR)(')')
           PsiWhiteSpace(' ')
@@ -287,7 +287,7 @@ JetFile: Graph.jet
                     PsiElement(new)('new')
                     PsiWhiteSpace(' ')
                     TYPE_REFERENCE
-                      USER_TYPE
+                      REFERENCE_EXPRESSION
                         PsiElement(IDENTIFIER)('Edge')
                     VALUE_ARGUMENT_LIST
                       PsiElement(LPAR)('(')
@@ -325,7 +325,7 @@ JetFile: Graph.jet
               PsiElement(COLON)(':')
               PsiWhiteSpace(' ')
               TYPE_REFERENCE
-                USER_TYPE
+                REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('V')
             PsiElement(RPAR)(')')
           PsiWhiteSpace(' ')
@@ -346,7 +346,7 @@ JetFile: Graph.jet
                     PsiElement(new)('new')
                     PsiWhiteSpace(' ')
                     TYPE_REFERENCE
-                      USER_TYPE
+                      REFERENCE_EXPRESSION
                         PsiElement(IDENTIFIER)('Edge')
                     VALUE_ARGUMENT_LIST
                       PsiElement(LPAR)('(')
@@ -384,12 +384,12 @@ JetFile: Graph.jet
               PsiElement(COLON)(':')
               PsiWhiteSpace(' ')
               TYPE_REFERENCE
-                USER_TYPE
+                REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('Vertex')
                   TYPE_ARGUMENT_LIST
                     PsiElement(LT)('<')
                     TYPE_REFERENCE
-                      USER_TYPE
+                      REFERENCE_EXPRESSION
                         PsiElement(IDENTIFIER)('V')
                     PsiElement(GT)('>')
             PsiElement(RPAR)(')')
@@ -456,14 +456,14 @@ JetFile: Graph.jet
                   VALUE_PARAMETER_LIST
                     PsiElement(LPAR)('(')
                     TYPE_REFERENCE
-                      USER_TYPE
+                      REFERENCE_EXPRESSION
                         PsiElement(IDENTIFIER)('V')
                     PsiElement(RPAR)(')')
                   PsiWhiteSpace(' ')
                   PsiElement(COLON)(':')
                   PsiWhiteSpace(' ')
                   TYPE_REFERENCE
-                    USER_TYPE
+                    REFERENCE_EXPRESSION
                       PsiElement(IDENTIFIER)('Unit')
                   PsiElement(RBRACE)('}')
             PsiElement(RPAR)(')')
@@ -482,17 +482,17 @@ JetFile: Graph.jet
                 PsiElement(new)('new')
                 PsiWhiteSpace(' ')
                 TYPE_REFERENCE
-                  USER_TYPE
+                  REFERENCE_EXPRESSION
                     PsiElement(IDENTIFIER)('HashSet')
                     TYPE_ARGUMENT_LIST
                       PsiElement(LT)('<')
                       TYPE_REFERENCE
-                        USER_TYPE
+                        REFERENCE_EXPRESSION
                           PsiElement(IDENTIFIER)('Vertex')
                           TYPE_ARGUMENT_LIST
                             PsiElement(LT)('<')
                             TYPE_REFERENCE
-                              USER_TYPE
+                              REFERENCE_EXPRESSION
                                 PsiElement(IDENTIFIER)('V')
                             PsiElement(GT)('>')
                       PsiElement(GT)('>')
@@ -545,12 +545,12 @@ JetFile: Graph.jet
                   PsiElement(COLON)(':')
                   PsiWhiteSpace(' ')
                   TYPE_REFERENCE
-                    USER_TYPE
+                    REFERENCE_EXPRESSION
                       PsiElement(IDENTIFIER)('Vertex')
                       TYPE_ARGUMENT_LIST
                         PsiElement(LT)('<')
                         TYPE_REFERENCE
-                          USER_TYPE
+                          REFERENCE_EXPRESSION
                             PsiElement(IDENTIFIER)('V')
                         PsiElement(GT)('>')
                 PsiElement(COMMA)(',')
@@ -561,17 +561,17 @@ JetFile: Graph.jet
                   PsiElement(COLON)(':')
                   PsiWhiteSpace(' ')
                   TYPE_REFERENCE
-                    USER_TYPE
+                    REFERENCE_EXPRESSION
                       PsiElement(IDENTIFIER)('ISet')
                       TYPE_ARGUMENT_LIST
                         PsiElement(LT)('<')
                         TYPE_REFERENCE
-                          USER_TYPE
+                          REFERENCE_EXPRESSION
                             PsiElement(IDENTIFIER)('Vertex')
                             TYPE_ARGUMENT_LIST
                               PsiElement(LT)('<')
                               TYPE_REFERENCE
-                                USER_TYPE
+                                REFERENCE_EXPRESSION
                                   PsiElement(IDENTIFIER)('V')
                               PsiElement(GT)('>')
                         PsiElement(GT)('>')
@@ -588,14 +588,14 @@ JetFile: Graph.jet
                       VALUE_PARAMETER_LIST
                         PsiElement(LPAR)('(')
                         TYPE_REFERENCE
-                          USER_TYPE
+                          REFERENCE_EXPRESSION
                             PsiElement(IDENTIFIER)('V')
                         PsiElement(RPAR)(')')
                       PsiWhiteSpace(' ')
                       PsiElement(COLON)(':')
                       PsiWhiteSpace(' ')
                       TYPE_REFERENCE
-                        USER_TYPE
+                        REFERENCE_EXPRESSION
                           PsiElement(IDENTIFIER)('Unit')
                       PsiElement(RBRACE)('}')
                 PsiElement(RPAR)(')')
@@ -698,17 +698,17 @@ JetFile: Graph.jet
               PsiElement(COLON)(':')
               PsiWhiteSpace(' ')
               TYPE_REFERENCE
-                USER_TYPE
+                REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('IPushPop')
                   TYPE_ARGUMENT_LIST
                     PsiElement(LT)('<')
                     TYPE_REFERENCE
-                      USER_TYPE
+                      REFERENCE_EXPRESSION
                         PsiElement(IDENTIFIER)('Vertex')
                         TYPE_ARGUMENT_LIST
                           PsiElement(LT)('<')
                           TYPE_REFERENCE
-                            USER_TYPE
+                            REFERENCE_EXPRESSION
                               PsiElement(IDENTIFIER)('V')
                           PsiElement(GT)('>')
                     PsiElement(GT)('>')
@@ -720,17 +720,17 @@ JetFile: Graph.jet
               PsiElement(COLON)(':')
               PsiWhiteSpace(' ')
               TYPE_REFERENCE
-                USER_TYPE
+                REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('ISet')
                   TYPE_ARGUMENT_LIST
                     PsiElement(LT)('<')
                     TYPE_REFERENCE
-                      USER_TYPE
+                      REFERENCE_EXPRESSION
                         PsiElement(IDENTIFIER)('Vertex')
                         TYPE_ARGUMENT_LIST
                           PsiElement(LT)('<')
                           TYPE_REFERENCE
-                            USER_TYPE
+                            REFERENCE_EXPRESSION
                               PsiElement(IDENTIFIER)('V')
                           PsiElement(GT)('>')
                     PsiElement(GT)('>')
@@ -747,14 +747,14 @@ JetFile: Graph.jet
                   VALUE_PARAMETER_LIST
                     PsiElement(LPAR)('(')
                     TYPE_REFERENCE
-                      USER_TYPE
+                      REFERENCE_EXPRESSION
                         PsiElement(IDENTIFIER)('V')
                     PsiElement(RPAR)(')')
                   PsiWhiteSpace(' ')
                   PsiElement(COLON)(':')
                   PsiWhiteSpace(' ')
                   TYPE_REFERENCE
-                    USER_TYPE
+                    REFERENCE_EXPRESSION
                       PsiElement(IDENTIFIER)('Unit')
                   PsiElement(RBRACE)('}')
             PsiElement(RPAR)(')')

idea/testData/psi/examples/IPushPop.txt

@@ -24,7 +24,7 @@ JetFile: IPushPop.jet
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('Boolean')
         PsiWhiteSpace('\n  ')
         FUN
@@ -41,7 +41,7 @@ JetFile: IPushPop.jet
               PsiElement(COLON)(':')
               PsiWhiteSpace(' ')
               TYPE_REFERENCE
-                USER_TYPE
+                REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('T')
             PsiElement(RPAR)(')')
         PsiWhiteSpace('\n  ')
@@ -58,7 +58,7 @@ JetFile: IPushPop.jet
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('T')
         PsiWhiteSpace('\n')
         PsiElement(RBRACE)('}')

idea/testData/psi/examples/PolymorphicClassObjects.txt

@@ -25,8 +25,9 @@ JetFile: PolymorphicClassObjects.jet
             ATTRIBUTE_ANNOTATION
               PsiElement(LBRACKET)('[')
               ATTRIBUTE
-                USER_TYPE
-                  PsiElement(IDENTIFIER)('operator')
+                TYPE_REFERENCE
+                  REFERENCE_EXPRESSION
+                    PsiElement(IDENTIFIER)('operator')
               PsiElement(RBRACKET)(']')
           PsiWhiteSpace(' ')
           PsiElement(fun)('fun')
@@ -42,7 +43,7 @@ JetFile: PolymorphicClassObjects.jet
               PsiElement(COLON)(':')
               PsiWhiteSpace(' ')
               TYPE_REFERENCE
-                USER_TYPE
+                REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('E')
             PsiElement(RPAR)(')')
         PsiWhiteSpace('\n  ')
@@ -59,7 +60,7 @@ JetFile: PolymorphicClassObjects.jet
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('R')
         PsiWhiteSpace('\n')
         PsiElement(RBRACE)('}')
@@ -97,17 +98,17 @@ JetFile: PolymorphicClassObjects.jet
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('Builder')
               TYPE_ARGUMENT_LIST
                 PsiElement(LT)('<')
                 TYPE_REFERENCE
-                  USER_TYPE
+                  REFERENCE_EXPRESSION
                     PsiElement(IDENTIFIER)('E')
                 PsiElement(COMMA)(',')
                 PsiWhiteSpace(' ')
                 TYPE_REFERENCE
-                  USER_TYPE
+                  REFERENCE_EXPRESSION
                     PsiElement(IDENTIFIER)('R')
                 PsiElement(GT)('>')
         PsiWhiteSpace('\n')
@@ -135,7 +136,7 @@ JetFile: PolymorphicClassObjects.jet
             DELEGATION_SPECIFIER_LIST
               DELEGATOR_SUPER_CLASS
                 TYPE_REFERENCE
-                  USER_TYPE
+                  REFERENCE_EXPRESSION
                     PsiElement(IDENTIFIER)('Buildable')
             PsiWhiteSpace(' ')
             CLASS_BODY
@@ -164,17 +165,17 @@ JetFile: PolymorphicClassObjects.jet
                 PsiElement(COLON)(':')
                 PsiWhiteSpace(' ')
                 TYPE_REFERENCE
-                  USER_TYPE
+                  REFERENCE_EXPRESSION
                     PsiElement(IDENTIFIER)('Builder')
                     TYPE_ARGUMENT_LIST
                       PsiElement(LT)('<')
                       TYPE_REFERENCE
-                        USER_TYPE
+                        REFERENCE_EXPRESSION
                           PsiElement(IDENTIFIER)('E')
                       PsiElement(COMMA)(',')
                       PsiWhiteSpace(' ')
                       TYPE_REFERENCE
-                        USER_TYPE
+                        REFERENCE_EXPRESSION
                           PsiElement(IDENTIFIER)('R')
                       PsiElement(GT)('>')
               PsiWhiteSpace('\n\n  ')
@@ -201,18 +202,18 @@ JetFile: PolymorphicClassObjects.jet
         TYPE_CONSTRAINT_LIST
           TYPE_CONSTRAINT
             TYPE_REFERENCE
-              USER_TYPE
+              REFERENCE_EXPRESSION
                 PsiElement(IDENTIFIER)('T')
             PsiWhiteSpace(' ')
             PsiElement(COLON)(':')
             PsiWhiteSpace(' ')
             TYPE_REFERENCE
-              USER_TYPE
+              REFERENCE_EXPRESSION
                 PsiElement(IDENTIFIER)('Iterable')
                 TYPE_ARGUMENT_LIST
                   PsiElement(LT)('<')
                   TYPE_REFERENCE
-                    USER_TYPE
+                    REFERENCE_EXPRESSION
                       PsiElement(IDENTIFIER)('E')
                   PsiElement(GT)('>')
           PsiElement(COMMA)(',')
@@ -223,30 +224,30 @@ JetFile: PolymorphicClassObjects.jet
             PsiElement(object)('object')
             PsiWhiteSpace(' ')
             TYPE_REFERENCE
-              USER_TYPE
+              REFERENCE_EXPRESSION
                 PsiElement(IDENTIFIER)('T')
             PsiWhiteSpace(' ')
             PsiElement(COLON)(':')
             PsiWhiteSpace(' ')
             TYPE_REFERENCE
-              USER_TYPE
+              REFERENCE_EXPRESSION
                 PsiElement(IDENTIFIER)('Buildable')
                 TYPE_ARGUMENT_LIST
                   PsiElement(LT)('<')
                   TYPE_REFERENCE
-                    USER_TYPE
+                    REFERENCE_EXPRESSION
                       PsiElement(IDENTIFIER)('E')
                   PsiElement(COMMA)(',')
                   PsiWhiteSpace(' ')
                   TYPE_REFERENCE
-                    USER_TYPE
+                    REFERENCE_EXPRESSION
                       PsiElement(IDENTIFIER)('T')
                   PsiElement(GT)('>')
       PsiWhiteSpace('  ')
       PsiElement(for)('for')
       PsiWhiteSpace(' ')
       TYPE_REFERENCE
-        USER_TYPE
+        REFERENCE_EXPRESSION
           PsiElement(IDENTIFIER)('T')
       PsiWhiteSpace(' ')
       CLASS_BODY
@@ -274,14 +275,14 @@ JetFile: PolymorphicClassObjects.jet
                   VALUE_PARAMETER_LIST
                     PsiElement(LPAR)('(')
                     TYPE_REFERENCE
-                      USER_TYPE
+                      REFERENCE_EXPRESSION
                         PsiElement(IDENTIFIER)('E')
                     PsiElement(RPAR)(')')
                   PsiWhiteSpace(' ')
                   PsiElement(COLON)(':')
                   PsiWhiteSpace(' ')
                   TYPE_REFERENCE
-                    USER_TYPE
+                    REFERENCE_EXPRESSION
                       PsiElement(IDENTIFIER)('R')
                   PsiElement(RBRACE)('}')
             PsiElement(RPAR)(')')
@@ -289,12 +290,12 @@ JetFile: PolymorphicClassObjects.jet
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('T')
               TYPE_ARGUMENT_LIST
                 PsiElement(LT)('<')
                 TYPE_REFERENCE
-                  USER_TYPE
+                  REFERENCE_EXPRESSION
                     PsiElement(IDENTIFIER)('R')
                 PsiElement(GT)('>')
           PsiWhiteSpace(' ')

idea/testData/psi/examples/Queue.txt

@@ -15,12 +15,12 @@ JetFile: Queue.jet
       DELEGATION_SPECIFIER_LIST
         DELEGATOR_SUPER_CLASS
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('IPushPop')
               TYPE_ARGUMENT_LIST
                 PsiElement(LT)('<')
                 TYPE_REFERENCE
-                  USER_TYPE
+                  REFERENCE_EXPRESSION
                     PsiElement(IDENTIFIER)('T')
                 PsiElement(GT)('>')
       PsiWhiteSpace(' ')
@@ -49,7 +49,7 @@ JetFile: Queue.jet
               PsiElement(COLON)(':')
               PsiWhiteSpace(' ')
               TYPE_REFERENCE
-                USER_TYPE
+                REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('T')
             PsiElement(COMMA)(',')
             PsiWhiteSpace(' ')
@@ -61,12 +61,12 @@ JetFile: Queue.jet
               PsiElement(COLON)(':')
               PsiWhiteSpace(' ')
               TYPE_REFERENCE
-                USER_TYPE
+                REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('Item')
                   TYPE_ARGUMENT_LIST
                     PsiElement(LT)('<')
                     TYPE_REFERENCE
-                      USER_TYPE
+                      REFERENCE_EXPRESSION
                         PsiElement(IDENTIFIER)('T')
                     PsiElement(GT)('>')
             PsiElement(RPAR)(')')
@@ -82,12 +82,12 @@ JetFile: Queue.jet
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('Item')
               TYPE_ARGUMENT_LIST
                 PsiElement(LT)('<')
                 TYPE_REFERENCE
-                  USER_TYPE
+                  REFERENCE_EXPRESSION
                     PsiElement(IDENTIFIER)('T')
                 PsiElement(GT)('>')
           PsiWhiteSpace(' ')
@@ -107,12 +107,12 @@ JetFile: Queue.jet
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('Item')
               TYPE_ARGUMENT_LIST
                 PsiElement(LT)('<')
                 TYPE_REFERENCE
-                  USER_TYPE
+                  REFERENCE_EXPRESSION
                     PsiElement(IDENTIFIER)('T')
                 PsiElement(GT)('>')
           PsiWhiteSpace(' ')
@@ -138,7 +138,7 @@ JetFile: Queue.jet
               PsiElement(COLON)(':')
               PsiWhiteSpace(' ')
               TYPE_REFERENCE
-                USER_TYPE
+                REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('T')
             PsiElement(RPAR)(')')
           PsiWhiteSpace(' ')
@@ -156,7 +156,7 @@ JetFile: Queue.jet
                 PsiElement(new)('new')
                 PsiWhiteSpace(' ')
                 TYPE_REFERENCE
-                  USER_TYPE
+                  REFERENCE_EXPRESSION
                     PsiElement(IDENTIFIER)('Item')
                 VALUE_ARGUMENT_LIST
                   PsiElement(LPAR)('(')
@@ -276,7 +276,7 @@ JetFile: Queue.jet
                   PsiElement(new)('new')
                   PsiWhiteSpace(' ')
                   TYPE_REFERENCE
-                    USER_TYPE
+                    REFERENCE_EXPRESSION
                       PsiElement(IDENTIFIER)('UnderflowException')
                   VALUE_ARGUMENT_LIST
                     PsiElement(LPAR)('(')

idea/testData/psi/examples/Stack.txt

@@ -15,12 +15,12 @@ JetFile: Stack.jet
       DELEGATION_SPECIFIER_LIST
         DELEGATOR_SUPER_CLASS
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('IPushPop')
               TYPE_ARGUMENT_LIST
                 PsiElement(LT)('<')
                 TYPE_REFERENCE
-                  USER_TYPE
+                  REFERENCE_EXPRESSION
                     PsiElement(IDENTIFIER)('T')
                 PsiElement(GT)('>')
       PsiWhiteSpace(' ')
@@ -41,12 +41,12 @@ JetFile: Stack.jet
             PsiElement(new)('new')
             PsiWhiteSpace(' ')
             TYPE_REFERENCE
-              USER_TYPE
+              REFERENCE_EXPRESSION
                 PsiElement(IDENTIFIER)('ArrayList')
                 TYPE_ARGUMENT_LIST
                   PsiElement(LT)('<')
                   TYPE_REFERENCE
-                    USER_TYPE
+                    REFERENCE_EXPRESSION
                       PsiElement(IDENTIFIER)('T')
                   PsiElement(GT)('>')
             VALUE_ARGUMENT_LIST
@@ -71,7 +71,7 @@ JetFile: Stack.jet
               PsiElement(COLON)(':')
               PsiWhiteSpace(' ')
               TYPE_REFERENCE
-                USER_TYPE
+                REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('T')
             PsiElement(RPAR)(')')
           PsiWhiteSpace(' ')

idea/testData/psi/examples/UnionFind.txt

@@ -26,7 +26,7 @@ JetFile: UnionFind.jet
             TYPE_ARGUMENT_LIST
               PsiElement(LT)('<')
               TYPE_REFERENCE
-                USER_TYPE
+                REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('Int')
               PsiElement(GT)('>')
             VALUE_ARGUMENT_LIST
@@ -46,7 +46,7 @@ JetFile: UnionFind.jet
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('Int')
           PsiWhiteSpace(' ')
           BLOCK
@@ -102,14 +102,14 @@ JetFile: UnionFind.jet
               PsiElement(COLON)(':')
               PsiWhiteSpace(' ')
               TYPE_REFERENCE
-                USER_TYPE
+                REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('Int')
             PsiElement(RPAR)(')')
           PsiWhiteSpace(' ')
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('Int')
           PsiWhiteSpace(' ')
           BLOCK
@@ -211,7 +211,7 @@ JetFile: UnionFind.jet
               PsiElement(COLON)(':')
               PsiWhiteSpace(' ')
               TYPE_REFERENCE
-                USER_TYPE
+                REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('Int')
             PsiElement(COMMA)(',')
             PsiWhiteSpace(' ')
@@ -221,7 +221,7 @@ JetFile: UnionFind.jet
               PsiElement(COLON)(':')
               PsiWhiteSpace(' ')
               TYPE_REFERENCE
-                USER_TYPE
+                REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('Int')
             PsiElement(RPAR)(')')
           PsiWhiteSpace(' ')
@@ -359,7 +359,7 @@ JetFile: UnionFind.jet
       PsiElement(val)('val')
       PsiWhiteSpace(' ')
       TYPE_REFERENCE
-        USER_TYPE
+        REFERENCE_EXPRESSION
           PsiElement(IDENTIFIER)('Int')
       PsiElement(DOT)('.')
       PsiElement(IDENTIFIER)('isOdd')
@@ -367,7 +367,7 @@ JetFile: UnionFind.jet
       PsiElement(COLON)(':')
       PsiWhiteSpace(' ')
       TYPE_REFERENCE
-        USER_TYPE
+        REFERENCE_EXPRESSION
           PsiElement(IDENTIFIER)('Boolean')
       PsiWhiteSpace('\n  ')
       PROPERTY_ACCESSOR

idea/testData/psi/examples/UpdateOperation.txt

@@ -14,7 +14,7 @@ JetFile: UpdateOperation.jet
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('Int')
         PsiElement(COMMA)(',')
         PsiWhiteSpace(' ')
@@ -24,7 +24,7 @@ JetFile: UpdateOperation.jet
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('Int')
         PsiElement(RPAR)(')')
       PsiWhiteSpace(' ')
@@ -54,7 +54,7 @@ JetFile: UpdateOperation.jet
                     PsiElement(COLON)(':')
                     PsiWhiteSpace(' ')
                     TYPE_REFERENCE
-                      USER_TYPE
+                      REFERENCE_EXPRESSION
                         PsiElement(IDENTIFIER)('Pair')
                   PsiElement(COMMA)(',')
                   PsiWhiteSpace(' ')
@@ -64,7 +64,7 @@ JetFile: UpdateOperation.jet
                     PsiElement(COLON)(':')
                     PsiWhiteSpace(' ')
                     TYPE_REFERENCE
-                      USER_TYPE
+                      REFERENCE_EXPRESSION
                         PsiElement(IDENTIFIER)('Int')
                     PsiWhiteSpace(' ')
                     PsiElement(EQ)('=')
@@ -83,7 +83,7 @@ JetFile: UpdateOperation.jet
                     PsiElement(COLON)(':')
                     PsiWhiteSpace(' ')
                     TYPE_REFERENCE
-                      USER_TYPE
+                      REFERENCE_EXPRESSION
                         PsiElement(IDENTIFIER)('Int')
                     PsiWhiteSpace(' ')
                     PsiElement(EQ)('=')
@@ -102,7 +102,7 @@ JetFile: UpdateOperation.jet
                   PsiElement(new)('new')
                   PsiWhiteSpace(' ')
                   TYPE_REFERENCE
-                    USER_TYPE
+                    REFERENCE_EXPRESSION
                       PsiElement(IDENTIFIER)('Pair')
                   VALUE_ARGUMENT_LIST
                     PsiElement(LPAR)('(')
@@ -133,7 +133,7 @@ JetFile: UpdateOperation.jet
         PsiElement(new)('new')
         PsiWhiteSpace(' ')
         TYPE_REFERENCE
-          USER_TYPE
+          REFERENCE_EXPRESSION
             PsiElement(IDENTIFIER)('Point')
         VALUE_ARGUMENT_LIST
           PsiElement(LPAR)('(')

idea/testData/psi/examples/With.txt

@@ -5,8 +5,9 @@ JetFile: With.jet
         ATTRIBUTE_ANNOTATION
           PsiElement(LBRACKET)('[')
           ATTRIBUTE
-            USER_TYPE
-              PsiElement(IDENTIFIER)('inline')
+            TYPE_REFERENCE
+              REFERENCE_EXPRESSION
+                PsiElement(IDENTIFIER)('inline')
           PsiElement(RBRACKET)(']')
       PsiWhiteSpace(' ')
       PsiElement(fun)('fun')
@@ -25,7 +26,7 @@ JetFile: With.jet
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('T')
         PsiElement(COMMA)(',')
         PsiWhiteSpace(' ')
@@ -38,7 +39,7 @@ JetFile: With.jet
             FUNCTION_TYPE
               PsiElement(LBRACE)('{')
               TYPE_REFERENCE
-                USER_TYPE
+                REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('T')
               PsiElement(DOT)('.')
               VALUE_PARAMETER_LIST
@@ -48,7 +49,7 @@ JetFile: With.jet
               PsiElement(COLON)(':')
               PsiWhiteSpace(' ')
               TYPE_REFERENCE
-                USER_TYPE
+                REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('Unit')
               PsiElement(RBRACE)('}')
         PsiElement(RPAR)(')')

idea/testData/psi/examples/array/MutableArray.txt

@@ -23,7 +23,7 @@ JetFile: MutableArray.jet
       DELEGATION_SPECIFIER_LIST
         DELEGATOR_SUPER_CLASS
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('ISized')
       PsiWhiteSpace(' ')
       CLASS_BODY
@@ -34,8 +34,9 @@ JetFile: MutableArray.jet
             ATTRIBUTE_ANNOTATION
               PsiElement(LBRACKET)('[')
               ATTRIBUTE
-                USER_TYPE
-                  PsiElement(IDENTIFIER)('operator')
+                TYPE_REFERENCE
+                  REFERENCE_EXPRESSION
+                    PsiElement(IDENTIFIER)('operator')
               PsiElement(RBRACKET)(']')
           PsiWhiteSpace(' ')
           PsiElement(fun)('fun')
@@ -51,14 +52,14 @@ JetFile: MutableArray.jet
               PsiElement(COLON)(':')
               PsiWhiteSpace(' ')
               TYPE_REFERENCE
-                USER_TYPE
+                REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('Int')
             PsiElement(RPAR)(')')
           PsiWhiteSpace(' ')
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('T')
         PsiWhiteSpace('\n')
         PsiElement(RBRACE)('}')
@@ -84,7 +85,7 @@ JetFile: MutableArray.jet
       DELEGATION_SPECIFIER_LIST
         DELEGATOR_SUPER_CLASS
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('ISized')
       PsiWhiteSpace(' ')
       CLASS_BODY
@@ -97,8 +98,9 @@ JetFile: MutableArray.jet
             ATTRIBUTE_ANNOTATION
               PsiElement(LBRACKET)('[')
               ATTRIBUTE
-                USER_TYPE
-                  PsiElement(IDENTIFIER)('operator')
+                TYPE_REFERENCE
+                  REFERENCE_EXPRESSION
+                    PsiElement(IDENTIFIER)('operator')
               PsiElement(RBRACKET)(']')
           PsiWhiteSpace(' ')
           PsiElement(fun)('fun')
@@ -114,7 +116,7 @@ JetFile: MutableArray.jet
               PsiElement(COLON)(':')
               PsiWhiteSpace(' ')
               TYPE_REFERENCE
-                USER_TYPE
+                REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('Int')
             PsiElement(COMMA)(',')
             PsiWhiteSpace(' ')
@@ -124,7 +126,7 @@ JetFile: MutableArray.jet
               PsiElement(COLON)(':')
               PsiWhiteSpace(' ')
               TYPE_REFERENCE
-                USER_TYPE
+                REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('T')
             PsiElement(RPAR)(')')
         PsiWhiteSpace('\n')
@@ -145,24 +147,24 @@ JetFile: MutableArray.jet
       DELEGATION_SPECIFIER_LIST
         DELEGATOR_SUPER_CLASS
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('ReadOnlyArray')
               TYPE_ARGUMENT_LIST
                 PsiElement(LT)('<')
                 TYPE_REFERENCE
-                  USER_TYPE
+                  REFERENCE_EXPRESSION
                     PsiElement(IDENTIFIER)('T')
                 PsiElement(GT)('>')
         PsiElement(COMMA)(',')
         PsiWhiteSpace(' ')
         DELEGATOR_SUPER_CLASS
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('WriteOnlyArray')
               TYPE_ARGUMENT_LIST
                 PsiElement(LT)('<')
                 TYPE_REFERENCE
-                  USER_TYPE
+                  REFERENCE_EXPRESSION
                     PsiElement(IDENTIFIER)('T')
                 PsiElement(GT)('>')
       PsiWhiteSpace(' ')

idea/testData/psi/examples/collections/ArrayList.txt

@@ -15,12 +15,12 @@ JetFile: ArrayList.jet
       DELEGATION_SPECIFIER_LIST
         DELEGATOR_SUPER_CLASS
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('IMutableList')
               TYPE_ARGUMENT_LIST
                 PsiElement(LT)('<')
                 TYPE_REFERENCE
-                  USER_TYPE
+                  REFERENCE_EXPRESSION
                     PsiElement(IDENTIFIER)('T')
                 PsiElement(GT)('>')
       PsiWhiteSpace(' ')
@@ -89,12 +89,12 @@ JetFile: ArrayList.jet
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('IIterator')
               TYPE_ARGUMENT_LIST
                 PsiElement(LT)('<')
                 TYPE_REFERENCE
-                  USER_TYPE
+                  REFERENCE_EXPRESSION
                     PsiElement(IDENTIFIER)('T')
                 PsiElement(GT)('>')
           PsiWhiteSpace(' ')
@@ -123,12 +123,12 @@ JetFile: ArrayList.jet
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('IMutableIterator')
               TYPE_ARGUMENT_LIST
                 PsiElement(LT)('<')
                 TYPE_REFERENCE
-                  USER_TYPE
+                  REFERENCE_EXPRESSION
                     PsiElement(IDENTIFIER)('T')
                 PsiElement(GT)('>')
           PsiWhiteSpace(' ')
@@ -140,7 +140,7 @@ JetFile: ArrayList.jet
             DELEGATION_SPECIFIER_LIST
               DELEGATOR_SUPER_CALL
                 TYPE_REFERENCE
-                  USER_TYPE
+                  REFERENCE_EXPRESSION
                     PsiElement(IDENTIFIER)('IMutableIterator')
                 VALUE_ARGUMENT_LIST
                   PsiElement(LPAR)('(')
@@ -216,7 +216,7 @@ JetFile: ArrayList.jet
                           PsiElement(new)('new')
                           PsiWhiteSpace(' ')
                           TYPE_REFERENCE
-                            USER_TYPE
+                            REFERENCE_EXPRESSION
                               PsiElement(IDENTIFIER)('ConcurrentModificationException')
                           VALUE_ARGUMENT_LIST
                             PsiElement(LPAR)('(')
@@ -264,7 +264,7 @@ JetFile: ArrayList.jet
                           PsiElement(new)('new')
                           PsiWhiteSpace(' ')
                           TYPE_REFERENCE
-                            USER_TYPE
+                            REFERENCE_EXPRESSION
                               PsiElement(IDENTIFIER)('NoMoreElementsException')
                           VALUE_ARGUMENT_LIST
                             PsiElement(LPAR)('(')
@@ -394,7 +394,7 @@ JetFile: ArrayList.jet
               PsiElement(COLON)(':')
               PsiWhiteSpace(' ')
               TYPE_REFERENCE
-                USER_TYPE
+                REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('Int')
             PsiElement(RPAR)(')')
           PsiWhiteSpace(' ')
@@ -439,7 +439,7 @@ JetFile: ArrayList.jet
               PsiElement(COLON)(':')
               PsiWhiteSpace(' ')
               TYPE_REFERENCE
-                USER_TYPE
+                REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('Int')
             PsiElement(RPAR)(')')
           PsiWhiteSpace(' ')
@@ -469,7 +469,7 @@ JetFile: ArrayList.jet
                     PsiElement(new)('new')
                     PsiWhiteSpace(' ')
                     TYPE_REFERENCE
-                      USER_TYPE
+                      REFERENCE_EXPRESSION
                         PsiElement(IDENTIFIER)('IndexOutOfBoundsException')
                     VALUE_ARGUMENT_LIST
                       PsiElement(LPAR)('(')
@@ -539,7 +539,7 @@ JetFile: ArrayList.jet
               PsiElement(COLON)(':')
               PsiWhiteSpace(' ')
               TYPE_REFERENCE
-                USER_TYPE
+                REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('Int')
             PsiElement(COMMA)(',')
             PsiWhiteSpace(' ')
@@ -549,7 +549,7 @@ JetFile: ArrayList.jet
               PsiElement(COLON)(':')
               PsiWhiteSpace(' ')
               TYPE_REFERENCE
-                USER_TYPE
+                REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('T')
             PsiElement(RPAR)(')')
           PsiWhiteSpace(' ')
@@ -619,7 +619,7 @@ JetFile: ArrayList.jet
               PsiElement(COLON)(':')
               PsiWhiteSpace(' ')
               TYPE_REFERENCE
-                USER_TYPE
+                REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('Int')
             PsiElement(COMMA)(',')
             PsiWhiteSpace(' ')
@@ -629,7 +629,7 @@ JetFile: ArrayList.jet
               PsiElement(COLON)(':')
               PsiWhiteSpace(' ')
               TYPE_REFERENCE
-                USER_TYPE
+                REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('T')
             PsiElement(RPAR)(')')
           PsiWhiteSpace(' ')
@@ -823,7 +823,7 @@ JetFile: ArrayList.jet
               PsiElement(COLON)(':')
               PsiWhiteSpace(' ')
               TYPE_REFERENCE
-                USER_TYPE
+                REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('Int')
             PsiElement(RPAR)(')')
           PsiWhiteSpace(' ')

idea/testData/psi/examples/collections/HashMap.txt

@@ -27,14 +27,14 @@ JetFile: HashMap.jet
               PsiElement(COLON)(':')
               PsiWhiteSpace(' ')
               TYPE_REFERENCE
-                USER_TYPE
+                REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('Any')
             PsiElement(RPAR)(')')
           PsiWhiteSpace(' ')
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('Boolean')
           PsiWhiteSpace('\n    ')
           PsiElement(EQ)('=')
@@ -50,9 +50,9 @@ JetFile: HashMap.jet
                   PsiElement(as)('as')
                   PsiWhiteSpace(' ')
                   TYPE_REFERENCE
-                    USER_TYPE
-                      USER_TYPE
-                        USER_TYPE
+                    REFERENCE_EXPRESSION
+                      REFERENCE_EXPRESSION
+                        REFERENCE_EXPRESSION
                           PsiElement(IDENTIFIER)('java')
                         PsiElement(DOT)('.')
                         PsiElement(IDENTIFIER)('lang')
@@ -72,9 +72,9 @@ JetFile: HashMap.jet
                   PsiElement(as)('as')
                   PsiWhiteSpace(' ')
                   TYPE_REFERENCE
-                    USER_TYPE
-                      USER_TYPE
-                        USER_TYPE
+                    REFERENCE_EXPRESSION
+                      REFERENCE_EXPRESSION
+                        REFERENCE_EXPRESSION
                           PsiElement(IDENTIFIER)('java')
                         PsiElement(DOT)('.')
                         PsiElement(IDENTIFIER)('lang')
@@ -99,7 +99,7 @@ JetFile: HashMap.jet
       DELEGATION_SPECIFIER_LIST
         DELEGATOR_SUPER_CLASS
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('IEquality')
       PsiWhiteSpace(' ')
       CLASS_BODY
@@ -113,7 +113,7 @@ JetFile: HashMap.jet
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('Integer')
           PsiWhiteSpace('\n    ')
           PROPERTY_ACCESSOR
@@ -134,9 +134,9 @@ JetFile: HashMap.jet
                     PsiElement(as)('as')
                     PsiWhiteSpace(' ')
                     TYPE_REFERENCE
-                      USER_TYPE
-                        USER_TYPE
-                          USER_TYPE
+                      REFERENCE_EXPRESSION
+                        REFERENCE_EXPRESSION
+                          REFERENCE_EXPRESSION
                             PsiElement(IDENTIFIER)('java')
                           PsiElement(DOT)('.')
                           PsiElement(IDENTIFIER)('lang')
@@ -186,14 +186,14 @@ JetFile: HashMap.jet
               PsiElement(COLON)(':')
               PsiWhiteSpace(' ')
               TYPE_REFERENCE
-                USER_TYPE
+                REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('K')
             PsiElement(RPAR)(')')
           PsiWhiteSpace(' ')
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('V')
         PsiWhiteSpace('\n  ')
         FUN
@@ -210,7 +210,7 @@ JetFile: HashMap.jet
               PsiElement(COLON)(':')
               PsiWhiteSpace(' ')
               TYPE_REFERENCE
-                USER_TYPE
+                REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('K')
             PsiElement(COMMA)(',')
             PsiWhiteSpace(' ')
@@ -220,14 +220,14 @@ JetFile: HashMap.jet
               PsiElement(COLON)(':')
               PsiWhiteSpace(' ')
               TYPE_REFERENCE
-                USER_TYPE
+                REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('V')
             PsiElement(RPAR)(')')
           PsiWhiteSpace(' ')
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('V')
         PsiWhiteSpace('\n  ')
         FUN
@@ -244,14 +244,14 @@ JetFile: HashMap.jet
               PsiElement(COLON)(':')
               PsiWhiteSpace(' ')
               TYPE_REFERENCE
-                USER_TYPE
+                REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('K')
             PsiElement(RPAR)(')')
           PsiWhiteSpace(' ')
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('V')
         PsiWhiteSpace('\n  ')
         FUN
@@ -268,14 +268,14 @@ JetFile: HashMap.jet
               PsiElement(COLON)(':')
               PsiWhiteSpace(' ')
               TYPE_REFERENCE
-                USER_TYPE
+                REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('K')
             PsiElement(RPAR)(')')
           PsiWhiteSpace(' ')
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('Boolean')
         PsiWhiteSpace('\n')
         PsiElement(RBRACE)('}')
@@ -299,7 +299,7 @@ JetFile: HashMap.jet
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('Any')
         PsiElement(RPAR)(')')
       PsiWhiteSpace(' ')
@@ -308,7 +308,7 @@ JetFile: HashMap.jet
       DELEGATION_SPECIFIER_LIST
         DELEGATOR_SUPER_CLASS
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('IHashable')
     PsiWhiteSpace('\n  ')
     PsiComment(EOL_COMMENT)('// equals and hashCode implementations are inherited')
@@ -318,14 +318,15 @@ JetFile: HashMap.jet
         ATTRIBUTE_ANNOTATION
           PsiElement(LBRACKET)('[')
           ATTRIBUTE
-            USER_TYPE
-              PsiElement(IDENTIFIER)('inline')
+            TYPE_REFERENCE
+              REFERENCE_EXPRESSION
+                PsiElement(IDENTIFIER)('inline')
           PsiElement(RBRACKET)(']')
       PsiWhiteSpace(' ')
       PsiElement(fun)('fun')
       PsiWhiteSpace(' ')
       TYPE_REFERENCE
-        USER_TYPE
+        REFERENCE_EXPRESSION
           PsiElement(IDENTIFIER)('Any')
       PsiElement(DOT)('.')
       PsiElement(IDENTIFIER)('hashable')
@@ -338,7 +339,7 @@ JetFile: HashMap.jet
       PsiElement(COLON)(':')
       PsiWhiteSpace(' ')
       TYPE_REFERENCE
-        USER_TYPE
+        REFERENCE_EXPRESSION
           PsiElement(IDENTIFIER)('HashableWrapper')
       PsiWhiteSpace(' ')
       PsiElement(EQ)('=')
@@ -347,7 +348,7 @@ JetFile: HashMap.jet
         PsiElement(new)('new')
         PsiWhiteSpace(' ')
         TYPE_REFERENCE
-          USER_TYPE
+          REFERENCE_EXPRESSION
             PsiElement(IDENTIFIER)('HashableWrapper')
         VALUE_ARGUMENT_LIST
           PsiElement(LPAR)('(')
@@ -386,7 +387,7 @@ JetFile: HashMap.jet
               PsiElement(COLON)(':')
               PsiWhiteSpace(' ')
               TYPE_REFERENCE
-                USER_TYPE
+                REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('K')
             PsiElement(COMMA)(',')
             PsiWhiteSpace(' ')
@@ -396,14 +397,14 @@ JetFile: HashMap.jet
               PsiElement(COLON)(':')
               PsiWhiteSpace(' ')
               TYPE_REFERENCE
-                USER_TYPE
+                REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('K')
             PsiElement(RPAR)(')')
           PsiWhiteSpace(' ')
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('Boolean')
         PsiWhiteSpace('\n  ')
         FUN
@@ -420,14 +421,14 @@ JetFile: HashMap.jet
               PsiElement(COLON)(':')
               PsiWhiteSpace(' ')
               TYPE_REFERENCE
-                USER_TYPE
+                REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('K')
             PsiElement(RPAR)(')')
           PsiWhiteSpace(' ')
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('Integer')
         PsiWhiteSpace('\n')
         PsiElement(RBRACE)('}')
@@ -447,7 +448,7 @@ JetFile: HashMap.jet
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('IHashable')
         PsiElement(GT)('>')
       PsiWhiteSpace(' ')
@@ -456,12 +457,12 @@ JetFile: HashMap.jet
       DELEGATION_SPECIFIER_LIST
         DELEGATOR_SUPER_CLASS
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('IHashingStrategy')
               TYPE_ARGUMENT_LIST
                 PsiElement(LT)('<')
                 TYPE_REFERENCE
-                  USER_TYPE
+                  REFERENCE_EXPRESSION
                     PsiElement(IDENTIFIER)('K')
                 PsiElement(GT)('>')
       PsiWhiteSpace(' ')
@@ -485,7 +486,7 @@ JetFile: HashMap.jet
               PsiElement(COLON)(':')
               PsiWhiteSpace(' ')
               TYPE_REFERENCE
-                USER_TYPE
+                REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('K')
             PsiElement(COMMA)(',')
             PsiWhiteSpace(' ')
@@ -495,14 +496,14 @@ JetFile: HashMap.jet
               PsiElement(COLON)(':')
               PsiWhiteSpace(' ')
               TYPE_REFERENCE
-                USER_TYPE
+                REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('K')
             PsiElement(RPAR)(')')
           PsiWhiteSpace(' ')
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('Boolean')
           PsiWhiteSpace(' ')
           PsiElement(EQ)('=')
@@ -538,14 +539,14 @@ JetFile: HashMap.jet
               PsiElement(COLON)(':')
               PsiWhiteSpace(' ')
               TYPE_REFERENCE
-                USER_TYPE
+                REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('K')
             PsiElement(RPAR)(')')
           PsiWhiteSpace(' ')
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('Integer')
           PsiWhiteSpace(' ')
           PsiElement(EQ)('=')
@@ -574,12 +575,12 @@ JetFile: HashMap.jet
       DELEGATION_SPECIFIER_LIST
         DELEGATOR_SUPER_CLASS
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('IHashingStrategy')
               TYPE_ARGUMENT_LIST
                 PsiElement(LT)('<')
                 TYPE_REFERENCE
-                  USER_TYPE
+                  REFERENCE_EXPRESSION
                     PsiElement(IDENTIFIER)('K')
                 PsiElement(GT)('>')
       PsiWhiteSpace(' ')
@@ -603,7 +604,7 @@ JetFile: HashMap.jet
               PsiElement(COLON)(':')
               PsiWhiteSpace(' ')
               TYPE_REFERENCE
-                USER_TYPE
+                REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('K')
             PsiElement(COMMA)(',')
             PsiWhiteSpace(' ')
@@ -613,14 +614,14 @@ JetFile: HashMap.jet
               PsiElement(COLON)(':')
               PsiWhiteSpace(' ')
               TYPE_REFERENCE
-                USER_TYPE
+                REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('K')
             PsiElement(RPAR)(')')
           PsiWhiteSpace(' ')
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('Boolean')
           PsiWhiteSpace('\n    ')
           PsiElement(EQ)('=')
@@ -664,14 +665,14 @@ JetFile: HashMap.jet
               PsiElement(COLON)(':')
               PsiWhiteSpace(' ')
               TYPE_REFERENCE
-                USER_TYPE
+                REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('K')
             PsiElement(RPAR)(')')
           PsiWhiteSpace(' ')
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('Integer')
           PsiWhiteSpace('\n    ')
           PsiElement(EQ)('=')
@@ -712,17 +713,17 @@ JetFile: HashMap.jet
       DELEGATION_SPECIFIER_LIST
         DELEGATOR_SUPER_CLASS
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('IMap')
               TYPE_ARGUMENT_LIST
                 PsiElement(LT)('<')
                 TYPE_REFERENCE
-                  USER_TYPE
+                  REFERENCE_EXPRESSION
                     PsiElement(IDENTIFIER)('K')
                 PsiElement(COMMA)(',')
                 PsiWhiteSpace(' ')
                 TYPE_REFERENCE
-                  USER_TYPE
+                  REFERENCE_EXPRESSION
                     PsiElement(IDENTIFIER)('V')
                 PsiElement(GT)('>')
       PsiWhiteSpace(' ')
@@ -736,8 +737,9 @@ JetFile: HashMap.jet
             ATTRIBUTE_ANNOTATION
               PsiElement(LBRACKET)('[')
               ATTRIBUTE
-                USER_TYPE
-                  PsiElement(IDENTIFIER)('inline')
+                TYPE_REFERENCE
+                  REFERENCE_EXPRESSION
+                    PsiElement(IDENTIFIER)('inline')
               PsiElement(RBRACKET)(']')
           PsiWhiteSpace(' ')
           PsiElement(fun)('fun')
@@ -753,7 +755,7 @@ JetFile: HashMap.jet
               PsiElement(COLON)(':')
               PsiWhiteSpace(' ')
               TYPE_REFERENCE
-                USER_TYPE
+                REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('K')
             PsiElement(RPAR)(')')
           PsiWhiteSpace(' ')
@@ -781,8 +783,9 @@ JetFile: HashMap.jet
             ATTRIBUTE_ANNOTATION
               PsiElement(LBRACKET)('[')
               ATTRIBUTE
-                USER_TYPE
-                  PsiElement(IDENTIFIER)('inline')
+                TYPE_REFERENCE
+                  REFERENCE_EXPRESSION
+                    PsiElement(IDENTIFIER)('inline')
               PsiElement(RBRACKET)(']')
           PsiWhiteSpace(' ')
           PsiElement(fun)('fun')
@@ -798,7 +801,7 @@ JetFile: HashMap.jet
               PsiElement(COLON)(':')
               PsiWhiteSpace(' ')
               TYPE_REFERENCE
-                USER_TYPE
+                REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('K')
             PsiElement(COMMA)(',')
             PsiWhiteSpace(' ')
@@ -808,7 +811,7 @@ JetFile: HashMap.jet
               PsiElement(COLON)(':')
               PsiWhiteSpace(' ')
               TYPE_REFERENCE
-                USER_TYPE
+                REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('K')
             PsiElement(RPAR)(')')
           PsiWhiteSpace(' ')
@@ -856,12 +859,12 @@ JetFile: HashMap.jet
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('IHashingStrategy')
               TYPE_ARGUMENT_LIST
                 PsiElement(LT)('<')
                 TYPE_REFERENCE
-                  USER_TYPE
+                  REFERENCE_EXPRESSION
                     PsiElement(IDENTIFIER)('K')
                 PsiElement(GT)('>')
         PsiElement(RPAR)(')')
@@ -871,17 +874,17 @@ JetFile: HashMap.jet
       DELEGATION_SPECIFIER_LIST
         DELEGATOR_SUPER_CLASS
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('IMap')
               TYPE_ARGUMENT_LIST
                 PsiElement(LT)('<')
                 TYPE_REFERENCE
-                  USER_TYPE
+                  REFERENCE_EXPRESSION
                     PsiElement(IDENTIFIER)('K')
                 PsiElement(COMMA)(',')
                 PsiWhiteSpace(' ')
                 TYPE_REFERENCE
-                  USER_TYPE
+                  REFERENCE_EXPRESSION
                     PsiElement(IDENTIFIER)('V')
                 PsiElement(GT)('>')
       PsiWhiteSpace(' ')
@@ -908,12 +911,12 @@ JetFile: HashMap.jet
                     PsiElement(new)('new')
                     PsiWhiteSpace(' ')
                     TYPE_REFERENCE
-                      USER_TYPE
+                      REFERENCE_EXPRESSION
                         PsiElement(IDENTIFIER)('JavaObjectHashingStrategy')
                         TYPE_ARGUMENT_LIST
                           PsiElement(LT)('<')
                           TYPE_REFERENCE
-                            USER_TYPE
+                            REFERENCE_EXPRESSION
                               PsiElement(IDENTIFIER)('K')
                           PsiElement(GT)('>')
                     VALUE_ARGUMENT_LIST

idea/testData/psi/examples/collections/IIterable.txt

@@ -32,12 +32,12 @@ JetFile: IIterable.jet
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('IIterator')
               TYPE_ARGUMENT_LIST
                 PsiElement(LT)('<')
                 TYPE_REFERENCE
-                  USER_TYPE
+                  REFERENCE_EXPRESSION
                     PsiElement(IDENTIFIER)('T')
                 PsiElement(GT)('>')
         PsiWhiteSpace('\n')

idea/testData/psi/examples/collections/IIterator.txt

@@ -32,7 +32,7 @@ JetFile: IIterator.jet
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('T')
         PsiWhiteSpace('\n  ')
         PROPERTY
@@ -43,7 +43,7 @@ JetFile: IIterator.jet
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('Boolean')
         PsiWhiteSpace('\n\n  ')
         FUN
@@ -60,7 +60,7 @@ JetFile: IIterator.jet
               PsiElement(COLON)(':')
               PsiWhiteSpace(' ')
               TYPE_REFERENCE
-                USER_TYPE
+                REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('MutableArray')
                   TYPE_ARGUMENT_LIST
                     PsiElement(LT)('<')
@@ -68,7 +68,7 @@ JetFile: IIterator.jet
                       PsiElement(in)('in')
                     PsiWhiteSpace(' ')
                     TYPE_REFERENCE
-                      USER_TYPE
+                      REFERENCE_EXPRESSION
                         PsiElement(IDENTIFIER)('T')
                     PsiElement(GT)('>')
             PsiElement(RPAR)(')')
@@ -76,7 +76,7 @@ JetFile: IIterator.jet
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('Int')
           PsiWhiteSpace(' ')
           BLOCK
@@ -127,7 +127,7 @@ JetFile: IIterator.jet
               PsiElement(COLON)(':')
               PsiWhiteSpace(' ')
               TYPE_REFERENCE
-                USER_TYPE
+                REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('MutableArray')
                   TYPE_ARGUMENT_LIST
                     PsiElement(LT)('<')
@@ -135,7 +135,7 @@ JetFile: IIterator.jet
                       PsiElement(in)('in')
                     PsiWhiteSpace(' ')
                     TYPE_REFERENCE
-                      USER_TYPE
+                      REFERENCE_EXPRESSION
                         PsiElement(IDENTIFIER)('T')
                     PsiElement(GT)('>')
             PsiElement(COMMA)(',')
@@ -146,7 +146,7 @@ JetFile: IIterator.jet
               PsiElement(COLON)(':')
               PsiWhiteSpace(' ')
               TYPE_REFERENCE
-                USER_TYPE
+                REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('Int')
             PsiElement(COMMA)(',')
             PsiWhiteSpace(' ')
@@ -156,14 +156,14 @@ JetFile: IIterator.jet
               PsiElement(COLON)(':')
               PsiWhiteSpace(' ')
               TYPE_REFERENCE
-                USER_TYPE
+                REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('Int')
             PsiElement(RPAR)(')')
           PsiWhiteSpace(' ')
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('Int')
           PsiWhiteSpace(' ')
           BLOCK

idea/testData/psi/examples/collections/IList.txt

@@ -21,19 +21,19 @@ JetFile: IList.jet
       DELEGATION_SPECIFIER_LIST
         DELEGATOR_SUPER_CLASS
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('IIterable')
               TYPE_ARGUMENT_LIST
                 PsiElement(LT)('<')
                 TYPE_REFERENCE
-                  USER_TYPE
+                  REFERENCE_EXPRESSION
                     PsiElement(IDENTIFIER)('T')
                 PsiElement(GT)('>')
         PsiElement(COMMA)(',')
         PsiWhiteSpace(' ')
         DELEGATOR_SUPER_CLASS
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('ISized')
       PsiWhiteSpace(' ')
       CLASS_BODY
@@ -44,8 +44,9 @@ JetFile: IList.jet
             ATTRIBUTE_ANNOTATION
               PsiElement(LBRACKET)('[')
               ATTRIBUTE
-                USER_TYPE
-                  PsiElement(IDENTIFIER)('operator')
+                TYPE_REFERENCE
+                  REFERENCE_EXPRESSION
+                    PsiElement(IDENTIFIER)('operator')
               PsiElement(RBRACKET)(']')
           PsiWhiteSpace(' ')
           PsiElement(fun)('fun')
@@ -61,14 +62,14 @@ JetFile: IList.jet
               PsiElement(COLON)(':')
               PsiWhiteSpace(' ')
               TYPE_REFERENCE
-                USER_TYPE
+                REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('Int')
             PsiElement(RPAR)(')')
           PsiWhiteSpace(' ')
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('T')
         PsiWhiteSpace('\n  ')
         PROPERTY
@@ -79,7 +80,7 @@ JetFile: IList.jet
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('Boolean')
         PsiWhiteSpace('\n')
         PsiElement(RBRACE)('}')

idea/testData/psi/examples/collections/IMutableIterable.txt

@@ -21,12 +21,12 @@ JetFile: IMutableIterable.jet
       DELEGATION_SPECIFIER_LIST
         DELEGATOR_SUPER_CLASS
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('IIterable')
               TYPE_ARGUMENT_LIST
                 PsiElement(LT)('<')
                 TYPE_REFERENCE
-                  USER_TYPE
+                  REFERENCE_EXPRESSION
                     PsiElement(IDENTIFIER)('T')
                 PsiElement(GT)('>')
       PsiWhiteSpace(' ')
@@ -46,12 +46,12 @@ JetFile: IMutableIterable.jet
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('IMutableIterator')
               TYPE_ARGUMENT_LIST
                 PsiElement(LT)('<')
                 TYPE_REFERENCE
-                  USER_TYPE
+                  REFERENCE_EXPRESSION
                     PsiElement(IDENTIFIER)('T')
                 PsiElement(GT)('>')
         PsiWhiteSpace('\n')

idea/testData/psi/examples/collections/IMutableIterator.txt

@@ -21,12 +21,12 @@ JetFile: IMutableIterator.jet
       DELEGATION_SPECIFIER_LIST
         DELEGATOR_SUPER_CLASS
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('IIterator')
               TYPE_ARGUMENT_LIST
                 PsiElement(LT)('<')
                 TYPE_REFERENCE
-                  USER_TYPE
+                  REFERENCE_EXPRESSION
                     PsiElement(IDENTIFIER)('T')
                 PsiElement(GT)('>')
       PsiWhiteSpace(' ')
@@ -46,7 +46,7 @@ JetFile: IMutableIterator.jet
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('T')
         PsiWhiteSpace('\n\n')
         PsiComment(BLOCK_COMMENT)('/*\n  Considerations:\n    pro: why not + non iteration breaking\n    con: counter-intuitive for, e.g., TreeSet\n\n\n  fun addBefore(item : T) : Boolean\n  fun addAfter(item : T) : Boolean\n*/')

idea/testData/psi/examples/collections/IMutableList.txt

@@ -18,24 +18,24 @@ JetFile: IMutableList.jet
       DELEGATION_SPECIFIER_LIST
         DELEGATOR_SUPER_CLASS
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('IList')
               TYPE_ARGUMENT_LIST
                 PsiElement(LT)('<')
                 TYPE_REFERENCE
-                  USER_TYPE
+                  REFERENCE_EXPRESSION
                     PsiElement(IDENTIFIER)('T')
                 PsiElement(GT)('>')
         PsiElement(COMMA)(',')
         PsiWhiteSpace(' ')
         DELEGATOR_SUPER_CLASS
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('IMutableIterable')
               TYPE_ARGUMENT_LIST
                 PsiElement(LT)('<')
                 TYPE_REFERENCE
-                  USER_TYPE
+                  REFERENCE_EXPRESSION
                     PsiElement(IDENTIFIER)('T')
                 PsiElement(GT)('>')
       PsiWhiteSpace(' ')
@@ -56,7 +56,7 @@ JetFile: IMutableList.jet
               PsiElement(COLON)(':')
               PsiWhiteSpace(' ')
               TYPE_REFERENCE
-                USER_TYPE
+                REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('Int')
             PsiElement(COMMA)(',')
             PsiWhiteSpace(' ')
@@ -66,14 +66,14 @@ JetFile: IMutableList.jet
               PsiElement(COLON)(':')
               PsiWhiteSpace(' ')
               TYPE_REFERENCE
-                USER_TYPE
+                REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('T')
             PsiElement(RPAR)(')')
           PsiWhiteSpace(' ')
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('T')
         PsiWhiteSpace('\n  ')
         FUN
@@ -90,7 +90,7 @@ JetFile: IMutableList.jet
               PsiElement(COLON)(':')
               PsiWhiteSpace(' ')
               TYPE_REFERENCE
-                USER_TYPE
+                REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('Int')
             PsiElement(COMMA)(',')
             PsiWhiteSpace(' ')
@@ -100,7 +100,7 @@ JetFile: IMutableList.jet
               PsiElement(COLON)(':')
               PsiWhiteSpace(' ')
               TYPE_REFERENCE
-                USER_TYPE
+                REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('T')
             PsiElement(RPAR)(')')
         PsiWhiteSpace('\n  ')
@@ -118,14 +118,14 @@ JetFile: IMutableList.jet
               PsiElement(COLON)(':')
               PsiWhiteSpace(' ')
               TYPE_REFERENCE
-                USER_TYPE
+                REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('Int')
             PsiElement(RPAR)(')')
           PsiWhiteSpace(' ')
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('T')
         PsiWhiteSpace('\n  ')
         FUN
@@ -141,12 +141,12 @@ JetFile: IMutableList.jet
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('IMutableIterator')
               TYPE_ARGUMENT_LIST
                 PsiElement(LT)('<')
                 TYPE_REFERENCE
-                  USER_TYPE
+                  REFERENCE_EXPRESSION
                     PsiElement(IDENTIFIER)('T')
                 PsiElement(GT)('>')
         PsiWhiteSpace('\n')

idea/testData/psi/examples/collections/IMutableSet.txt

@@ -18,24 +18,24 @@ JetFile: IMutableSet.jet
       DELEGATION_SPECIFIER_LIST
         DELEGATOR_SUPER_CLASS
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('ISet')
               TYPE_ARGUMENT_LIST
                 PsiElement(LT)('<')
                 TYPE_REFERENCE
-                  USER_TYPE
+                  REFERENCE_EXPRESSION
                     PsiElement(IDENTIFIER)('T')
                 PsiElement(GT)('>')
         PsiElement(COMMA)(',')
         PsiWhiteSpace(' ')
         DELEGATOR_SUPER_CLASS
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('IMutableIterable')
               TYPE_ARGUMENT_LIST
                 PsiElement(LT)('<')
                 TYPE_REFERENCE
-                  USER_TYPE
+                  REFERENCE_EXPRESSION
                     PsiElement(IDENTIFIER)('T')
                 PsiElement(GT)('>')
       PsiWhiteSpace(' ')
@@ -56,14 +56,14 @@ JetFile: IMutableSet.jet
               PsiElement(COLON)(':')
               PsiWhiteSpace(' ')
               TYPE_REFERENCE
-                USER_TYPE
+                REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('T')
             PsiElement(RPAR)(')')
           PsiWhiteSpace(' ')
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('Boolean')
         PsiWhiteSpace('\n  ')
         FUN
@@ -80,14 +80,14 @@ JetFile: IMutableSet.jet
               PsiElement(COLON)(':')
               PsiWhiteSpace(' ')
               TYPE_REFERENCE
-                USER_TYPE
+                REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('T')
             PsiElement(RPAR)(')')
           PsiWhiteSpace(' ')
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('Boolean')
         PsiWhiteSpace('\n')
         PsiElement(RBRACE)('}')

idea/testData/psi/examples/collections/ISet.txt

@@ -18,19 +18,19 @@ JetFile: ISet.jet
       DELEGATION_SPECIFIER_LIST
         DELEGATOR_SUPER_CLASS
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('IIterable')
               TYPE_ARGUMENT_LIST
                 PsiElement(LT)('<')
                 TYPE_REFERENCE
-                  USER_TYPE
+                  REFERENCE_EXPRESSION
                     PsiElement(IDENTIFIER)('T')
                 PsiElement(GT)('>')
         PsiElement(COMMA)(',')
         PsiWhiteSpace(' ')
         DELEGATOR_SUPER_CLASS
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('ISized')
       PsiWhiteSpace(' ')
       CLASS_BODY
@@ -50,14 +50,14 @@ JetFile: ISet.jet
               PsiElement(COLON)(':')
               PsiWhiteSpace(' ')
               TYPE_REFERENCE
-                USER_TYPE
+                REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('T')
             PsiElement(RPAR)(')')
           PsiWhiteSpace(' ')
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('Boolean')
         PsiWhiteSpace('\n')
         PsiElement(RBRACE)('}')

idea/testData/psi/examples/collections/ISized.txt

@@ -21,7 +21,7 @@ JetFile: ISized.jet
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('Int')
         PsiWhiteSpace('\n')
         PsiElement(RBRACE)('}')

idea/testData/psi/examples/collections/LinkedList.txt

@@ -15,12 +15,12 @@ JetFile: LinkedList.jet
       DELEGATION_SPECIFIER_LIST
         DELEGATOR_SUPER_CLASS
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('IMutableList')
               TYPE_ARGUMENT_LIST
                 PsiElement(LT)('<')
                 TYPE_REFERENCE
-                  USER_TYPE
+                  REFERENCE_EXPRESSION
                     PsiElement(IDENTIFIER)('T')
                 PsiElement(GT)('>')
       PsiWhiteSpace(' ')
@@ -46,7 +46,7 @@ JetFile: LinkedList.jet
               PsiElement(COLON)(':')
               PsiWhiteSpace(' ')
               TYPE_REFERENCE
-                USER_TYPE
+                REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('Item')
             PsiElement(RPAR)(')')
           PsiWhiteSpace(' ')
@@ -61,7 +61,7 @@ JetFile: LinkedList.jet
               PsiElement(COLON)(':')
               PsiWhiteSpace(' ')
               TYPE_REFERENCE
-                USER_TYPE
+                REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('Item')
             PsiWhiteSpace('\n    ')
             PROPERTY
@@ -72,7 +72,7 @@ JetFile: LinkedList.jet
               PsiElement(COLON)(':')
               PsiWhiteSpace(' ')
               TYPE_REFERENCE
-                USER_TYPE
+                REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('Item')
             PsiWhiteSpace('\n  ')
             PsiElement(RBRACE)('}')
@@ -88,7 +88,7 @@ JetFile: LinkedList.jet
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('Item')
           PsiWhiteSpace(' ')
           PsiElement(EQ)('=')
@@ -107,7 +107,7 @@ JetFile: LinkedList.jet
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('Item')
           PsiWhiteSpace(' ')
           PsiElement(EQ)('=')
@@ -149,7 +149,7 @@ JetFile: LinkedList.jet
               PsiElement(COLON)(':')
               PsiWhiteSpace(' ')
               TYPE_REFERENCE
-                USER_TYPE
+                REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('Int')
             PsiElement(COMMA)(',')
             PsiWhiteSpace(' ')
@@ -159,7 +159,7 @@ JetFile: LinkedList.jet
               PsiElement(COLON)(':')
               PsiWhiteSpace(' ')
               TYPE_REFERENCE
-                USER_TYPE
+                REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('T')
             PsiElement(RPAR)(')')
           PsiWhiteSpace(' ')
@@ -379,7 +379,7 @@ JetFile: LinkedList.jet
               PsiElement(COLON)(':')
               PsiWhiteSpace(' ')
               TYPE_REFERENCE
-                USER_TYPE
+                REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('Int')
             PsiElement(RPAR)(')')
           PsiWhiteSpace(' ')
@@ -448,14 +448,14 @@ JetFile: LinkedList.jet
               PsiElement(COLON)(':')
               PsiWhiteSpace(' ')
               TYPE_REFERENCE
-                USER_TYPE
+                REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('Int')
             PsiElement(RPAR)(')')
           PsiWhiteSpace(' ')
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('T')
           PsiWhiteSpace(' ')
           BLOCK
@@ -680,7 +680,7 @@ JetFile: LinkedList.jet
               PsiElement(COLON)(':')
               PsiWhiteSpace(' ')
               TYPE_REFERENCE
-                USER_TYPE
+                REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('Int')
             PsiElement(COMMA)(',')
             PsiWhiteSpace(' ')
@@ -690,14 +690,14 @@ JetFile: LinkedList.jet
               PsiElement(COLON)(':')
               PsiWhiteSpace(' ')
               TYPE_REFERENCE
-                USER_TYPE
+                REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('T')
             PsiElement(RPAR)(')')
           PsiWhiteSpace(' ')
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('T')
           PsiWhiteSpace(' ')
           BLOCK
@@ -782,7 +782,7 @@ JetFile: LinkedList.jet
               PsiElement(COLON)(':')
               PsiWhiteSpace(' ')
               TYPE_REFERENCE
-                USER_TYPE
+                REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('Int')
             PsiElement(RPAR)(')')
           PsiWhiteSpace(' ')
@@ -861,12 +861,12 @@ JetFile: LinkedList.jet
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('IMutableIterator')
               TYPE_ARGUMENT_LIST
                 PsiElement(LT)('<')
                 TYPE_REFERENCE
-                  USER_TYPE
+                  REFERENCE_EXPRESSION
                     PsiElement(IDENTIFIER)('T')
                 PsiElement(GT)('>')
         PsiWhiteSpace('\n')

idea/testData/psi/examples/collections/List.txt

@@ -23,7 +23,7 @@ JetFile: List.jet
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('Int')
         PsiElement(RPAR)(')')
       PsiWhiteSpace(' ')
@@ -32,12 +32,12 @@ JetFile: List.jet
       DELEGATION_SPECIFIER_LIST
         DELEGATOR_SUPER_CLASS
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('IList')
               TYPE_ARGUMENT_LIST
                 PsiElement(LT)('<')
                 TYPE_REFERENCE
-                  USER_TYPE
+                  REFERENCE_EXPRESSION
                     PsiElement(IDENTIFIER)('T')
                 PsiElement(GT)('>')
       PsiWhiteSpace(' ')
@@ -54,12 +54,12 @@ JetFile: List.jet
           INITIALIZER_LIST
             DELEGATOR_SUPER_CALL
               TYPE_REFERENCE
-                USER_TYPE
+                REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('List')
                   TYPE_ARGUMENT_LIST
                     PsiElement(LT)('<')
                     TYPE_REFERENCE
-                      USER_TYPE
+                      REFERENCE_EXPRESSION
                         PsiElement(IDENTIFIER)('Nothing')
                     PsiElement(GT)('>')
               VALUE_ARGUMENT_LIST
@@ -86,7 +86,7 @@ JetFile: List.jet
               PsiElement(COLON)(':')
               PsiWhiteSpace(' ')
               TYPE_REFERENCE
-                USER_TYPE
+                REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('T')
             PsiElement(COMMA)(',')
             PsiWhiteSpace(' ')
@@ -98,12 +98,12 @@ JetFile: List.jet
               PsiElement(COLON)(':')
               PsiWhiteSpace(' ')
               TYPE_REFERENCE
-                USER_TYPE
+                REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('List')
                   TYPE_ARGUMENT_LIST
                     PsiElement(LT)('<')
                     TYPE_REFERENCE
-                      USER_TYPE
+                      REFERENCE_EXPRESSION
                         PsiElement(IDENTIFIER)('T')
                     PsiElement(GT)('>')
             PsiElement(RPAR)(')')
@@ -113,12 +113,12 @@ JetFile: List.jet
           INITIALIZER_LIST
             DELEGATOR_SUPER_CALL
               TYPE_REFERENCE
-                USER_TYPE
+                REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('List')
                   TYPE_ARGUMENT_LIST
                     PsiElement(LT)('<')
                     TYPE_REFERENCE
-                      USER_TYPE
+                      REFERENCE_EXPRESSION
                         PsiElement(IDENTIFIER)('T')
                     PsiElement(GT)('>')
               VALUE_ARGUMENT_LIST
@@ -149,7 +149,7 @@ JetFile: List.jet
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('Int')
           PsiWhiteSpace('\n    ')
           PROPERTY_ACCESSOR
@@ -173,7 +173,7 @@ JetFile: List.jet
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('Boolean')
           PsiWhiteSpace('\n    ')
           PROPERTY_ACCESSOR
@@ -212,7 +212,7 @@ JetFile: List.jet
               PsiElement(new)('new')
               PsiWhiteSpace(' ')
               TYPE_REFERENCE
-                USER_TYPE
+                REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('IIterator')
               VALUE_ARGUMENT_LIST
                 PsiElement(LPAR)('(')

idea/testData/psi/examples/io/IOSamples.txt

@@ -33,14 +33,14 @@ JetFile: IOSamples.jet
               PsiElement(COLON)(':')
               PsiWhiteSpace(' ')
               TYPE_REFERENCE
-                USER_TYPE
+                REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('T')
             PsiElement(RPAR)(')')
           PsiWhiteSpace(' ')
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('Boolean')
         PsiWhiteSpace('\n')
         PsiElement(RBRACE)('}')
@@ -87,9 +87,9 @@ JetFile: IOSamples.jet
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
-              USER_TYPE
-                USER_TYPE
+            REFERENCE_EXPRESSION
+              REFERENCE_EXPRESSION
+                REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('java')
                 PsiElement(DOT)('.')
                 PsiElement(IDENTIFIER)('io')
@@ -102,7 +102,7 @@ JetFile: IOSamples.jet
       DELEGATION_SPECIFIER_LIST
         DELEGATOR_SUPER_CALL
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('ICloseable')
           VALUE_ARGUMENT_LIST
             PsiElement(LPAR)('(')
@@ -128,12 +128,12 @@ JetFile: IOSamples.jet
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('IIterable')
               TYPE_ARGUMENT_LIST
                 PsiElement(LT)('<')
                 TYPE_REFERENCE
-                  USER_TYPE
+                  REFERENCE_EXPRESSION
                     PsiElement(IDENTIFIER)('T')
                 PsiElement(GT)('>')
         PsiElement(COMMA)(',')
@@ -144,12 +144,12 @@ JetFile: IOSamples.jet
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('IAdder')
               TYPE_ARGUMENT_LIST
                 PsiElement(LT)('<')
                 TYPE_REFERENCE
-                  USER_TYPE
+                  REFERENCE_EXPRESSION
                     PsiElement(IDENTIFIER)('T')
                 PsiElement(GT)('>')
         PsiElement(RPAR)(')')
@@ -200,19 +200,19 @@ JetFile: IOSamples.jet
       DELEGATION_SPECIFIER_LIST
         DELEGATOR_SUPER_CLASS
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('IIterator')
               TYPE_ARGUMENT_LIST
                 PsiElement(LT)('<')
                 TYPE_REFERENCE
-                  USER_TYPE
+                  REFERENCE_EXPRESSION
                     PsiElement(IDENTIFIER)('Byte')
                 PsiElement(GT)('>')
         PsiElement(COMMA)(',')
         PsiWhiteSpace(' ')
         DELEGATOR_SUPER_CLASS
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('JavaCloseableWrapper')
       PsiWhiteSpace(' ')
       CLASS_BODY
@@ -229,7 +229,7 @@ JetFile: IOSamples.jet
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('InputStream')
         PsiWhiteSpace('\n  ')
         PROPERTY
@@ -243,7 +243,7 @@ JetFile: IOSamples.jet
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('Int')
         PsiWhiteSpace('\n  ')
         PROPERTY
@@ -269,7 +269,7 @@ JetFile: IOSamples.jet
               PsiElement(COLON)(':')
               PsiWhiteSpace(' ')
               TYPE_REFERENCE
-                USER_TYPE
+                REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('File')
             PsiElement(RPAR)(')')
           PsiWhiteSpace(' ')
@@ -278,7 +278,7 @@ JetFile: IOSamples.jet
           INITIALIZER_LIST
             DELEGATOR_SUPER_CALL
               TYPE_REFERENCE
-                USER_TYPE
+                REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('JavaCloseableWrapper')
               VALUE_ARGUMENT_LIST
                 PsiElement(LPAR)('(')
@@ -363,7 +363,7 @@ JetFile: IOSamples.jet
                         PsiElement(as)('as')
                         PsiWhiteSpace(' ')
                         TYPE_REFERENCE
-                          USER_TYPE
+                          REFERENCE_EXPRESSION
                             PsiElement(IDENTIFIER)('Byte')
                   PsiWhiteSpace('\n    ')
                   PsiElement(RBRACE)('}')
@@ -479,19 +479,19 @@ JetFile: IOSamples.jet
       DELEGATION_SPECIFIER_LIST
         DELEGATOR_SUPER_CLASS
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('IAdder')
               TYPE_ARGUMENT_LIST
                 PsiElement(LT)('<')
                 TYPE_REFERENCE
-                  USER_TYPE
+                  REFERENCE_EXPRESSION
                     PsiElement(IDENTIFIER)('Byte')
                 PsiElement(GT)('>')
         PsiElement(COMMA)(',')
         PsiWhiteSpace(' ')
         DELEGATOR_SUPER_CLASS
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('JavaCloseableWrapper')
       PsiWhiteSpace(' ')
       CLASS_BODY
@@ -508,7 +508,7 @@ JetFile: IOSamples.jet
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('OutputStream')
         PsiWhiteSpace('\n\n  ')
         CONSTRUCTOR
@@ -521,7 +521,7 @@ JetFile: IOSamples.jet
               PsiElement(COLON)(':')
               PsiWhiteSpace(' ')
               TYPE_REFERENCE
-                USER_TYPE
+                REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('File')
             PsiElement(RPAR)(')')
           PsiWhiteSpace(' ')
@@ -530,7 +530,7 @@ JetFile: IOSamples.jet
           INITIALIZER_LIST
             DELEGATOR_SUPER_CALL
               TYPE_REFERENCE
-                USER_TYPE
+                REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('JavaCloseableWrapper')
               VALUE_ARGUMENT_LIST
                 PsiElement(LPAR)('(')
@@ -577,7 +577,7 @@ JetFile: IOSamples.jet
               PsiElement(COLON)(':')
               PsiWhiteSpace(' ')
               TYPE_REFERENCE
-                USER_TYPE
+                REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('Byte')
             PsiElement(RPAR)(')')
           PsiWhiteSpace(' ')
@@ -625,7 +625,7 @@ JetFile: IOSamples.jet
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('File')
         PsiWhiteSpace(' ')
         PsiComment(EOL_COMMENT)('//= ...')
@@ -638,7 +638,7 @@ JetFile: IOSamples.jet
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('File')
         PsiWhiteSpace(' ')
         PsiComment(EOL_COMMENT)('//= ...')

idea/testData/psi/examples/priorityqueues/BinaryHeap.txt

@@ -15,12 +15,12 @@ JetFile: BinaryHeap.jet
       DELEGATION_SPECIFIER_LIST
         DELEGATOR_SUPER_CLASS
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('IPriorityQueue')
               TYPE_ARGUMENT_LIST
                 PsiElement(LT)('<')
                 TYPE_REFERENCE
-                  USER_TYPE
+                  REFERENCE_EXPRESSION
                     PsiElement(IDENTIFIER)('T')
                 PsiElement(GT)('>')
       PsiWhiteSpace(' ')
@@ -38,12 +38,12 @@ JetFile: BinaryHeap.jet
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('IMutableList')
               TYPE_ARGUMENT_LIST
                 PsiElement(LT)('<')
                 TYPE_REFERENCE
-                  USER_TYPE
+                  REFERENCE_EXPRESSION
                     PsiElement(IDENTIFIER)('T')
                 PsiElement(GT)('>')
         PsiWhiteSpace('\n  ')
@@ -58,12 +58,12 @@ JetFile: BinaryHeap.jet
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('Comparison')
               TYPE_ARGUMENT_LIST
                 PsiElement(LT)('<')
                 TYPE_REFERENCE
-                  USER_TYPE
+                  REFERENCE_EXPRESSION
                     PsiElement(IDENTIFIER)('T')
                 PsiElement(GT)('>')
         PsiWhiteSpace('\n\n  ')
@@ -77,12 +77,12 @@ JetFile: BinaryHeap.jet
               PsiElement(COLON)(':')
               PsiWhiteSpace(' ')
               TYPE_REFERENCE
-                USER_TYPE
+                REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('IIterable')
                   TYPE_ARGUMENT_LIST
                     PsiElement(LT)('<')
                     TYPE_REFERENCE
-                      USER_TYPE
+                      REFERENCE_EXPRESSION
                         PsiElement(IDENTIFIER)('T')
                     PsiElement(GT)('>')
             PsiElement(COMMA)(',')
@@ -93,12 +93,12 @@ JetFile: BinaryHeap.jet
               PsiElement(COLON)(':')
               PsiWhiteSpace(' ')
               TYPE_REFERENCE
-                USER_TYPE
+                REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('Comparison')
                   TYPE_ARGUMENT_LIST
                     PsiElement(LT)('<')
                     TYPE_REFERENCE
-                      USER_TYPE
+                      REFERENCE_EXPRESSION
                         PsiElement(IDENTIFIER)('T')
                     PsiElement(GT)('>')
               PsiWhiteSpace(' ')
@@ -110,7 +110,7 @@ JetFile: BinaryHeap.jet
                 TYPE_ARGUMENT_LIST
                   PsiElement(LT)('<')
                   TYPE_REFERENCE
-                    USER_TYPE
+                    REFERENCE_EXPRESSION
                       PsiElement(IDENTIFIER)('T')
                   PsiElement(GT)('>')
             PsiElement(RPAR)(')')
@@ -214,12 +214,12 @@ JetFile: BinaryHeap.jet
               PsiElement(COLON)(':')
               PsiWhiteSpace(' ')
               TYPE_REFERENCE
-                USER_TYPE
+                REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('Comparison')
                   TYPE_ARGUMENT_LIST
                     PsiElement(LT)('<')
                     TYPE_REFERENCE
-                      USER_TYPE
+                      REFERENCE_EXPRESSION
                         PsiElement(IDENTIFIER)('T')
                     PsiElement(GT)('>')
             PsiElement(RPAR)(')')
@@ -291,19 +291,19 @@ JetFile: BinaryHeap.jet
               VALUE_ARGUMENT_LIST
                 PsiElement(LPAR)('(')
                 VALUE_ARGUMENT
-                  BINARY_WITH_TYPE
+                  BINARY_WITH_PATTERN
                     REFERENCE_EXPRESSION
                       PsiElement(IDENTIFIER)('T')
                     PsiWhiteSpace(' ')
                     PsiElement(is)('is')
                     PsiWhiteSpace(' ')
-                    TYPE_REFERENCE
-                      USER_TYPE
+                    TYPE_PATTERN
+                      REFERENCE_EXPRESSION
                         PsiElement(IDENTIFIER)('IComparable')
                         TYPE_ARGUMENT_LIST
                           PsiElement(LT)('<')
                           TYPE_REFERENCE
-                            USER_TYPE
+                            REFERENCE_EXPRESSION
                               PsiElement(IDENTIFIER)('T')
                           PsiElement(GT)('>')
                 PsiElement(RPAR)(')')
@@ -324,7 +324,7 @@ JetFile: BinaryHeap.jet
                 TYPE_ARGUMENT_LIST
                   PsiElement(LT)('<')
                   TYPE_REFERENCE
-                    USER_TYPE
+                    REFERENCE_EXPRESSION
                       PsiElement(IDENTIFIER)('T')
                   PsiElement(GT)('>')
             PsiWhiteSpace('\n  ')
@@ -346,7 +346,7 @@ JetFile: BinaryHeap.jet
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('T')
           PsiWhiteSpace(' ')
           BLOCK
@@ -446,7 +446,7 @@ JetFile: BinaryHeap.jet
               PsiElement(COLON)(':')
               PsiWhiteSpace(' ')
               TYPE_REFERENCE
-                USER_TYPE
+                REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('T')
             PsiElement(RPAR)(')')
           PsiWhiteSpace(' ')
@@ -500,7 +500,7 @@ JetFile: BinaryHeap.jet
               PsiElement(COLON)(':')
               PsiWhiteSpace(' ')
               TYPE_REFERENCE
-                USER_TYPE
+                REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('Int')
             PsiElement(RPAR)(')')
           PsiWhiteSpace(' ')
@@ -725,7 +725,7 @@ JetFile: BinaryHeap.jet
               PsiElement(COLON)(':')
               PsiWhiteSpace(' ')
               TYPE_REFERENCE
-                USER_TYPE
+                REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('Int')
             PsiElement(RPAR)(')')
           PsiWhiteSpace(' ')
@@ -870,7 +870,7 @@ JetFile: BinaryHeap.jet
           PsiElement(for)('for')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('Int')
           PsiWhiteSpace(' ')
           CLASS_BODY
@@ -884,7 +884,7 @@ JetFile: BinaryHeap.jet
               PsiElement(COLON)(':')
               PsiWhiteSpace(' ')
               TYPE_REFERENCE
-                USER_TYPE
+                REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('Int')
               PsiWhiteSpace('\n      ')
               PROPERTY_ACCESSOR
@@ -920,7 +920,7 @@ JetFile: BinaryHeap.jet
               PsiElement(COLON)(':')
               PsiWhiteSpace(' ')
               TYPE_REFERENCE
-                USER_TYPE
+                REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('Int')
               PsiWhiteSpace('\n      ')
               PROPERTY_ACCESSOR
@@ -953,7 +953,7 @@ JetFile: BinaryHeap.jet
               PsiElement(COLON)(':')
               PsiWhiteSpace(' ')
               TYPE_REFERENCE
-                USER_TYPE
+                REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('Int')
               PsiWhiteSpace('\n      ')
               PROPERTY_ACCESSOR
@@ -986,7 +986,7 @@ JetFile: BinaryHeap.jet
               PsiElement(COLON)(':')
               PsiWhiteSpace(' ')
               TYPE_REFERENCE
-                USER_TYPE
+                REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('T')
               PsiWhiteSpace(' ')
               PsiElement(EQ)('=')
@@ -1047,7 +1047,7 @@ JetFile: BinaryHeap.jet
               PsiElement(COLON)(':')
               PsiWhiteSpace(' ')
               TYPE_REFERENCE
-                USER_TYPE
+                REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('Boolean')
               PsiWhiteSpace('\n      ')
               PROPERTY_ACCESSOR
@@ -1101,7 +1101,7 @@ JetFile: BinaryHeap.jet
           PsiElement(for)('for')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('T')
           PsiWhiteSpace(' ')
           CLASS_BODY
@@ -1112,8 +1112,9 @@ JetFile: BinaryHeap.jet
                 ATTRIBUTE_ANNOTATION
                   PsiElement(LBRACKET)('[')
                   ATTRIBUTE
-                    USER_TYPE
-                      PsiElement(IDENTIFIER)('operator')
+                    TYPE_REFERENCE
+                      REFERENCE_EXPRESSION
+                        PsiElement(IDENTIFIER)('operator')
                   PsiElement(RBRACKET)(']')
               PsiWhiteSpace(' ')
               PsiElement(fun)('fun')
@@ -1129,14 +1130,14 @@ JetFile: BinaryHeap.jet
                   PsiElement(COLON)(':')
                   PsiWhiteSpace(' ')
                   TYPE_REFERENCE
-                    USER_TYPE
+                    REFERENCE_EXPRESSION
                       PsiElement(IDENTIFIER)('T')
                 PsiElement(RPAR)(')')
               PsiWhiteSpace(' ')
               PsiElement(COLON)(':')
               PsiWhiteSpace(' ')
               TYPE_REFERENCE
-                USER_TYPE
+                REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('Int')
               PsiWhiteSpace(' ')
               PsiElement(EQ)('=')
@@ -1164,12 +1165,12 @@ JetFile: BinaryHeap.jet
       PsiElement(fun)('fun')
       PsiWhiteSpace(' ')
       TYPE_REFERENCE
-        USER_TYPE
+        REFERENCE_EXPRESSION
           PsiElement(IDENTIFIER)('IMutableList')
           TYPE_ARGUMENT_LIST
             PsiElement(LT)('<')
             TYPE_REFERENCE
-              USER_TYPE
+              REFERENCE_EXPRESSION
                 PsiElement(IDENTIFIER)('T')
             PsiElement(GT)('>')
       PsiElement(DOT)('.')
@@ -1184,7 +1185,7 @@ JetFile: BinaryHeap.jet
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('Int')
         PsiElement(COMMA)(',')
         PsiWhiteSpace(' ')
@@ -1194,7 +1195,7 @@ JetFile: BinaryHeap.jet
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('Int')
         PsiElement(RPAR)(')')
       PsiWhiteSpace(' ')
@@ -1259,12 +1260,12 @@ JetFile: BinaryHeap.jet
       PsiElement(val)('val')
       PsiWhiteSpace(' ')
       TYPE_REFERENCE
-        USER_TYPE
+        REFERENCE_EXPRESSION
           PsiElement(IDENTIFIER)('IList')
           TYPE_ARGUMENT_LIST
             PsiElement(LT)('<')
             TYPE_REFERENCE
-              USER_TYPE
+              REFERENCE_EXPRESSION
                 PsiElement(IDENTIFIER)('T')
             PsiElement(GT)('>')
       PsiElement(DOT)('.')
@@ -1273,7 +1274,7 @@ JetFile: BinaryHeap.jet
       PsiElement(COLON)(':')
       PsiWhiteSpace(' ')
       TYPE_REFERENCE
-        USER_TYPE
+        REFERENCE_EXPRESSION
           PsiElement(IDENTIFIER)('Int')
       PsiWhiteSpace('\n  ')
       PROPERTY_ACCESSOR

idea/testData/psi/examples/priorityqueues/IPriorityQueue.txt

@@ -29,7 +29,7 @@ JetFile: IPriorityQueue.jet
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('T')
         PsiWhiteSpace('\n  ')
         FUN
@@ -46,7 +46,7 @@ JetFile: IPriorityQueue.jet
               PsiElement(COLON)(':')
               PsiWhiteSpace(' ')
               TYPE_REFERENCE
-                USER_TYPE
+                REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('T')
             PsiElement(RPAR)(')')
         PsiWhiteSpace('\n  ')
@@ -58,7 +58,7 @@ JetFile: IPriorityQueue.jet
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('Boolean')
         PsiWhiteSpace('\n')
         PsiElement(RBRACE)('}')

idea/testData/psi/examples/priorityqueues/PriorityQueueAsPushPop.txt

@@ -19,12 +19,12 @@ JetFile: PriorityQueueAsPushPop.jet
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('IPriorityQueue')
               TYPE_ARGUMENT_LIST
                 PsiElement(LT)('<')
                 TYPE_REFERENCE
-                  USER_TYPE
+                  REFERENCE_EXPRESSION
                     PsiElement(IDENTIFIER)('T')
                 PsiElement(GT)('>')
         PsiElement(RPAR)(')')
@@ -34,12 +34,12 @@ JetFile: PriorityQueueAsPushPop.jet
       DELEGATION_SPECIFIER_LIST
         DELEGATOR_SUPER_CLASS
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('IPushPop')
               TYPE_ARGUMENT_LIST
                 PsiElement(LT)('<')
                 TYPE_REFERENCE
-                  USER_TYPE
+                  REFERENCE_EXPRESSION
                     PsiElement(IDENTIFIER)('T')
                 PsiElement(GT)('>')
       PsiWhiteSpace(' ')
@@ -89,7 +89,7 @@ JetFile: PriorityQueueAsPushPop.jet
               PsiElement(COLON)(':')
               PsiWhiteSpace(' ')
               TYPE_REFERENCE
-                USER_TYPE
+                REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('T')
             PsiElement(RPAR)(')')
           PsiWhiteSpace(' ')

idea/testData/psi/examples/util/Comparison.txt

@@ -21,19 +21,19 @@ JetFile: Comparison.jet
           VALUE_PARAMETER_LIST
             PsiElement(LPAR)('(')
             TYPE_REFERENCE
-              USER_TYPE
+              REFERENCE_EXPRESSION
                 PsiElement(IDENTIFIER)('T')
             PsiElement(COMMA)(',')
             PsiWhiteSpace(' ')
             TYPE_REFERENCE
-              USER_TYPE
+              REFERENCE_EXPRESSION
                 PsiElement(IDENTIFIER)('T')
             PsiElement(RPAR)(')')
           PsiWhiteSpace(' ')
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('Int')
           PsiElement(RBRACE)('}')
     PsiWhiteSpace('\n\n')
@@ -52,12 +52,12 @@ JetFile: Comparison.jet
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('IComparable')
               TYPE_ARGUMENT_LIST
                 PsiElement(LT)('<')
                 TYPE_REFERENCE
-                  USER_TYPE
+                  REFERENCE_EXPRESSION
                     PsiElement(IDENTIFIER)('T')
                 PsiElement(GT)('>')
         PsiElement(GT)('>')
@@ -69,7 +69,7 @@ JetFile: Comparison.jet
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('T')
         PsiElement(COMMA)(',')
         PsiWhiteSpace(' ')
@@ -79,14 +79,14 @@ JetFile: Comparison.jet
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('T')
         PsiElement(RPAR)(')')
       PsiWhiteSpace(' ')
       PsiElement(COLON)(':')
       PsiWhiteSpace(' ')
       TYPE_REFERENCE
-        USER_TYPE
+        REFERENCE_EXPRESSION
           PsiElement(IDENTIFIER)('Int')
       PsiWhiteSpace(' ')
       PsiElement(EQ)('=')
@@ -119,7 +119,7 @@ JetFile: Comparison.jet
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('Object')
         PsiElement(COMMA)(',')
         PsiWhiteSpace(' ')
@@ -129,14 +129,14 @@ JetFile: Comparison.jet
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('Object')
         PsiElement(RPAR)(')')
       PsiWhiteSpace(' ')
       PsiElement(COLON)(':')
       PsiWhiteSpace(' ')
       TYPE_REFERENCE
-        USER_TYPE
+        REFERENCE_EXPRESSION
           PsiElement(IDENTIFIER)('Int')
       PsiWhiteSpace(' ')
       PsiElement(EQ)('=')
@@ -152,12 +152,12 @@ JetFile: Comparison.jet
               PsiElement(as)('as')
               PsiWhiteSpace(' ')
               TYPE_REFERENCE
-                USER_TYPE
+                REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('Comparable')
                   TYPE_ARGUMENT_LIST
                     PsiElement(LT)('<')
                     TYPE_REFERENCE
-                      USER_TYPE
+                      REFERENCE_EXPRESSION
                         PsiElement(IDENTIFIER)('Object')
                     PsiElement(GT)('>')
             PsiElement(RPAR)(')')
@@ -174,12 +174,12 @@ JetFile: Comparison.jet
               PsiElement(as)('as')
               PsiWhiteSpace(' ')
               TYPE_REFERENCE
-                USER_TYPE
+                REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('Comparable')
                   TYPE_ARGUMENT_LIST
                     PsiElement(LT)('<')
                     TYPE_REFERENCE
-                      USER_TYPE
+                      REFERENCE_EXPRESSION
                         PsiElement(IDENTIFIER)('Object')
                     PsiElement(GT)('>')
           PsiElement(RPAR)(')')
@@ -237,19 +237,19 @@ JetFile: Comparison.jet
           VALUE_PARAMETER_LIST
             PsiElement(LPAR)('(')
             TYPE_REFERENCE
-              USER_TYPE
+              REFERENCE_EXPRESSION
                 PsiElement(IDENTIFIER)('T')
             PsiElement(COMMA)(',')
             PsiWhiteSpace(' ')
             TYPE_REFERENCE
-              USER_TYPE
+              REFERENCE_EXPRESSION
                 PsiElement(IDENTIFIER)('T')
             PsiElement(RPAR)(')')
           PsiWhiteSpace(' ')
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('ComparisonResult')
           PsiElement(RBRACE)('}')
     PsiWhiteSpace('\n\n')
@@ -270,12 +270,12 @@ JetFile: Comparison.jet
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('Comparison')
               TYPE_ARGUMENT_LIST
                 PsiElement(LT)('<')
                 TYPE_REFERENCE
-                  USER_TYPE
+                  REFERENCE_EXPRESSION
                     PsiElement(IDENTIFIER)('T')
                 PsiElement(GT)('>')
         PsiElement(RPAR)(')')
@@ -283,12 +283,12 @@ JetFile: Comparison.jet
       PsiElement(COLON)(':')
       PsiWhiteSpace(' ')
       TYPE_REFERENCE
-        USER_TYPE
+        REFERENCE_EXPRESSION
           PsiElement(IDENTIFIER)('MatchableComparison')
           TYPE_ARGUMENT_LIST
             PsiElement(LT)('<')
             TYPE_REFERENCE
-              USER_TYPE
+              REFERENCE_EXPRESSION
                 PsiElement(IDENTIFIER)('T')
             PsiElement(GT)('>')
       PsiWhiteSpace(' ')

idea/testData/psi/examples/util/IComparable.txt

@@ -33,14 +33,14 @@ JetFile: IComparable.jet
               PsiElement(COLON)(':')
               PsiWhiteSpace(' ')
               TYPE_REFERENCE
-                USER_TYPE
+                REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('T')
             PsiElement(RPAR)(')')
           PsiWhiteSpace(' ')
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
-            USER_TYPE
+            REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('Int')
         PsiWhiteSpace('\n')
         PsiElement(RBRACE)('}')