MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

Proper inheritance of mixins in JSON PSI

Browse Source
This commit is contained in:
Mikhail Golubev
2014-10-19 14:14:42 +04:00
parent 88a32db062
commit 3b82e3856c
4 changed files with 1 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
json/gen/com/intellij/json/psi/JsonStringLiteral.java
-2
View File
@@ -15,8 +15,6 @@ public interface JsonStringLiteral extends JsonLiteral {
@Nullable
PsiElement getSingleQuotedString();
boolean isQuotedString();
@NotNull
List<Pair<TextRange, String>> getTextFragments();
json/gen/com/intellij/json/psi/impl/JsonStringLiteralImpl.java
-4
View File
@@ -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);
json/src/com/intellij/json/psi/impl/JsonStringLiteralMixin.java
+1 -1
View File
@@ -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);
}
json/src/json.bnf
-1
View File
@@ -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"