From 134be56b0a707d406c8d84ec75b52966e172edf2 Mon Sep 17 00:00:00 2001 From: Max Medvedev Date: Thu, 10 Apr 2025 18:30:23 +0200 Subject: [PATCH] IJPL-162853 JvmName must be imported in multiplatform GitOrigin-RevId: ddf78548e36a9714343ed9424d19930721dae59a --- .../src/com/intellij/platform/syntax/SyntaxElementTypeSet.kt | 1 + .../src/com/intellij/platform/syntax/lexer/TokenList.kt | 1 + .../src/com/intellij/platform/syntax/logger/NoopLogger.kt | 1 + .../com/intellij/platform/syntax/psi/IntelliJLoggerAdapter.kt | 1 + .../src/com/intellij/platform/syntax/psi/ParsingDiagnostics.kt | 1 + .../src/com/intellij/platform/syntax/psi/impl/NodeBase.kt | 2 ++ .../src/com/intellij/openapi/util/text/StringsKmp.kt | 1 + .../src/com/intellij/openapi/util/text/StringUtilKmp.kt | 1 + 8 files changed, 9 insertions(+) diff --git a/platform/syntax/syntax-api/src/com/intellij/platform/syntax/SyntaxElementTypeSet.kt b/platform/syntax/syntax-api/src/com/intellij/platform/syntax/SyntaxElementTypeSet.kt index 1f04e2957acc..afe9a6a18fd6 100644 --- a/platform/syntax/syntax-api/src/com/intellij/platform/syntax/SyntaxElementTypeSet.kt +++ b/platform/syntax/syntax-api/src/com/intellij/platform/syntax/SyntaxElementTypeSet.kt @@ -6,6 +6,7 @@ package com.intellij.platform.syntax import com.intellij.platform.syntax.impl.fastutil.ints.IntArrayList import com.intellij.platform.syntax.impl.util.BitSet import org.jetbrains.annotations.ApiStatus +import kotlin.jvm.JvmName @ApiStatus.Experimental fun Collection.asSyntaxElementTypeSet(): SyntaxElementTypeSet { diff --git a/platform/syntax/syntax-api/src/com/intellij/platform/syntax/lexer/TokenList.kt b/platform/syntax/syntax-api/src/com/intellij/platform/syntax/lexer/TokenList.kt index b6f7222456d8..4df3396078d9 100644 --- a/platform/syntax/syntax-api/src/com/intellij/platform/syntax/lexer/TokenList.kt +++ b/platform/syntax/syntax-api/src/com/intellij/platform/syntax/lexer/TokenList.kt @@ -8,6 +8,7 @@ import com.intellij.platform.syntax.CancellationProvider import com.intellij.platform.syntax.Logger import com.intellij.platform.syntax.SyntaxElementType import com.intellij.platform.syntax.SyntaxElementTypeSet +import kotlin.jvm.JvmName import org.jetbrains.annotations.ApiStatus /** diff --git a/platform/syntax/syntax-api/src/com/intellij/platform/syntax/logger/NoopLogger.kt b/platform/syntax/syntax-api/src/com/intellij/platform/syntax/logger/NoopLogger.kt index d4ced03f7004..a553a3ce6898 100644 --- a/platform/syntax/syntax-api/src/com/intellij/platform/syntax/logger/NoopLogger.kt +++ b/platform/syntax/syntax-api/src/com/intellij/platform/syntax/logger/NoopLogger.kt @@ -5,6 +5,7 @@ package com.intellij.platform.syntax.logger import com.intellij.platform.syntax.Logger +import kotlin.jvm.JvmName import org.jetbrains.annotations.ApiStatus @ApiStatus.Experimental diff --git a/platform/syntax/syntax-psi/src/com/intellij/platform/syntax/psi/IntelliJLoggerAdapter.kt b/platform/syntax/syntax-psi/src/com/intellij/platform/syntax/psi/IntelliJLoggerAdapter.kt index 6d27a45737ad..7a286a14a4c6 100644 --- a/platform/syntax/syntax-psi/src/com/intellij/platform/syntax/psi/IntelliJLoggerAdapter.kt +++ b/platform/syntax/syntax-psi/src/com/intellij/platform/syntax/psi/IntelliJLoggerAdapter.kt @@ -5,6 +5,7 @@ package com.intellij.platform.syntax.psi import com.intellij.openapi.diagnostic.Logger +import kotlin.jvm.JvmName import org.jetbrains.annotations.ApiStatus @ApiStatus.Experimental diff --git a/platform/syntax/syntax-psi/src/com/intellij/platform/syntax/psi/ParsingDiagnostics.kt b/platform/syntax/syntax-psi/src/com/intellij/platform/syntax/psi/ParsingDiagnostics.kt index 92f72ff9aa15..314d592756d7 100644 --- a/platform/syntax/syntax-psi/src/com/intellij/platform/syntax/psi/ParsingDiagnostics.kt +++ b/platform/syntax/syntax-psi/src/com/intellij/platform/syntax/psi/ParsingDiagnostics.kt @@ -8,6 +8,7 @@ import com.intellij.lang.Language import com.intellij.openapi.application.ApplicationManager import com.intellij.platform.syntax.parser.SyntaxTreeBuilder import com.intellij.psi.ParsingDiagnostics.ParserDiagnosticsHandler +import kotlin.jvm.JvmName import org.jetbrains.annotations.ApiStatus @ApiStatus.Experimental diff --git a/platform/syntax/syntax-psi/src/com/intellij/platform/syntax/psi/impl/NodeBase.kt b/platform/syntax/syntax-psi/src/com/intellij/platform/syntax/psi/impl/NodeBase.kt index 0a4aef901963..976fd7ca9b4e 100644 --- a/platform/syntax/syntax-psi/src/com/intellij/platform/syntax/psi/impl/NodeBase.kt +++ b/platform/syntax/syntax-psi/src/com/intellij/platform/syntax/psi/impl/NodeBase.kt @@ -1,6 +1,8 @@ // Copyright 2000-2025 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. package com.intellij.platform.syntax.psi.impl +import kotlin.jvm.JvmName + internal abstract class NodeBase( val markerId: Int, @get:JvmName( "_getIndex") // class with getStartIndex diff --git a/platform/util/base/multiplatform/src/com/intellij/openapi/util/text/StringsKmp.kt b/platform/util/base/multiplatform/src/com/intellij/openapi/util/text/StringsKmp.kt index 25a8f823cb28..9606c294765a 100644 --- a/platform/util/base/multiplatform/src/com/intellij/openapi/util/text/StringsKmp.kt +++ b/platform/util/base/multiplatform/src/com/intellij/openapi/util/text/StringsKmp.kt @@ -6,6 +6,7 @@ package com.intellij.openapi.util.text import org.jetbrains.annotations.ApiStatus import org.jetbrains.annotations.Contract +import kotlin.jvm.JvmName @Contract(pure = true) fun CharSequence.stringHashCode(): Int { diff --git a/platform/util/multiplatform/src/com/intellij/openapi/util/text/StringUtilKmp.kt b/platform/util/multiplatform/src/com/intellij/openapi/util/text/StringUtilKmp.kt index 56e8710ae740..7fb2c9afe046 100644 --- a/platform/util/multiplatform/src/com/intellij/openapi/util/text/StringUtilKmp.kt +++ b/platform/util/multiplatform/src/com/intellij/openapi/util/text/StringUtilKmp.kt @@ -6,6 +6,7 @@ package com.intellij.openapi.util.text import org.jetbrains.annotations.ApiStatus import org.jetbrains.annotations.Contract +import kotlin.jvm.JvmName @Contract(pure = true) fun CharSequence.containsLineBreak(): Boolean {