third_party/WebKit/Source/devtools/front_end/source_frame/CodeMirrorTextEditor.js - Issue 2187173002: DevTools: Find bookmarks at line endpoints when calling _clearBookmarks

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/WebKit/Source/devtools/front_end/source_frame/CodeMirrorTextEditor.js

Issue 2187173002: DevTools: Find bookmarks at line endpoints when calling _clearBookmarks (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Addressed comments Created 4 years, 5 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « third_party/WebKit/LayoutTests/inspector/sources/color-swatch-position-expected.txt ('k') | third_party/WebKit/Source/devtools/front_end/sources/CSSSourceFrame.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/devtools/front_end/source_frame/CodeMirrorTextEditor.js

diff --git a/third_party/WebKit/Source/devtools/front_end/source_frame/CodeMirrorTextEditor.js b/third_party/WebKit/Source/devtools/front_end/source_frame/CodeMirrorTextEditor.js

index fe51527baac65db0f83ccae14ad9a0e96810ed68..56bfaa058012e21995256050307dc9275b97c592 100644

--- a/third_party/WebKit/Source/devtools/front_end/source_frame/CodeMirrorTextEditor.js

+++ b/third_party/WebKit/Source/devtools/front_end/source_frame/CodeMirrorTextEditor.js

@@ -1025,8 +1025,12 @@ WebInspector.CodeMirrorTextEditor.prototype = {

bookmarks: function(range)

{

var pos = WebInspector.CodeMirrorUtils.toPos(range);

- var markers = this._codeMirror.findMarks(pos.start, pos.end);

- return markers.filter(marker => marker.type === "bookmark");

+ if (range.isEmpty())

+ return this._codeMirror.findMarksAt(pos.start).filter(marker => marker.type === "bookmark");

+ var startMarkers = this._codeMirror.findMarksAt(pos.start);

+ var middleMarkers = this._codeMirror.findMarks(pos.start, pos.end);

+ var endMarkers = this._codeMirror.findMarksAt(pos.end);

+ return startMarkers.concat(middleMarkers, endMarkers).filter(marker => marker.type === "bookmark");

/**