DevTools: simplify WI.FormattedContentBuilder

third_party/WebKit/Source/devtools/front_end/formatter_worker/JavaScriptFormatter.js

 /*
  * Copyright (C) 2011 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 28 matching lines @@
 
 WebInspector.JavaScriptFormatter.prototype = {
     /**
      * @param {string} text
      * @param {!Array<number>} lineEndings
      * @param {number} fromOffset
      * @param {number} toOffset
      */
     format: function(text, lineEndings, fromOffset, toOffset)
     {
-        this._lineOffset = lineEndings.lowerBound(fromOffset);
         this._fromOffset = fromOffset;
         this._toOffset = toOffset;
         this._content = text.substring(this._fromOffset, this._toOffset);
         this._tokenizer = new WebInspector.AcornTokenizer(this._content);
         var ast = acorn.parse(this._content, { ranges: false, ecmaVersion: 6 });
         var walker = new WebInspector.ESTreeWalker(this._beforeVisit.bind(this), this._afterVisit.bind(this));
         walker.walk(ast);
     },
 
     /**
      * @param {?Acorn.TokenOrComment} token
      * @param {string} format
      */
     _push: function(token, format)
     {
         for (var i = 0; i < format.length; ++i) {
             if (format[i] === "s")
                 this._builder.addSoftSpace();
             else if (format[i] === "S")
                 this._builder.addHardSpace();
             else if (format[i] === "n")
                 this._builder.addNewLine();
             else if (format[i] === ">")
                 this._builder.increaseNestingLevel();
             else if (format[i] === "<")
                 this._builder.decreaseNestingLevel();
             else if (format[i] === "t")
-                this._builder.addToken(this._content.substring(token.start, token.end), this._fromOffset + token.start, this._lineOffset + this._tokenizer.tokenLineStart(), this._lineOffset + this._tokenizer.tokenLineEnd());
+                this._builder.addToken(this._content.substring(token.start, token.end), this._fromOffset + token.start);
         }
     },
 
     /**
      * @param {!ESTree.Node} node
      */
     _beforeVisit: function(node)
     {
         if (!node.parent)
             return;
@@ skipping 37 matching lines @@
      * @param {!ESTree.Node} node
      * @param {!Acorn.TokenOrComment} token
      * @return {string}
      */
     _formatToken: function(node, token)
     {
         var AT = WebInspector.AcornTokenizer;
         if (AT.lineComment(token))
             return "tn";
         if (AT.blockComment(token))
-            return "t";
+            return "tn";
         if (node.type === "ContinueStatement" || node.type === "BreakStatement") {
             return node.label && AT.keyword(token) ? "ts" : "t";
         } else if (node.type === "Identifier") {
             return "t";
         } else if (node.type === "ReturnStatement") {
             if (AT.punctuator(token, ";"))
                 return "t";
             return node.argument ? "ts" : "t";
         } else if (node.type === "Property") {
             if (AT.punctuator(token, ":"))
@@ skipping 152 matching lines @@
                 if (node.consequent.type !== "BlockStatement")
                     return "<";
             }
         } else if (node.type === "BreakStatement" || node.type === "ThrowStatement" || node.type === "ReturnStatement" || node.type === "ExpressionStatement") {
             return "n";
         }
         return "";
     }
 }