Skip to content

Commit 470b44f

Browse files
committed
Move bnf, update AST
1 parent 6fd7e40 commit 470b44f

25 files changed

+21
-111
lines changed

src/json.bnf renamed to grammar/json.bnf

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
{
2-
parserClass = 'com.intellij.json.JsonParser'
3-
parserUtilClass = "com.intellij.json.psi.JsonParserUtil"
4-
psiPackage = 'com.intellij.json.psi'
5-
psiImplPackage = 'com.intellij.json.psi.impl'
2+
parserClass = 'com.intellij.devkt.json.JsonParser'
3+
parserUtilClass = "com.intellij.devkt.json.psi.JsonParserUtil"
4+
psiPackage = 'com.intellij.devkt.json.psi'
5+
psiImplPackage = 'com.intellij.devkt.json.psi.impl'
66

7-
elementTypeHolderClass = 'com.intellij.json.JsonElementTypes'
8-
elementTypeClass = 'com.intellij.json.JsonElementType'
7+
elementTypeHolderClass = 'com.intellij.devkt.json.JsonElementTypes'
8+
elementTypeClass = 'com.intellij.devkt.json.JsonElementType'
99
psiClassPrefix = "Json"
1010
psiVisitorName = "JsonElementVisitor"
1111

12-
psiImplUtilClass = 'com.intellij.json.psi.impl.JsonPsiImplUtils'
13-
tokenTypeClass = 'com.intellij.json.JsonTokenType'
12+
psiImplUtilClass = 'com.intellij.devkt.json.psi.impl.JsonPsiImplUtils'
13+
tokenTypeClass = 'com.intellij.devkt.json.JsonTokenType'
1414

15-
implements("value") = "com.intellij.json.psi.JsonElement"
16-
extends("value") = "com.intellij.json.psi.impl.JsonElementImpl"
15+
implements("value") = "com.intellij.devkt.json.psi.JsonElement"
16+
extends("value") = "com.intellij.devkt.json.psi.impl.JsonElementImpl"
1717

1818
tokens = [
1919
L_CURLY='{'
@@ -53,8 +53,7 @@
5353
extends("array|object")=container
5454
extends("string_literal|number_literal|boolean_literal|null_literal")=literal
5555
implements("property")=[
56-
"com.intellij.json.psi.JsonElement"
57-
"com.intellij.psi.PsiNamedElement"
56+
"com.intellij.devkt.json.psi.JsonElement"
5857
]
5958
}
6059

@@ -67,7 +66,7 @@ object ::= '{' object_element* '}' {
6766
findProperty
6867
getPresentation
6968
]
70-
mixin="com.intellij.json.psi.impl.JsonObjectMixin"
69+
mixin="com.intellij.devkt.json.psi.impl.JsonObjectMixin"
7170
}
7271

7372
// Hackity-hack to parse array elements and properties even if separating commas are missing,
@@ -86,7 +85,7 @@ property ::= property_name (':' value) {
8685
value=""
8786
getPresentation
8887
]
89-
mixin="com.intellij.json.psi.impl.JsonPropertyMixin"
88+
mixin="com.intellij.devkt.json.psi.impl.JsonPropertyMixin"
9089
pin(".*")=1
9190
}
9291

@@ -111,7 +110,7 @@ string_literal ::= SINGLE_QUOTED_STRING | DOUBLE_QUOTED_STRING {
111110
SINGLE_QUOTED_STRING=""
112111
DOUBLE_QUOTED_STRING=""
113112
]
114-
mixin="com.intellij.json.psi.impl.JsonStringLiteralMixin"
113+
mixin="com.intellij.devkt.json.psi.impl.JsonStringLiteralMixin"
115114
}
116115
number_literal ::= NUMBER {
117116
methods=[
@@ -130,7 +129,7 @@ literal ::= string_literal | number_literal | boolean_literal | null_literal {
130129
methods=[
131130
isQuotedString
132131
]
133-
mixin="com.intellij.json.psi.impl.JsonLiteralMixin"
132+
mixin="com.intellij.devkt.json.psi.impl.JsonLiteralMixin"
134133
}
135134

136135
fake container ::=

src/com/intellij/devkt/json/psi/JsonArray.java

Lines changed: 0 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/com/intellij/devkt/json/psi/JsonBooleanLiteral.java

Lines changed: 0 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/com/intellij/devkt/json/psi/JsonContainer.java

Lines changed: 0 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/com/intellij/devkt/json/psi/JsonElementVisitor.java

Lines changed: 0 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/com/intellij/devkt/json/psi/JsonLiteral.java

Lines changed: 0 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/com/intellij/devkt/json/psi/JsonNullLiteral.java

Lines changed: 0 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/com/intellij/devkt/json/psi/JsonNumberLiteral.java

Lines changed: 0 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/com/intellij/devkt/json/psi/JsonObject.java

Lines changed: 0 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)