From 8dfa1fe592c4c32926213c5f1040fa5b156bb9a0 Mon Sep 17 00:00:00 2001 From: Silvano Cerza Date: Sun, 9 Mar 2025 15:43:27 +0100 Subject: [PATCH] Fix type checking issue --- src/views/conflicts-resolution/unified-diff-view.tsx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/views/conflicts-resolution/unified-diff-view.tsx b/src/views/conflicts-resolution/unified-diff-view.tsx index 4afb5a4..639f8ff 100644 --- a/src/views/conflicts-resolution/unified-diff-view.tsx +++ b/src/views/conflicts-resolution/unified-diff-view.tsx @@ -1,6 +1,7 @@ import * as React from "react"; import CodeMirror, { EditorState, + Range, RangeSetBuilder, StateEffect, StateField, @@ -306,7 +307,7 @@ const createBlockDecorations = ( [rangesStateField], (state: EditorState) => { const ranges = state.field(rangesStateField); - let widgets = []; + let widgets: Range[] = []; ranges.forEach((range: ConflictRange, index: number) => { if (range.source === "both") {