Skip to content

Commit 2c1def5

Browse files
committed
refactor: move substringAfterIgnoreCase
1 parent c695a6c commit 2c1def5

File tree

3 files changed

+10
-16
lines changed

3 files changed

+10
-16
lines changed

marker/src/main/kotlin/spp/jetbrains/marker/SourceMarkerUtils.kt

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -125,4 +125,12 @@ object SourceMarkerUtils {
125125
SwingUtilities.invokeLater { action.invoke() }
126126
}
127127
}
128+
129+
fun substringAfterIgnoreCase(str: String, search: String): String {
130+
val index = str.indexOf(search, ignoreCase = true)
131+
if (index == -1) {
132+
return str
133+
}
134+
return str.substring(index + search.length)
135+
}
128136
}

plugin/src/main/kotlin/spp/jetbrains/sourcemarker/command/CommandBarController.kt

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ import spp.jetbrains.ScopeExtensions.safeRunBlocking
2424
import spp.jetbrains.command.LiveCommand
2525
import spp.jetbrains.command.LiveCommandContext
2626
import spp.jetbrains.command.LiveLocationContext
27+
import spp.jetbrains.marker.SourceMarkerUtils.substringAfterIgnoreCase
2728
import spp.jetbrains.marker.service.ArtifactCreationService
2829
import spp.jetbrains.marker.service.ArtifactNamingService
2930
import spp.jetbrains.marker.service.ArtifactScopeService
@@ -170,12 +171,4 @@ object CommandBarController {
170171
}
171172
return null
172173
}
173-
174-
private fun substringAfterIgnoreCase(str: String, search: String): String {
175-
val index = str.indexOf(search, ignoreCase = true)
176-
if (index == -1) {
177-
return str
178-
}
179-
return str.substring(index + search.length)
180-
}
181174
}

plugin/src/main/kotlin/spp/jetbrains/sourcemarker/status/util/AutocompleteField.kt

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ import com.intellij.util.ui.UIUtil
2424
import spp.jetbrains.PluginUI
2525
import spp.jetbrains.PluginUI.SMALLEST_FONT
2626
import spp.jetbrains.icons.PluginIcons
27+
import spp.jetbrains.marker.SourceMarkerUtils.substringAfterIgnoreCase
2728
import spp.jetbrains.sourcemarker.command.ui.status.element.AutocompleteDropdown
2829
import spp.jetbrains.sourcemarker.service.instrument.log.VariableParser
2930
import spp.protocol.artifact.ArtifactQualifiedName
@@ -497,12 +498,4 @@ class AutocompleteField<T : AutocompleteFieldRow>(
497498
fun interface SaveListener {
498499
fun onSave()
499500
}
500-
501-
private fun substringAfterIgnoreCase(str: String, search: String): String {
502-
val index = str.indexOf(search, ignoreCase = true)
503-
if (index == -1) {
504-
return str
505-
}
506-
return str.substring(index + search.length)
507-
}
508501
}

0 commit comments

Comments
 (0)