Skip to content

Commit 3596a38

Browse files
committed
Fix data race with folds
fixes #154 fixes #152 fixes #148 fixes #147 fixes #146 fixes #144 fixes #143 fixes #142 fixes #137 fixes #135 fixes #130 fixes #129 fixes #127 fixes #125 fixes #124 fixes #121 fixes #120 fixes #119 fixes #118 fixes #117 fixes #112 fixes #57
1 parent 5cfe5c4 commit 3596a38

File tree

2 files changed

+2
-8
lines changed

2 files changed

+2
-8
lines changed

src/main/java/net/vektah/codeglance/GlancePanel.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ class GlancePanel(private val project: Project, fileEditor: FileEditor, private
152152
}
153153

154154
val text = editor.document.text
155-
val folds = editor.foldingModel.allFoldRegions
155+
val folds = editor.foldingModel.allFoldRegions.clone()
156156

157157
runner.run {
158158
map.update(text, editor.colorsScheme, hl, folds)

src/main/java/net/vektah/codeglance/render/Minimap.kt

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -196,13 +196,7 @@ class Minimap(private val config: Config) {
196196
* @return true if the given position is folded.
197197
*/
198198
private fun isFolded(position: Int, regions: Array<FoldRegion>): Boolean {
199-
for (region in regions) {
200-
if (!region.isExpanded && region.startOffset < position && position < region.endOffset) {
201-
return true
202-
}
203-
}
204-
205-
return false
199+
return regions.any { !it.isExpanded && it.startOffset < position && position < it.endOffset }
206200
}
207201

208202
/**

0 commit comments

Comments
 (0)