DevTools: introduce goto-column functionality

Source/devtools/front_end/FilteredItemSelectionDialog.js

 /*
  * Copyright (C) 2012 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 606 matching lines @@
         this._uiSourceCodes = this._uiSourceCodes.concat(projects[i].uiSourceCodes());
     this._defaultScores = defaultScores;
     this._scorer = new WebInspector.FilePathScoreFunction("");
     WebInspector.workspace.addEventListener(WebInspector.Workspace.Events.UISourceCodeAdded, this._uiSourceCodeAdded, this);
 }
 
 WebInspector.SelectUISourceCodeDialog.prototype = {
     /**
      * @param {?WebInspector.UISourceCode} uiSourceCode
      * @param {number=} lineNumber
+     * @param {number=} columnNumber
      */
-    uiSourceCodeSelected: function(uiSourceCode, lineNumber)
+    uiSourceCodeSelected: function(uiSourceCode, lineNumber, columnNumber)
     {
         // Overridden by subclasses
     },
 
     /**
      * @param {!WebInspector.Project} project
      * @return {boolean}
      */
     filterProject: function(project)
     {
@@ skipping 43 matching lines @@
      * @param {number} itemIndex
      * @param {string} query
      * @param {!Element} titleElement
      * @param {!Element} subtitleElement
      * @return {!Array.<!Element>}
      */
     renderItem: function(itemIndex, query, titleElement, subtitleElement)
     {
         query = this.rewriteQuery(query);
         var uiSourceCode = this._uiSourceCodes[itemIndex];
-        titleElement.textContent = uiSourceCode.displayName() + (this._queryLineNumber ? this._queryLineNumber : "");
+        titleElement.textContent = uiSourceCode.displayName() + (this._queryLineNumberAndColumnNumber || "");
         subtitleElement.textContent = uiSourceCode.fullDisplayName().trimEnd(100);
 
         var indexes = [];
         var score = new WebInspector.FilePathScoreFunction(query).score(subtitleElement.textContent, indexes);
         var fileNameIndex = subtitleElement.textContent.lastIndexOf("/");
         var ranges = [];
         for (var i = 0; i < indexes.length; ++i)
             ranges.push({offset: indexes[i], length: 1});
         if (indexes[0] > fileNameIndex) {
             for (var i = 0; i < ranges.length; ++i)
                 ranges[i].offset -= fileNameIndex + 1;
             return WebInspector.highlightRangesWithStyleClass(titleElement, ranges, "highlight");
         } else {
             return WebInspector.highlightRangesWithStyleClass(subtitleElement, ranges, "highlight");
         }
     },
 
     /**
      * @param {number} itemIndex
      * @param {string} promptValue
      */
     selectItem: function(itemIndex, promptValue)
     {
-        if (/^:\d+$/.test(promptValue.trimRight())) {

[vsevik, 2014/01/27 17:19:11]

Let's keep trimRight

[lushnikov, 2014/01/28 13:27:07]

Done; even more: made trim() call here as it makes more sense

-            var lineNumber = parseInt(promptValue.trimRight().substring(1), 10) - 1;
-            if (!isNaN(lineNumber) && lineNumber >= 0)
-                this.uiSourceCodeSelected(null, lineNumber);
+        var gotoLineNumber = promptValue.match(/^(:\d+)(:\d+)?$/);
+        if (gotoLineNumber) {
+            var lineNumber = parseInt(gotoLineNumber[1].substr(1), 10) - 1;
+            var columnNumber;
+            if (gotoLineNumber[2])
+                columnNumber = parseInt(gotoLineNumber[2].substr(1), 10) - 1;
+            this.uiSourceCodeSelected(null, lineNumber, columnNumber);
             return;
         }
-        var lineNumberMatch = promptValue.match(/[^:]+\:([\d]*)$/);
-        var lineNumber = lineNumberMatch ? Math.max(parseInt(lineNumberMatch[1], 10) - 1, 0) : undefined;
-        this.uiSourceCodeSelected(this._uiSourceCodes[itemIndex], lineNumber);
+        var gotoSourceMatch = promptValue.match(/^[^:]+(:\d+)?(:\d+)?$/);

[vsevik, 2014/01/27 17:19:11]

A lot of code duplication here.

[lushnikov, 2014/01/28 13:27:07]

Done.

+        var lineNumber;
+        var columnNumber;
+        if (gotoSourceMatch[1])
+            lineNumber =  parseInt(gotoSourceMatch[1].substr(1), 10) - 1;
+        if (gotoSourceMatch[2])
+            columnNumber =  parseInt(gotoSourceMatch[2].substr(1), 10) - 1;
+        this.uiSourceCodeSelected(this._uiSourceCodes[itemIndex], lineNumber, columnNumber);
     },
 
     /**
      * @param {string} query
      * @return {string}
      */
     rewriteQuery: function(query)
     {
         if (!query)
             return query;
         query = query.trim();
-        var lineNumberMatch = query.match(/([^:]+)(\:[\d]*)$/);
-        this._queryLineNumber = lineNumberMatch ? lineNumberMatch[2] : "";
+        var lineNumberMatch = query.match(/^([^:]+)((?::[^:]*){0,2})$/);
+        this._queryLineNumberAndColumnNumber = lineNumberMatch ? lineNumberMatch[2] : "";
         return lineNumberMatch ? lineNumberMatch[1] : query;
     },
 
     /**
      * @param {!WebInspector.Event} event
      */
     _uiSourceCodeAdded: function(event)
     {
         var uiSourceCode = /** @type {!WebInspector.UISourceCode} */ (event.data);
         if (!this.filterProject(uiSourceCode.project()))
@@ skipping 20 matching lines @@
 {
     WebInspector.SelectUISourceCodeDialog.call(this, defaultScores);
     this._panel = panel;
 }
 
 WebInspector.OpenResourceDialog.prototype = {
 
     /**
      * @param {?WebInspector.UISourceCode} uiSourceCode
      * @param {number=} lineNumber
+     * @param {number=} columnNumber
      */
-    uiSourceCodeSelected: function(uiSourceCode, lineNumber)
+    uiSourceCodeSelected: function(uiSourceCode, lineNumber, columnNumber)
     {
         if (!uiSourceCode)
             uiSourceCode = this._panel.currentUISourceCode();
         if (!uiSourceCode)
             return;
-        this._panel.showUISourceCode(uiSourceCode, lineNumber);
+        this._panel.showUISourceCode(uiSourceCode, lineNumber, columnNumber);
     },
 
     /**
      * @param {string} query
      * @return {boolean}
      */
     shouldShowMatchingItems: function(query)
     {
         return !query.startsWith(":");
     },
@@ skipping 38 matching lines @@
 {
     this._type = type;
     WebInspector.SelectUISourceCodeDialog.call(this);
     this._callback = callback;
 }
 
 WebInspector.SelectUISourceCodeForProjectTypeDialog.prototype = {
     /**
      * @param {!WebInspector.UISourceCode} uiSourceCode
      * @param {number=} lineNumber
+     * @param {number=} columnNumber
      */
-    uiSourceCodeSelected: function(uiSourceCode, lineNumber)
+    uiSourceCodeSelected: function(uiSourceCode, lineNumber, columnNumber)
     {
         this._callback(uiSourceCode);
     },
 
     /**
      * @param {!WebInspector.Project} project
      * @return {boolean}
      */
     filterProject: function(project)
     {
@@ skipping 11 matching lines @@
 WebInspector.SelectUISourceCodeForProjectTypeDialog.show = function(name, type, callback, relativeToElement)
 {
     if (WebInspector.Dialog.currentInstance())
         return;
 
     var filteredItemSelectionDialog = new WebInspector.FilteredItemSelectionDialog(new WebInspector.SelectUISourceCodeForProjectTypeDialog(type, callback));
     filteredItemSelectionDialog.setQuery(name);
     filteredItemSelectionDialog.renderAsTwoRows();
     WebInspector.Dialog.show(relativeToElement, filteredItemSelectionDialog);
 }