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

Unified Diff: third_party/WebKit/Source/devtools/front_end/formatter_worker/AcornTokenizer.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/AcornTokenizer.js
diff --git a/third_party/WebKit/Source/devtools/front_end/formatter_worker/AcornTokenizer.js b/third_party/WebKit/Source/devtools/front_end/formatter_worker/AcornTokenizer.js
index be58e380cac0cb0065fad53570f4865763707aa2..dd70a031755fa510541d8f69b833ce18c61a93e4 100644
--- a/third_party/WebKit/Source/devtools/front_end/formatter_worker/AcornTokenizer.js
+++ b/third_party/WebKit/Source/devtools/front_end/formatter_worker/AcornTokenizer.js
@@ -1,148 +1,136 @@
// Copyright (c) 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
- * @param {string} content
+ * @unrestricted
*/
-WebInspector.AcornTokenizer = function(content)
-{
+WebInspector.AcornTokenizer = class {
+ /**
+ * @param {string} content
+ */
+ constructor(content) {
this._content = content;
this._comments = [];
- this._tokenizer = acorn.tokenizer(this._content, { ecmaVersion: 6, onComment: this._comments });
+ this._tokenizer = acorn.tokenizer(this._content, {ecmaVersion: 6, onComment: this._comments});
this._lineEndings = this._content.computeLineEndings();
this._lineNumber = 0;
this._tokenLineStart = 0;
this._tokenLineEnd = 0;
this._nextTokenInternal();
-};
+ }
-/**
- * @param {!Acorn.TokenOrComment} token
- * @param {string=} values
- * @return {boolean}
- */
-WebInspector.AcornTokenizer.punctuator = function(token, values)
-{
- return token.type !== acorn.tokTypes.num &&
- token.type !== acorn.tokTypes.regexp &&
- token.type !== acorn.tokTypes.string &&
- token.type !== acorn.tokTypes.name &&
- !token.type.keyword &&
+ /**
+ * @param {!Acorn.TokenOrComment} token
+ * @param {string=} values
+ * @return {boolean}
+ */
+ static punctuator(token, values) {
+ return token.type !== acorn.tokTypes.num && token.type !== acorn.tokTypes.regexp &&
+ token.type !== acorn.tokTypes.string && token.type !== acorn.tokTypes.name && !token.type.keyword &&
(!values || (token.type.label.length === 1 && values.indexOf(token.type.label) !== -1));
-};
+ }
-/**
- * @param {!Acorn.TokenOrComment} token
- * @param {string=} keyword
- * @return {boolean}
- */
-WebInspector.AcornTokenizer.keyword = function(token, keyword)
-{
+ /**
+ * @param {!Acorn.TokenOrComment} token
+ * @param {string=} keyword
+ * @return {boolean}
+ */
+ static keyword(token, keyword) {
return !!token.type.keyword && token.type !== acorn.tokTypes._true && token.type !== acorn.tokTypes._false &&
token.type !== acorn.tokTypes._null && (!keyword || token.type.keyword === keyword);
-};
+ }
-/**
- * @param {!Acorn.TokenOrComment} token
- * @param {string=} identifier
- * @return {boolean}
- */
-WebInspector.AcornTokenizer.identifier = function(token, identifier)
-{
+ /**
+ * @param {!Acorn.TokenOrComment} token
+ * @param {string=} identifier
+ * @return {boolean}
+ */
+ static identifier(token, identifier) {
return token.type === acorn.tokTypes.name && (!identifier || token.value === identifier);
-};
+ }
-/**
- * @param {!Acorn.TokenOrComment} token
- * @return {boolean}
- */
-WebInspector.AcornTokenizer.lineComment = function(token)
-{
- return token.type === "Line";
-};
+ /**
+ * @param {!Acorn.TokenOrComment} token
+ * @return {boolean}
+ */
+ static lineComment(token) {
+ return token.type === 'Line';
+ }
-/**
- * @param {!Acorn.TokenOrComment} token
- * @return {boolean}
- */
-WebInspector.AcornTokenizer.blockComment = function(token)
-{
- return token.type === "Block";
-};
+ /**
+ * @param {!Acorn.TokenOrComment} token
+ * @return {boolean}
+ */
+ static blockComment(token) {
+ return token.type === 'Block';
+ }
+
+ /**
+ * @return {!Acorn.TokenOrComment}
+ */
+ _nextTokenInternal() {
+ if (this._comments.length)
+ return this._comments.shift();
+ var token = this._bufferedToken;
+
+ this._bufferedToken = this._tokenizer.getToken();
+ return token;
+ }
+
+ /**
+ * @param {number} position
+ * @return {number}
+ */
+ _rollLineNumberToPosition(position) {
+ while (this._lineNumber + 1 < this._lineEndings.length && position > this._lineEndings[this._lineNumber])
+ ++this._lineNumber;
+ return this._lineNumber;
+ }
+
+ /**
+ * @return {?Acorn.TokenOrComment}
+ */
+ nextToken() {
+ var token = this._nextTokenInternal();
+ if (token.type === acorn.tokTypes.eof)
+ return null;
-WebInspector.AcornTokenizer.prototype = {
- /**
- * @return {!Acorn.TokenOrComment}
- */
- _nextTokenInternal: function()
- {
- if (this._comments.length)
- return this._comments.shift();
- var token = this._bufferedToken;
-
- this._bufferedToken = this._tokenizer.getToken();
- return token;
- },
-
- /**
- * @param {number} position
- * @return {number}
- */
- _rollLineNumberToPosition: function(position)
- {
- while (this._lineNumber + 1 < this._lineEndings.length && position > this._lineEndings[this._lineNumber])
- ++this._lineNumber;
- return this._lineNumber;
- },
-
- /**
- * @return {?Acorn.TokenOrComment}
- */
- nextToken: function()
- {
- var token = this._nextTokenInternal();
- if (token.type === acorn.tokTypes.eof)
- return null;
-
- this._tokenLineStart = this._rollLineNumberToPosition(token.start);
- this._tokenLineEnd = this._rollLineNumberToPosition(token.end);
- this._tokenColumnStart = this._tokenLineStart > 0 ? token.start - this._lineEndings[this._tokenLineStart - 1] - 1 : token.start;
- return token;
- },
-
- /**
- * @return {?Acorn.TokenOrComment}
- */
- peekToken: function()
- {
- if (this._comments.length)
- return this._comments[0];
- return this._bufferedToken.type !== acorn.tokTypes.eof ? this._bufferedToken : null;
- },
-
- /**
- * @return {number}
- */
- tokenLineStart: function()
- {
- return this._tokenLineStart;
- },
-
- /**
- * @return {number}
- */
- tokenLineEnd: function()
- {
- return this._tokenLineEnd;
- },
-
- /**
- * @return {number}
- */
- tokenColumnStart: function()
- {
- return this._tokenColumnStart;
- }
+ this._tokenLineStart = this._rollLineNumberToPosition(token.start);
+ this._tokenLineEnd = this._rollLineNumberToPosition(token.end);
+ this._tokenColumnStart =
+ this._tokenLineStart > 0 ? token.start - this._lineEndings[this._tokenLineStart - 1] - 1 : token.start;
+ return token;
+ }
+
+ /**
+ * @return {?Acorn.TokenOrComment}
+ */
+ peekToken() {
+ if (this._comments.length)
+ return this._comments[0];
+ return this._bufferedToken.type !== acorn.tokTypes.eof ? this._bufferedToken : null;
+ }
+
+ /**
+ * @return {number}
+ */
+ tokenLineStart() {
+ return this._tokenLineStart;
+ }
+
+ /**
+ * @return {number}
+ */
+ tokenLineEnd() {
+ return this._tokenLineEnd;
+ }
+
+ /**
+ * @return {number}
+ */
+ tokenColumnStart() {
+ return this._tokenColumnStart;
+ }
};
+
+

Powered by Google App Engine
This is Rietveld 408576698