From a907ec04fcfb10dd81ec13ea0806b226f9e976a2 Mon Sep 17 00:00:00 2001 From: James Allen Date: Tue, 8 Nov 2016 15:17:20 +0000 Subject: [PATCH] Don't complain about comment markers when checking --- .../track-changes/TrackChangesManager.coffee | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/services/web/public/coffee/ide/editor/directives/aceEditor/track-changes/TrackChangesManager.coffee b/services/web/public/coffee/ide/editor/directives/aceEditor/track-changes/TrackChangesManager.coffee index 4ab381dbf4..cd2215c75c 100644 --- a/services/web/public/coffee/ide/editor/directives/aceEditor/track-changes/TrackChangesManager.coffee +++ b/services/web/public/coffee/ide/editor/directives/aceEditor/track-changes/TrackChangesManager.coffee @@ -90,16 +90,28 @@ define [ for marker_id, marker of session.getMarkers() markers[marker_id] = marker + expected_markers = [] for change in @changesTracker.changes op = change.op marker_id = @changeIdToMarkerIdMap[change.id] - start = @_shareJsOffsetToAcePosition(op.p) if op.i? end = @_shareJsOffsetToAcePosition(op.p + op.i.length) else if op.d? end = start - + expected_markers.push { + marker_id, start, end + } + + for comment in @changesTracker.comments + marker_id = @changeIdToMarkerIdMap[comment.id] + start = @_shareJsOffsetToAcePosition(comment.offset) + end = @_shareJsOffsetToAcePosition(comment.offset + comment.length) + expected_markers.push { + marker_id, start, end + } + + for {marker_id, start, end} in expected_markers marker = markers[marker_id] delete markers[marker_id] if marker.range.start.row != start.row or