From 3b82e3856cff36ebc109cde2f6e82a92ee7979a7 Mon Sep 17 00:00:00 2001
From: Mikhail Golubev <mikhail.golubev@jetbrains.com>
Date: Sun, 19 Oct 2014 02:25:53 +0400
Subject: [PATCH] Proper inheritance of mixins in JSON PSI

---
 json/gen/com/intellij/json/psi/JsonStringLiteral.java         | 2 --
 .../gen/com/intellij/json/psi/impl/JsonStringLiteralImpl.java | 4 ----
 .../com/intellij/json/psi/impl/JsonStringLiteralMixin.java    | 2 +-
 json/src/json.bnf                                             | 1 -
 4 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/json/gen/com/intellij/json/psi/JsonStringLiteral.java b/json/gen/com/intellij/json/psi/JsonStringLiteral.java
index b67f1bfb3c59..8b5710bff963 100644
--- a/json/gen/com/intellij/json/psi/JsonStringLiteral.java
+++ b/json/gen/com/intellij/json/psi/JsonStringLiteral.java
@@ -15,8 +15,6 @@ public interface JsonStringLiteral extends JsonLiteral {
   @Nullable
   PsiElement getSingleQuotedString();
 
-  boolean isQuotedString();
-
   @NotNull
   List<Pair<TextRange, String>> getTextFragments();
 
diff --git a/json/gen/com/intellij/json/psi/impl/JsonStringLiteralImpl.java b/json/gen/com/intellij/json/psi/impl/JsonStringLiteralImpl.java
index 7f76952b2376..0323af1174d2 100644
--- a/json/gen/com/intellij/json/psi/impl/JsonStringLiteralImpl.java
+++ b/json/gen/com/intellij/json/psi/impl/JsonStringLiteralImpl.java
@@ -35,10 +35,6 @@ public class JsonStringLiteralImpl extends JsonStringLiteralMixin implements Jso
     return findChildByType(SINGLE_QUOTED_STRING);
   }
 
-  public boolean isQuotedString() {
-    return JsonPsiImplUtils.isQuotedString(this);
-  }
-
   @NotNull
   public List<Pair<TextRange, String>> getTextFragments() {
     return JsonPsiImplUtils.getTextFragments(this);
diff --git a/json/src/com/intellij/json/psi/impl/JsonStringLiteralMixin.java b/json/src/com/intellij/json/psi/impl/JsonStringLiteralMixin.java
index 88e5d2c95f20..595113ca472a 100644
--- a/json/src/com/intellij/json/psi/impl/JsonStringLiteralMixin.java
+++ b/json/src/com/intellij/json/psi/impl/JsonStringLiteralMixin.java
@@ -9,7 +9,7 @@ import org.jetbrains.annotations.NotNull;
 /**
  * @author Konstantin.Ulitin
  */
-public abstract class JsonStringLiteralMixin extends JsonLiteralMixin implements PsiLanguageInjectionHost {
+public abstract class JsonStringLiteralMixin extends JsonLiteralImpl implements PsiLanguageInjectionHost {
   protected JsonStringLiteralMixin(ASTNode node) {
     super(node);
   }
diff --git a/json/src/json.bnf b/json/src/json.bnf
index a8eec4bf9970..20ece0aa6229 100644
--- a/json/src/json.bnf
+++ b/json/src/json.bnf
@@ -100,7 +100,6 @@ private array_element ::= value (','|&']') {
 
 string_literal ::= SINGLE_QUOTED_STRING | DOUBLE_QUOTED_STRING {
   methods=[
-    isQuotedString
     getTextFragments
   ]
   mixin="com.intellij.json.psi.impl.JsonStringLiteralMixin"