From cfd1a54463d294aa4b10d87448a5f85e195700be Mon Sep 17 00:00:00 2001
From: Mikhail Glukhikh <mikhail.glukhikh@jetbrains.com>
Date: Wed, 6 Jun 2018 19:06:49 +0300
Subject: [PATCH] Do not create expect / actual gutters for primary constructor

So #KT-22177 Fixed
So #KT-21063 Obsolete
---
 .../kotlin/idea/highlighter/markers/KotlinLineMarkerProvider.kt | 2 ++
 .../idea/highlighter/markers/KotlinLineMarkerProvider.kt.172    | 2 ++
 .../multiModuleLineMarker/fromActualAnnotation/jvm/jvm.kt       | 2 +-
 .../fromExpectedAnnotation/common/common.kt                     | 2 +-
 4 files changed, 6 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 422c02a0414..27529e1e5a6 100644
--- a/idea/src/org/jetbrains/kotlin/idea/highlighter/markers/KotlinLineMarkerProvider.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/highlighter/markers/KotlinLineMarkerProvider.kt
@@ -349,6 +349,7 @@ private fun collectActualMarkers(
     declaration: KtNamedDeclaration,
     result: MutableCollection<LineMarkerInfo<*>>
 ) {
+    if (declaration is KtPrimaryConstructor) return
 
     val descriptor = declaration.toDescriptor() as? MemberDescriptor ?: return
     val commonModuleDescriptor = declaration.containingKtFile.findModuleDescriptor()
@@ -378,6 +379,7 @@ private fun collectExpectedMarkers(
     declaration: KtNamedDeclaration,
     result: MutableCollection<LineMarkerInfo<*>>
 ) {
+    if (declaration is KtPrimaryConstructor) return
 
     val descriptor = declaration.toDescriptor() as? MemberDescriptor ?: return
     val platformModuleDescriptor = declaration.containingKtFile.findModuleDescriptor()
diff --git a/idea/src/org/jetbrains/kotlin/idea/highlighter/markers/KotlinLineMarkerProvider.kt.172 b/idea/src/org/jetbrains/kotlin/idea/highlighter/markers/KotlinLineMarkerProvider.kt.172
index 76606fa260f..30176c666d9 100644
--- a/idea/src/org/jetbrains/kotlin/idea/highlighter/markers/KotlinLineMarkerProvider.kt.172
+++ b/idea/src/org/jetbrains/kotlin/idea/highlighter/markers/KotlinLineMarkerProvider.kt.172
@@ -340,6 +340,7 @@ private fun collectActualMarkers(
     declaration: KtNamedDeclaration,
     result: MutableCollection<LineMarkerInfo<*>>
 ) {
+    if (declaration is KtPrimaryConstructor) return
 
     val descriptor = declaration.toDescriptor() as? MemberDescriptor ?: return
     val commonModuleDescriptor = declaration.containingKtFile.findModuleDescriptor()
@@ -369,6 +370,7 @@ private fun collectExpectedMarkers(
     declaration: KtNamedDeclaration,
     result: MutableCollection<LineMarkerInfo<*>>
 ) {
+    if (declaration is KtPrimaryConstructor) return
 
     val descriptor = declaration.toDescriptor() as? MemberDescriptor ?: return
     val platformModuleDescriptor = declaration.containingKtFile.findModuleDescriptor()
diff --git a/idea/testData/multiModuleLineMarker/fromActualAnnotation/jvm/jvm.kt b/idea/testData/multiModuleLineMarker/fromActualAnnotation/jvm/jvm.kt
index 9f1316f2e06..6e2612c3fda 100644
--- a/idea/testData/multiModuleLineMarker/fromActualAnnotation/jvm/jvm.kt
+++ b/idea/testData/multiModuleLineMarker/fromActualAnnotation/jvm/jvm.kt
@@ -1,4 +1,4 @@
-actual annotation class <lineMarker>Ann</lineMarker> actual <lineMarker>constructor</lineMarker>(
+actual annotation class <lineMarker>Ann</lineMarker> actual constructor(
         actual val <lineMarker>x</lineMarker>: Int,
         actual val <lineMarker>y</lineMarker>: String
 )
diff --git a/idea/testData/multiModuleLineMarker/fromExpectedAnnotation/common/common.kt b/idea/testData/multiModuleLineMarker/fromExpectedAnnotation/common/common.kt
index ea5863edd61..cd7bdf8b692 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>(</lineMarker>
+expect annotation class <lineMarker>Ann</lineMarker>(
         val <lineMarker>x</lineMarker>: Int,
         val <lineMarker>y</lineMarker>: String
 )
\ No newline at end of file