From 87d0926bfc023d7d93448bb9a728bc4915cc1010 Mon Sep 17 00:00:00 2001
From: "Maxim.Medvedev" <maxim.medvedev@jetbrains.com>
Date: Tue, 24 Apr 2012 19:23:02 +0400
Subject: [PATCH] adding refs to implements & extends lists

---
 .../typedef/GrExtendsClauseImpl.java          |  7 ++++++
 .../typedef/GrImplementsClauseImpl.java       |  7 ++++++
 .../typedef/GrReferenceListImpl.java          | 23 +++++++++++--------
 3 files changed, 28 insertions(+), 9 deletions(-)

diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/typedef/GrExtendsClauseImpl.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/typedef/GrExtendsClauseImpl.java
index 20c3f1b1ebdb..1675c7975806 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/typedef/GrExtendsClauseImpl.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/typedef/GrExtendsClauseImpl.java
@@ -17,7 +17,9 @@
 package org.jetbrains.plugins.groovy.lang.psi.impl.statements.typedef;
 
 import com.intellij.lang.ASTNode;
+import com.intellij.psi.tree.IElementType;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.plugins.groovy.lang.lexer.GroovyTokenTypes;
 import org.jetbrains.plugins.groovy.lang.parser.GroovyElementTypes;
 import org.jetbrains.plugins.groovy.lang.psi.GroovyElementVisitor;
 import org.jetbrains.plugins.groovy.lang.psi.api.statements.typedef.GrExtendsClause;
@@ -33,6 +35,11 @@ public class GrExtendsClauseImpl extends GrReferenceListImpl implements GrExtend
     super(node);
   }
 
+  @Override
+  protected IElementType getKeywordType() {
+    return GroovyTokenTypes.kEXTENDS;
+  }
+
   public GrExtendsClauseImpl(final GrReferenceListStub stub) {
     super(stub, GroovyElementTypes.EXTENDS_CLAUSE);
   }
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/typedef/GrImplementsClauseImpl.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/typedef/GrImplementsClauseImpl.java
index 75619d8a9fb6..90fa5b6f63e1 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/typedef/GrImplementsClauseImpl.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/typedef/GrImplementsClauseImpl.java
@@ -17,7 +17,9 @@
 package org.jetbrains.plugins.groovy.lang.psi.impl.statements.typedef;
 
 import com.intellij.lang.ASTNode;
+import com.intellij.psi.tree.IElementType;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.plugins.groovy.lang.lexer.GroovyTokenTypes;
 import org.jetbrains.plugins.groovy.lang.parser.GroovyElementTypes;
 import org.jetbrains.plugins.groovy.lang.psi.GroovyElementVisitor;
 import org.jetbrains.plugins.groovy.lang.psi.api.statements.typedef.GrImplementsClause;
@@ -33,6 +35,11 @@ public class GrImplementsClauseImpl extends GrReferenceListImpl implements GrImp
     super(node);
   }
 
+  @Override
+  protected IElementType getKeywordType() {
+    return GroovyTokenTypes.kIMPLEMENTS;
+  }
+
   public GrImplementsClauseImpl(final GrReferenceListStub stub) {
     super(stub, GroovyElementTypes.IMPLEMENTS_CLAUSE);
   }
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/typedef/GrReferenceListImpl.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/typedef/GrReferenceListImpl.java
index 13b7117cda8c..bff946c69765 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/typedef/GrReferenceListImpl.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/typedef/GrReferenceListImpl.java
@@ -20,6 +20,7 @@ import com.intellij.psi.PsiClassType;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.StubBasedPsiElement;
 import com.intellij.psi.stubs.IStubElementType;
+import com.intellij.psi.tree.IElementType;
 import com.intellij.util.IncorrectOperationException;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.plugins.groovy.lang.lexer.GroovyTokenTypes;
@@ -88,16 +89,20 @@ public abstract class GrReferenceListImpl extends GrStubElementBase<GrReferenceL
 
   @Override
   public PsiElement add(@NotNull PsiElement element) throws IncorrectOperationException {
-    if (element instanceof GrCodeReferenceElement && findChildByClass(GrCodeReferenceElement.class) != null) {
-      PsiElement lastChild = getLastChild();
-      lastChild = PsiUtil.skipWhitespaces(lastChild, false);
-      if (!lastChild.getNode().getElementType().equals(GroovyTokenTypes.mCOMMA)) {
-        getNode().addLeaf(GroovyTokenTypes.mCOMMA, ",", null);
+    if (element instanceof GrCodeReferenceElement) {
+      if (findChildByType(getKeywordType()) == null) {
+        getNode().addLeaf(getKeywordType(), getKeywordType().toString(), null);
+      }
+      else if (findChildByClass(GrCodeReferenceElement.class) != null) {
+        PsiElement lastChild = getLastChild();
+        lastChild = PsiUtil.skipWhitespaces(lastChild, false);
+        if (!lastChild.getNode().getElementType().equals(GroovyTokenTypes.mCOMMA)) {
+          getNode().addLeaf(GroovyTokenTypes.mCOMMA, ",", null);
+        }
       }
-      return super.add(element);
-    }
-    else {
-      return super.add(element);
     }
+    return super.add(element);
   }
+
+  protected abstract IElementType getKeywordType();
 }