DevTools: don't cherrypick Common files for Gonzales

Previous, Gonzales was cherrypicking files from Common module for the
TextRange class which was used as a struct.

BUG=none

Review-Url: https://codereview.chromium.org/2625163002
Cr-Commit-Position: refs/heads/master@{#443148}

third_party/WebKit/Source/devtools/.eslintignore

@@ -7,6 +7,6 @@ front_end/cm_modes/*
 front_end/cm_web_modes/*
 front_end/diff/diff_match_patch.js
 front_end/formatter_worker/acorn/acorn.js
-front_end/gonzales/*
+front_end/gonzales/gonzales-scss.js
 front_end/terminal/xterm.js/**
 front_end/protocol_externs.js

third_party/WebKit/Source/devtools/front_end/formatter_worker/module.json

@@ -6,8 +6,6 @@
     "scripts": [
         "../cm_web_modes/css.js",
         "../cm_web_modes/xml.js",
-        "../common/Text.js",
-        "../common/TextRange.js",
         "ESTreeWalker.js",
         "FormatterWorker.js",
         "acorn/acorn.js",

third_party/WebKit/Source/devtools/front_end/gonzales/SCSSParser.js

@@ -3,33 +3,25 @@
 // found in the LICENSE file.
 
 /**
- * @constructor
  * @implements {FormatterWorker.FormatterWorkerContentParser}
+ * @unrestricted
  */
-Gonzales.SCSSParser = function()
-{
-}
-
-Gonzales.SCSSParser.prototype = {
+Gonzales.SCSSParser = class {
   /**
    * @override
    * @param {string} content
    * @return {!Array<!Gonzales.SCSSParser.Rule>}
    */
-    parse: function(content)
-    {
+  parse(content) {
     var ast = null;
     try {
-            ast = gonzales.parse(content, {syntax: "scss"});
+      ast = gonzales.parse(content, {syntax: 'scss'});
     } catch (e) {
       return [];
     }
 
     /** @type {!{properties: !Array<!Gonzales.Node>, node: !Gonzales.Node}} */
-        var rootBlock = {
-            properties: [],
-            node: ast
-        };
+    var rootBlock = {properties: [], node: ast};
     /** @type {!Array<!{properties: !Array<!Gonzales.Node>, node: !Gonzales.Node}>} */
     var blocks = [rootBlock];
     ast.selectors = [];
@@ -39,123 +31,118 @@ Gonzales.SCSSParser.prototype = {
     for (var block of blocks)
       this._handleBlock(block, rules);
     return rules;
-    },
+  }
 
   /**
    * @param {!{node: !Gonzales.Node, properties: !Array<!Gonzales.Node>}} block
    * @param {!Array<!Gonzales.SCSSParser.Rule>} output
    */
-    _handleBlock: function(block, output)
-    {
+  _handleBlock(block, output) {
     var selectors = block.node.selectors.map(Gonzales.SCSSParser.rangeFromNode);
     var properties = [];
     var styleRange = Gonzales.SCSSParser.rangeFromNode(block.node);
     styleRange.startColumn += 1;
     styleRange.endColumn -= 1;
     for (var node of block.properties) {
-            if (node.type === "declaration")
+      if (node.type === 'declaration')
         this._handleDeclaration(node, properties);
-            else if (node.type === "include")
+      else if (node.type === 'include')
         this._handleInclude(node, properties);
-            else if (node.type === "multilineComment" && node.start.line === node.end.line)
+      else if (node.type === 'multilineComment' && node.start.line === node.end.line)
         this._handleComment(node, properties);
     }
     if (!selectors.length && !properties.length)
       return;
     var rule = new Gonzales.SCSSParser.Rule(selectors, properties, styleRange);
     output.push(rule);
-    },
+  }
 
   /**
    * @param {!Gonzales.Node} node
    * @param {!Array<!Gonzales.SCSSParser.Property>} output
    */
-    _handleDeclaration: function(node, output)
-    {
-        var propertyNode = node.content.find(node => node.type === "property");
-        var valueNode = node.content.find(node => node.type === "value");
+  _handleDeclaration(node, output) {
+    var propertyNode = node.content.find(node => node.type === 'property');
+    var valueNode = node.content.find(node => node.type === 'value');
     if (!propertyNode || !valueNode)
       return;
 
     var nameRange = Gonzales.SCSSParser.rangeFromNode(propertyNode);
     var valueRange = Gonzales.SCSSParser.rangeFromNode(valueNode);
-        var range = /** @type {!Common.TextRange} */(node.declarationRange);
+    var range = /** @type {!Gonzales.TextRange} */ (node.declarationRange);
 
     var property = new Gonzales.SCSSParser.Property(range, nameRange, valueRange, false);
     output.push(property);
-    },
+  }
 
   /**
    * @param {!Gonzales.Node} node
    * @param {!Array<!Gonzales.SCSSParser.Property>} output
    */
-    _handleInclude: function(node, output)
-    {
-        var mixinName = node.content.find(node => node.type === "ident");
+  _handleInclude(node, output) {
+    var mixinName = node.content.find(node => node.type === 'ident');
     if (!mixinName)
       return;
     var nameRange = Gonzales.SCSSParser.rangeFromNode(mixinName);
-        var mixinArguments = node.content.find(node => node.type === "arguments");
+    var mixinArguments = node.content.find(node => node.type === 'arguments');
     if (!mixinArguments)
       return;
-        var parameters = mixinArguments.content.filter(node => node.type !== "delimiter" && node.type !== "space");
+    var parameters = mixinArguments.content.filter(node => node.type !== 'delimiter' && node.type !== 'space');
     for (var parameter of parameters) {
       var range = Gonzales.SCSSParser.rangeFromNode(node);
       var valueRange = Gonzales.SCSSParser.rangeFromNode(parameter);
       var property = new Gonzales.SCSSParser.Property(range, nameRange, valueRange, false);
       output.push(property);
     }
-    },
+  }
 
   /**
    * @param {!Gonzales.Node} node
    * @param {!Array<!Gonzales.SCSSParser.Property>} output
    */
-    _handleComment: function(node, output)
-    {
+  _handleComment(node, output) {
     if (node.start.line !== node.end.line)
       return;
-        var innerText = /** @type {string} */(node.content);
+    var innerText = /** @type {string} */ (node.content);
     var innerResult = this.parse(innerText);
     if (innerResult.length !== 1 || innerResult[0].properties.length !== 1)
       return;
     var property = innerResult[0].properties[0];
     var disabledProperty = property.rebaseInsideOneLineComment(node);
     output.push(disabledProperty);
-    },
-}
+  }
+};
 
 /**
  * @param {!Gonzales.Node} node
- * @return {!Common.TextRange}
+ * @return {!Gonzales.TextRange}
  */
-Gonzales.SCSSParser.rangeFromNode = function(node)
-{
-    return new Common.TextRange(node.start.line - 1, node.start.column - 1, node.end.line - 1, node.end.column);
-}
+Gonzales.SCSSParser.rangeFromNode = function(node) {
+  return new Gonzales.TextRange(node.start.line - 1, node.start.column - 1, node.end.line - 1, node.end.column);
+};
 
 /**
- * @constructor
- * @param {!Common.TextRange} range
- * @param {!Common.TextRange} nameRange
- * @param {!Common.TextRange} valueRange
+ * @unrestricted
+ */
+Gonzales.SCSSParser.Property = class {
+  /**
+   * @param {!Gonzales.TextRange} range
+   * @param {!Gonzales.TextRange} nameRange
+   * @param {!Gonzales.TextRange} valueRange
    * @param {boolean} disabled
    */
-Gonzales.SCSSParser.Property = function(range, nameRange, valueRange, disabled)
-{
+  constructor(range, nameRange, valueRange, disabled) {
     this.range = range;
     this.name = nameRange;
     this.value = valueRange;
     this.disabled = disabled;
-}
+  }
 
-Gonzales.SCSSParser.Property.prototype = {
   /**
    * @param {!Gonzales.Node} commentNode
    * @return {!Gonzales.SCSSParser.Property}
    */
-    rebaseInsideOneLineComment: function(commentNode)
-    {
+  rebaseInsideOneLineComment(commentNode) {
     var lineOffset = commentNode.start.line - 1;
     // Account for the "/*".
     var columnOffset = commentNode.start.column - 1 + 2;
@@ -165,66 +152,68 @@ Gonzales.SCSSParser.Property.prototype = {
     return new Gonzales.SCSSParser.Property(range, name, value, true);
 
     /**
-         * @param {!Common.TextRange} range
+     * @param {!Gonzales.TextRange} range
      * @param {number} lineOffset
      * @param {number} columnOffset
-         * @return {!Common.TextRange}
+     * @return {!Gonzales.TextRange}
      */
-        function rebaseRange(range, lineOffset, columnOffset)
-        {
-            return new Common.TextRange(range.startLine + lineOffset, range.startColumn + columnOffset, range.endLine + lineOffset, range.endColumn + columnOffset);
+    function rebaseRange(range, lineOffset, columnOffset) {
+      return new Gonzales.TextRange(
+          range.startLine + lineOffset, range.startColumn + columnOffset, range.endLine + lineOffset,
+          range.endColumn + columnOffset);
     }
   }
-}
+};
 
 /**
- * @constructor
- * @param {!Array<!Common.TextRange>} selectors
+ * @unrestricted
+ */
+Gonzales.SCSSParser.Rule = class {
+  /**
+   * @param {!Array<!Gonzales.TextRange>} selectors
    * @param {!Array<!Gonzales.SCSSParser.Property>} properties
- * @param {!Common.TextRange} styleRange
+   * @param {!Gonzales.TextRange} styleRange
    */
-Gonzales.SCSSParser.Rule = function(selectors, properties, styleRange)
-{
+  constructor(selectors, properties, styleRange) {
     this.selectors = selectors;
     this.properties = properties;
     this.styleRange = styleRange;
-}
+  }
+};
 
 /**
  * @param {!Gonzales.Node} node
  * @param {!Array<{node: !Gonzales.Node, properties: !Array<!Gonzales.Node>}>} blocks
  * @param {!{node: !Gonzales.Node, properties: !Array<!Gonzales.Node>}} lastBlock
  */
-Gonzales.SCSSParser.extractNodes = function(node, blocks, lastBlock)
-{
+Gonzales.SCSSParser.extractNodes = function(node, blocks, lastBlock) {
   if (!Array.isArray(node.content))
     return;
-    if (node.type === "block") {
-        lastBlock = {
-            node: node,
-            properties: []
-        };
+  if (node.type === 'block') {
+    lastBlock = {node: node, properties: []};
     blocks.push(lastBlock);
   }
   var lastDeclaration = null;
   var selectors = [];
   for (var i = 0; i < node.content.length; ++i) {
     var child = node.content[i];
-        if (child.type === "declarationDelimiter" && lastDeclaration) {
+    if (child.type === 'declarationDelimiter' && lastDeclaration) {
       lastDeclaration.declarationRange.endLine = child.end.line - 1;
       lastDeclaration.declarationRange.endColumn = child.end.column;
       lastDeclaration = null;
-        } else if (child.type === "selector") {
+    } else if (child.type === 'selector') {
       selectors.push(child);
-        } else if (child.type === "block") {
+    } else if (child.type === 'block') {
       child.selectors = selectors;
       selectors = [];
     }
-        if (child.type === "include" || child.type === "declaration" || child.type === "multilineComment")
+    if (child.type === 'include' || child.type === 'declaration' || child.type === 'multilineComment')
       lastBlock.properties.push(child);
-        if (child.type === "declaration") {
+    if (child.type === 'declaration') {
       lastDeclaration = child;
-            lastDeclaration.declarationRange = Common.TextRange.createFromLocation(child.start.line - 1, child.start.column - 1);
+      const line = child.start.line - 1;
+      const column = child.start.column - 1;
+      lastDeclaration.declarationRange = new Gonzales.TextRange(line, column, line, column);
     }
     Gonzales.SCSSParser.extractNodes(child, blocks, lastBlock);
   }
@@ -232,4 +221,22 @@ Gonzales.SCSSParser.extractNodes = function(node, blocks, lastBlock)
     lastDeclaration.declarationRange.endLine = node.end.line - 1;
     lastDeclaration.declarationRange.endColumn = node.end.column - 1;
   }
-}
+};
+
+/**
+ * @unrestricted
+ */
+Gonzales.TextRange = class {
+  /**
+   * @param {number} startLine
+   * @param {number} startColumn
+   * @param {number} endLine
+   * @param {number} endColumn
+   */
+  constructor(startLine, startColumn, endLine, endColumn) {
+    this.startLine = startLine;
+    this.startColumn = startColumn;
+    this.endLine = endLine;
+    this.endColumn = endColumn;
+  }
+};
\ No newline at end of file