Companion public val annotated with @JvmFIeld or const

idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/navigation/SourceNavigationHelper.java

@@ -243,7 +243,7 @@ public class SourceNavigationHelper {
         MutableModuleContext newModuleContext = ContextKt.ContextForNewModule(
                 project, Name.special("<library module>"),
                 ModuleDescriptorKt.ModuleParameters(
-                        JvmPlatform.defaultModuleParameters.getDefaultImports(),
+                        JvmPlatform.INSTANCE.getDefaultModuleParameters().getDefaultImports(),
                         PlatformToKotlinClassMap.EMPTY
                 ),
                 DefaultBuiltIns.getInstance()

idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/IdeRenderers.kt

@@ -28,6 +28,8 @@ import org.jetbrains.kotlin.resolve.jvm.diagnostics.ConflictingJvmDeclarationsDa
 import org.jetbrains.kotlin.types.KotlinType
 
 public object IdeRenderers {
+
+    @JvmField
     public val HTML_AMBIGUOUS_CALLS: Renderer<Collection<ResolvedCall<*>>> = Renderer {
         calls: Collection<ResolvedCall<*>> ->
             calls
@@ -36,10 +38,12 @@ public object IdeRenderers {
                 .joinToString("") { "<li>" + DescriptorRenderer.HTML.render(it) + "</li>" }
     }
 
+    @JvmField
     public val HTML_RENDER_TYPE: Renderer<KotlinType> = Renderer {
         DescriptorRenderer.HTML.renderType(it)
     }
 
+    @JvmField
     public val HTML_NONE_APPLICABLE_CALLS: Renderer<Collection<ResolvedCall<*>>> = Renderer {
         calls: Collection<ResolvedCall<*>> ->
             // TODO: compareBy(comparator, selector) in stdlib
@@ -49,31 +53,38 @@ public object IdeRenderers {
                 .joinToString("") { "<li>" + renderResolvedCall(it) + "</li>" }
     }
 
+    @JvmField
     public val HTML_TYPE_INFERENCE_CONFLICTING_SUBSTITUTIONS_RENDERER: Renderer<InferenceErrorData> = Renderer {
         Renderers.renderConflictingSubstitutionsInferenceError(it, HtmlTabledDescriptorRenderer.create()).toString()
     }
 
+    @JvmField
     public val HTML_TYPE_INFERENCE_PARAMETER_CONSTRAINT_ERROR_RENDERER: Renderer<InferenceErrorData> = Renderer {
         Renderers.renderParameterConstraintError(it, HtmlTabledDescriptorRenderer.create()).toString()
     }
 
+    @JvmField
     public val HTML_TYPE_INFERENCE_NO_INFORMATION_FOR_PARAMETER_RENDERER: Renderer<InferenceErrorData> = Renderer {
         Renderers.renderNoInformationForParameterError(it, HtmlTabledDescriptorRenderer.create()).toString()
     }
 
+    @JvmField
     public val HTML_TYPE_INFERENCE_UPPER_BOUND_VIOLATED_RENDERER: Renderer<InferenceErrorData> = Renderer {
         Renderers.renderUpperBoundViolatedInferenceError(it, HtmlTabledDescriptorRenderer.create()).toString()
     }
 
+    @JvmField
     public val HTML_RENDER_RETURN_TYPE: Renderer<CallableMemberDescriptor> = Renderer {
         val returnType = it.getReturnType()!!
         DescriptorRenderer.HTML.renderType(returnType)
     }
 
+    @JvmField
     public val HTML_COMPACT_WITH_MODIFIERS: DescriptorRenderer = DescriptorRenderer.HTML.withOptions {
         withDefinedIn = false
     }
 
+    @JvmField
     public val HTML_CONFLICTING_JVM_DECLARATIONS_DATA: Renderer<ConflictingJvmDeclarationsData> = Renderer {
         data: ConflictingJvmDeclarationsData ->
 
@@ -85,6 +96,7 @@ public object IdeRenderers {
         "The following declarations have the same JVM signature (<code>${data.signature.name}${data.signature.desc}</code>):<br/>\n<ul>\n$conflicts</ul>"
     }
 
+    @JvmField
     public val HTML_THROWABLE: Renderer<Throwable> = Renderer {
         Renderers.THROWABLE.render(it).replace("\n", "<br/>")
     }

idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/TypeKindHighlightingVisitor.java

@@ -36,7 +36,7 @@ class TypeKindHighlightingVisitor extends AfterAnalysisHighlightingVisitor {
 
     @Override
     public void visitSimpleNameExpression(@NotNull KtSimpleNameExpression expression) {
-        if (NameHighlighter.namesHighlightingEnabled) {
+        if (NameHighlighter.INSTANCE.getNamesHighlightingEnabled()) {
             DeclarationDescriptor referenceTarget = bindingContext.get(BindingContext.REFERENCE_TARGET, expression);
             if (referenceTarget instanceof ConstructorDescriptor) {
                 referenceTarget = referenceTarget.getContainingDeclaration();

idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/KotlinFileFacadeClassByPackageIndex.kt

@@ -30,7 +30,10 @@ public class KotlinFileFacadeClassByPackageIndex private constructor() : StringS
 
     companion object {
         private val KEY = KotlinIndexUtil.createIndexKey(KotlinFileFacadeClassByPackageIndex::class.java)
+
+        @JvmField
         public val INSTANCE: KotlinFileFacadeClassByPackageIndex = KotlinFileFacadeClassByPackageIndex()
+
         @JvmStatic
         public fun getInstance(): KotlinFileFacadeClassByPackageIndex = INSTANCE
     }

idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/KotlinFileFacadeFqNameIndex.kt

@@ -30,7 +30,10 @@ public class KotlinFileFacadeFqNameIndex private constructor() : StringStubIndex
 
     companion object {
         private val KEY = KotlinIndexUtil.createIndexKey(KotlinFileFacadeFqNameIndex::class.java)
+
+        @JvmField
         public val INSTANCE: KotlinFileFacadeFqNameIndex = KotlinFileFacadeFqNameIndex()
+
         @JvmStatic
         public fun getInstance(): KotlinFileFacadeFqNameIndex = INSTANCE
     }

idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/KotlinFileFacadeShortNameIndex.kt

@@ -30,7 +30,10 @@ public class KotlinFileFacadeShortNameIndex private constructor() : StringStubIn
 
     companion object {
         private val KEY = KotlinIndexUtil.createIndexKey(KotlinFileFacadeShortNameIndex::class.java)
+
+        @JvmField
         public val INSTANCE: KotlinFileFacadeShortNameIndex = KotlinFileFacadeShortNameIndex()
+
         @JvmStatic
         public fun getInstance(): KotlinFileFacadeShortNameIndex = INSTANCE
     }

idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/KotlinFilePartClassIndex.kt

@@ -31,7 +31,10 @@ public class KotlinFilePartClassIndex private constructor() : StringStubIndexExt
 
     companion object {
         private val KEY = KotlinIndexUtil.createIndexKey(KotlinFilePartClassIndex::class.java)
+
+        @JvmField
         public val INSTANCE: KotlinFilePartClassIndex = KotlinFilePartClassIndex()
+
         @JvmStatic
         public fun getInstance(): KotlinFilePartClassIndex = INSTANCE
     }

idea/idea-analysis/src/org/jetbrains/kotlin/idea/stubindex/KotlinMultifileClassPartIndex.kt

@@ -31,7 +31,11 @@ public class KotlinMultifileClassPartIndex private constructor() : StringStubInd
 
     companion object {
         private val KEY = KotlinIndexUtil.createIndexKey(KotlinMultifileClassPartIndex::class.java)
+
+        @JvmField
         public val INSTANCE: KotlinMultifileClassPartIndex = KotlinMultifileClassPartIndex()
-        public @JvmStatic fun getInstance(): KotlinMultifileClassPartIndex = INSTANCE
+
+        @JvmStatic
+        public fun getInstance(): KotlinMultifileClassPartIndex = INSTANCE
     }
 }

idea/idea-analysis/src/org/jetbrains/kotlin/idea/util/ShortenReferences.kt

@@ -55,6 +55,7 @@ public class ShortenReferences(val options: (KtElement) -> Options = { Options.D
     }
 
     companion object {
+        @JvmField
         val DEFAULT = ShortenReferences()
 
         private fun DeclarationDescriptor.asString()