Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(9)

Unified Diff: third_party/WebKit/Source/devtools/front_end/formatter_worker/FormattedContentBuilder.js

Issue 2466123002: DevTools: reformat front-end code to match chromium style. (Closed)
Patch Set: all done Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/devtools/front_end/formatter_worker/FormattedContentBuilder.js
diff --git a/third_party/WebKit/Source/devtools/front_end/formatter_worker/FormattedContentBuilder.js b/third_party/WebKit/Source/devtools/front_end/formatter_worker/FormattedContentBuilder.js
index b454ef2f0430890f4c12355662b55e846848c887..1a838d10e31460c1ba87cd79d1c7f187934d9015 100644
--- a/third_party/WebKit/Source/devtools/front_end/formatter_worker/FormattedContentBuilder.js
+++ b/third_party/WebKit/Source/devtools/front_end/formatter_worker/FormattedContentBuilder.js
@@ -1,13 +1,14 @@
// Copyright 2016 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
- * @param {string} indentString
+ * @unrestricted
*/
-WebInspector.FormattedContentBuilder = function(indentString)
-{
+WebInspector.FormattedContentBuilder = class {
+ /**
+ * @param {string} indentString
+ */
+ constructor(indentString) {
this._lastOriginalPosition = 0;
this._formattedContent = [];
@@ -15,7 +16,7 @@ WebInspector.FormattedContentBuilder = function(indentString)
this._lastFormattedPosition = 0;
/** @type {!{original: !Array.<number>, formatted: !Array.<number>}} */
- this._mapping = { original: [0], formatted: [0] };
+ this._mapping = {original: [0], formatted: [0]};
this._nestingLevel = 0;
this._indentString = indentString;
@@ -26,147 +27,132 @@ WebInspector.FormattedContentBuilder = function(indentString)
this._softSpace = false;
this._hardSpaces = 0;
this._enforceSpaceBetweenWords = true;
-};
-
-WebInspector.FormattedContentBuilder.prototype = {
- /**
- * @param {boolean} value
- * @return {boolean}
- */
- setEnforceSpaceBetweenWords: function(value)
- {
- var oldValue = this._enforceSpaceBetweenWords;
- this._enforceSpaceBetweenWords = value;
- return oldValue;
- },
-
- /**
- * @param {string} token
- * @param {number} offset
- */
- addToken: function(token, offset)
- {
- var last = this._formattedContent.peekLast();
- if (this._enforceSpaceBetweenWords && last && /\w/.test(last[last.length - 1]) && /\w/.test(token))
- this.addSoftSpace();
-
- this._appendFormatting();
-
- // Insert token.
- this._addMappingIfNeeded(offset);
- this._addText(token);
- },
-
- addSoftSpace: function()
- {
- if (!this._hardSpaces)
- this._softSpace = true;
- },
-
- addHardSpace: function()
- {
- this._softSpace = false;
- ++this._hardSpaces;
- },
-
- /**
- * @param {boolean=} noSquash
- */
- addNewLine: function(noSquash)
- {
- // Avoid leading newlines.
- if (!this._formattedContentLength)
- return;
- if (noSquash)
- ++this._newLines;
- else
- this._newLines = this._newLines || 1;
- },
-
- increaseNestingLevel: function()
- {
- this._nestingLevel += 1;
- },
-
- decreaseNestingLevel: function()
- {
- if (this._nestingLevel > 0)
- this._nestingLevel -= 1;
- },
-
- _appendFormatting: function()
- {
- if (this._newLines) {
- for (var i = 0; i < this._newLines; ++i)
- this._addText("\n");
- this._addText(this._indent());
- } else if (this._softSpace) {
- this._addText(" ");
- }
- if (this._hardSpaces) {
- for (var i = 0; i < this._hardSpaces; ++i)
- this._addText(" ");
- }
- this._newLines = 0;
- this._softSpace = false;
- this._hardSpaces = 0;
- },
-
- /**
- * @return {string}
- */
- content: function()
- {
- return this._formattedContent.join("") + (this._newLines ? "\n" : "");
- },
-
- /**
- * @return {!{original: !Array.<number>, formatted: !Array.<number>}}
- */
- mapping: function()
- {
- return this._mapping;
- },
-
- /**
- * @return {string}
- */
- _indent: function()
- {
- var cachedValue = this._cachedIndents.get(this._nestingLevel);
- if (cachedValue)
- return cachedValue;
-
- var fullIndent = "";
- for (var i = 0; i < this._nestingLevel; ++i)
- fullIndent += this._indentString;
-
- // Cache a maximum of 20 nesting level indents.
- if (this._nestingLevel <= 20)
- this._cachedIndents.set(this._nestingLevel, fullIndent);
- return fullIndent;
- },
-
- /**
- * @param {string} text
- */
- _addText: function(text)
- {
- this._formattedContent.push(text);
- this._formattedContentLength += text.length;
- },
-
- /**
- * @param {number} originalPosition
- */
- _addMappingIfNeeded: function(originalPosition)
- {
- if (originalPosition - this._lastOriginalPosition === this._formattedContentLength - this._lastFormattedPosition)
- return;
- this._mapping.original.push(originalPosition);
- this._lastOriginalPosition = originalPosition;
- this._mapping.formatted.push(this._formattedContentLength);
- this._lastFormattedPosition = this._formattedContentLength;
+ }
+
+ /**
+ * @param {boolean} value
+ * @return {boolean}
+ */
+ setEnforceSpaceBetweenWords(value) {
+ var oldValue = this._enforceSpaceBetweenWords;
+ this._enforceSpaceBetweenWords = value;
+ return oldValue;
+ }
+
+ /**
+ * @param {string} token
+ * @param {number} offset
+ */
+ addToken(token, offset) {
+ var last = this._formattedContent.peekLast();
+ if (this._enforceSpaceBetweenWords && last && /\w/.test(last[last.length - 1]) && /\w/.test(token))
+ this.addSoftSpace();
+
+ this._appendFormatting();
+
+ // Insert token.
+ this._addMappingIfNeeded(offset);
+ this._addText(token);
+ }
+
+ addSoftSpace() {
+ if (!this._hardSpaces)
+ this._softSpace = true;
+ }
+
+ addHardSpace() {
+ this._softSpace = false;
+ ++this._hardSpaces;
+ }
+
+ /**
+ * @param {boolean=} noSquash
+ */
+ addNewLine(noSquash) {
+ // Avoid leading newlines.
+ if (!this._formattedContentLength)
+ return;
+ if (noSquash)
+ ++this._newLines;
+ else
+ this._newLines = this._newLines || 1;
+ }
+
+ increaseNestingLevel() {
+ this._nestingLevel += 1;
+ }
+
+ decreaseNestingLevel() {
+ if (this._nestingLevel > 0)
+ this._nestingLevel -= 1;
+ }
+
+ _appendFormatting() {
+ if (this._newLines) {
+ for (var i = 0; i < this._newLines; ++i)
+ this._addText('\n');
+ this._addText(this._indent());
+ } else if (this._softSpace) {
+ this._addText(' ');
+ }
+ if (this._hardSpaces) {
+ for (var i = 0; i < this._hardSpaces; ++i)
+ this._addText(' ');
}
+ this._newLines = 0;
+ this._softSpace = false;
+ this._hardSpaces = 0;
+ }
+
+ /**
+ * @return {string}
+ */
+ content() {
+ return this._formattedContent.join('') + (this._newLines ? '\n' : '');
+ }
+
+ /**
+ * @return {!{original: !Array.<number>, formatted: !Array.<number>}}
+ */
+ mapping() {
+ return this._mapping;
+ }
+
+ /**
+ * @return {string}
+ */
+ _indent() {
+ var cachedValue = this._cachedIndents.get(this._nestingLevel);
+ if (cachedValue)
+ return cachedValue;
+
+ var fullIndent = '';
+ for (var i = 0; i < this._nestingLevel; ++i)
+ fullIndent += this._indentString;
+
+ // Cache a maximum of 20 nesting level indents.
+ if (this._nestingLevel <= 20)
+ this._cachedIndents.set(this._nestingLevel, fullIndent);
+ return fullIndent;
+ }
+
+ /**
+ * @param {string} text
+ */
+ _addText(text) {
+ this._formattedContent.push(text);
+ this._formattedContentLength += text.length;
+ }
+
+ /**
+ * @param {number} originalPosition
+ */
+ _addMappingIfNeeded(originalPosition) {
+ if (originalPosition - this._lastOriginalPosition === this._formattedContentLength - this._lastFormattedPosition)
+ return;
+ this._mapping.original.push(originalPosition);
+ this._lastOriginalPosition = originalPosition;
+ this._mapping.formatted.push(this._formattedContentLength);
+ this._lastFormattedPosition = this._formattedContentLength;
+ }
};
-

Powered by Google App Engine
This is Rietveld 408576698