From 1bf0424b1cdcb9d83d739083b9b8d6f89f60ee07 Mon Sep 17 00:00:00 2001
From: Mikhail Glukhikh <Mikhail.Glukhikh@jetbrains.com>
Date: Mon, 9 Oct 2017 16:14:22 +0300
Subject: [PATCH] Set line marker on expect constructor '(' if no constructor
 keyword

---
 .../idea/highlighter/markers/KotlinLineMarkerProvider.kt   | 7 ++++++-
 .../fromExpectedAnnotation/common/common.kt                | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/idea/src/org/jetbrains/kotlin/idea/highlighter/markers/KotlinLineMarkerProvider.kt b/idea/src/org/jetbrains/kotlin/idea/highlighter/markers/KotlinLineMarkerProvider.kt
index 341a0a98d48..6a795e9dce2 100644
--- a/idea/src/org/jetbrains/kotlin/idea/highlighter/markers/KotlinLineMarkerProvider.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/highlighter/markers/KotlinLineMarkerProvider.kt
@@ -298,7 +298,12 @@ private fun collectOverriddenPropertyAccessors(properties: Collection<KtNamedDec
 }
 
 private val KtNamedDeclaration.expectOrActualAnchor
-    get() = nameIdentifier ?: (this as? KtConstructor<*>)?.getConstructorKeyword() ?: this
+    get() =
+        nameIdentifier
+        ?: (this as? KtConstructor<*>)?.let {
+            it.getConstructorKeyword() ?: it.getValueParameterList()?.leftParenthesis
+        }
+        ?: this
 
 private fun collectActualMarkers(declaration: KtNamedDeclaration,
                                  result: MutableCollection<LineMarkerInfo<*>>) {
diff --git a/idea/testData/multiModuleLineMarker/fromExpectedAnnotation/common/common.kt b/idea/testData/multiModuleLineMarker/fromExpectedAnnotation/common/common.kt
index 16dce8a4398..ea5863edd61 100644
--- a/idea/testData/multiModuleLineMarker/fromExpectedAnnotation/common/common.kt
+++ b/idea/testData/multiModuleLineMarker/fromExpectedAnnotation/common/common.kt
@@ -1,4 +1,4 @@
-expect annotation class <lineMarker>Ann</lineMarker> <lineMarker>constructor</lineMarker>(
+expect annotation class <lineMarker>Ann</lineMarker><lineMarker>(</lineMarker>
         val <lineMarker>x</lineMarker>: Int,
         val <lineMarker>y</lineMarker>: String
 )
\ No newline at end of file