Resolve for named infix calls and infix plus

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

@@ -92,7 +92,10 @@ public interface JetNodeTypes {
     JetNodeType BLOCK                     = new JetNodeType("BLOCK", JetBlockExpression.class);
     JetNodeType FUNCTION_LITERAL          = new JetNodeType("FUNCTION_LITERAL", JetFunctionLiteralExpression.class);
     JetNodeType ANNOTATED_EXPRESSION      = new JetNodeType("ANNOTATED_EXPRESSION", JetAnnotatedExpression.class);
+
     JetNodeType REFERENCE_EXPRESSION      = new JetNodeType("REFERENCE_EXPRESSION", JetReferenceExpression.class);
+    JetNodeType OPERATION_REFERENCE       = new JetNodeType("OPERATION_REFERENCE", JetReferenceExpression.class);
+
     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);

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

@@ -6,8 +6,7 @@ import com.intellij.psi.tree.TokenSet;
 import org.jetbrains.jet.JetNodeType;
 import org.jetbrains.jet.lexer.JetTokens;
 
-import java.util.ArrayList;
+import java.util.*;
-import java.util.List;
 
 import static org.jetbrains.jet.JetNodeTypes.*;
 import static org.jetbrains.jet.lexer.JetTokens.*;
@@ -170,6 +169,28 @@ public class JetExpressionParsing extends AbstractJetParsing {
         }
     }
 
+    public static final TokenSet ALL_OPERATIONS;
+    static {
+        Set<IElementType> operations = new HashSet<IElementType>();
+        Precedence[] values = Precedence.values();
+        for (Precedence precedence : values) {
+            operations.addAll(Arrays.asList(precedence.getOperations().getTypes()));
+        }
+        ALL_OPERATIONS = TokenSet.create(operations.toArray(new IElementType[operations.size()]));
+    }
+
+    static {
+        IElementType[] operations = OPERATIONS.getTypes();
+        Set<IElementType> opSet = new HashSet<IElementType>(Arrays.asList(operations));
+        IElementType[] usedOperations = ALL_OPERATIONS.getTypes();
+        Set<IElementType> usedSet = new HashSet<IElementType>(Arrays.asList(usedOperations));
+
+        usedSet.removeAll(opSet);
+
+        assert usedSet.isEmpty() : "" + usedSet;
+    }
+
+
     private final JetParsing myJetParsing;
     private TokenSet decomposerExpressionFollow = null;
 
@@ -238,7 +259,10 @@ public class JetExpressionParsing extends AbstractJetParsing {
 
         while (!myBuilder.newlineBeforeCurrentToken() && atSet(precedence.getOperations())) {
             IElementType operation = tt();
+
+            PsiBuilder.Marker operationReference = mark();
             advance(); // operation
+            operationReference.done(OPERATION_REFERENCE);
 
             JetNodeType resultType = precedence.parseRightHandSide(operation, this);
             expression.done(resultType);

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

@@ -4,8 +4,7 @@ import com.intellij.lang.ASTNode;
 import com.intellij.psi.PsiElement;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.jetbrains.jet.lexer.JetToken;
+import org.jetbrains.jet.JetNodeTypes;
-import org.jetbrains.jet.lexer.JetTokens;
 
 /**
  * @author max
@@ -29,7 +28,7 @@ public class JetBinaryExpression extends JetExpression {
 
     @Nullable @IfNotParsed
     public JetExpression getRight() {
-        ASTNode node = getOperationTokenNode();
+        ASTNode node = getOperationReference().getNode().getTreeNext();
         while (node != null) {
             PsiElement psi = node.getPsi();
             if (psi instanceof JetExpression) {
@@ -42,14 +41,8 @@ public class JetBinaryExpression extends JetExpression {
     }
 
     @NotNull
-    public ASTNode getOperationTokenNode() {
+    public JetReferenceExpression getOperationReference() {
-        ASTNode operationNode = getNode().findChildByType(JetTokens.OPERATIONS);
+        return (JetReferenceExpression) findChildByType(JetNodeTypes.OPERATION_REFERENCE);
-        assert operationNode != null;
-        return operationNode;
     }
 
-    @NotNull
-    public JetToken getOperationSign() {
-        return (JetToken) getOperationTokenNode().getElementType();
-    }
 }

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

@@ -4,8 +4,7 @@ import com.intellij.lang.ASTNode;
 import com.intellij.psi.PsiElement;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.jetbrains.jet.lexer.JetToken;
+import org.jetbrains.jet.JetNodeTypes;
-import org.jetbrains.jet.lexer.JetTokens;
 
 /**
  * @author max
@@ -29,7 +28,7 @@ public class JetBinaryExpressionWithTypeRHS extends JetExpression {
 
     @Nullable @IfNotParsed
     public JetTypeReference getRight() {
-        ASTNode node = getOperationTokenNode();
+        ASTNode node = getOperationReference().getNode();
         while (node != null) {
             PsiElement psi = node.getPsi();
             if (psi instanceof JetTypeReference) {
@@ -40,16 +39,9 @@ public class JetBinaryExpressionWithTypeRHS extends JetExpression {
 
         return null;
     }
-
     @NotNull
-    public ASTNode getOperationTokenNode() {
+    public JetReferenceExpression getOperationReference() {
-        ASTNode operationNode = getNode().findChildByType(JetTokens.OPERATIONS);
+        return (JetReferenceExpression) findChildByType(JetNodeTypes.OPERATION_REFERENCE);
-        assert operationNode != null;
-        return operationNode;
     }
 
-    @NotNull
-    public JetToken getOperationSign() {
-        return (JetToken) getOperationTokenNode().getElementType();
-    }
 }

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

@@ -4,12 +4,14 @@ import com.intellij.lang.ASTNode;
 import com.intellij.openapi.util.TextRange;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiReference;
+import com.intellij.psi.tree.IElementType;
 import com.intellij.psi.tree.TokenSet;
 import com.intellij.psi.util.PsiTreeUtil;
 import com.intellij.util.IncorrectOperationException;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.jet.lang.ErrorHandler;
+import org.jetbrains.jet.lang.parsing.JetExpressionParsing;
 import org.jetbrains.jet.lang.resolve.AnalyzingUtils;
 import org.jetbrains.jet.lang.resolve.BindingContext;
 import org.jetbrains.jet.lexer.JetTokens;
@@ -26,18 +28,23 @@ public class JetReferenceExpression extends JetExpression {
 
     @Nullable @IfNotParsed
     public String getReferencedName() {
-        ASTNode node = getNode().findChildByType(REFERENCE_TOKENS);
+        PsiElement referencedNameElement = getReferencedNameElement();
-        return node == null ? null : node.getText();
+        return referencedNameElement == null ? null : referencedNameElement.getNode().getText();
     }
 
     @Nullable @IfNotParsed
     public PsiElement getReferencedNameElement() {
-        return findChildByType(REFERENCE_TOKENS);
+        PsiElement element = findChildByType(REFERENCE_TOKENS);
+        if (element == null) {
+            element = findChildByType(JetExpressionParsing.ALL_OPERATIONS);
+        }
+        return element;
     }
 
-    @Override
+    @Nullable @IfNotParsed
-    public void accept(JetVisitor visitor) {
+    public IElementType getReferencedNameElementType() {
-        visitor.visitReferenceExpression(this);
+        PsiElement element = getReferencedNameElement();
+        return element == null ? null : element.getNode().getElementType();
     }
 
     @Override
@@ -51,7 +58,7 @@ public class JetReferenceExpression extends JetExpression {
         return new PsiReference() {
             @Override
             public PsiElement getElement() {
-                return findChildByType(REFERENCE_TOKENS);
+                return getReferencedNameElement();
             }
 
             @Override
@@ -104,4 +111,9 @@ public class JetReferenceExpression extends JetExpression {
         };
     }
 
+    @Override
+    public void accept(JetVisitor visitor) {
+        visitor.visitReferenceExpression(this);
+    }
+
 }

idea/src/org/jetbrains/jet/lang/resolve/BindingContext.java

@@ -17,7 +17,6 @@ public interface BindingContext {
 
     JetScope getTopLevelScope();
 
-
     DeclarationDescriptor resolveReferenceExpression(JetReferenceExpression referenceExpression);
 
     Type resolveTypeReference(JetTypeReference typeReference);

idea/src/org/jetbrains/jet/lang/resolve/BindingTraceContext.java

@@ -38,8 +38,8 @@ public class BindingTraceContext extends BindingTrace implements BindingContext
 
     @Override
     public void recordDeclarationResolution(@NotNull PsiElement declaration, @NotNull DeclarationDescriptor descriptor) {
-        descriptorToDeclarations.put(descriptor, declaration);
+        descriptorToDeclarations.put(descriptor.getOriginal(), declaration);
-        declarationsToDescriptors.put(declaration, descriptor);
+        declarationsToDescriptors.put(declaration, descriptor.getOriginal());
     }
 
     public void setToplevelScope(JetScope toplevelScope) {
@@ -89,7 +89,11 @@ public class BindingTraceContext extends BindingTrace implements BindingContext
 
     @Override
     public PsiElement resolveToDeclarationPsiElement(JetReferenceExpression referenceExpression) {
-        return descriptorToDeclarations.get(resolveReferenceExpression(referenceExpression));
+        DeclarationDescriptor declarationDescriptor = resolveReferenceExpression(referenceExpression);
+        if (declarationDescriptor == null) {
+            return null;
+        }
+        return descriptorToDeclarations.get(declarationDescriptor.getOriginal());
     }
 
 }

idea/src/org/jetbrains/jet/lang/types/JetTypeInferrer.java

@@ -167,7 +167,7 @@ public class JetTypeInferrer {
 
             @Override
             public void visitBinaryWithTypeRHSExpression(JetBinaryExpressionWithTypeRHS expression) {
-                if (expression.getOperationSign() == JetTokens.COLON) {
+                if (expression.getOperationReference().getReferencedNameElementType() == JetTokens.COLON) {
                     Type actualType = getType(scope, expression.getLeft(), false);
                     Type expectedType = typeResolver.resolveType(scope, expression.getRight());
                     if (JetTypeChecker.INSTANCE.isSubtypeOf(actualType, expectedType)) {
@@ -316,6 +316,12 @@ public class JetTypeInferrer {
 
 //                    result[0] = overloadDomain.getFunctionDescriptorForNamedArguments(typeArguments, valueArguments, functionLiteralArgument);
                 } else {
+                    List<Type> types = new ArrayList<Type>();
+                    for (JetTypeProjection projection : typeArguments) {
+                        // TODO : check that there's no projection
+                        types.add(typeResolver.resolveType(scope, projection.getTypeReference()));
+                    }
+
                     List<JetExpression> positionedValueArguments = new ArrayList<JetExpression>();
                     for (JetArgument argument : valueArguments) {
                         positionedValueArguments.add(argument.getArgumentExpression());
@@ -323,12 +329,6 @@ public class JetTypeInferrer {
 
                     positionedValueArguments.addAll(functionLiteralArguments);
 
-                    List<Type> types = new ArrayList<Type>();
-                    for (JetTypeProjection projection : typeArguments) {
-                        // TODO : check that there's no projection
-                        types.add(typeResolver.resolveType(scope, projection.getTypeReference()));
-                    }
-
                     List<Type> valueArgumentTypes = new ArrayList<Type>();
                     for (JetExpression valueArgument : positionedValueArguments) {
                         valueArgumentTypes.add(getType(scope, valueArgument, false));
@@ -341,10 +341,40 @@ public class JetTypeInferrer {
                 }
             }
 
+            @Override
+            public void visitBinaryExpression(JetBinaryExpression expression) {
+                JetReferenceExpression operationSign = expression.getOperationReference();
+
+                IElementType operationType = operationSign.getReferencedNameElementType();
+                if (operationType == JetTokens.IDENTIFIER) {
+                    result[0] = getTypeForBinaryCall(expression, operationSign.getReferencedName(), scope);
+                }
+                else if (operationType == JetTokens.PLUS) {
+                    result[0] = getTypeForBinaryCall(expression, "plus", scope);
+                } else {
+                    throw new UnsupportedOperationException(); // TODO
+                }
+            }
+
             @Override
             public void visitJetElement(JetElement elem) {
                 throw new IllegalArgumentException("Unsupported element: " + elem);
             }
+
+            private Type getTypeForBinaryCall(JetBinaryExpression expression, String name, JetScope scope) {
+                JetReferenceExpression operationSign = expression.getOperationReference();
+                JetExpression left = expression.getLeft();
+                Type leftType = getType(scope, left, false);
+                JetExpression right = expression.getRight();
+                Type rightType = getType(scope, right, false);
+                OverloadDomain overloadDomain = OverloadResolver.INSTANCE.getOverloadDomain(leftType, scope, name);
+                overloadDomain = wrapForTracing(overloadDomain, operationSign);
+                FunctionDescriptor functionDescriptor = overloadDomain.getFunctionDescriptorForPositionedArguments(Collections.<Type>emptyList(), Collections.singletonList(rightType));
+                if (functionDescriptor != null) {
+                    return functionDescriptor.getUnsubstitutedReturnType();
+                }
+                return null;
+            }
         });
         if (result[0] != null) {
             trace.recordExpressionType(expression, result[0]);
@@ -352,6 +382,7 @@ public class JetTypeInferrer {
         return result[0];
     }
 
+
     private OverloadDomain getOverloadDomain(final JetScope scope, JetExpression calleeExpression) {
         final OverloadDomain[] result = new OverloadDomain[1];
         final JetReferenceExpression[] reference = new JetReferenceExpression[1];
@@ -404,26 +435,30 @@ public class JetTypeInferrer {
                 throw new IllegalArgumentException("Unsupported element: " + elem);
             }
         });
-        if (result[0] == null) return OverloadDomain.EMPTY;
+        return wrapForTracing(result[0], reference[0]);
+    }
+
+    private OverloadDomain wrapForTracing(final OverloadDomain overloadDomain, final JetReferenceExpression referenceExpression) {
+        if (overloadDomain == null) return OverloadDomain.EMPTY;
         return new OverloadDomain() {
             @Override
             public FunctionDescriptor getFunctionDescriptorForNamedArguments(@NotNull List<Type> typeArguments, @NotNull Map<String, Type> valueArgumentTypes, @Nullable Type functionLiteralArgumentType) {
-                FunctionDescriptor descriptor = result[0].getFunctionDescriptorForNamedArguments(typeArguments, valueArgumentTypes, functionLiteralArgumentType);
+                FunctionDescriptor descriptor = overloadDomain.getFunctionDescriptorForNamedArguments(typeArguments, valueArgumentTypes, functionLiteralArgumentType);
                 if (descriptor != null) {
-                    trace.recordReferenceResolution(reference[0], descriptor);
+                    trace.recordReferenceResolution(referenceExpression, descriptor);
                 } else {
-                    semanticServices.getErrorHandler().unresolvedReference(reference[0]);
+                    semanticServices.getErrorHandler().unresolvedReference(referenceExpression);
                 }
                 return descriptor;
             }
 
             @Override
             public FunctionDescriptor getFunctionDescriptorForPositionedArguments(@NotNull List<Type> typeArguments, @NotNull List<Type> positionedValueArgumentTypes) {
-                FunctionDescriptor descriptor = result[0].getFunctionDescriptorForPositionedArguments(typeArguments, positionedValueArgumentTypes);
+                FunctionDescriptor descriptor = overloadDomain.getFunctionDescriptorForPositionedArguments(typeArguments, positionedValueArgumentTypes);
                 if (descriptor != null) {
-                    trace.recordReferenceResolution(reference[0], descriptor);
+                    trace.recordReferenceResolution(referenceExpression, descriptor);
                 } else {
-                    semanticServices.getErrorHandler().unresolvedReference(reference[0]);
+                    semanticServices.getErrorHandler().unresolvedReference(referenceExpression);
                 }
                 return descriptor;
             }

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

@@ -6,6 +6,7 @@ package org.jetbrains.jet.lexer;
 import com.intellij.psi.TokenType;
 import com.intellij.psi.tree.IElementType;
 import com.intellij.psi.tree.TokenSet;
+import org.jetbrains.jet.lang.parsing.JetExpressionParsing;
 
 public interface JetTokens {
     JetToken EOF   = new JetToken("EOF");

idea/src/org/jetbrains/jet/plugin/JetQuickDocumentationProvider.java

@@ -31,4 +31,6 @@ public class JetQuickDocumentationProvider extends QuickDocumentationProvider {
         }
         return "Not a reference";
     }
+
+
 }

idea/testData/psi/Attributes.txt

@@ -171,6 +171,7 @@ JetFile: Attributes.jet
                 BINARY_EXPRESSION
                   INTEGER_CONSTANT
                     PsiElement(INTEGER_LITERAL)('1')
+                  OPERATION_REFERENCE
                     PsiElement(PLUS)('+')
                   INTEGER_CONSTANT
                     PsiElement(INTEGER_LITERAL)('1')
@@ -194,6 +195,7 @@ JetFile: Attributes.jet
                 BINARY_EXPRESSION
                   INTEGER_CONSTANT
                     PsiElement(INTEGER_LITERAL)('1')
+                  OPERATION_REFERENCE
                     PsiElement(PLUS)('+')
                   INTEGER_CONSTANT
                     PsiElement(INTEGER_LITERAL)('1')
@@ -220,6 +222,7 @@ JetFile: Attributes.jet
                 BINARY_EXPRESSION
                   INTEGER_CONSTANT
                     PsiElement(INTEGER_LITERAL)('1')
+                  OPERATION_REFERENCE
                     PsiElement(PLUS)('+')
                   INTEGER_CONSTANT
                     PsiElement(INTEGER_LITERAL)('1')

idea/testData/psi/ByCaluses.txt

@@ -58,6 +58,7 @@ JetFile: ByCaluses.jet
             REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('a')
             PsiWhiteSpace(' ')
+            OPERATION_REFERENCE
               PsiElement(PLUS)('+')
             PsiWhiteSpace(' ')
             BINARY_EXPRESSION
@@ -68,6 +69,7 @@ JetFile: ByCaluses.jet
                   PsiElement(LPAR)('(')
                   PsiElement(RPAR)(')')
               PsiWhiteSpace(' ')
+              OPERATION_REFERENCE
                 PsiElement(MUL)('*')
               PsiWhiteSpace(' ')
               INTEGER_CONSTANT

idea/testData/psi/ControlStructures.txt

@@ -676,6 +676,7 @@ JetFile: ControlStructures.jet
               REFERENCE_EXPRESSION
                 PsiElement(IDENTIFIER)('a')
               PsiWhiteSpace(' ')
+              OPERATION_REFERENCE
                 PsiElement(in)('in')
               PsiWhiteSpace(' ')
               REFERENCE_EXPRESSION
@@ -695,6 +696,7 @@ JetFile: ControlStructures.jet
               REFERENCE_EXPRESSION
                 PsiElement(IDENTIFIER)('a')
               PsiWhiteSpace(' ')
+              OPERATION_REFERENCE
                 PsiElement(in)('in')
               PsiWhiteSpace(' ')
               REFERENCE_EXPRESSION
@@ -720,6 +722,7 @@ JetFile: ControlStructures.jet
               REFERENCE_EXPRESSION
                 PsiElement(IDENTIFIER)('a')
               PsiWhiteSpace(' ')
+              OPERATION_REFERENCE
                 PsiElement(in)('in')
               PsiWhiteSpace(' ')
               REFERENCE_EXPRESSION

idea/testData/psi/EOLsInComments.txt

@@ -48,6 +48,7 @@ JetFile: EOLsInComments.jet
           PsiWhiteSpace(' ')
           PsiComment(BLOCK_COMMENT)('/*\n  */')
           PsiWhiteSpace('  ')
+          OPERATION_REFERENCE
             PsiElement(PLUS)('+')
           PsiWhiteSpace(' ')
           REFERENCE_EXPRESSION
@@ -70,6 +71,7 @@ JetFile: EOLsInComments.jet
           PsiWhiteSpace(' ')
           PsiComment(DOC_COMMENT)('/**\n  */')
           PsiWhiteSpace('  ')
+          OPERATION_REFERENCE
             PsiElement(PLUS)('+')
           PsiWhiteSpace(' ')
           REFERENCE_EXPRESSION

idea/testData/psi/FunctionCalls.txt

@@ -252,6 +252,7 @@ JetFile: FunctionCalls.jet
               BINARY_EXPRESSION
                 REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('foo')
+                OPERATION_REFERENCE
                   PsiElement(LT)('<')
                 REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('a')
@@ -266,6 +267,7 @@ JetFile: FunctionCalls.jet
               BINARY_EXPRESSION
                 REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('b')
+                OPERATION_REFERENCE
                   PsiElement(GT)('>')
                 PARENTHESIZED
                   PsiElement(LPAR)('(')
@@ -283,6 +285,7 @@ JetFile: FunctionCalls.jet
               BINARY_EXPRESSION
                 REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('foo')
+                OPERATION_REFERENCE
                   PsiElement(LT)('<')
                 REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('a')
@@ -295,6 +298,7 @@ JetFile: FunctionCalls.jet
                   INTEGER_CONSTANT
                     PsiElement(INTEGER_LITERAL)('1')
                   PsiWhiteSpace(' ')
+                  OPERATION_REFERENCE
                     PsiElement(PLUS)('+')
                   PsiWhiteSpace(' ')
                   INTEGER_CONSTANT
@@ -306,6 +310,7 @@ JetFile: FunctionCalls.jet
               BINARY_EXPRESSION
                 REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('b')
+                OPERATION_REFERENCE
                   PsiElement(GT)('>')
                 PARENTHESIZED
                   PsiElement(LPAR)('(')

idea/testData/psi/NewlinesInParentheses.txt

@@ -24,6 +24,7 @@ JetFile: NewlinesInParentheses.jet
             REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('a')
             PsiWhiteSpace(' ')
+            OPERATION_REFERENCE
               PsiElement(PLUS)('+')
             PsiWhiteSpace(' ')
             REFERENCE_EXPRESSION
@@ -40,6 +41,7 @@ JetFile: NewlinesInParentheses.jet
             REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('a')
             PsiWhiteSpace(' ')
+            OPERATION_REFERENCE
               PsiElement(PLUS)('+')
             PsiWhiteSpace('\n    ')
             REFERENCE_EXPRESSION
@@ -74,6 +76,7 @@ JetFile: NewlinesInParentheses.jet
               REFERENCE_EXPRESSION
                 PsiElement(IDENTIFIER)('a')
               PsiWhiteSpace('\n  ')
+              OPERATION_REFERENCE
                 PsiElement(PLUS)('+')
               PsiWhiteSpace(' ')
               REFERENCE_EXPRESSION
@@ -126,6 +129,7 @@ JetFile: NewlinesInParentheses.jet
                       PsiElement(IDENTIFIER)('b')
                 PsiElement(RBRACE)('}')
               PsiWhiteSpace('\n  ')
+              OPERATION_REFERENCE
                 PsiElement(PLUS)('+')
               PsiWhiteSpace(' ')
               REFERENCE_EXPRESSION
@@ -148,6 +152,7 @@ JetFile: NewlinesInParentheses.jet
                 REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('c')
                 PsiWhiteSpace('\n    ')
+                OPERATION_REFERENCE
                   PsiElement(PLUS)('+')
                 PsiWhiteSpace(' ')
                 REFERENCE_EXPRESSION
@@ -206,6 +211,7 @@ JetFile: NewlinesInParentheses.jet
                         PsiElement(IDENTIFIER)('d')
                   PsiElement(RBRACE)('}')
                 PsiWhiteSpace('\n    ')
+                OPERATION_REFERENCE
                   PsiElement(PLUS)('+')
                 PsiWhiteSpace(' ')
                 REFERENCE_EXPRESSION
@@ -322,6 +328,7 @@ JetFile: NewlinesInParentheses.jet
             REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('a')
             PsiWhiteSpace(' ')
+            OPERATION_REFERENCE
               PsiElement(is)('is')
             PsiWhiteSpace(' ')
             TYPE_PATTERN

idea/testData/psi/Precedence.txt

@@ -95,6 +95,7 @@ JetFile: Precedence.jet
               BINARY_EXPRESSION
                 REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('foo')
+                OPERATION_REFERENCE
                   PsiElement(LT)('<')
                 REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('a')
@@ -109,6 +110,7 @@ JetFile: Precedence.jet
               BINARY_EXPRESSION
                 REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('b')
+                OPERATION_REFERENCE
                   PsiElement(GT)('>')
                 PARENTHESIZED
                   PsiElement(LPAR)('(')
@@ -126,6 +128,7 @@ JetFile: Precedence.jet
               BINARY_EXPRESSION
                 REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('foo')
+                OPERATION_REFERENCE
                   PsiElement(LT)('<')
                 REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('a')
@@ -138,6 +141,7 @@ JetFile: Precedence.jet
                   REFERENCE_EXPRESSION
                     PsiElement(IDENTIFIER)('a')
                   PsiWhiteSpace(' ')
+                  OPERATION_REFERENCE
                     PsiElement(PLUS)('+')
                   PsiWhiteSpace(' ')
                   INTEGER_CONSTANT
@@ -149,6 +153,7 @@ JetFile: Precedence.jet
               BINARY_EXPRESSION
                 REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('b')
+                OPERATION_REFERENCE
                   PsiElement(GT)('>')
                 PARENTHESIZED
                   PsiElement(LPAR)('(')
@@ -166,6 +171,7 @@ JetFile: Precedence.jet
               BINARY_EXPRESSION
                 REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('foo')
+                OPERATION_REFERENCE
                   PsiElement(LT)('<')
                 REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('a')
@@ -177,6 +183,7 @@ JetFile: Precedence.jet
                 BINARY_EXPRESSION
                   REFERENCE_EXPRESSION
                     PsiElement(IDENTIFIER)('b')
+                  OPERATION_REFERENCE
                     PsiElement(GT)('>')
                   PARENTHESIZED
                     PsiElement(LPAR)('(')
@@ -229,6 +236,7 @@ JetFile: Precedence.jet
                 BINARY_EXPRESSION
                   REFERENCE_EXPRESSION
                     PsiElement(IDENTIFIER)('foo')
+                  OPERATION_REFERENCE
                     PsiElement(LT)('<')
                   REFERENCE_EXPRESSION
                     PsiElement(IDENTIFIER)('a')
@@ -239,6 +247,7 @@ JetFile: Precedence.jet
               BINARY_EXPRESSION
                 REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('b')
+                OPERATION_REFERENCE
                   PsiElement(GT)('>')
                 PARENTHESIZED
                   PsiElement(LPAR)('(')
@@ -256,6 +265,7 @@ JetFile: Precedence.jet
               BINARY_EXPRESSION
                 REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('foo')
+                OPERATION_REFERENCE
                   PsiElement(LT)('<')
                 REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('a')
@@ -270,6 +280,7 @@ JetFile: Precedence.jet
           REFERENCE_EXPRESSION
             PsiElement(IDENTIFIER)('a')
           PsiWhiteSpace(' ')
+          OPERATION_REFERENCE
             PsiElement(PLUS)('+')
           PsiWhiteSpace(' ')
           REFERENCE_EXPRESSION
@@ -279,12 +290,14 @@ JetFile: Precedence.jet
           REFERENCE_EXPRESSION
             PsiElement(IDENTIFIER)('a')
           PsiWhiteSpace(' ')
+          OPERATION_REFERENCE
             PsiElement(PLUS)('+')
           PsiWhiteSpace(' ')
           BINARY_EXPRESSION
             REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('b')
             PsiWhiteSpace(' ')
+            OPERATION_REFERENCE
               PsiElement(MUL)('*')
             PsiWhiteSpace(' ')
             REFERENCE_EXPRESSION
@@ -294,6 +307,7 @@ JetFile: Precedence.jet
           REFERENCE_EXPRESSION
             PsiElement(IDENTIFIER)('a')
           PsiWhiteSpace(' ')
+          OPERATION_REFERENCE
             PsiElement(PLUS)('+')
           PsiWhiteSpace(' ')
           PARENTHESIZED
@@ -302,6 +316,7 @@ JetFile: Precedence.jet
               REFERENCE_EXPRESSION
                 PsiElement(IDENTIFIER)('b')
               PsiWhiteSpace(' ')
+              OPERATION_REFERENCE
                 PsiElement(MUL)('*')
               PsiWhiteSpace(' ')
               REFERENCE_EXPRESSION
@@ -315,12 +330,14 @@ JetFile: Precedence.jet
               REFERENCE_EXPRESSION
                 PsiElement(IDENTIFIER)('a')
               PsiWhiteSpace(' ')
+              OPERATION_REFERENCE
                 PsiElement(PLUS)('+')
               PsiWhiteSpace(' ')
               REFERENCE_EXPRESSION
                 PsiElement(IDENTIFIER)('b')
             PsiElement(RPAR)(')')
           PsiWhiteSpace(' ')
+          OPERATION_REFERENCE
             PsiElement(MUL)('*')
           PsiWhiteSpace(' ')
           REFERENCE_EXPRESSION
@@ -331,17 +348,20 @@ JetFile: Precedence.jet
             REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('a')
             PsiWhiteSpace(' ')
+            OPERATION_REFERENCE
               PsiElement(PLUS)('+')
             PsiWhiteSpace(' ')
             REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('b')
           PsiWhiteSpace(' ')
+          OPERATION_REFERENCE
             PsiElement(GT)('>')
           PsiWhiteSpace(' ')
           BINARY_EXPRESSION
             REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('c')
             PsiWhiteSpace(' ')
+            OPERATION_REFERENCE
               PsiElement(MUL)('*')
             PsiWhiteSpace(' ')
             REFERENCE_EXPRESSION
@@ -352,17 +372,20 @@ JetFile: Precedence.jet
             REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('a')
             PsiWhiteSpace(' ')
+            OPERATION_REFERENCE
               PsiElement(PLUS)('+')
             PsiWhiteSpace(' ')
             REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('b')
           PsiWhiteSpace(' ')
+          OPERATION_REFERENCE
             PsiElement(in)('in')
           PsiWhiteSpace(' ')
           BINARY_EXPRESSION
             REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('c')
             PsiWhiteSpace(' ')
+            OPERATION_REFERENCE
               PsiElement(MUL)('*')
             PsiWhiteSpace(' ')
             REFERENCE_EXPRESSION
@@ -379,6 +402,7 @@ JetFile: Precedence.jet
           REFERENCE_EXPRESSION
             PsiElement(IDENTIFIER)('a')
           PsiWhiteSpace(' ')
+          OPERATION_REFERENCE
             PsiElement(PLUS)('+')
           PsiWhiteSpace(' ')
           DOT_QIALIFIED_EXPRESSION
@@ -396,6 +420,7 @@ JetFile: Precedence.jet
             REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('b')
           PsiWhiteSpace(' ')
+          OPERATION_REFERENCE
             PsiElement(PLUS)('+')
           PsiWhiteSpace(' ')
           REFERENCE_EXPRESSION
@@ -427,6 +452,7 @@ JetFile: Precedence.jet
             REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('a')
           PsiWhiteSpace(' ')
+          OPERATION_REFERENCE
             PsiElement(MUL)('*')
           PsiWhiteSpace(' ')
           REFERENCE_EXPRESSION
@@ -436,13 +462,16 @@ JetFile: Precedence.jet
           BINARY_EXPRESSION
             REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('a')
+            OPERATION_REFERENCE
               PsiElement(PLUS)('+')
             REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('b')
+          OPERATION_REFERENCE
             PsiElement(RANGE)('..')
           BINARY_EXPRESSION
             REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('b')
+            OPERATION_REFERENCE
               PsiElement(MINUS)('-')
             INTEGER_CONSTANT
               PsiElement(INTEGER_LITERAL)('1')
@@ -451,15 +480,18 @@ JetFile: Precedence.jet
           BINARY_EXPRESSION
             INTEGER_CONSTANT
               PsiElement(INTEGER_LITERAL)('1')
+            OPERATION_REFERENCE
               PsiElement(RANGE)('..')
             INTEGER_CONSTANT
               PsiElement(INTEGER_LITERAL)('2')
           PsiWhiteSpace(' ')
+          OPERATION_REFERENCE
             PsiElement(IDENTIFIER)('foo')
           PsiWhiteSpace(' ')
           BINARY_EXPRESSION
             INTEGER_CONSTANT
               PsiElement(INTEGER_LITERAL)('2')
+            OPERATION_REFERENCE
               PsiElement(RANGE)('..')
             INTEGER_CONSTANT
               PsiElement(INTEGER_LITERAL)('3')
@@ -469,17 +501,20 @@ JetFile: Precedence.jet
             INTEGER_CONSTANT
               PsiElement(INTEGER_LITERAL)('1')
             PsiWhiteSpace(' ')
+            OPERATION_REFERENCE
               PsiElement(IDENTIFIER)('foo')
             PsiWhiteSpace(' ')
             INTEGER_CONSTANT
               PsiElement(INTEGER_LITERAL)('2')
           PsiWhiteSpace(' ')
+          OPERATION_REFERENCE
             PsiElement(ELVIS)('?:')
           PsiWhiteSpace(' ')
           BINARY_EXPRESSION
             INTEGER_CONSTANT
               PsiElement(INTEGER_LITERAL)('1')
             PsiWhiteSpace(' ')
+            OPERATION_REFERENCE
               PsiElement(IDENTIFIER)('bar')
             PsiWhiteSpace(' ')
             INTEGER_CONSTANT
@@ -491,16 +526,19 @@ JetFile: Precedence.jet
               REFERENCE_EXPRESSION
                 PsiElement(IDENTIFIER)('a')
               PsiWhiteSpace(' ')
+              OPERATION_REFERENCE
                 PsiElement(IDENTIFIER)('b')
               PsiWhiteSpace(' ')
               REFERENCE_EXPRESSION
                 PsiElement(IDENTIFIER)('c')
             PsiWhiteSpace(' ')
+            OPERATION_REFERENCE
               PsiElement(IDENTIFIER)('d')
             PsiWhiteSpace(' ')
             REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('e')
           PsiWhiteSpace(' ')
+          OPERATION_REFERENCE
             PsiElement(IDENTIFIER)('f')
           PsiWhiteSpace(' ')
           REFERENCE_EXPRESSION
@@ -511,16 +549,19 @@ JetFile: Precedence.jet
             REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('a')
             PsiWhiteSpace(' ')
+            OPERATION_REFERENCE
               PsiElement(ELVIS)('?:')
             PsiWhiteSpace(' ')
             REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('b')
           PsiWhiteSpace(' ')
+          OPERATION_REFERENCE
             PsiElement(in)('in')
           PsiWhiteSpace(' ')
           BINARY_EXPRESSION
             REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('b')
+            OPERATION_REFERENCE
               PsiElement(ELVIS)('?:')
             PsiWhiteSpace(' ')
             REFERENCE_EXPRESSION
@@ -533,6 +574,7 @@ JetFile: Precedence.jet
               REFERENCE_EXPRESSION
                 PsiElement(IDENTIFIER)('a')
               PsiWhiteSpace(' ')
+              OPERATION_REFERENCE
                 PsiElement(COLON)(':')
               PsiWhiteSpace(' ')
               TYPE_REFERENCE
@@ -541,12 +583,14 @@ JetFile: Precedence.jet
                     PsiElement(IDENTIFIER)('b')
             PsiElement(RPAR)(')')
           PsiWhiteSpace(' ')
+          OPERATION_REFERENCE
             PsiElement(LT)('<')
           PsiWhiteSpace(' ')
           BINARY_WITH_TYPE
             REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('b')
             PsiWhiteSpace(' ')
+            OPERATION_REFERENCE
               PsiElement(COLON)(':')
             PsiWhiteSpace(' ')
             TYPE_REFERENCE
@@ -559,17 +603,20 @@ JetFile: Precedence.jet
             REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('a')
             PsiWhiteSpace(' ')
+            OPERATION_REFERENCE
               PsiElement(LT)('<')
             PsiWhiteSpace(' ')
             REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('b')
           PsiWhiteSpace(' ')
+          OPERATION_REFERENCE
             PsiElement(EQEQ)('==')
           PsiWhiteSpace(' ')
           BINARY_EXPRESSION
             REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('b')
             PsiWhiteSpace(' ')
+            OPERATION_REFERENCE
               PsiElement(GT)('>')
             PsiWhiteSpace(' ')
             REFERENCE_EXPRESSION
@@ -580,11 +627,13 @@ JetFile: Precedence.jet
             REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('a')
             PsiWhiteSpace(' ')
+            OPERATION_REFERENCE
               PsiElement(EXCLEQ)('!=')
             PsiWhiteSpace(' ')
             REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('b')
           PsiWhiteSpace(' ')
+          OPERATION_REFERENCE
             PsiElement(ANDAND)('&&')
           PsiWhiteSpace(' ')
           REFERENCE_EXPRESSION
@@ -594,12 +643,14 @@ JetFile: Precedence.jet
           REFERENCE_EXPRESSION
             PsiElement(IDENTIFIER)('a')
           PsiWhiteSpace(' ')
+          OPERATION_REFERENCE
             PsiElement(OROR)('||')
           PsiWhiteSpace(' ')
           BINARY_EXPRESSION
             REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('b')
             PsiWhiteSpace(' ')
+            OPERATION_REFERENCE
               PsiElement(ANDAND)('&&')
             PsiWhiteSpace(' ')
             REFERENCE_EXPRESSION
@@ -609,12 +660,14 @@ JetFile: Precedence.jet
           REFERENCE_EXPRESSION
             PsiElement(IDENTIFIER)('a')
           PsiWhiteSpace(' ')
+          OPERATION_REFERENCE
             PsiElement(EQ)('=')
           PsiWhiteSpace(' ')
           BINARY_EXPRESSION
             REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('b')
             PsiWhiteSpace(' ')
+            OPERATION_REFERENCE
               PsiElement(ARROW)('->')
             PsiWhiteSpace(' ')
             REFERENCE_EXPRESSION
@@ -624,12 +677,14 @@ JetFile: Precedence.jet
           REFERENCE_EXPRESSION
             PsiElement(IDENTIFIER)('a')
           PsiWhiteSpace(' ')
+          OPERATION_REFERENCE
             PsiElement(EQ)('=')
           PsiWhiteSpace(' ')
           BINARY_EXPRESSION
             REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('b')
             PsiWhiteSpace(' ')
+            OPERATION_REFERENCE
               PsiElement(OROR)('||')
             PsiWhiteSpace(' ')
             REFERENCE_EXPRESSION

idea/testData/psi/Properties.txt

@@ -694,6 +694,7 @@ JetFile: Properties.jet
               PsiElement(LPAR)('(')
               PsiElement(RPAR)(')')
           PsiWhiteSpace(' ')
+          OPERATION_REFERENCE
             PsiElement(EQ)('=')
           PsiWhiteSpace(' ')
           INTEGER_CONSTANT
@@ -710,6 +711,7 @@ JetFile: Properties.jet
                   REFERENCE_EXPRESSION
                     PsiElement(IDENTIFIER)('int')
                   PsiWhiteSpace(' ')
+                  OPERATION_REFERENCE
                     PsiElement(COLON)(':')
                   PsiWhiteSpace(' ')
                   TYPE_REFERENCE
@@ -718,6 +720,7 @@ JetFile: Properties.jet
                         PsiElement(IDENTIFIER)('x')
               PsiElement(RPAR)(')')
           PsiWhiteSpace(' ')
+          OPERATION_REFERENCE
             PsiElement(EQ)('=')
           PsiWhiteSpace(' ')
           INTEGER_CONSTANT
@@ -765,6 +768,7 @@ JetFile: Properties.jet
             REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('size')
           PsiWhiteSpace(' ')
+          OPERATION_REFERENCE
             PsiElement(MINUS)('-')
           PsiWhiteSpace(' ')
           INTEGER_CONSTANT

idea/testData/psi/ThisType.txt

@@ -75,6 +75,7 @@ JetFile: ThisType.jet
             REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('foo')
             PsiWhiteSpace(' ')
+            OPERATION_REFERENCE
               PsiElement(as)('as')
             PsiWhiteSpace(' ')
             TYPE_REFERENCE

idea/testData/psi/TypeExpressionAmbiguities_ERR.txt

@@ -61,6 +61,7 @@ JetFile: TypeExpressionAmbiguities_ERR.jet
               BINARY_EXPRESSION
                 REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('bar')
+                OPERATION_REFERENCE
                   PsiElement(LT)('<')
                 REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('a')
@@ -70,6 +71,7 @@ JetFile: TypeExpressionAmbiguities_ERR.jet
               BINARY_EXPRESSION
                 REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('b')
+                OPERATION_REFERENCE
                   PsiElement(PLUS)('+')
                 INTEGER_CONSTANT
                   PsiElement(INTEGER_LITERAL)('1')
@@ -79,6 +81,7 @@ JetFile: TypeExpressionAmbiguities_ERR.jet
               BINARY_EXPRESSION
                 REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('c')
+                OPERATION_REFERENCE
                   PsiElement(GT)('>')
                 PARENTHESIZED
                   PsiElement(LPAR)('(')
@@ -96,6 +99,7 @@ JetFile: TypeExpressionAmbiguities_ERR.jet
               BINARY_EXPRESSION
                 REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('bar')
+                OPERATION_REFERENCE
                   PsiElement(LT)('<')
                 REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('a')
@@ -114,6 +118,7 @@ JetFile: TypeExpressionAmbiguities_ERR.jet
               BINARY_EXPRESSION
                 REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('c')
+                OPERATION_REFERENCE
                   PsiElement(GT)('>')
                 PARENTHESIZED
                   PsiElement(LPAR)('(')
@@ -131,6 +136,7 @@ JetFile: TypeExpressionAmbiguities_ERR.jet
               BINARY_EXPRESSION
                 REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('bar')
+                OPERATION_REFERENCE
                   PsiElement(LT)('<')
                 REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('a')
@@ -141,6 +147,7 @@ JetFile: TypeExpressionAmbiguities_ERR.jet
                 REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('a')
                 PsiWhiteSpace(' ')
+                OPERATION_REFERENCE
                   PsiElement(COLON)(':')
                 PsiWhiteSpace(' ')
                 TYPE_REFERENCE
@@ -153,6 +160,7 @@ JetFile: TypeExpressionAmbiguities_ERR.jet
               BINARY_EXPRESSION
                 REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('c')
+                OPERATION_REFERENCE
                   PsiElement(GT)('>')
                 PARENTHESIZED
                   PsiElement(LPAR)('(')
@@ -165,6 +173,7 @@ JetFile: TypeExpressionAmbiguities_ERR.jet
           REFERENCE_EXPRESSION
             PsiElement(IDENTIFIER)('a')
           PsiWhiteSpace(' ')
+          OPERATION_REFERENCE
             PsiElement(COLON)(':')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
@@ -187,6 +196,7 @@ JetFile: TypeExpressionAmbiguities_ERR.jet
           REFERENCE_EXPRESSION
             PsiElement(IDENTIFIER)('d')
           PsiWhiteSpace(' ')
+          OPERATION_REFERENCE
             PsiElement(as)('as')
           PsiWhiteSpace(' ')
           TYPE_REFERENCE
@@ -209,6 +219,7 @@ JetFile: TypeExpressionAmbiguities_ERR.jet
           REFERENCE_EXPRESSION
             PsiElement(IDENTIFIER)('x')
           PsiWhiteSpace(' ')
+          OPERATION_REFERENCE
             PsiElement(is)('is')
           PsiWhiteSpace(' ')
           TYPE_PATTERN

idea/testData/psi/When.txt

@@ -209,6 +209,7 @@ JetFile: When.jet
               REFERENCE_EXPRESSION
                 PsiElement(IDENTIFIER)('a')
               PsiWhiteSpace(' ')
+              OPERATION_REFERENCE
                 PsiElement(GT)('>')
               PsiWhiteSpace(' ')
               INTEGER_CONSTANT
@@ -772,6 +773,7 @@ JetFile: When.jet
               BINARY_EXPRESSION
                 INTEGER_CONSTANT
                   PsiElement(INTEGER_LITERAL)('1')
+                OPERATION_REFERENCE
                   PsiElement(RANGE)('..')
                 INTEGER_CONSTANT
                   PsiElement(INTEGER_LITERAL)('2')
@@ -916,6 +918,7 @@ JetFile: When.jet
                     BINARY_EXPRESSION
                       INTEGER_CONSTANT
                         PsiElement(INTEGER_LITERAL)('1')
+                      OPERATION_REFERENCE
                         PsiElement(RANGE)('..')
                       INTEGER_CONSTANT
                         PsiElement(INTEGER_LITERAL)('2')
@@ -1171,6 +1174,7 @@ JetFile: When.jet
                 INTEGER_CONSTANT
                   PsiElement(INTEGER_LITERAL)('2')
                 PsiWhiteSpace(' ')
+                OPERATION_REFERENCE
                   PsiElement(PLUS)('+')
                 PsiWhiteSpace(' ')
                 INTEGER_CONSTANT
@@ -1247,12 +1251,14 @@ JetFile: When.jet
               REFERENCE_EXPRESSION
                 PsiElement(IDENTIFIER)('b')
               PsiWhiteSpace(' ')
+              OPERATION_REFERENCE
                 PsiElement(EQEQ)('==')
               PsiWhiteSpace(' ')
               BINARY_EXPRESSION
                 REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('a')
                 PsiWhiteSpace(' ')
+                OPERATION_REFERENCE
                   PsiElement(PLUS)('+')
                 PsiWhiteSpace(' ')
                 INTEGER_CONSTANT

idea/testData/psi/examples/AnonymousObjects.txt

@@ -89,6 +89,7 @@ JetFile: AnonymousObjects.jet
                             REFERENCE_EXPRESSION
                               PsiElement(IDENTIFIER)('clickCount')
                             PsiWhiteSpace(' ')
+                            OPERATION_REFERENCE
                               PsiElement(GT)('>')
                             PsiWhiteSpace(' ')
                             INTEGER_CONSTANT

idea/testData/psi/examples/BinaryTree.txt

@@ -185,6 +185,7 @@ JetFile: BinaryTree.jet
                 REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('compare')
               PsiWhiteSpace(' ')
+              OPERATION_REFERENCE
                 PsiElement(EQ)('=')
               PsiWhiteSpace(' ')
               CALL_EXPRESSION
@@ -393,6 +394,7 @@ JetFile: BinaryTree.jet
                       REFERENCE_EXPRESSION
                         PsiElement(IDENTIFIER)('node')
                       PsiWhiteSpace(' ')
+                      OPERATION_REFERENCE
                         PsiElement(EQEQ)('==')
                       PsiWhiteSpace(' ')
                       NULL
@@ -639,6 +641,7 @@ JetFile: BinaryTree.jet
                       REFERENCE_EXPRESSION
                         PsiElement(IDENTIFIER)('node')
                       PsiWhiteSpace(' ')
+                      OPERATION_REFERENCE
                         PsiElement(EQEQ)('==')
                       PsiWhiteSpace(' ')
                       NULL
@@ -654,6 +657,7 @@ JetFile: BinaryTree.jet
                           REFERENCE_EXPRESSION
                             PsiElement(IDENTIFIER)('node')
                           PsiWhiteSpace(' ')
+                          OPERATION_REFERENCE
                             PsiElement(EQ)('=')
                           PsiWhiteSpace(' ')
                           CALL_EXPRESSION
@@ -815,6 +819,7 @@ JetFile: BinaryTree.jet
                       REFERENCE_EXPRESSION
                         PsiElement(IDENTIFIER)('node')
                       PsiWhiteSpace(' ')
+                      OPERATION_REFERENCE
                         PsiElement(EQEQ)('==')
                       PsiWhiteSpace(' ')
                       NULL
@@ -830,6 +835,7 @@ JetFile: BinaryTree.jet
                           REFERENCE_EXPRESSION
                             PsiElement(IDENTIFIER)('root')
                           PsiWhiteSpace(' ')
+                          OPERATION_REFERENCE
                             PsiElement(EQ)('=')
                           PsiWhiteSpace(' ')
                           CALL_EXPRESSION
@@ -914,6 +920,7 @@ JetFile: BinaryTree.jet
                             REFERENCE_EXPRESSION
                               PsiElement(IDENTIFIER)('left')
                           PsiWhiteSpace(' ')
+                          OPERATION_REFERENCE
                             PsiElement(EQEQ)('==')
                           PsiWhiteSpace(' ')
                           NULL
@@ -933,6 +940,7 @@ JetFile: BinaryTree.jet
                                 REFERENCE_EXPRESSION
                                   PsiElement(IDENTIFIER)('left')
                               PsiWhiteSpace(' ')
+                              OPERATION_REFERENCE
                                 PsiElement(EQ)('=')
                               PsiWhiteSpace(' ')
                               CALL_EXPRESSION
@@ -998,6 +1006,7 @@ JetFile: BinaryTree.jet
                             REFERENCE_EXPRESSION
                               PsiElement(IDENTIFIER)('right')
                           PsiWhiteSpace(' ')
+                          OPERATION_REFERENCE
                             PsiElement(EQEQ)('==')
                           PsiWhiteSpace(' ')
                           NULL
@@ -1017,6 +1026,7 @@ JetFile: BinaryTree.jet
                                 REFERENCE_EXPRESSION
                                   PsiElement(IDENTIFIER)('right')
                               PsiWhiteSpace(' ')
+                              OPERATION_REFERENCE
                                 PsiElement(EQ)('=')
                               PsiWhiteSpace(' ')
                               CALL_EXPRESSION
@@ -1131,6 +1141,7 @@ JetFile: BinaryTree.jet
                   REFERENCE_EXPRESSION
                     PsiElement(IDENTIFIER)('toRemove')
                   PsiWhiteSpace(' ')
+                  OPERATION_REFERENCE
                     PsiElement(EQEQ)('==')
                   PsiWhiteSpace(' ')
                   NULL
@@ -1208,6 +1219,7 @@ JetFile: BinaryTree.jet
                       REFERENCE_EXPRESSION
                         PsiElement(IDENTIFIER)('node')
                       PsiWhiteSpace(' ')
+                      OPERATION_REFERENCE
                         PsiElement(EQEQ)('==')
                       PsiWhiteSpace(' ')
                       NULL
@@ -1530,6 +1542,7 @@ JetFile: BinaryTree.jet
                         REFERENCE_EXPRESSION
                           PsiElement(IDENTIFIER)('value')
                       PsiWhiteSpace(' ')
+                      OPERATION_REFERENCE
                         PsiElement(EQ)('=')
                       PsiWhiteSpace(' ')
                       DOT_QIALIFIED_EXPRESSION
@@ -1595,6 +1608,7 @@ JetFile: BinaryTree.jet
                       REFERENCE_EXPRESSION
                         PsiElement(IDENTIFIER)('node')
                       PsiWhiteSpace(' ')
+                      OPERATION_REFERENCE
                         PsiElement(EQEQ)('==')
                       PsiWhiteSpace(' ')
                       REFERENCE_EXPRESSION
@@ -1610,6 +1624,7 @@ JetFile: BinaryTree.jet
                           REFERENCE_EXPRESSION
                             PsiElement(IDENTIFIER)('root')
                           PsiWhiteSpace(' ')
+                          OPERATION_REFERENCE
                             PsiElement(EQ)('=')
                           PsiWhiteSpace(' ')
                           REFERENCE_EXPRESSION
@@ -1637,6 +1652,7 @@ JetFile: BinaryTree.jet
                         REFERENCE_EXPRESSION
                           PsiElement(IDENTIFIER)('left')
                       PsiWhiteSpace(' ')
+                      OPERATION_REFERENCE
                         PsiElement(EQEQ)('==')
                       PsiWhiteSpace(' ')
                       REFERENCE_EXPRESSION
@@ -1660,6 +1676,7 @@ JetFile: BinaryTree.jet
                             REFERENCE_EXPRESSION
                               PsiElement(IDENTIFIER)('left')
                           PsiWhiteSpace(' ')
+                          OPERATION_REFERENCE
                             PsiElement(EQ)('=')
                           PsiWhiteSpace(' ')
                           REFERENCE_EXPRESSION
@@ -1687,6 +1704,7 @@ JetFile: BinaryTree.jet
                             REFERENCE_EXPRESSION
                               PsiElement(IDENTIFIER)('right')
                           PsiWhiteSpace(' ')
+                          OPERATION_REFERENCE
                             PsiElement(EQEQ)('==')
                           PsiWhiteSpace(' ')
                           REFERENCE_EXPRESSION
@@ -1710,6 +1728,7 @@ JetFile: BinaryTree.jet
                                 REFERENCE_EXPRESSION
                                   PsiElement(IDENTIFIER)('right')
                               PsiWhiteSpace(' ')
+                              OPERATION_REFERENCE
                                 PsiElement(EQ)('=')
                               PsiWhiteSpace(' ')
                               REFERENCE_EXPRESSION
@@ -1774,6 +1793,7 @@ JetFile: BinaryTree.jet
                     REFERENCE_EXPRESSION
                       PsiElement(IDENTIFIER)('left')
                   PsiWhiteSpace(' ')
+                  OPERATION_REFERENCE
                     PsiElement(EQEQ)('==')
                   PsiWhiteSpace(' ')
                   NULL
@@ -1975,6 +1995,7 @@ JetFile: BinaryTree.jet
                         REFERENCE_EXPRESSION
                           PsiElement(IDENTIFIER)('root')
                         PsiWhiteSpace(' ')
+                        OPERATION_REFERENCE
                           PsiElement(EXCLEQ)('!=')
                         PsiWhiteSpace(' ')
                         NULL
@@ -2054,6 +2075,7 @@ JetFile: BinaryTree.jet
                     REFERENCE_EXPRESSION
                       PsiElement(IDENTIFIER)('lastNode')
                     PsiWhiteSpace(' ')
+                    OPERATION_REFERENCE
                       PsiElement(EQ)('=')
                     PsiWhiteSpace(' ')
                     CALL_EXPRESSION
@@ -2163,6 +2185,7 @@ JetFile: BinaryTree.jet
                                           REFERENCE_EXPRESSION
                                             PsiElement(IDENTIFIER)('left')
                                         PsiWhiteSpace(' ')
+                                        OPERATION_REFERENCE
                                           PsiElement(EXCLEQ)('!=')
                                         PsiWhiteSpace(' ')
                                         NULL
@@ -2228,6 +2251,7 @@ JetFile: BinaryTree.jet
                                                   REFERENCE_EXPRESSION
                                                     PsiElement(IDENTIFIER)('right')
                                                 PsiWhiteSpace(' ')
+                                                OPERATION_REFERENCE
                                                   PsiElement(EXCLEQ)('!=')
                                                 PsiWhiteSpace(' ')
                                                 NULL
@@ -2308,6 +2332,7 @@ JetFile: BinaryTree.jet
                                           REFERENCE_EXPRESSION
                                             PsiElement(IDENTIFIER)('right')
                                         PsiWhiteSpace(' ')
+                                        OPERATION_REFERENCE
                                           PsiElement(EXCLEQ)('!=')
                                         PsiWhiteSpace(' ')
                                         NULL
@@ -2383,6 +2408,7 @@ JetFile: BinaryTree.jet
                         REFERENCE_EXPRESSION
                           PsiElement(IDENTIFIER)('isEmpty')
                     PsiWhiteSpace(' ')
+                    OPERATION_REFERENCE
                       PsiElement(OROR)('||')
                     PsiWhiteSpace(' ')
                     PREFIX_EXPRESSION
@@ -2426,6 +2452,7 @@ JetFile: BinaryTree.jet
                         REFERENCE_EXPRESSION
                           PsiElement(IDENTIFIER)('lastNode')
                         PsiWhiteSpace(' ')
+                        OPERATION_REFERENCE
                           PsiElement(EQEQ)('==')
                         PsiWhiteSpace(' ')
                         NULL
@@ -2473,6 +2500,7 @@ JetFile: BinaryTree.jet
                       REFERENCE_EXPRESSION
                         PsiElement(IDENTIFIER)('version')
                     PsiWhiteSpace(' ')
+                    OPERATION_REFERENCE
                       PsiElement(EQ)('=')
                     PsiWhiteSpace(' ')
                     REFERENCE_EXPRESSION
@@ -2505,6 +2533,7 @@ JetFile: BinaryTree.jet
                         REFERENCE_EXPRESSION
                           PsiElement(IDENTIFIER)('version')
                         PsiWhiteSpace(' ')
+                        OPERATION_REFERENCE
                           PsiElement(EXCLEQ)('!=')
                         PsiWhiteSpace(' ')
                         DOT_QIALIFIED_EXPRESSION

idea/testData/psi/examples/BitArith.txt

@@ -25,6 +25,7 @@ JetFile: BitArith.jet
         INTEGER_CONSTANT
           PsiElement(INTEGER_LITERAL)('1')
         PsiWhiteSpace(' ')
+        OPERATION_REFERENCE
           PsiElement(IDENTIFIER)('shl')
         PsiWhiteSpace(' ')
         REFERENCE_EXPRESSION
@@ -66,6 +67,7 @@ JetFile: BitArith.jet
         REFERENCE_EXPRESSION
           PsiElement(IDENTIFIER)('x')
         PsiWhiteSpace(' ')
+        OPERATION_REFERENCE
           PsiElement(IDENTIFIER)('or')
         PsiWhiteSpace(' ')
         CALL_EXPRESSION
@@ -114,6 +116,7 @@ JetFile: BitArith.jet
         REFERENCE_EXPRESSION
           PsiElement(IDENTIFIER)('x')
         PsiWhiteSpace(' ')
+        OPERATION_REFERENCE
           PsiElement(IDENTIFIER)('and')
         PsiWhiteSpace(' ')
         CALL_EXPRESSION
@@ -170,6 +173,7 @@ JetFile: BitArith.jet
           REFERENCE_EXPRESSION
             PsiElement(IDENTIFIER)('x')
           PsiWhiteSpace(' ')
+          OPERATION_REFERENCE
             PsiElement(IDENTIFIER)('and')
           PsiWhiteSpace(' ')
           CALL_EXPRESSION
@@ -182,6 +186,7 @@ JetFile: BitArith.jet
                   PsiElement(IDENTIFIER)('index')
               PsiElement(RPAR)(')')
         PsiWhiteSpace(' ')
+        OPERATION_REFERENCE
           PsiElement(EXCLEQ)('!=')
         PsiWhiteSpace(' ')
         INTEGER_CONSTANT
@@ -227,17 +232,20 @@ JetFile: BitArith.jet
               REFERENCE_EXPRESSION
                 PsiElement(IDENTIFIER)('x')
               PsiWhiteSpace(' ')
+              OPERATION_REFERENCE
                 PsiElement(IDENTIFIER)('shr')
               PsiWhiteSpace(' ')
               REFERENCE_EXPRESSION
                 PsiElement(IDENTIFIER)('index')
             PsiElement(RPAR)(')')
           PsiWhiteSpace(' ')
+          OPERATION_REFERENCE
             PsiElement(IDENTIFIER)('shl')
           PsiWhiteSpace(' ')
           INTEGER_CONSTANT
             PsiElement(INTEGER_LITERAL)('31')
         PsiWhiteSpace(' ')
+        OPERATION_REFERENCE
           PsiElement(EXCLEQ)('!=')
         PsiWhiteSpace(' ')
         INTEGER_CONSTANT
@@ -284,6 +292,7 @@ JetFile: BitArith.jet
               REFERENCE_EXPRESSION
                 PsiElement(IDENTIFIER)('x')
               PsiWhiteSpace(' ')
+              OPERATION_REFERENCE
                 PsiElement(EXCLEQ)('!=')
               PsiWhiteSpace(' ')
               INTEGER_CONSTANT
@@ -299,12 +308,14 @@ JetFile: BitArith.jet
                   REFERENCE_EXPRESSION
                     PsiElement(IDENTIFIER)('result')
                   PsiWhiteSpace(' ')
+                  OPERATION_REFERENCE
                     PsiElement(PLUSEQ)('+=')
                   PsiWhiteSpace(' ')
                   BINARY_EXPRESSION
                     REFERENCE_EXPRESSION
                       PsiElement(IDENTIFIER)('x')
                     PsiWhiteSpace(' ')
+                    OPERATION_REFERENCE
                       PsiElement(IDENTIFIER)('and')
                     PsiWhiteSpace(' ')
                     INTEGER_CONSTANT
@@ -314,12 +325,14 @@ JetFile: BitArith.jet
                   REFERENCE_EXPRESSION
                     PsiElement(IDENTIFIER)('x')
                   PsiWhiteSpace(' ')
+                  OPERATION_REFERENCE
                     PsiElement(EQ)('=')
                   PsiWhiteSpace(' ')
                   BINARY_EXPRESSION
                     REFERENCE_EXPRESSION
                       PsiElement(IDENTIFIER)('x')
                     PsiWhiteSpace(' ')
+                    OPERATION_REFERENCE
                       PsiElement(IDENTIFIER)('ushr')
                     PsiWhiteSpace(' ')
                     INTEGER_CONSTANT
@@ -361,6 +374,7 @@ JetFile: BitArith.jet
               REFERENCE_EXPRESSION
                 PsiElement(IDENTIFIER)('x')
               PsiWhiteSpace(' ')
+              OPERATION_REFERENCE
                 PsiElement(IDENTIFIER)('and')
               PsiWhiteSpace(' ')
               CALL_EXPRESSION
@@ -377,18 +391,21 @@ JetFile: BitArith.jet
                         REFERENCE_EXPRESSION
                           PsiElement(IDENTIFIER)('bits')
                       PsiWhiteSpace(' ')
+                      OPERATION_REFERENCE
                         PsiElement(MINUS)('-')
                       PsiWhiteSpace(' ')
                       INTEGER_CONSTANT
                         PsiElement(INTEGER_LITERAL)('1')
                   PsiElement(RPAR)(')')
             PsiWhiteSpace(' ')
+            OPERATION_REFERENCE
               PsiElement(EXCLEQ)('!=')
             PsiWhiteSpace(' ')
             INTEGER_CONSTANT
               PsiElement(INTEGER_LITERAL)('0')
           PsiElement(RPAR)(')')
         PsiWhiteSpace(' ')
+        OPERATION_REFERENCE
           PsiElement(as)('as')
         PsiWhiteSpace(' ')
         TYPE_REFERENCE
@@ -426,6 +443,7 @@ JetFile: BitArith.jet
             REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('x')
             PsiWhiteSpace(' ')
+            OPERATION_REFERENCE
               PsiElement(EQEQ)('==')
             PsiWhiteSpace(' ')
             INTEGER_CONSTANT
@@ -450,6 +468,7 @@ JetFile: BitArith.jet
                     PsiElement(IDENTIFIER)('x')
                 PsiElement(RPAR)(')')
             PsiWhiteSpace(' ')
+            OPERATION_REFERENCE
               PsiElement(PLUS)('+')
             PsiWhiteSpace(' ')
             CALL_EXPRESSION
@@ -462,6 +481,7 @@ JetFile: BitArith.jet
                     REFERENCE_EXPRESSION
                       PsiElement(IDENTIFIER)('x')
                     PsiWhiteSpace(' ')
+                    OPERATION_REFERENCE
                       PsiElement(IDENTIFIER)('shl')
                     PsiWhiteSpace(' ')
                     INTEGER_CONSTANT
@@ -499,11 +519,13 @@ JetFile: BitArith.jet
           THIS_EXPRESSION
             PsiElement(this)('this')
           PsiWhiteSpace(' ')
+          OPERATION_REFERENCE
             PsiElement(IDENTIFIER)('and')
           PsiWhiteSpace(' ')
           REFERENCE_EXPRESSION
             PsiElement(IDENTIFIER)('mask')
         PsiWhiteSpace(' ')
+        OPERATION_REFERENCE
           PsiElement(EQEQ)('==')
         PsiWhiteSpace(' ')
         REFERENCE_EXPRESSION

idea/testData/psi/examples/Builder.txt

@@ -157,6 +157,7 @@ JetFile: Builder.jet
                         REFERENCE_EXPRESSION
                           PsiElement(IDENTIFIER)('targetLevel')
                         PsiWhiteSpace(' ')
+                        OPERATION_REFERENCE
                           PsiElement(EQ)('=')
                         PsiWhiteSpace(' ')
                         STRING_CONSTANT

idea/testData/psi/examples/Graph.txt

@@ -455,6 +455,7 @@ JetFile: Graph.jet
                         REFERENCE_EXPRESSION
                           PsiElement(IDENTIFIER)('from')
                       PsiWhiteSpace(' ')
+                      OPERATION_REFERENCE
                         PsiElement(EQEQ)('==')
                       PsiWhiteSpace(' ')
                       REFERENCE_EXPRESSION

idea/testData/psi/examples/LINQ.txt

@@ -19,6 +19,7 @@ JetFile: LINQ.jet
               REFERENCE_EXPRESSION
                 PsiElement(IDENTIFIER)('l')
               PsiWhiteSpace(' ')
+              OPERATION_REFERENCE
                 PsiElement(IDENTIFIER)('filter')
               PsiWhiteSpace(' ')
               FUNCTION_LITERAL
@@ -32,6 +33,7 @@ JetFile: LINQ.jet
                       PsiElement(IDENTIFIER)('x')
                 PsiElement(RBRACE)('}')
             PsiWhiteSpace(' ')
+            OPERATION_REFERENCE
               PsiElement(IDENTIFIER)('map')
             PsiWhiteSpace(' ')
             FUNCTION_LITERAL
@@ -45,6 +47,7 @@ JetFile: LINQ.jet
                     PsiElement(IDENTIFIER)('foo')
               PsiElement(RBRACE)('}')
           PsiWhiteSpace(' ')
+          OPERATION_REFERENCE
             PsiElement(IDENTIFIER)('aggregate')
           PsiWhiteSpace(' ')
           FUNCTION_LITERAL
@@ -66,6 +69,7 @@ JetFile: LINQ.jet
                 REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('a')
                 PsiWhiteSpace(' ')
+                OPERATION_REFERENCE
                   PsiElement(PLUS)('+')
                 PsiWhiteSpace(' ')
                 REFERENCE_EXPRESSION

idea/testData/psi/examples/PolymorphicClassObjects.txt

@@ -377,6 +377,7 @@ JetFile: PolymorphicClassObjects.jet
                         REFERENCE_EXPRESSION
                           PsiElement(IDENTIFIER)('builder')
                         PsiWhiteSpace(' ')
+                        OPERATION_REFERENCE
                           PsiElement(PLUSEQ)('+=')
                         PsiWhiteSpace(' ')
                         CALL_EXPRESSION

idea/testData/psi/examples/Queue.txt

@@ -189,6 +189,7 @@ JetFile: Queue.jet
                   REFERENCE_EXPRESSION
                     PsiElement(IDENTIFIER)('tail')
                   PsiWhiteSpace(' ')
+                  OPERATION_REFERENCE
                     PsiElement(EQEQ)('==')
                   PsiWhiteSpace(' ')
                   NULL
@@ -204,6 +205,7 @@ JetFile: Queue.jet
                       REFERENCE_EXPRESSION
                         PsiElement(IDENTIFIER)('head')
                       PsiWhiteSpace(' ')
+                      OPERATION_REFERENCE
                         PsiElement(EQ)('=')
                       PsiWhiteSpace(' ')
                       REFERENCE_EXPRESSION
@@ -213,6 +215,7 @@ JetFile: Queue.jet
                       REFERENCE_EXPRESSION
                         PsiElement(IDENTIFIER)('tail')
                       PsiWhiteSpace(' ')
+                      OPERATION_REFERENCE
                         PsiElement(EQ)('=')
                       PsiWhiteSpace(' ')
                       REFERENCE_EXPRESSION
@@ -235,6 +238,7 @@ JetFile: Queue.jet
                         REFERENCE_EXPRESSION
                           PsiElement(IDENTIFIER)('next')
                       PsiWhiteSpace(' ')
+                      OPERATION_REFERENCE
                         PsiElement(EQ)('=')
                       PsiWhiteSpace(' ')
                       REFERENCE_EXPRESSION
@@ -244,6 +248,7 @@ JetFile: Queue.jet
                       REFERENCE_EXPRESSION
                         PsiElement(IDENTIFIER)('tail')
                       PsiWhiteSpace(' ')
+                      OPERATION_REFERENCE
                         PsiElement(EQ)('=')
                       PsiWhiteSpace(' ')
                       REFERENCE_EXPRESSION
@@ -277,6 +282,7 @@ JetFile: Queue.jet
                 REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('head')
                 PsiWhiteSpace(' ')
+                OPERATION_REFERENCE
                   PsiElement(EQEQ)('==')
                 PsiWhiteSpace(' ')
                 NULL
@@ -323,6 +329,7 @@ JetFile: Queue.jet
                     REFERENCE_EXPRESSION
                       PsiElement(IDENTIFIER)('head')
                     PsiWhiteSpace(' ')
+                    OPERATION_REFERENCE
                       PsiElement(EQ)('=')
                     PsiWhiteSpace(' ')
                     DOT_QIALIFIED_EXPRESSION
@@ -341,6 +348,7 @@ JetFile: Queue.jet
                         REFERENCE_EXPRESSION
                           PsiElement(IDENTIFIER)('head')
                         PsiWhiteSpace(' ')
+                        OPERATION_REFERENCE
                           PsiElement(EQEQ)('==')
                         PsiWhiteSpace(' ')
                         NULL
@@ -352,6 +360,7 @@ JetFile: Queue.jet
                         REFERENCE_EXPRESSION
                           PsiElement(IDENTIFIER)('tail')
                         PsiWhiteSpace(' ')
+                        OPERATION_REFERENCE
                           PsiElement(EQ)('=')
                         PsiWhiteSpace(' ')
                         NULL
@@ -381,6 +390,7 @@ JetFile: Queue.jet
               REFERENCE_EXPRESSION
                 PsiElement(IDENTIFIER)('head')
               PsiWhiteSpace(' ')
+              OPERATION_REFERENCE
                 PsiElement(EQEQ)('==')
               PsiWhiteSpace(' ')
               NULL

idea/testData/psi/examples/UnionFind.txt

@@ -146,6 +146,7 @@ JetFile: UnionFind.jet
                   REFERENCE_EXPRESSION
                     PsiElement(IDENTIFIER)('p')
                   PsiWhiteSpace(' ')
+                  OPERATION_REFERENCE
                     PsiElement(EQEQ)('==')
                   PsiWhiteSpace(' ')
                   REFERENCE_EXPRESSION
@@ -194,6 +195,7 @@ JetFile: UnionFind.jet
                     PsiElement(IDENTIFIER)('x')
                   PsiElement(RBRACKET)(']')
               PsiWhiteSpace(' ')
+              OPERATION_REFERENCE
                 PsiElement(EQ)('=')
               PsiWhiteSpace(' ')
               REFERENCE_EXPRESSION
@@ -278,6 +280,7 @@ JetFile: UnionFind.jet
                   REFERENCE_EXPRESSION
                     PsiElement(IDENTIFIER)('pa')
                   PsiWhiteSpace(' ')
+                  OPERATION_REFERENCE
                     PsiElement(EXCLEQ)('!=')
                   PsiWhiteSpace(' ')
                   REFERENCE_EXPRESSION
@@ -325,6 +328,7 @@ JetFile: UnionFind.jet
                                     PsiElement(IDENTIFIER)('pb')
                                   PsiElement(RBRACKET)(']')
                               PsiWhiteSpace(' ')
+                              OPERATION_REFERENCE
                                 PsiElement(EQ)('=')
                               PsiWhiteSpace(' ')
                               REFERENCE_EXPRESSION
@@ -349,6 +353,7 @@ JetFile: UnionFind.jet
                                     PsiElement(IDENTIFIER)('pa')
                                   PsiElement(RBRACKET)(']')
                               PsiWhiteSpace(' ')
+                              OPERATION_REFERENCE
                                 PsiElement(EQ)('=')
                               PsiWhiteSpace(' ')
                               REFERENCE_EXPRESSION
@@ -391,11 +396,13 @@ JetFile: UnionFind.jet
             THIS_EXPRESSION
               PsiElement(this)('this')
             PsiWhiteSpace(' ')
+            OPERATION_REFERENCE
               PsiElement(PERC)('%')
             PsiWhiteSpace(' ')
             INTEGER_CONSTANT
               PsiElement(INTEGER_LITERAL)('2')
           PsiWhiteSpace(' ')
+          OPERATION_REFERENCE
             PsiElement(EXCLEQ)('!=')
           PsiWhiteSpace(' ')
           INTEGER_CONSTANT

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

@@ -212,6 +212,7 @@ JetFile: ArrayList.jet
                         REFERENCE_EXPRESSION
                           PsiElement(IDENTIFIER)('version')
                         PsiWhiteSpace(' ')
+                        OPERATION_REFERENCE
                           PsiElement(EXCLEQ)('!=')
                         PsiWhiteSpace(' ')
                         REFERENCE_EXPRESSION
@@ -314,6 +315,7 @@ JetFile: ArrayList.jet
                     REFERENCE_EXPRESSION
                       PsiElement(IDENTIFIER)('index')
                     PsiWhiteSpace(' ')
+                    OPERATION_REFERENCE
                       PsiElement(LT)('<')
                     PsiWhiteSpace(' ')
                     REFERENCE_EXPRESSION
@@ -367,6 +369,7 @@ JetFile: ArrayList.jet
                             REFERENCE_EXPRESSION
                               PsiElement(IDENTIFIER)('index')
                             PsiWhiteSpace(' ')
+                            OPERATION_REFERENCE
                               PsiElement(MINUS)('-')
                             PsiWhiteSpace(' ')
                             INTEGER_CONSTANT
@@ -377,6 +380,7 @@ JetFile: ArrayList.jet
                     REFERENCE_EXPRESSION
                       PsiElement(IDENTIFIER)('myVersion')
                     PsiWhiteSpace(' ')
+                    OPERATION_REFERENCE
                       PsiElement(EQ)('=')
                     PsiWhiteSpace(' ')
                     REFERENCE_EXPRESSION
@@ -469,6 +473,7 @@ JetFile: ArrayList.jet
                   REFERENCE_EXPRESSION
                     PsiElement(IDENTIFIER)('index')
                   PsiWhiteSpace(' ')
+                  OPERATION_REFERENCE
                     PsiElement(GT)('>')
                   PsiWhiteSpace(' ')
                   REFERENCE_EXPRESSION
@@ -514,6 +519,7 @@ JetFile: ArrayList.jet
               REFERENCE_EXPRESSION
                 PsiElement(IDENTIFIER)('used')
               PsiWhiteSpace(' ')
+              OPERATION_REFERENCE
                 PsiElement(EQEQ)('==')
               PsiWhiteSpace(' ')
               INTEGER_CONSTANT
@@ -609,6 +615,7 @@ JetFile: ArrayList.jet
                     PsiElement(IDENTIFIER)('index')
                   PsiElement(RBRACKET)(']')
               PsiWhiteSpace(' ')
+              OPERATION_REFERENCE
                 PsiElement(EQ)('=')
               PsiWhiteSpace(' ')
               REFERENCE_EXPRESSION
@@ -665,6 +672,7 @@ JetFile: ArrayList.jet
                     REFERENCE_EXPRESSION
                       PsiElement(IDENTIFIER)('used')
                     PsiWhiteSpace(' ')
+                    OPERATION_REFERENCE
                       PsiElement(PLUS)('+')
                     PsiWhiteSpace(' ')
                     INTEGER_CONSTANT
@@ -680,6 +688,7 @@ JetFile: ArrayList.jet
                   REFERENCE_EXPRESSION
                     PsiElement(IDENTIFIER)('index')
                   PsiWhiteSpace(' ')
+                  OPERATION_REFERENCE
                     PsiElement(EQEQ)('==')
                   PsiWhiteSpace(' ')
                   REFERENCE_EXPRESSION
@@ -703,6 +712,7 @@ JetFile: ArrayList.jet
                             PsiElement(PLUSPLUS)('++')
                           PsiElement(RBRACKET)(']')
                       PsiWhiteSpace(' ')
+                      OPERATION_REFERENCE
                         PsiElement(EQ)('=')
                       PsiWhiteSpace(' ')
                       REFERENCE_EXPRESSION
@@ -722,6 +732,7 @@ JetFile: ArrayList.jet
                       REFERENCE_EXPRESSION
                         PsiElement(IDENTIFIER)('index')
                       PsiWhiteSpace(' ')
+                      OPERATION_REFERENCE
                         PsiElement(LT)('<')
                       PsiWhiteSpace(' ')
                       REFERENCE_EXPRESSION
@@ -747,9 +758,11 @@ JetFile: ArrayList.jet
                               BINARY_EXPRESSION
                                 REFERENCE_EXPRESSION
                                   PsiElement(IDENTIFIER)('used')
+                                OPERATION_REFERENCE
                                   PsiElement(MINUS)('-')
                                 INTEGER_CONSTANT
                                   PsiElement(INTEGER_LITERAL)('1')
+                              OPERATION_REFERENCE
                                 PsiElement(RANGE)('..')
                               REFERENCE_EXPRESSION
                                 PsiElement(IDENTIFIER)('index')
@@ -768,12 +781,14 @@ JetFile: ArrayList.jet
                                     REFERENCE_EXPRESSION
                                       PsiElement(IDENTIFIER)('i')
                                     PsiWhiteSpace(' ')
+                                    OPERATION_REFERENCE
                                       PsiElement(PLUS)('+')
                                     PsiWhiteSpace(' ')
                                     INTEGER_CONSTANT
                                       PsiElement(INTEGER_LITERAL)('1')
                                   PsiElement(RBRACKET)(']')
                               PsiWhiteSpace(' ')
+                              OPERATION_REFERENCE
                                 PsiElement(EQ)('=')
                               PsiWhiteSpace(' ')
                               ARRAY_ACCESS_EXPRESSION
@@ -795,6 +810,7 @@ JetFile: ArrayList.jet
                                 PsiElement(IDENTIFIER)('index')
                               PsiElement(RBRACKET)(']')
                           PsiWhiteSpace(' ')
+                          OPERATION_REFERENCE
                             PsiElement(EQ)('=')
                           PsiWhiteSpace(' ')
                           REFERENCE_EXPRESSION
@@ -863,10 +879,12 @@ JetFile: ArrayList.jet
                 BINARY_EXPRESSION
                   REFERENCE_EXPRESSION
                     PsiElement(IDENTIFIER)('index')
+                  OPERATION_REFERENCE
                     PsiElement(RANGE)('..')
                   BINARY_EXPRESSION
                     REFERENCE_EXPRESSION
                       PsiElement(IDENTIFIER)('used')
+                    OPERATION_REFERENCE
                       PsiElement(MINUS)('-')
                     INTEGER_CONSTANT
                       PsiElement(INTEGER_LITERAL)('1')
@@ -883,6 +901,7 @@ JetFile: ArrayList.jet
                         PsiElement(IDENTIFIER)('i')
                       PsiElement(RBRACKET)(']')
                   PsiWhiteSpace(' ')
+                  OPERATION_REFERENCE
                     PsiElement(EQ)('=')
                   PsiWhiteSpace(' ')
                   ARRAY_ACCESS_EXPRESSION
@@ -894,6 +913,7 @@ JetFile: ArrayList.jet
                         REFERENCE_EXPRESSION
                           PsiElement(IDENTIFIER)('i')
                         PsiWhiteSpace(' ')
+                        OPERATION_REFERENCE
                           PsiElement(PLUS)('+')
                         PsiWhiteSpace(' ')
                         INTEGER_CONSTANT

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

@@ -49,6 +49,7 @@ JetFile: HashMap.jet
                   THIS_EXPRESSION
                     PsiElement(this)('this')
                   PsiWhiteSpace(' ')
+                  OPERATION_REFERENCE
                     PsiElement(as)('as')
                   PsiWhiteSpace(' ')
                   TYPE_REFERENCE
@@ -74,6 +75,7 @@ JetFile: HashMap.jet
                   REFERENCE_EXPRESSION
                     PsiElement(IDENTIFIER)('other')
                   PsiWhiteSpace(' ')
+                  OPERATION_REFERENCE
                     PsiElement(as)('as')
                   PsiWhiteSpace(' ')
                   TYPE_REFERENCE
@@ -141,6 +143,7 @@ JetFile: HashMap.jet
                     THIS_EXPRESSION
                       PsiElement(this)('this')
                     PsiWhiteSpace(' ')
+                    OPERATION_REFERENCE
                       PsiElement(as)('as')
                     PsiWhiteSpace(' ')
                     TYPE_REFERENCE
@@ -889,6 +892,7 @@ JetFile: HashMap.jet
                 PsiElement(LPAR)('(')
                 PsiElement(RPAR)(')')
             PsiWhiteSpace(' ')
+            OPERATION_REFERENCE
               PsiElement(EQEQ)('==')
             PsiWhiteSpace(' ')
             REFERENCE_EXPRESSION

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

@@ -195,17 +195,20 @@ JetFile: IIterator.jet
                         REFERENCE_EXPRESSION
                           PsiElement(IDENTIFIER)('from')
                         PsiWhiteSpace(' ')
+                        OPERATION_REFERENCE
                           PsiElement(LT)('<')
                         PsiWhiteSpace(' ')
                         INTEGER_CONSTANT
                           PsiElement(INTEGER_LITERAL)('0')
                       PsiWhiteSpace(' ')
+                      OPERATION_REFERENCE
                         PsiElement(OROR)('||')
                       PsiWhiteSpace(' ')
                       BINARY_EXPRESSION
                         REFERENCE_EXPRESSION
                           PsiElement(IDENTIFIER)('from')
                         PsiWhiteSpace(' ')
+                        OPERATION_REFERENCE
                           PsiElement(GT)('>')
                         PsiWhiteSpace(' ')
                         DOT_QIALIFIED_EXPRESSION
@@ -215,23 +218,27 @@ JetFile: IIterator.jet
                           REFERENCE_EXPRESSION
                             PsiElement(IDENTIFIER)('lastIndex')
                     PsiWhiteSpace(' ')
+                    OPERATION_REFERENCE
                       PsiElement(OROR)('||')
                     PsiWhiteSpace(' ')
                     BINARY_EXPRESSION
                       REFERENCE_EXPRESSION
                         PsiElement(IDENTIFIER)('length')
                       PsiWhiteSpace(' ')
+                      OPERATION_REFERENCE
                         PsiElement(LT)('<')
                       PsiWhiteSpace(' ')
                       INTEGER_CONSTANT
                         PsiElement(INTEGER_LITERAL)('0')
                   PsiWhiteSpace(' ')
+                  OPERATION_REFERENCE
                     PsiElement(OROR)('||')
                   PsiWhiteSpace(' ')
                   BINARY_EXPRESSION
                     REFERENCE_EXPRESSION
                       PsiElement(IDENTIFIER)('length')
                     PsiWhiteSpace(' ')
+                    OPERATION_REFERENCE
                       PsiElement(GT)('>')
                     PsiWhiteSpace(' ')
                     BINARY_EXPRESSION
@@ -242,6 +249,7 @@ JetFile: IIterator.jet
                         REFERENCE_EXPRESSION
                           PsiElement(IDENTIFIER)('size')
                       PsiWhiteSpace(' ')
+                      OPERATION_REFERENCE
                         PsiElement(MINUS)('-')
                       PsiWhiteSpace(' ')
                       REFERENCE_EXPRESSION
@@ -275,6 +283,7 @@ JetFile: IIterator.jet
                   REFERENCE_EXPRESSION
                     PsiElement(IDENTIFIER)('len')
                   PsiWhiteSpace(' ')
+                  OPERATION_REFERENCE
                     PsiElement(EQEQ)('==')
                   PsiWhiteSpace(' ')
                   INTEGER_CONSTANT
@@ -313,6 +322,7 @@ JetFile: IIterator.jet
                   REFERENCE_EXPRESSION
                     PsiElement(IDENTIFIER)('from')
                   PsiWhiteSpace(' ')
+                  OPERATION_REFERENCE
                     PsiElement(RANGE)('..')
                   PsiWhiteSpace(' ')
                   BINARY_EXPRESSION
@@ -320,11 +330,13 @@ JetFile: IIterator.jet
                       REFERENCE_EXPRESSION
                         PsiElement(IDENTIFIER)('from')
                       PsiWhiteSpace(' ')
+                      OPERATION_REFERENCE
                         PsiElement(PLUS)('+')
                       PsiWhiteSpace(' ')
                       REFERENCE_EXPRESSION
                         PsiElement(IDENTIFIER)('length')
                     PsiWhiteSpace(' ')
+                    OPERATION_REFERENCE
                       PsiElement(MINUS)('-')
                     PsiWhiteSpace(' ')
                     INTEGER_CONSTANT
@@ -364,6 +376,7 @@ JetFile: IIterator.jet
                             PsiElement(IDENTIFIER)('i')
                           PsiElement(RBRACKET)(']')
                       PsiWhiteSpace(' ')
+                      OPERATION_REFERENCE
                         PsiElement(EQ)('=')
                       PsiWhiteSpace(' ')
                       CALL_EXPRESSION

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

@@ -217,6 +217,7 @@ JetFile: LinkedList.jet
                   REFERENCE_EXPRESSION
                     PsiElement(IDENTIFIER)('index')
                   PsiWhiteSpace(' ')
+                  OPERATION_REFERENCE
                     PsiElement(EQEQ)('==')
                   PsiWhiteSpace(' ')
                   INTEGER_CONSTANT
@@ -236,6 +237,7 @@ JetFile: LinkedList.jet
                         REFERENCE_EXPRESSION
                           PsiElement(IDENTIFIER)('next')
                       PsiWhiteSpace(' ')
+                      OPERATION_REFERENCE
                         PsiElement(EQ)('=')
                       PsiWhiteSpace(' ')
                       REFERENCE_EXPRESSION
@@ -245,6 +247,7 @@ JetFile: LinkedList.jet
                       REFERENCE_EXPRESSION
                         PsiElement(IDENTIFIER)('head')
                       PsiWhiteSpace(' ')
+                      OPERATION_REFERENCE
                         PsiElement(EQ)('=')
                       PsiWhiteSpace(' ')
                       REFERENCE_EXPRESSION
@@ -259,6 +262,7 @@ JetFile: LinkedList.jet
                           REFERENCE_EXPRESSION
                             PsiElement(IDENTIFIER)('tail')
                           PsiWhiteSpace(' ')
+                          OPERATION_REFERENCE
                             PsiElement(EQEQEQ)('===')
                           PsiWhiteSpace(' ')
                           NULL
@@ -274,6 +278,7 @@ JetFile: LinkedList.jet
                               REFERENCE_EXPRESSION
                                 PsiElement(IDENTIFIER)('tail')
                               PsiWhiteSpace(' ')
+                              OPERATION_REFERENCE
                                 PsiElement(EQ)('=')
                               PsiWhiteSpace(' ')
                               REFERENCE_EXPRESSION
@@ -315,6 +320,7 @@ JetFile: LinkedList.jet
                         REFERENCE_EXPRESSION
                           PsiElement(IDENTIFIER)('next')
                       PsiWhiteSpace(' ')
+                      OPERATION_REFERENCE
                         PsiElement(EQ)('=')
                       PsiWhiteSpace(' ')
                       DOT_QIALIFIED_EXPRESSION
@@ -332,6 +338,7 @@ JetFile: LinkedList.jet
                         REFERENCE_EXPRESSION
                           PsiElement(IDENTIFIER)('next')
                       PsiWhiteSpace(' ')
+                      OPERATION_REFERENCE
                         PsiElement(EQ)('=')
                       PsiWhiteSpace(' ')
                       REFERENCE_EXPRESSION
@@ -346,6 +353,7 @@ JetFile: LinkedList.jet
                           REFERENCE_EXPRESSION
                             PsiElement(IDENTIFIER)('tail')
                           PsiWhiteSpace(' ')
+                          OPERATION_REFERENCE
                             PsiElement(EQEQEQ)('===')
                           PsiWhiteSpace(' ')
                           REFERENCE_EXPRESSION
@@ -361,6 +369,7 @@ JetFile: LinkedList.jet
                               REFERENCE_EXPRESSION
                                 PsiElement(IDENTIFIER)('tail')
                               PsiWhiteSpace(' ')
+                              OPERATION_REFERENCE
                                 PsiElement(EQ)('=')
                               PsiWhiteSpace(' ')
                               REFERENCE_EXPRESSION
@@ -406,15 +415,18 @@ JetFile: LinkedList.jet
                   REFERENCE_EXPRESSION
                     PsiElement(IDENTIFIER)('index')
                   PsiWhiteSpace(' ')
+                  OPERATION_REFERENCE
                     PsiElement(NOT_IN)('!in')
                   PsiWhiteSpace(' ')
                   BINARY_EXPRESSION
                     INTEGER_CONSTANT
                       PsiElement(INTEGER_LITERAL)('0')
+                    OPERATION_REFERENCE
                       PsiElement(RANGE)('..')
                     BINARY_EXPRESSION
                       REFERENCE_EXPRESSION
                         PsiElement(IDENTIFIER)('size')
+                      OPERATION_REFERENCE
                         PsiElement(MINUS)('-')
                       INTEGER_CONSTANT
                         PsiElement(INTEGER_LITERAL)('1')
@@ -510,6 +522,7 @@ JetFile: LinkedList.jet
                   REFERENCE_EXPRESSION
                     PsiElement(IDENTIFIER)('item')
                   PsiWhiteSpace(' ')
+                  OPERATION_REFERENCE
                     PsiElement(EQEQEQ)('===')
                   PsiWhiteSpace(' ')
                   REFERENCE_EXPRESSION
@@ -525,6 +538,7 @@ JetFile: LinkedList.jet
                       REFERENCE_EXPRESSION
                         PsiElement(IDENTIFIER)('head')
                       PsiWhiteSpace(' ')
+                      OPERATION_REFERENCE
                         PsiElement(EQ)('=')
                       PsiWhiteSpace(' ')
                       DOT_QIALIFIED_EXPRESSION
@@ -543,6 +557,7 @@ JetFile: LinkedList.jet
                           REFERENCE_EXPRESSION
                             PsiElement(IDENTIFIER)('head')
                           PsiWhiteSpace(' ')
+                          OPERATION_REFERENCE
                             PsiElement(EQEQEQ)('===')
                           PsiWhiteSpace(' ')
                           NULL
@@ -553,6 +568,7 @@ JetFile: LinkedList.jet
                         BINARY_EXPRESSION
                           REFERENCE_EXPRESSION
                             PsiElement(IDENTIFIER)('tail')
+                          OPERATION_REFERENCE
                             PsiElement(EQ)('=')
                           PsiWhiteSpace(' ')
                           NULL
@@ -579,6 +595,7 @@ JetFile: LinkedList.jet
                         REFERENCE_EXPRESSION
                           PsiElement(IDENTIFIER)('next')
                       PsiWhiteSpace(' ')
+                      OPERATION_REFERENCE
                         PsiElement(EQ)('=')
                       PsiWhiteSpace(' ')
                       DOT_QIALIFIED_EXPRESSION
@@ -601,6 +618,7 @@ JetFile: LinkedList.jet
                             REFERENCE_EXPRESSION
                               PsiElement(IDENTIFIER)('next')
                           PsiWhiteSpace(' ')
+                          OPERATION_REFERENCE
                             PsiElement(EQEQEQ)('===')
                           PsiWhiteSpace(' ')
                           NULL
@@ -624,6 +642,7 @@ JetFile: LinkedList.jet
                                 REFERENCE_EXPRESSION
                                   PsiElement(IDENTIFIER)('previous')
                               PsiWhiteSpace(' ')
+                              OPERATION_REFERENCE
                                 PsiElement(EQ)('=')
                               PsiWhiteSpace(' ')
                               DOT_QIALIFIED_EXPRESSION
@@ -646,6 +665,7 @@ JetFile: LinkedList.jet
                               REFERENCE_EXPRESSION
                                 PsiElement(IDENTIFIER)('tail')
                               PsiWhiteSpace(' ')
+                              OPERATION_REFERENCE
                                 PsiElement(EQ)('=')
                               PsiWhiteSpace(' ')
                               DOT_QIALIFIED_EXPRESSION
@@ -768,6 +788,7 @@ JetFile: LinkedList.jet
                 REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('value')
               PsiWhiteSpace(' ')
+              OPERATION_REFERENCE
                 PsiElement(EQ)('=')
               PsiWhiteSpace(' ')
               REFERENCE_EXPRESSION
@@ -829,6 +850,7 @@ JetFile: LinkedList.jet
                 BINARY_EXPRESSION
                   INTEGER_CONSTANT
                     PsiElement(INTEGER_LITERAL)('1')
+                  OPERATION_REFERENCE
                     PsiElement(RANGE)('..')
                   REFERENCE_EXPRESSION
                     PsiElement(IDENTIFIER)('index')
@@ -843,6 +865,7 @@ JetFile: LinkedList.jet
                       REFERENCE_EXPRESSION
                         PsiElement(IDENTIFIER)('result')
                       PsiWhiteSpace(' ')
+                      OPERATION_REFERENCE
                         PsiElement(EQ)('=')
                       PsiWhiteSpace(' ')
                       DOT_QIALIFIED_EXPRESSION

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

@@ -142,6 +142,7 @@ JetFile: List.jet
                     INTEGER_CONSTANT
                       PsiElement(INTEGER_LITERAL)('1')
                     PsiWhiteSpace(' ')
+                    OPERATION_REFERENCE
                       PsiElement(PLUS)('+')
                     PsiWhiteSpace(' ')
                     DOT_QIALIFIED_EXPRESSION
@@ -203,6 +204,7 @@ JetFile: List.jet
               THIS_EXPRESSION
                 PsiElement(this)('this')
               PsiWhiteSpace(' ')
+              OPERATION_REFERENCE
                 PsiElement(EQEQ)('==')
               PsiWhiteSpace(' ')
               REFERENCE_EXPRESSION
@@ -277,12 +279,14 @@ JetFile: List.jet
                             PsiElement(LPAR)('(')
                             PsiElement(RPAR)(')')
                         PsiWhiteSpace(' ')
+                        OPERATION_REFERENCE
                           PsiElement(EQ)('=')
                         PsiWhiteSpace(' ')
                         BINARY_EXPRESSION
                           REFERENCE_EXPRESSION
                             PsiElement(IDENTIFIER)('current')
                           PsiWhiteSpace(' ')
+                          OPERATION_REFERENCE
                             PsiElement(EQEQ)('==')
                           PsiWhiteSpace(' ')
                           REFERENCE_EXPRESSION
@@ -324,6 +328,7 @@ JetFile: List.jet
                       REFERENCE_EXPRESSION
                         PsiElement(IDENTIFIER)('current')
                       PsiWhiteSpace(' ')
+                      OPERATION_REFERENCE
                         PsiElement(EQ)('=')
                       PsiWhiteSpace(' ')
                       DOT_QIALIFIED_EXPRESSION

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

@@ -316,6 +316,7 @@ JetFile: IOSamples.jet
               REFERENCE_EXPRESSION
                 PsiElement(IDENTIFIER)('stream')
               PsiWhiteSpace(' ')
+              OPERATION_REFERENCE
                 PsiElement(EQ)('=')
               PsiWhiteSpace(' ')
               CALL_EXPRESSION
@@ -368,6 +369,7 @@ JetFile: IOSamples.jet
                       REFERENCE_EXPRESSION
                         PsiElement(IDENTIFIER)('nextUsed')
                       PsiWhiteSpace(' ')
+                      OPERATION_REFERENCE
                         PsiElement(EQ)('=')
                       PsiWhiteSpace(' ')
                       BOOLEAN_CONSTANT
@@ -380,6 +382,7 @@ JetFile: IOSamples.jet
                         REFERENCE_EXPRESSION
                           PsiElement(IDENTIFIER)('next')
                         PsiWhiteSpace(' ')
+                        OPERATION_REFERENCE
                           PsiElement(as)('as')
                         PsiWhiteSpace(' ')
                         TYPE_REFERENCE
@@ -421,12 +424,14 @@ JetFile: IOSamples.jet
                     REFERENCE_EXPRESSION
                       PsiElement(IDENTIFIER)('nextUsed')
                     PsiWhiteSpace(' ')
+                    OPERATION_REFERENCE
                       PsiElement(ANDAND)('&&')
                     PsiWhiteSpace(' ')
                     BINARY_EXPRESSION
                       REFERENCE_EXPRESSION
                         PsiElement(IDENTIFIER)('next')
                       PsiWhiteSpace(' ')
+                      OPERATION_REFERENCE
                         PsiElement(EXCLEQ)('!=')
                       PsiWhiteSpace(' ')
                       PREFIX_EXPRESSION
@@ -444,6 +449,7 @@ JetFile: IOSamples.jet
                         REFERENCE_EXPRESSION
                           PsiElement(IDENTIFIER)('nextUsed')
                         PsiWhiteSpace(' ')
+                        OPERATION_REFERENCE
                           PsiElement(EQ)('=')
                         PsiWhiteSpace(' ')
                         BOOLEAN_CONSTANT
@@ -453,6 +459,7 @@ JetFile: IOSamples.jet
                         REFERENCE_EXPRESSION
                           PsiElement(IDENTIFIER)('next')
                         PsiWhiteSpace(' ')
+                        OPERATION_REFERENCE
                           PsiElement(EQ)('=')
                         PsiWhiteSpace(' ')
                         CALL_EXPRESSION
@@ -477,6 +484,7 @@ JetFile: IOSamples.jet
                   REFERENCE_EXPRESSION
                     PsiElement(IDENTIFIER)('next')
                   PsiWhiteSpace(' ')
+                  OPERATION_REFERENCE
                     PsiElement(EXCLEQ)('!=')
                   PsiWhiteSpace(' ')
                   PREFIX_EXPRESSION
@@ -574,6 +582,7 @@ JetFile: IOSamples.jet
               REFERENCE_EXPRESSION
                 PsiElement(IDENTIFIER)('stream')
               PsiWhiteSpace(' ')
+              OPERATION_REFERENCE
                 PsiElement(EQ)('=')
               PsiWhiteSpace(' ')
               CALL_EXPRESSION

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

@@ -143,6 +143,7 @@ JetFile: BinaryHeap.jet
                 REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('compare')
               PsiWhiteSpace(' ')
+              OPERATION_REFERENCE
                 PsiElement(EQ)('=')
               PsiWhiteSpace(' ')
               REFERENCE_EXPRESSION
@@ -156,6 +157,7 @@ JetFile: BinaryHeap.jet
                 REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('data')
               PsiWhiteSpace(' ')
+              OPERATION_REFERENCE
                 PsiElement(EQ)('=')
               PsiWhiteSpace(' ')
               CALL_EXPRESSION
@@ -191,11 +193,13 @@ JetFile: BinaryHeap.jet
                       REFERENCE_EXPRESSION
                         PsiElement(IDENTIFIER)('size')
                     PsiWhiteSpace(' ')
+                    OPERATION_REFERENCE
                       PsiElement(DIV)('/')
                     PsiWhiteSpace(' ')
                     INTEGER_CONSTANT
                       PsiElement(INTEGER_LITERAL)('2')
                   PsiWhiteSpace(' ')
+                  OPERATION_REFERENCE
                     PsiElement(RANGE)('..')
                   PsiWhiteSpace(' ')
                   INTEGER_CONSTANT
@@ -255,6 +259,7 @@ JetFile: BinaryHeap.jet
                 REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('compare')
               PsiWhiteSpace(' ')
+              OPERATION_REFERENCE
                 PsiElement(EQ)('=')
               PsiWhiteSpace(' ')
               REFERENCE_EXPRESSION
@@ -268,6 +273,7 @@ JetFile: BinaryHeap.jet
                 REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('data')
               PsiWhiteSpace(' ')
+              OPERATION_REFERENCE
                 PsiElement(EQ)('=')
               PsiWhiteSpace(' ')
               CALL_EXPRESSION
@@ -296,6 +302,7 @@ JetFile: BinaryHeap.jet
                 REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('data')
               PsiWhiteSpace(' ')
+              OPERATION_REFERENCE
                 PsiElement(EQ)('=')
               PsiWhiteSpace(' ')
               CALL_EXPRESSION
@@ -315,6 +322,7 @@ JetFile: BinaryHeap.jet
                     REFERENCE_EXPRESSION
                       PsiElement(IDENTIFIER)('T')
                     PsiWhiteSpace(' ')
+                    OPERATION_REFERENCE
                       PsiElement(is)('is')
                     PsiWhiteSpace(' ')
                     TYPE_PATTERN
@@ -340,6 +348,7 @@ JetFile: BinaryHeap.jet
                 REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('comparator')
               PsiWhiteSpace(' ')
+              OPERATION_REFERENCE
                 PsiElement(EQ)('=')
               PsiWhiteSpace(' ')
               CALL_EXPRESSION
@@ -595,6 +604,7 @@ JetFile: BinaryHeap.jet
                             REFERENCE_EXPRESSION
                               PsiElement(IDENTIFIER)('value')
                           PsiWhiteSpace(' ')
+                          OPERATION_REFERENCE
                             PsiElement(LT)('<')
                           PsiWhiteSpace(' ')
                           DOT_QIALIFIED_EXPRESSION
@@ -614,6 +624,7 @@ JetFile: BinaryHeap.jet
                               REFERENCE_EXPRESSION
                                 PsiElement(IDENTIFIER)('min')
                               PsiWhiteSpace(' ')
+                              OPERATION_REFERENCE
                                 PsiElement(EQ)('=')
                               PsiWhiteSpace(' ')
                               DOT_QIALIFIED_EXPRESSION
@@ -642,6 +653,7 @@ JetFile: BinaryHeap.jet
                             REFERENCE_EXPRESSION
                               PsiElement(IDENTIFIER)('exists')
                           PsiWhiteSpace(' ')
+                          OPERATION_REFERENCE
                             PsiElement(ANDAND)('&&')
                           PsiWhiteSpace(' ')
                           BINARY_EXPRESSION
@@ -656,6 +668,7 @@ JetFile: BinaryHeap.jet
                               REFERENCE_EXPRESSION
                                 PsiElement(IDENTIFIER)('value')
                             PsiWhiteSpace(' ')
+                            OPERATION_REFERENCE
                               PsiElement(LT)('<')
                             PsiWhiteSpace(' ')
                             DOT_QIALIFIED_EXPRESSION
@@ -675,6 +688,7 @@ JetFile: BinaryHeap.jet
                               REFERENCE_EXPRESSION
                                 PsiElement(IDENTIFIER)('min')
                               PsiWhiteSpace(' ')
+                              OPERATION_REFERENCE
                                 PsiElement(EQ)('=')
                               PsiWhiteSpace(' ')
                               DOT_QIALIFIED_EXPRESSION
@@ -695,6 +709,7 @@ JetFile: BinaryHeap.jet
                           REFERENCE_EXPRESSION
                             PsiElement(IDENTIFIER)('min')
                           PsiWhiteSpace(' ')
+                          OPERATION_REFERENCE
                             PsiElement(EQEQ)('==')
                           PsiWhiteSpace(' ')
                           REFERENCE_EXPRESSION
@@ -728,6 +743,7 @@ JetFile: BinaryHeap.jet
                       REFERENCE_EXPRESSION
                         PsiElement(IDENTIFIER)('current')
                       PsiWhiteSpace(' ')
+                      OPERATION_REFERENCE
                         PsiElement(EQ)('=')
                       PsiWhiteSpace(' ')
                       REFERENCE_EXPRESSION
@@ -826,6 +842,7 @@ JetFile: BinaryHeap.jet
                             REFERENCE_EXPRESSION
                               PsiElement(IDENTIFIER)('value')
                           PsiWhiteSpace(' ')
+                          OPERATION_REFERENCE
                             PsiElement(LT)('<')
                           PsiWhiteSpace(' ')
                           DOT_QIALIFIED_EXPRESSION
@@ -872,6 +889,7 @@ JetFile: BinaryHeap.jet
                               REFERENCE_EXPRESSION
                                 PsiElement(IDENTIFIER)('current')
                               PsiWhiteSpace(' ')
+                              OPERATION_REFERENCE
                                 PsiElement(EQ)('=')
                               PsiWhiteSpace(' ')
                               DOT_QIALIFIED_EXPRESSION
@@ -933,12 +951,14 @@ JetFile: BinaryHeap.jet
                       THIS_EXPRESSION
                         PsiElement(this)('this')
                       PsiWhiteSpace(' ')
+                      OPERATION_REFERENCE
                         PsiElement(MINUS)('-')
                       PsiWhiteSpace(' ')
                       INTEGER_CONSTANT
                         PsiElement(INTEGER_LITERAL)('1')
                     PsiElement(RPAR)(')')
                   PsiWhiteSpace(' ')
+                  OPERATION_REFERENCE
                     PsiElement(DIV)('/')
                   PsiWhiteSpace(' ')
                   INTEGER_CONSTANT
@@ -968,11 +988,13 @@ JetFile: BinaryHeap.jet
                     THIS_EXPRESSION
                       PsiElement(this)('this')
                     PsiWhiteSpace(' ')
+                    OPERATION_REFERENCE
                       PsiElement(MUL)('*')
                     PsiWhiteSpace(' ')
                     INTEGER_CONSTANT
                       PsiElement(INTEGER_LITERAL)('2')
                   PsiWhiteSpace(' ')
+                  OPERATION_REFERENCE
                     PsiElement(PLUS)('+')
                   PsiWhiteSpace(' ')
                   INTEGER_CONSTANT
@@ -1002,11 +1024,13 @@ JetFile: BinaryHeap.jet
                     THIS_EXPRESSION
                       PsiElement(this)('this')
                     PsiWhiteSpace(' ')
+                    OPERATION_REFERENCE
                       PsiElement(MUL)('*')
                     PsiWhiteSpace(' ')
                     INTEGER_CONSTANT
                       PsiElement(INTEGER_LITERAL)('2')
                   PsiWhiteSpace(' ')
+                  OPERATION_REFERENCE
                     PsiElement(PLUS)('+')
                   PsiWhiteSpace(' ')
                   INTEGER_CONSTANT
@@ -1067,6 +1091,7 @@ JetFile: BinaryHeap.jet
                     REFERENCE_EXPRESSION
                       PsiElement(FIELD_IDENTIFIER)('$value')
                     PsiWhiteSpace(' ')
+                    OPERATION_REFERENCE
                       PsiElement(EQ)('=')
                     PsiWhiteSpace(' ')
                     REFERENCE_EXPRESSION
@@ -1100,6 +1125,7 @@ JetFile: BinaryHeap.jet
                       THIS_EXPRESSION
                         PsiElement(this)('this')
                       PsiWhiteSpace(' ')
+                      OPERATION_REFERENCE
                         PsiElement(LT)('<')
                       PsiWhiteSpace(' ')
                       DOT_QIALIFIED_EXPRESSION
@@ -1110,6 +1136,7 @@ JetFile: BinaryHeap.jet
                           PsiElement(IDENTIFIER)('size')
                     PsiElement(RPAR)(')')
                   PsiWhiteSpace(' ')
+                  OPERATION_REFERENCE
                     PsiElement(ANDAND)('&&')
                   PsiWhiteSpace(' ')
                   PARENTHESIZED
@@ -1118,6 +1145,7 @@ JetFile: BinaryHeap.jet
                       THIS_EXPRESSION
                         PsiElement(this)('this')
                       PsiWhiteSpace(' ')
+                      OPERATION_REFERENCE
                         PsiElement(GTEQ)('>=')
                       PsiWhiteSpace(' ')
                       INTEGER_CONSTANT
@@ -1273,6 +1301,7 @@ JetFile: BinaryHeap.jet
                 PsiElement(IDENTIFIER)('a')
               PsiElement(RBRACKET)(']')
           PsiWhiteSpace(' ')
+          OPERATION_REFERENCE
             PsiElement(EQ)('=')
           PsiWhiteSpace(' ')
           ARRAY_ACCESS_EXPRESSION
@@ -1294,6 +1323,7 @@ JetFile: BinaryHeap.jet
                 PsiElement(IDENTIFIER)('b')
               PsiElement(RBRACKET)(']')
           PsiWhiteSpace(' ')
+          OPERATION_REFERENCE
             PsiElement(EQ)('=')
           PsiWhiteSpace(' ')
           REFERENCE_EXPRESSION
@@ -1341,6 +1371,7 @@ JetFile: BinaryHeap.jet
             REFERENCE_EXPRESSION
               PsiElement(IDENTIFIER)('size')
           PsiWhiteSpace(' ')
+          OPERATION_REFERENCE
             PsiElement(MINUS)('-')
           PsiWhiteSpace(' ')
           INTEGER_CONSTANT

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

@@ -163,6 +163,7 @@ JetFile: Comparison.jet
               REFERENCE_EXPRESSION
                 PsiElement(IDENTIFIER)('a')
               PsiWhiteSpace(' ')
+              OPERATION_REFERENCE
                 PsiElement(as)('as')
               PsiWhiteSpace(' ')
               TYPE_REFERENCE
@@ -188,6 +189,7 @@ JetFile: Comparison.jet
               REFERENCE_EXPRESSION
                 PsiElement(IDENTIFIER)('b')
               PsiWhiteSpace(' ')
+              OPERATION_REFERENCE
                 PsiElement(as)('as')
               PsiWhiteSpace(' ')
               TYPE_REFERENCE
@@ -371,6 +373,7 @@ JetFile: Comparison.jet
                 REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('res')
                 PsiWhiteSpace(' ')
+                OPERATION_REFERENCE
                   PsiElement(EQEQ)('==')
                 PsiWhiteSpace(' ')
                 INTEGER_CONSTANT
@@ -397,6 +400,7 @@ JetFile: Comparison.jet
                 REFERENCE_EXPRESSION
                   PsiElement(IDENTIFIER)('res')
                 PsiWhiteSpace(' ')
+                OPERATION_REFERENCE
                   PsiElement(LT)('<')
                 PsiWhiteSpace(' ')
                 INTEGER_CONSTANT