From 72e48bb9a6c80af853feb308d828aeb1dcdb63ac Mon Sep 17 00:00:00 2001 From: Wynne Plaga Date: Wed, 22 Nov 2023 15:07:27 -0500 Subject: [PATCH 1/2] Update LineMarkerInfo calls to avoid method marked for removal --- .../intellij/provider/ScopeHierarchyLineMarkerProvider.kt | 3 +-- .../provider/ScopeNavigationLineMarkerProvider.kt | 8 ++++---- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/intellij/src/main/kotlin/motif/intellij/provider/ScopeHierarchyLineMarkerProvider.kt b/intellij/src/main/kotlin/motif/intellij/provider/ScopeHierarchyLineMarkerProvider.kt index a54e0e1b..c5258ec0 100644 --- a/intellij/src/main/kotlin/motif/intellij/provider/ScopeHierarchyLineMarkerProvider.kt +++ b/intellij/src/main/kotlin/motif/intellij/provider/ScopeHierarchyLineMarkerProvider.kt @@ -70,10 +70,9 @@ class ScopeHierarchyLineMarkerProvider : LineMarkerProvider, MotifService.Listen element, identifier.textRange, AllIcons.Hierarchy.Supertypes, - UPDATE_ALL, ConstantFunction(LABEL_ANCESTORS_SCOPE), ScopeHierarchyHandler(element.project), - LEFT) + LEFT) { LABEL_ANCESTORS_SCOPE } } private class ScopeHierarchyHandler(val project: Project) : diff --git a/intellij/src/main/kotlin/motif/intellij/provider/ScopeNavigationLineMarkerProvider.kt b/intellij/src/main/kotlin/motif/intellij/provider/ScopeNavigationLineMarkerProvider.kt index b1883155..f2c2e1f2 100644 --- a/intellij/src/main/kotlin/motif/intellij/provider/ScopeNavigationLineMarkerProvider.kt +++ b/intellij/src/main/kotlin/motif/intellij/provider/ScopeNavigationLineMarkerProvider.kt @@ -48,6 +48,7 @@ import motif.intellij.analytics.AnalyticsService import motif.intellij.analytics.MotifAnalyticsActions import motif.intellij.toPsiClass import motif.intellij.toPsiMethod +import java.util.function.Supplier /* * {@LineMarkerProvider} used to display navigation icons in gutter to navigate to parent/children of Motif scopes. @@ -81,10 +82,9 @@ class ScopeNavigationLineMarkerProvider : LineMarkerProvider, MotifService.Liste element, identifier.textRange, AllIcons.Actions.PreviousOccurence, - UPDATE_ALL, ConstantFunction(LABEL_NAVIGATE_PARENT_SCOPE), NavigationScopeHandler(element.project, graph), - LEFT) + LEFT) { LABEL_NAVIGATE_PARENT_SCOPE } } } else { val methodElement = element.toPsiMethod() @@ -93,10 +93,10 @@ class ScopeNavigationLineMarkerProvider : LineMarkerProvider, MotifService.Liste element, element.textRange, AllIcons.Actions.NextOccurence, - UPDATE_ALL, ConstantFunction(LABEL_NAVIGATE_CHILD_SCOPE), NavigationScopeHandler(element.project, graph), - LEFT) + LEFT + ) { LABEL_NAVIGATE_CHILD_SCOPE } } } return null From 100851aad2e36ea77cc614756beb86929e9b99f0 Mon Sep 17 00:00:00 2001 From: Wynne Plaga Date: Wed, 22 Nov 2023 15:18:09 -0500 Subject: [PATCH 2/2] Formatting --- .../intellij/provider/ScopeHierarchyLineMarkerProvider.kt | 1 - .../intellij/provider/ScopeNavigationLineMarkerProvider.kt | 5 +---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/intellij/src/main/kotlin/motif/intellij/provider/ScopeHierarchyLineMarkerProvider.kt b/intellij/src/main/kotlin/motif/intellij/provider/ScopeHierarchyLineMarkerProvider.kt index c5258ec0..18c45d98 100644 --- a/intellij/src/main/kotlin/motif/intellij/provider/ScopeHierarchyLineMarkerProvider.kt +++ b/intellij/src/main/kotlin/motif/intellij/provider/ScopeHierarchyLineMarkerProvider.kt @@ -15,7 +15,6 @@ */ package motif.intellij.provider -import com.intellij.codeHighlighting.Pass.UPDATE_ALL import com.intellij.codeInsight.daemon.GutterIconNavigationHandler import com.intellij.codeInsight.daemon.LineMarkerInfo import com.intellij.codeInsight.daemon.LineMarkerProvider diff --git a/intellij/src/main/kotlin/motif/intellij/provider/ScopeNavigationLineMarkerProvider.kt b/intellij/src/main/kotlin/motif/intellij/provider/ScopeNavigationLineMarkerProvider.kt index f2c2e1f2..30f1184a 100644 --- a/intellij/src/main/kotlin/motif/intellij/provider/ScopeNavigationLineMarkerProvider.kt +++ b/intellij/src/main/kotlin/motif/intellij/provider/ScopeNavigationLineMarkerProvider.kt @@ -15,7 +15,6 @@ */ package motif.intellij.provider -import com.intellij.codeHighlighting.Pass.UPDATE_ALL import com.intellij.codeInsight.daemon.GutterIconNavigationHandler import com.intellij.codeInsight.daemon.LineMarkerInfo import com.intellij.codeInsight.daemon.LineMarkerProvider @@ -48,7 +47,6 @@ import motif.intellij.analytics.AnalyticsService import motif.intellij.analytics.MotifAnalyticsActions import motif.intellij.toPsiClass import motif.intellij.toPsiMethod -import java.util.function.Supplier /* * {@LineMarkerProvider} used to display navigation icons in gutter to navigate to parent/children of Motif scopes. @@ -95,8 +93,7 @@ class ScopeNavigationLineMarkerProvider : LineMarkerProvider, MotifService.Liste AllIcons.Actions.NextOccurence, ConstantFunction(LABEL_NAVIGATE_CHILD_SCOPE), NavigationScopeHandler(element.project, graph), - LEFT - ) { LABEL_NAVIGATE_CHILD_SCOPE } + LEFT) { LABEL_NAVIGATE_CHILD_SCOPE } } } return null