From bc3d8b9491f46334699a73f2dfb7ddb982cb4e1f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tesla=20Ice=20Zhang=E2=80=AE?= <ice1000kotlin@foxmail.com>
Date: Tue, 17 Mar 2020 04:02:52 -0400
Subject: [PATCH] Add `@NotNull` annotation to generated fields

---
 src/org/intellij/grammar/generator/ParserGenerator.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/org/intellij/grammar/generator/ParserGenerator.java b/src/org/intellij/grammar/generator/ParserGenerator.java
index 4441f2c9..25acab5a 100755
--- a/src/org/intellij/grammar/generator/ParserGenerator.java
+++ b/src/org/intellij/grammar/generator/ParserGenerator.java
@@ -1563,6 +1563,7 @@ private void generateElementTypesHolder(String className, Map<String, BnfRule> s
         imports.add(CommonClassNames.JAVA_UTIL_COLLECTIONS);
         imports.add(CommonClassNames.JAVA_UTIL_SET);
         imports.add("java.util.LinkedHashMap");
+        imports.add("org.jetbrains.annotations.NotNull");
       }
       if (G.generatePsiFactory) {
         if (JBIterable.from(myRuleInfos.values()).find(o -> o.mixedAST) != null) {
@@ -1584,7 +1585,7 @@ private void generateElementTypesHolder(String className, Map<String, BnfRule> s
         }
         String fieldType = ObjectUtils.notNull(useExactElements ? exactType : "IElementType");
         String callFix = elementCreateCall.equals("new IElementType") ? ", null" : "";
-        out(fieldType + " " + elementType + " = " + elementCreateCall + "(\"" + elementType + "\"" + callFix + ");");
+        out("@NotNull " + fieldType + " " + elementType + " = " + elementCreateCall + "(\"" + elementType + "\"" + callFix + ");");
       }
     }
     if (G.generateTokenTypes) {