DevTools: [SASS] fix CSSWorkspaceBinding.propertyUILocation to account for comments

third_party/WebKit/Source/devtools/front_end/bindings/CSSWorkspaceBinding.js

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 /**
  * @constructor
  * @implements {WebInspector.TargetManager.Observer}
  * @param {!WebInspector.TargetManager} targetManager
  * @param {!WebInspector.Workspace} workspace
  * @param {!WebInspector.NetworkMapping} networkMapping
@@ skipping 115 matching lines @@
         var info = this._headerInfo(location._header);
         if (info)
             info._removeLocation(location);
     },
 
     /**
      * @param {!WebInspector.CSSProperty} cssProperty
      * @param {boolean} forName
      * @return {?WebInspector.UILocation}
      */
     propertyUILocation: function(cssProperty, forName)

[pfeldman, 2016/05/03 17:52:29]

I don't think this method belongs here, lets move it to the call site.

[lushnikov, 2016/05/03 23:19:27]

Introduced property.nameRange() and property.valueRange() methods

     {
         var style = cssProperty.ownerStyle;
         if (!style || !style.parentRule || !style.styleSheetId)
             return null;
 
         var range = cssProperty.range;
-        if (!range)
+        var text = cssProperty.text;
+        var header = style.cssModel().styleSheetHeaderForId(style.styleSheetId);
+        if (!range || !text || !header)
             return null;
 
-        var header = style.cssModel().styleSheetHeaderForId(style.styleSheetId);
-        if (!header)
-            return null;
-
-        var line = forName ? range.startLine : range.endLine;
-        // End of range is exclusive, so subtract 1 from the end offset.
-        var column = forName ? range.startColumn : range.endColumn - (cssProperty.text && cssProperty.text.endsWith(";") ? 2 : 1);
-        var rawLocation = new WebInspector.CSSLocation(header, header.lineNumberInSource(line), header.columnNumberInSource(line, column));
+        var textCursor = new WebInspector.TextCursor(cssProperty.text.computeLineEndings());
+        if (forName) {
+            var nameIndex = text.indexOf(cssProperty.name);
+            textCursor.resetTo(nameIndex);
+        } else {
+            var valueIndex = text.lastIndexOf(cssProperty.value);
+            textCursor.resetTo(valueIndex + cssProperty.value.length);

[pfeldman, 2016/05/03 17:52:29]

You want to accompany this with a test. Otherwise lgtm.

[lushnikov, 2016/05/03 23:19:27]

Done.

+        }
+        var lineNumber = range.startLine;
+        var columnNumber = range.startColumn;
+        if (textCursor.lineNumber() === 0) {
+            columnNumber += textCursor.columnNumber();
+        } else {
+            lineNumber += textCursor.lineNumber();
+            columnNumber = textCursor.columnNumber();
+        }
+        var rawLocation = new WebInspector.CSSLocation(header, header.lineNumberInSource(lineNumber), header.columnNumberInSource(lineNumber, columnNumber));
         return this.rawLocationToUILocation(rawLocation);
     },
 
     /**
      * @param {?WebInspector.CSSLocation} rawLocation
      * @return {?WebInspector.UILocation}
      */
     rawLocationToUILocation: function(rawLocation)
     {
         if (!rawLocation)
@@ skipping 286 matching lines @@
      * @param {number} lineNumber
      * @return {boolean}
      */
     uiLineHasMapping: function(uiSourceCode, lineNumber) { }
 }
 
 /**
  * @type {!WebInspector.CSSWorkspaceBinding}
  */
 WebInspector.cssWorkspaceBinding;