Fix line selection when editor has collapsed lines (#184)

Author: ben-gibson

CHANGELOG.md

@@ -3,9 +3,10 @@
 # GitLink Changelog
 
 ## [Unreleased]
+- Fix line selection around collapsed code sections
 
 ## [4.0.4]
-- Add pipeline to handle URL logic
+- Add pipeline to handle URL logic
 - Fix typos
 
 ## [4.0.3]

gradle.properties

@@ -4,7 +4,7 @@
 pluginGroup = uk.co.ben_gibson.git.link
 pluginName = GitLink
 # SemVer format -> https://semver.org
-pluginVersion = 4.0.4
+pluginVersion = 4.0.5
 
 # See https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html
 # for insight into build numbers and IntelliJ Platform versions.

src/main/kotlin/uk/co/ben_gibson/git/link/ui/EditorExtensions.kt

@@ -4,10 +4,20 @@ import com.intellij.openapi.editor.Editor
 
 val Editor.lineSelection: LineSelection
     get() {
-        val primaryCaret = caretModel.primaryCaret
+        val caretStates = caretModel.caretsAndSelections
 
-        val start = primaryCaret.selectionStartPosition.line + 1
-        val end = primaryCaret.selectionEndPosition.line + 1
+        if (caretStates.size < 1) {
+            return LineSelection(caretModel.logicalPosition.line + 1)
+        }
 
-        return LineSelection(start, end)
+        val caretState = caretStates[0]
+
+        val start = caretState.selectionStart
+        val end = caretState.selectionEnd
+
+        if (start == null || end == null) {
+            return LineSelection(caretModel.logicalPosition.line + 1)
+        }
+
+        return LineSelection(start.line + 1, end.line + 1)
     }

src/main/kotlin/uk/co/ben_gibson/git/link/ui/LineSelection.kt

@@ -1,3 +1,5 @@
 package uk.co.ben_gibson.git.link.ui
 
-data class LineSelection(val start: Int, val end: Int)
+data class LineSelection(val start: Int, val end: Int) {
+    constructor(start: Int) : this(start, start)
+}