DevTools: Find bookmarks at line endpoints when calling _clearBookmarks

third_party/WebKit/Source/devtools/front_end/sources/CSSSourceFrame.js

 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 94 matching lines @@
     /**
      * @param {number} startLine
      * @param {number} endLine
      */
     _updateColorSwatches: function(startLine, endLine)
     {
         var colorPositions = [];
 
         var colorRegex = /[\s:;,(){}]((?:rgb|hsl)a?\([^)]+\)|#[0-9a-f]{8}|#[0-9a-f]{6}|#[0-9a-f]{3,4}|[a-z]+)(?=[\s;,(){}])/gi;
         for (var lineNumber = startLine; lineNumber <= endLine; lineNumber++) {
-            var line = this.textEditor.line(lineNumber).substring(0, WebInspector.CSSSourceFrame.maxSwatchProcessingLength) + "\n";
+            var line = "\n" + this.textEditor.line(lineNumber).substring(0, WebInspector.CSSSourceFrame.maxSwatchProcessingLength) + "\n";
             var match;
             while ((match = colorRegex.exec(line)) !== null) {
                 if (match.length < 2)
                     continue;
                 var colorText = match[1];
                 var color = WebInspector.Color.parse(colorText);
                 if (color)
-                    colorPositions.push(new WebInspector.CSSSourceFrame.ColorPosition(color, lineNumber, match.index + 1, colorText.length));
+                    colorPositions.push(new WebInspector.CSSSourceFrame.ColorPosition(color, lineNumber, match.index, colorText.length));
             }
         }
 
         this.textEditor.operation(putColorSwatchesInline.bind(this));
 
         /**
          * @this {WebInspector.CSSSourceFrame}
          */
         function putColorSwatchesInline()
         {
@@ skipping 10 matching lines @@
             }
         }
     },
 
     /**
      * @param {number} startLine
      * @param {number} endLine
      */
     _clearBookmarks: function(startLine, endLine)
     {
-        var range = new WebInspector.TextRange(startLine, 0, endLine, this.textEditor.line(endLine).length);
-        var markers = this.textEditor.bookmarks(range);
-        for (var i = 0; i < markers.length; i++)
-            markers[i].clear();
+        var startPos = new CodeMirror.Pos(startLine, 0);

[lushnikov, 2016/07/27 23:32:02]

we shouldn't be using CodeMirror.Pos outside of CodeMirrorTextEditor, let's do
ranges right away

[flandy, 2016/07/29 17:25:51]

Done.

+        var endPos = new CodeMirror.Pos(endLine, this.textEditor.line(endLine).length)
+        var range = WebInspector.CodeMirrorUtils.toRange(startPos, endPos);
+
+        var startMarkers = this.textEditor.bookmarksAt(startPos);
+        for (var i = 0; i < startMarkers.length; i++)
+            startMarkers[i].clear();
+
+        var endMarkers = this.textEditor.bookmarksAt(endPos)
+        for (var i = 0; i < endMarkers.length; i++)
+            endMarkers[i].clear();
+
+        var innerMarkers = this.textEditor.bookmarks(range);
+        for (var i = 0; i < innerMarkers.length; i++)
+            innerMarkers[i].clear();
     },
 
     /**
      * @param {!WebInspector.ColorSwatch} swatch
      * @param {!CodeMirror.TextMarker} bookmark
      * @param {!Event} event
      */
     _showSpectrum: function(swatch, bookmark, event)
     {
         event.consume(true);
@@ skipping 187 matching lines @@
         var propertyToken = this._backtrackPropertyToken(editor, prefixRange.startLine, prefixRange.startColumn - 1);
         if (!propertyToken)
             return this._simpleDelegate.wordsWithPrefix(editor, prefixRange, substituteRange);
 
         var line = editor.line(prefixRange.startLine);
         var tokenContent = line.substring(propertyToken.startColumn, propertyToken.endColumn);
         var keywords = WebInspector.CSSMetadata.keywordsForProperty(tokenContent);
         return keywords.startsWith(prefix);
     },
 }