From f2a089bc511bc016cbff8af1f9d8259aa1d5933f Mon Sep 17 00:00:00 2001
From: Roman Shevchenko <roman.shevchenko@jetbrains.com>
Date: Sun, 9 Oct 2016 10:51:36 +0200
Subject: [PATCH] [java] stubs for 'requires' and 'exports' statement (NPE fix)

---
 .../psi/impl/java/stubs/JavaExportsStatementElementType.java  | 4 +++-
 .../psi/impl/java/stubs/JavaRequiresStatementElementType.java | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/java/stubs/JavaExportsStatementElementType.java b/java/java-psi-impl/src/com/intellij/psi/impl/java/stubs/JavaExportsStatementElementType.java
index e3d4c2cf3cfd..ea95eef7a788 100644
--- a/java/java-psi-impl/src/com/intellij/psi/impl/java/stubs/JavaExportsStatementElementType.java
+++ b/java/java-psi-impl/src/com/intellij/psi/impl/java/stubs/JavaExportsStatementElementType.java
@@ -36,6 +36,8 @@ import org.jetbrains.annotations.NotNull;
 import java.io.IOException;
 import java.util.List;
 
+import static com.intellij.util.ObjectUtils.notNull;
+
 public class JavaExportsStatementElementType extends JavaStubElementType<PsiExportsStatementStub, PsiExportsStatement> {
   public JavaExportsStatementElementType() {
     super("EXPORTS_STATEMENT");
@@ -68,7 +70,7 @@ public class JavaExportsStatementElementType extends JavaStubElementType<PsiExpo
       else if (type == JavaElementType.MODULE_REFERENCE) to.add(JavaSourceUtil.getReferenceText(tree, child));
     }
 
-    return new PsiExportsStatementStubImpl(parentStub, refText, to);
+    return new PsiExportsStatementStubImpl(parentStub, notNull(refText, ""), to);
   }
 
   @Override
diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/java/stubs/JavaRequiresStatementElementType.java b/java/java-psi-impl/src/com/intellij/psi/impl/java/stubs/JavaRequiresStatementElementType.java
index 405f8f3478d7..43af3563fbb0 100644
--- a/java/java-psi-impl/src/com/intellij/psi/impl/java/stubs/JavaRequiresStatementElementType.java
+++ b/java/java-psi-impl/src/com/intellij/psi/impl/java/stubs/JavaRequiresStatementElementType.java
@@ -35,6 +35,8 @@ import org.jetbrains.annotations.NotNull;
 
 import java.io.IOException;
 
+import static com.intellij.util.ObjectUtils.notNull;
+
 public class JavaRequiresStatementElementType extends JavaStubElementType<PsiRequiresStatementStub, PsiRequiresStatement> {
   public JavaRequiresStatementElementType() {
     super("REQUIRES_STATEMENT");
@@ -68,7 +70,7 @@ public class JavaRequiresStatementElementType extends JavaStubElementType<PsiReq
       else if (type == JavaTokenType.STATIC_KEYWORD) isStatic = true;
     }
 
-    return new PsiRequiresStatementStubImpl(parentStub, refText, isPublic, isStatic);
+    return new PsiRequiresStatementStubImpl(parentStub, notNull(refText, ""), isPublic, isStatic);
   }
 
   @Override