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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: third_party/WebKit/Source/devtools/front_end/common/TextUtils.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
« no previous file with comments | « third_party/WebKit/Source/devtools/front_end/common/TextRange.js ('k') | third_party/WebKit/Source/devtools/front_end/common/Throttler.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/Source/devtools/front_end/common/TextUtils.js
diff --git a/third_party/WebKit/Source/devtools/front_end/common/TextUtils.js b/third_party/WebKit/Source/devtools/front_end/common/TextUtils.js
index 356a49cddfcbf2e3380cce88776a4928723a1c7e..aaa97e9e1de9d013d8e1a338744f1a49acbe0e66 100644
--- a/third_party/WebKit/Source/devtools/front_end/common/TextUtils.js
+++ b/third_party/WebKit/Source/devtools/front_end/common/TextUtils.js
@@ -27,185 +27,160 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-
WebInspector.TextUtils = {
- /**
- * @param {string} char
- * @return {boolean}
- */
- isStopChar: function(char)
- {
- return (char > " " && char < "0") ||
- (char > "9" && char < "A") ||
- (char > "Z" && char < "_") ||
- (char > "_" && char < "a") ||
- (char > "z" && char <= "~");
- },
+ /**
+ * @param {string} char
+ * @return {boolean}
+ */
+ isStopChar: function(char) {
+ return (char > ' ' && char < '0') || (char > '9' && char < 'A') || (char > 'Z' && char < '_') ||
+ (char > '_' && char < 'a') || (char > 'z' && char <= '~');
+ },
- /**
- * @param {string} char
- * @return {boolean}
- */
- isWordChar: function(char)
- {
- return !WebInspector.TextUtils.isStopChar(char) && !WebInspector.TextUtils.isSpaceChar(char);
- },
+ /**
+ * @param {string} char
+ * @return {boolean}
+ */
+ isWordChar: function(char) {
+ return !WebInspector.TextUtils.isStopChar(char) && !WebInspector.TextUtils.isSpaceChar(char);
+ },
- /**
- * @param {string} char
- * @return {boolean}
- */
- isSpaceChar: function(char)
- {
- return WebInspector.TextUtils._SpaceCharRegex.test(char);
- },
+ /**
+ * @param {string} char
+ * @return {boolean}
+ */
+ isSpaceChar: function(char) {
+ return WebInspector.TextUtils._SpaceCharRegex.test(char);
+ },
- /**
- * @param {string} word
- * @return {boolean}
- */
- isWord: function(word)
- {
- for (var i = 0; i < word.length; ++i) {
- if (!WebInspector.TextUtils.isWordChar(word.charAt(i)))
- return false;
- }
- return true;
- },
+ /**
+ * @param {string} word
+ * @return {boolean}
+ */
+ isWord: function(word) {
+ for (var i = 0; i < word.length; ++i) {
+ if (!WebInspector.TextUtils.isWordChar(word.charAt(i)))
+ return false;
+ }
+ return true;
+ },
- /**
- * @param {string} char
- * @return {boolean}
- */
- isOpeningBraceChar: function(char)
- {
- return char === "(" || char === "{";
- },
+ /**
+ * @param {string} char
+ * @return {boolean}
+ */
+ isOpeningBraceChar: function(char) {
+ return char === '(' || char === '{';
+ },
- /**
- * @param {string} char
- * @return {boolean}
- */
- isClosingBraceChar: function(char)
- {
- return char === ")" || char === "}";
- },
+ /**
+ * @param {string} char
+ * @return {boolean}
+ */
+ isClosingBraceChar: function(char) {
+ return char === ')' || char === '}';
+ },
- /**
- * @param {string} char
- * @return {boolean}
- */
- isBraceChar: function(char)
- {
- return WebInspector.TextUtils.isOpeningBraceChar(char) || WebInspector.TextUtils.isClosingBraceChar(char);
- },
+ /**
+ * @param {string} char
+ * @return {boolean}
+ */
+ isBraceChar: function(char) {
+ return WebInspector.TextUtils.isOpeningBraceChar(char) || WebInspector.TextUtils.isClosingBraceChar(char);
+ },
- /**
- * @param {string} text
- * @param {function(string):boolean} isWordChar
- * @param {function(string)} wordCallback
- */
- textToWords: function(text, isWordChar, wordCallback)
- {
- var startWord = -1;
- for (var i = 0; i < text.length; ++i) {
- if (!isWordChar(text.charAt(i))) {
- if (startWord !== -1)
- wordCallback(text.substring(startWord, i));
- startWord = -1;
- } else if (startWord === -1)
- startWord = i;
- }
+ /**
+ * @param {string} text
+ * @param {function(string):boolean} isWordChar
+ * @param {function(string)} wordCallback
+ */
+ textToWords: function(text, isWordChar, wordCallback) {
+ var startWord = -1;
+ for (var i = 0; i < text.length; ++i) {
+ if (!isWordChar(text.charAt(i))) {
if (startWord !== -1)
- wordCallback(text.substring(startWord));
- },
+ wordCallback(text.substring(startWord, i));
+ startWord = -1;
+ } else if (startWord === -1)
+ startWord = i;
+ }
+ if (startWord !== -1)
+ wordCallback(text.substring(startWord));
+ },
- /**
- * @param {string} line
- * @return {string}
- */
- lineIndent: function(line)
- {
- var indentation = 0;
- while (indentation < line.length && WebInspector.TextUtils.isSpaceChar(line.charAt(indentation)))
- ++indentation;
- return line.substr(0, indentation);
- },
+ /**
+ * @param {string} line
+ * @return {string}
+ */
+ lineIndent: function(line) {
+ var indentation = 0;
+ while (indentation < line.length && WebInspector.TextUtils.isSpaceChar(line.charAt(indentation)))
+ ++indentation;
+ return line.substr(0, indentation);
+ },
- /**
- * @param {string} text
- * @return {boolean}
- */
- isUpperCase: function(text)
- {
- return text === text.toUpperCase();
- },
+ /**
+ * @param {string} text
+ * @return {boolean}
+ */
+ isUpperCase: function(text) {
+ return text === text.toUpperCase();
+ },
- /**
- * @param {string} text
- * @return {boolean}
- */
- isLowerCase: function(text)
- {
- return text === text.toLowerCase();
- },
+ /**
+ * @param {string} text
+ * @return {boolean}
+ */
+ isLowerCase: function(text) {
+ return text === text.toLowerCase();
+ },
+
+ /**
+ * @param {string} text
+ * @param {!Array<!RegExp>} regexes
+ * @return {!Array<{value: string, position: number, regexIndex: number}>}
+ */
+ splitStringByRegexes(text, regexes) {
+ var matches = [];
+ var globalRegexes = [];
+ for (var i = 0; i < regexes.length; i++) {
+ var regex = regexes[i];
+ if (!regex.global)
+ globalRegexes.push(new RegExp(regex.source, regex.flags ? regex.flags + 'g' : 'g'));
+ else
+ globalRegexes.push(regex);
+ }
+ doSplit(text, 0, 0);
+ return matches;
/**
* @param {string} text
- * @param {!Array<!RegExp>} regexes
- * @return {!Array<{value: string, position: number, regexIndex: number}>}
+ * @param {number} regexIndex
+ * @param {number} startIndex
*/
- splitStringByRegexes(text, regexes)
- {
- var matches = [];
- var globalRegexes = [];
- for (var i = 0; i < regexes.length; i++) {
- var regex = regexes[i];
- if (!regex.global)
- globalRegexes.push(new RegExp(regex.source, regex.flags ? regex.flags + "g" : "g"));
- else
- globalRegexes.push(regex);
- }
- doSplit(text, 0, 0);
- return matches;
-
- /**
- * @param {string} text
- * @param {number} regexIndex
- * @param {number} startIndex
- */
- function doSplit(text, regexIndex, startIndex)
- {
- if (regexIndex >= globalRegexes.length) {
- // Set regexIndex as -1 if text did not match with any regular expression
- matches.push({
- value: text,
- position: startIndex,
- regexIndex: -1
- });
- return;
- }
- var regex = globalRegexes[regexIndex];
- var currentIndex = 0;
- var result;
- regex.lastIndex = 0;
- while ((result = regex.exec(text)) !== null) {
- var stringBeforeMatch = text.substring(currentIndex, result.index);
- if (stringBeforeMatch)
- doSplit(stringBeforeMatch, regexIndex + 1, startIndex + currentIndex);
- var match = result[0];
- matches.push({
- value: match,
- position: startIndex + result.index,
- regexIndex: regexIndex
- });
- currentIndex = result.index + match.length;
- }
- var stringAfterMatches = text.substring(currentIndex);
- if (stringAfterMatches)
- doSplit(stringAfterMatches, regexIndex + 1, startIndex + currentIndex);
- }
+ function doSplit(text, regexIndex, startIndex) {
+ if (regexIndex >= globalRegexes.length) {
+ // Set regexIndex as -1 if text did not match with any regular expression
+ matches.push({value: text, position: startIndex, regexIndex: -1});
+ return;
+ }
+ var regex = globalRegexes[regexIndex];
+ var currentIndex = 0;
+ var result;
+ regex.lastIndex = 0;
+ while ((result = regex.exec(text)) !== null) {
+ var stringBeforeMatch = text.substring(currentIndex, result.index);
+ if (stringBeforeMatch)
+ doSplit(stringBeforeMatch, regexIndex + 1, startIndex + currentIndex);
+ var match = result[0];
+ matches.push({value: match, position: startIndex + result.index, regexIndex: regexIndex});
+ currentIndex = result.index + match.length;
+ }
+ var stringAfterMatches = text.substring(currentIndex);
+ if (stringAfterMatches)
+ doSplit(stringAfterMatches, regexIndex + 1, startIndex + currentIndex);
}
+ }
};
WebInspector.TextUtils._SpaceCharRegex = /\s/;
@@ -214,95 +189,93 @@ WebInspector.TextUtils._SpaceCharRegex = /\s/;
* @enum {string}
*/
WebInspector.TextUtils.Indent = {
- TwoSpaces: " ",
- FourSpaces: " ",
- EightSpaces: " ",
- TabCharacter: "\t"
+ TwoSpaces: ' ',
+ FourSpaces: ' ',
+ EightSpaces: ' ',
+ TabCharacter: '\t'
};
/**
- * @constructor
- * @param {function(string)} callback
- * @param {boolean=} findMultiple
+ * @unrestricted
*/
-WebInspector.TextUtils.BalancedJSONTokenizer = function(callback, findMultiple)
-{
+WebInspector.TextUtils.BalancedJSONTokenizer = class {
+ /**
+ * @param {function(string)} callback
+ * @param {boolean=} findMultiple
+ */
+ constructor(callback, findMultiple) {
this._callback = callback;
this._index = 0;
this._balance = 0;
- this._buffer = "";
+ this._buffer = '';
this._findMultiple = findMultiple || false;
this._closingDoubleQuoteRegex = /[^\\](?:\\\\)*"/g;
-};
+ }
-WebInspector.TextUtils.BalancedJSONTokenizer.prototype = {
- /**
- * @param {string} chunk
- * @return {boolean}
- */
- write: function(chunk)
- {
- this._buffer += chunk;
- var lastIndex = this._buffer.length;
- var buffer = this._buffer;
- for (var index = this._index; index < lastIndex; ++index) {
- var character = buffer[index];
- if (character === "\"") {
- this._closingDoubleQuoteRegex.lastIndex = index;
- if (!this._closingDoubleQuoteRegex.test(buffer))
- break;
- index = this._closingDoubleQuoteRegex.lastIndex - 1;
- } else if (character === "{") {
- ++this._balance;
- } else if (character === "}") {
- --this._balance;
- if (this._balance < 0) {
- this._reportBalanced();
- return false;
- }
- if (!this._balance) {
- this._lastBalancedIndex = index + 1;
- if (!this._findMultiple)
- break;
- }
- } else if (character === "]" && !this._balance) {
- this._reportBalanced();
- return false;
- }
+ /**
+ * @param {string} chunk
+ * @return {boolean}
+ */
+ write(chunk) {
+ this._buffer += chunk;
+ var lastIndex = this._buffer.length;
+ var buffer = this._buffer;
+ for (var index = this._index; index < lastIndex; ++index) {
+ var character = buffer[index];
+ if (character === '"') {
+ this._closingDoubleQuoteRegex.lastIndex = index;
+ if (!this._closingDoubleQuoteRegex.test(buffer))
+ break;
+ index = this._closingDoubleQuoteRegex.lastIndex - 1;
+ } else if (character === '{') {
+ ++this._balance;
+ } else if (character === '}') {
+ --this._balance;
+ if (this._balance < 0) {
+ this._reportBalanced();
+ return false;
+ }
+ if (!this._balance) {
+ this._lastBalancedIndex = index + 1;
+ if (!this._findMultiple)
+ break;
}
- this._index = index;
+ } else if (character === ']' && !this._balance) {
this._reportBalanced();
- return true;
- },
+ return false;
+ }
+ }
+ this._index = index;
+ this._reportBalanced();
+ return true;
+ }
- _reportBalanced: function()
- {
- if (!this._lastBalancedIndex)
- return;
- this._callback(this._buffer.slice(0, this._lastBalancedIndex));
- this._buffer = this._buffer.slice(this._lastBalancedIndex);
- this._index -= this._lastBalancedIndex;
- this._lastBalancedIndex = 0;
- },
+ _reportBalanced() {
+ if (!this._lastBalancedIndex)
+ return;
+ this._callback(this._buffer.slice(0, this._lastBalancedIndex));
+ this._buffer = this._buffer.slice(this._lastBalancedIndex);
+ this._index -= this._lastBalancedIndex;
+ this._lastBalancedIndex = 0;
+ }
- /**
- * @return {string}
- */
- remainder: function()
- {
- return this._buffer;
- }
+ /**
+ * @return {string}
+ */
+ remainder() {
+ return this._buffer;
+ }
};
/**
* @interface
*/
-WebInspector.TokenizerFactory = function() { };
+WebInspector.TokenizerFactory = function() {};
WebInspector.TokenizerFactory.prototype = {
- /**
- * @param {string} mimeType
- * @return {function(string, function(string, ?string, number, number))}
- */
- createTokenizer: function(mimeType) { }
+ /**
+ * @param {string} mimeType
+ * @return {function(string, function(string, ?string, number, number))}
+ */
+ createTokenizer: function(mimeType) {}
};
« no previous file with comments | « third_party/WebKit/Source/devtools/front_end/common/TextRange.js ('k') | third_party/WebKit/Source/devtools/front_end/common/Throttler.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698