diff --git a/java/java-syntax/src/com/intellij/java/syntax/JavaSyntaxBundle.kt b/java/java-syntax/src/com/intellij/java/syntax/JavaSyntaxBundle.kt index 3f833f2ec939..85a10548a117 100644 --- a/java/java-syntax/src/com/intellij/java/syntax/JavaSyntaxBundle.kt +++ b/java/java-syntax/src/com/intellij/java/syntax/JavaSyntaxBundle.kt @@ -6,6 +6,7 @@ import org.jetbrains.annotations.ApiStatus import org.jetbrains.annotations.Nls import org.jetbrains.annotations.NonNls import org.jetbrains.annotations.PropertyKey +import kotlin.jvm.JvmStatic @ApiStatus.Internal object JavaSyntaxBundle { diff --git a/java/java-syntax/src/com/intellij/java/syntax/JavaSyntaxDefinition.kt b/java/java-syntax/src/com/intellij/java/syntax/JavaSyntaxDefinition.kt index 03aad75b4e8b..ae5004cb2db9 100644 --- a/java/java-syntax/src/com/intellij/java/syntax/JavaSyntaxDefinition.kt +++ b/java/java-syntax/src/com/intellij/java/syntax/JavaSyntaxDefinition.kt @@ -10,6 +10,7 @@ import com.intellij.platform.syntax.SyntaxElementTypeSet import com.intellij.platform.syntax.lexer.Lexer import com.intellij.platform.syntax.syntaxElementTypeSetOf import com.intellij.pom.java.LanguageLevel +import kotlin.jvm.JvmStatic object JavaSyntaxDefinition { @JvmStatic diff --git a/java/java-syntax/src/com/intellij/java/syntax/parser/ExpressionParser.kt b/java/java-syntax/src/com/intellij/java/syntax/parser/ExpressionParser.kt index fe397d9223e9..29ac83dafde1 100644 --- a/java/java-syntax/src/com/intellij/java/syntax/parser/ExpressionParser.kt +++ b/java/java-syntax/src/com/intellij/java/syntax/parser/ExpressionParser.kt @@ -8,6 +8,7 @@ import com.intellij.platform.syntax.SyntaxElementTypeSet import com.intellij.platform.syntax.parser.SyntaxTreeBuilder import com.intellij.platform.syntax.syntaxElementTypeSetOf import org.jetbrains.annotations.PropertyKey +import kotlin.jvm.JvmStatic class ExpressionParser( private val myNewExpressionParser: PrattExpressionParser, diff --git a/java/java-syntax/src/com/intellij/openapi/projectRoots/JavaSdkVersion.kt b/java/java-syntax/src/com/intellij/openapi/projectRoots/JavaSdkVersion.kt index 8526554f31ca..e63d78a822b8 100644 --- a/java/java-syntax/src/com/intellij/openapi/projectRoots/JavaSdkVersion.kt +++ b/java/java-syntax/src/com/intellij/openapi/projectRoots/JavaSdkVersion.kt @@ -5,6 +5,7 @@ import com.intellij.openapi.util.NlsSafe import com.intellij.pom.java.LanguageLevel import com.intellij.util.lang.JavaVersion import com.intellij.util.lang.JavaVersion.Companion.tryParse +import kotlin.jvm.JvmStatic /** * Represents a version of Java SDK. Use `JavaSdk#getVersion(Sdk)` method to obtain a version of an `Sdk`. diff --git a/java/java-syntax/src/com/intellij/pom/java/JavaFeature.kt b/java/java-syntax/src/com/intellij/pom/java/JavaFeature.kt index 01e71db0aaa4..31a76a52d999 100644 --- a/java/java-syntax/src/com/intellij/pom/java/JavaFeature.kt +++ b/java/java-syntax/src/com/intellij/pom/java/JavaFeature.kt @@ -7,6 +7,7 @@ import org.jetbrains.annotations.Contract import org.jetbrains.annotations.Nls import org.jetbrains.annotations.NonNls import org.jetbrains.annotations.PropertyKey +import kotlin.jvm.JvmStatic /** * Represents Java language, JVM, or standard library features and provides information diff --git a/java/java-syntax/src/com/intellij/pom/java/LanguageLevel.kt b/java/java-syntax/src/com/intellij/pom/java/LanguageLevel.kt index 114077be90a3..4ebe175cde9d 100644 --- a/java/java-syntax/src/com/intellij/pom/java/LanguageLevel.kt +++ b/java/java-syntax/src/com/intellij/pom/java/LanguageLevel.kt @@ -8,6 +8,7 @@ import com.intellij.util.lang.JavaVersion import com.intellij.util.lang.JavaVersion.Companion.compose import org.jetbrains.annotations.ApiStatus import org.jetbrains.annotations.Nls +import kotlin.jvm.JvmStatic /** * Represents a language level (i.e. features available) of a Java code. diff --git a/platform/syntax/syntax-api/src/com/intellij/platform/syntax/element/SyntaxTokenTypes.kt b/platform/syntax/syntax-api/src/com/intellij/platform/syntax/element/SyntaxTokenTypes.kt index 6ca2a976e87b..243c785460d3 100644 --- a/platform/syntax/syntax-api/src/com/intellij/platform/syntax/element/SyntaxTokenTypes.kt +++ b/platform/syntax/syntax-api/src/com/intellij/platform/syntax/element/SyntaxTokenTypes.kt @@ -3,6 +3,7 @@ package com.intellij.platform.syntax.element import com.intellij.platform.syntax.SyntaxElementType import org.jetbrains.annotations.ApiStatus +import kotlin.jvm.JvmStatic /** * A set of most used basic token types diff --git a/platform/syntax/syntax-api/src/com/intellij/platform/syntax/parser/SyntaxTreeBuilderFactory.kt b/platform/syntax/syntax-api/src/com/intellij/platform/syntax/parser/SyntaxTreeBuilderFactory.kt index 8249f1f5a273..e43a18cfe921 100644 --- a/platform/syntax/syntax-api/src/com/intellij/platform/syntax/parser/SyntaxTreeBuilderFactory.kt +++ b/platform/syntax/syntax-api/src/com/intellij/platform/syntax/parser/SyntaxTreeBuilderFactory.kt @@ -8,6 +8,7 @@ import com.intellij.platform.syntax.lexer.TokenList import com.intellij.platform.syntax.logger.noopLogger import com.intellij.platform.syntax.parser.SyntaxTreeBuilderFactory.Builder import org.jetbrains.annotations.ApiStatus +import kotlin.jvm.JvmStatic /** * Factory for constructing a [SyntaxTreeBuilder] diff --git a/platform/syntax/syntax-psi/src/com/intellij/platform/syntax/psi/ElementTypeConverters.kt b/platform/syntax/syntax-psi/src/com/intellij/platform/syntax/psi/ElementTypeConverters.kt index 4efb74c6490a..fedb4a933398 100644 --- a/platform/syntax/syntax-psi/src/com/intellij/platform/syntax/psi/ElementTypeConverters.kt +++ b/platform/syntax/syntax-psi/src/com/intellij/platform/syntax/psi/ElementTypeConverters.kt @@ -7,6 +7,7 @@ import com.intellij.lang.LanguageExtensionWithAny import com.intellij.openapi.diagnostic.logger import org.jetbrains.annotations.ApiStatus import java.util.concurrent.ConcurrentHashMap +import kotlin.jvm.JvmStatic object ElementTypeConverters { private val cache = ConcurrentHashMap() diff --git a/platform/syntax/syntax-psi/src/com/intellij/platform/syntax/psi/LanguageSyntaxDefinition.kt b/platform/syntax/syntax-psi/src/com/intellij/platform/syntax/psi/LanguageSyntaxDefinition.kt index 7af66d5c46c5..8a2b344e1678 100644 --- a/platform/syntax/syntax-psi/src/com/intellij/platform/syntax/psi/LanguageSyntaxDefinition.kt +++ b/platform/syntax/syntax-psi/src/com/intellij/platform/syntax/psi/LanguageSyntaxDefinition.kt @@ -8,7 +8,7 @@ import com.intellij.platform.syntax.lexer.Lexer import com.intellij.platform.syntax.syntaxElementTypeSetOf import com.intellij.platform.syntax.runtime.SyntaxGeneratedParserRuntime import org.jetbrains.annotations.ApiStatus - +import kotlin.jvm.JvmStatic /** * Extension point providing syntax implementation for a given [com.intellij.lang.Language] diff --git a/platform/syntax/syntax-psi/src/com/intellij/platform/syntax/psi/PsiSyntaxBuilderFactory.kt b/platform/syntax/syntax-psi/src/com/intellij/platform/syntax/psi/PsiSyntaxBuilderFactory.kt index fc57e29fc68d..1df084c0f923 100644 --- a/platform/syntax/syntax-psi/src/com/intellij/platform/syntax/psi/PsiSyntaxBuilderFactory.kt +++ b/platform/syntax/syntax-psi/src/com/intellij/platform/syntax/psi/PsiSyntaxBuilderFactory.kt @@ -14,6 +14,7 @@ import com.intellij.platform.syntax.psi.impl.extractCachedLexemes import com.intellij.psi.impl.source.tree.SharedImplUtil import com.intellij.psi.text.BlockSupport import com.intellij.psi.tree.IElementType +import kotlin.jvm.JvmStatic @Service(Service.Level.APP) class PsiSyntaxBuilderFactory { diff --git a/platform/syntax/syntax-psi/src/com/intellij/platform/syntax/psi/impl/PsiSyntaxBuilderImpl.kt b/platform/syntax/syntax-psi/src/com/intellij/platform/syntax/psi/impl/PsiSyntaxBuilderImpl.kt index 81df1c8a19de..47088f59cc92 100644 --- a/platform/syntax/syntax-psi/src/com/intellij/platform/syntax/psi/impl/PsiSyntaxBuilderImpl.kt +++ b/platform/syntax/syntax-psi/src/com/intellij/platform/syntax/psi/impl/PsiSyntaxBuilderImpl.kt @@ -39,6 +39,7 @@ import com.intellij.util.text.CharArrayUtil import org.jetbrains.annotations.NonNls import java.util.* import kotlin.math.max +import kotlin.jvm.JvmStatic internal class PsiSyntaxBuilderImpl( internal var file: PsiFile?, diff --git a/platform/syntax/syntax-util/src/com/intellij/platform/syntax/util/parser/SyntaxBuilderUtil.kt b/platform/syntax/syntax-util/src/com/intellij/platform/syntax/util/parser/SyntaxBuilderUtil.kt index 3baee7962d77..30d2986bdce5 100644 --- a/platform/syntax/syntax-util/src/com/intellij/platform/syntax/util/parser/SyntaxBuilderUtil.kt +++ b/platform/syntax/syntax-util/src/com/intellij/platform/syntax/util/parser/SyntaxBuilderUtil.kt @@ -9,6 +9,7 @@ import com.intellij.platform.syntax.parser.SyntaxTreeBuilder import com.intellij.platform.syntax.parser.WhitespacesBinders import com.intellij.util.text.CharSequenceSubSequence import org.jetbrains.annotations.ApiStatus +import kotlin.jvm.JvmStatic @ApiStatus.Experimental object SyntaxBuilderUtil {