diff --git a/java/java-psi-impl/src/com/intellij/lang/java/syntax/JavaElementTypeConverterExtension.kt b/java/java-psi-impl/src/com/intellij/lang/java/syntax/JavaElementTypeConverterExtension.kt
index 1dd5e44ccae6..d51584fe7f23 100644
--- a/java/java-psi-impl/src/com/intellij/lang/java/syntax/JavaElementTypeConverterExtension.kt
+++ b/java/java-psi-impl/src/com/intellij/lang/java/syntax/JavaElementTypeConverterExtension.kt
@@ -6,6 +6,7 @@ import com.intellij.java.syntax.element.JavaDocSyntaxTokenType
 import com.intellij.java.syntax.element.JavaSyntaxElementType
 import com.intellij.java.syntax.element.JavaSyntaxTokenType
 import com.intellij.lang.java.JavaParserDefinition
+import com.intellij.platform.syntax.element.SyntaxTokenTypes
 import com.intellij.platform.syntax.psi.ElementTypeConverter
 import com.intellij.platform.syntax.psi.ElementTypeConverterFactory
 import com.intellij.platform.syntax.psi.elementTypeConverterOf
diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/ElementType.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/ElementType.java
index 050ebf28a960..6f23636eeb90 100644
--- a/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/ElementType.java
+++ b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/ElementType.java
@@ -22,8 +22,8 @@ public interface ElementType extends JavaTokenType, JavaDocTokenType, JavaElemen
   TokenSet JAVA_COMMENT_BIT_SET =
     ElementTypeConverterKt.asTokenSet(SyntaxElementTypes.INSTANCE.getJAVA_COMMENT_BIT_SET(), javaPsiElementTypeConverter);
 
-  TokenSet JAVA_COMMENT_OR_WHITESPACE_BIT_SET =
-    ElementTypeConverterKt.asTokenSet(SyntaxElementTypes.INSTANCE.getJAVA_COMMENT_OR_WHITESPACE_BIT_SET(), javaPsiElementTypeConverter);
+  //is not changed, because it includes white_space
+  TokenSet JAVA_COMMENT_OR_WHITESPACE_BIT_SET = TokenSet.orSet(TokenSet.WHITE_SPACE, JAVA_COMMENT_BIT_SET);
 
   TokenSet KEYWORD_BIT_SET =
     ElementTypeConverterKt.asTokenSet(SyntaxElementTypes.INSTANCE.getKEYWORD_BIT_SET(), javaPsiElementTypeConverter);