Starter/samples
1
0
Fork 0
mirror of https://github.com/flutter/samples.git synced 2025-11-08 13:58:47 +00:00
Code Issues Releases Wiki Activity

Fix issue where intervals where merged when they did not overlap due to a typo, also only add interval to merged list if it has overlapped and been merged (#1228)

Browse Source
This commit is contained in:
Renzo Olivares
2022-05-09 07:34:51 -07:00
committed by GitHub
parent c70bda1de3
commit f057071adc
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
simplistic_editor/lib/replacements.dart
View File

@@ -603,12 +603,13 @@ class ReplacementTextEditingController extends TextEditingController {
final List<dynamic> toRemoveRangesThatHaveBeenMerged = <dynamic>[]; final List<dynamic> toRemoveRangesThatHaveBeenMerged = <dynamic>[];
final List<dynamic> toAddRangesThatHaveBeenMerged = <dynamic>[]; final List<dynamic> toAddRangesThatHaveBeenMerged = <dynamic>[];
for (int i = 0; i < overlappingTriples.length; i++) { for (int i = 0; i < overlappingTriples.length; i++) {
bool didOverlap = false;
List<dynamic> tripleA = overlappingTriples[i]; List<dynamic> tripleA = overlappingTriples[i];
if (toRemoveRangesThatHaveBeenMerged.contains(tripleA)) continue; if (toRemoveRangesThatHaveBeenMerged.contains(tripleA)) continue;
for (int j = i + 1; j < overlappingTriples.length; j++) { for (int j = i + 1; j < overlappingTriples.length; j++) {
final List<dynamic> tripleB = overlappingTriples[j]; final List<dynamic> tripleB = overlappingTriples[j];
if (math.max(tripleA[0] as int, tripleB[0] as int) if (math.max(tripleA[0] as int, tripleB[0] as int)
<= math.min(tripleB[1] as int, tripleB[1] as int) <= math.min(tripleA[1] as int, tripleB[1] as int)
&& tripleA[2] == tripleB[2]) { && tripleA[2] == tripleB[2]) {
toRemoveRangesThatHaveBeenMerged.addAll(<dynamic>[tripleA, tripleB]); toRemoveRangesThatHaveBeenMerged.addAll(<dynamic>[tripleA, tripleB]);
tripleA = <dynamic>[ tripleA = <dynamic>[
@@ -616,10 +617,11 @@ class ReplacementTextEditingController extends TextEditingController {
math.max(tripleA[1] as int, tripleB[1] as int), math.max(tripleA[1] as int, tripleB[1] as int),
tripleA[2], tripleA[2],
]; ];
didOverlap = true;
} }
} }
if (i != overlappingTriples.length - 1 if (didOverlap
&& !toAddRangesThatHaveBeenMerged.contains(tripleA) && !toAddRangesThatHaveBeenMerged.contains(tripleA)
&& !toRemoveRangesThatHaveBeenMerged.contains(tripleA)) { && !toRemoveRangesThatHaveBeenMerged.contains(tripleA)) {
toAddRangesThatHaveBeenMerged.add(tripleA); toAddRangesThatHaveBeenMerged.add(tripleA);