diff options
author | Cashew <52880648+Scrub1492@users.noreply.github.com> | 2023-12-25 17:13:34 +0900 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-12-25 08:13:34 +0000 |
commit | bdaa77ff0d7c23f1594575ac22fb9693f1802b24 (patch) | |
tree | 87cef502658dfb1ba62434eef51f994a08ec5739 /ext/js/dom/dom-text-scanner.js | |
parent | 89994427c7dfb25e7879948061a531f34cb1e9ab (diff) |
Narrow down enum types (#431)
* narrow down enum types
* add enum types
* change from default to case
* add enum types
* remove comments
* remove comments
* fix
* Move getErrorLevelValue to Logger
* Add enum type for LogErrorLevelValue
* add eslint switch-exhaustiveness-check rule
* Revert "add eslint switch-exhaustiveness-check"
This reverts commit 49f9caabf0af900bc5ba2b80f5baff72c27e02cd.
* move from labelled loop to helper functions
* move helper functions downward
Diffstat (limited to 'ext/js/dom/dom-text-scanner.js')
-rw-r--r-- | ext/js/dom/dom-text-scanner.js | 227 |
1 files changed, 135 insertions, 92 deletions
diff --git a/ext/js/dom/dom-text-scanner.js b/ext/js/dom/dom-text-scanner.js index df097688..6d979515 100644 --- a/ext/js/dom/dom-text-scanner.js +++ b/ext/js/dom/dom-text-scanner.js @@ -170,6 +170,7 @@ export class DOMTextScanner { const nodeValueLength = nodeValue.length; const {preserveNewlines, preserveWhitespace} = this._getWhitespaceSettings(textNode); + let done = false; let lineHasWhitespace = this._lineHasWhitespace; let lineHasContent = this._lineHasContent; let content = this._content; @@ -181,51 +182,11 @@ export class DOMTextScanner { const char = StringUtil.readCodePointsForward(nodeValue, offset, 1); offset += char.length; const charAttributes = DOMTextScanner.getCharacterAttributes(char, preserveNewlines, preserveWhitespace); + /** @type {import('dom-text-scanner').SeekTextNoteDetails} */ + const seekTextNoteDetails = {done, lineHasWhitespace, lineHasContent, content, offset, remainder, newlines}; - if (charAttributes === 0) { - // Character should be ignored - continue; - } else if (charAttributes === 1) { - // Character is collapsible whitespace - lineHasWhitespace = true; - } else { - // Character should be added to the content - if (newlines > 0) { - if (content.length > 0) { - const useNewlineCount = Math.min(remainder, newlines); - content += '\n'.repeat(useNewlineCount); - remainder -= useNewlineCount; - newlines -= useNewlineCount; - } else { - newlines = 0; - } - lineHasContent = false; - lineHasWhitespace = false; - if (remainder <= 0) { - offset -= char.length; // Revert character offset - break; - } - } - - lineHasContent = (charAttributes === 2); // 3 = character is a newline - - if (lineHasWhitespace) { - if (lineHasContent) { - content += ' '; - lineHasWhitespace = false; - if (--remainder <= 0) { - offset -= char.length; // Revert character offset - break; - } - } else { - lineHasWhitespace = false; - } - } - - content += char; - - if (--remainder <= 0) { break; } - } + ({done, lineHasWhitespace, lineHasContent, content, offset, remainder, newlines} = this._checkCharacterForward(char, charAttributes, seekTextNoteDetails)); + if (done) { break; } } this._lineHasWhitespace = lineHasWhitespace; @@ -256,6 +217,7 @@ export class DOMTextScanner { const nodeValueLength = nodeValue.length; const {preserveNewlines, preserveWhitespace} = this._getWhitespaceSettings(textNode); + let done = false; let lineHasWhitespace = this._lineHasWhitespace; let lineHasContent = this._lineHasContent; let content = this._content; @@ -268,50 +230,11 @@ export class DOMTextScanner { offset -= char.length; const charAttributes = DOMTextScanner.getCharacterAttributes(char, preserveNewlines, preserveWhitespace); - if (charAttributes === 0) { - // Character should be ignored - continue; - } else if (charAttributes === 1) { - // Character is collapsible whitespace - lineHasWhitespace = true; - } else { - // Character should be added to the content - if (newlines > 0) { - if (content.length > 0) { - const useNewlineCount = Math.min(remainder, newlines); - content = '\n'.repeat(useNewlineCount) + content; - remainder -= useNewlineCount; - newlines -= useNewlineCount; - } else { - newlines = 0; - } - lineHasContent = false; - lineHasWhitespace = false; - if (remainder <= 0) { - offset += char.length; // Revert character offset - break; - } - } - - lineHasContent = (charAttributes === 2); // 3 = character is a newline + /** @type {import('dom-text-scanner').SeekTextNoteDetails} */ + const seekTextNoteDetails = {done, lineHasWhitespace, lineHasContent, content, offset, remainder, newlines}; - if (lineHasWhitespace) { - if (lineHasContent) { - content = ' ' + content; - lineHasWhitespace = false; - if (--remainder <= 0) { - offset += char.length; // Revert character offset - break; - } - } else { - lineHasWhitespace = false; - } - } - - content = char + content; - - if (--remainder <= 0) { break; } - } + ({done, lineHasWhitespace, lineHasContent, content, offset, remainder, newlines} = this._checkCharacterBackward(char, charAttributes, seekTextNoteDetails)); + if (done) { break; } } this._lineHasWhitespace = lineHasWhitespace; @@ -350,6 +273,130 @@ export class DOMTextScanner { return {preserveNewlines: false, preserveWhitespace: false}; } + /** + * @param {string} char + * @param {import('dom-text-scanner').CharacterAttributesEnum} charAttributes + * @param {import('dom-text-scanner').SeekTextNoteDetails} seekTextNoteDetails + * @returns {import('dom-text-scanner').SeekTextNoteDetails} + */ + _checkCharacterForward(char, charAttributes, seekTextNoteDetails) { + let {done, lineHasWhitespace, lineHasContent, content, offset, remainder, newlines} = seekTextNoteDetails; + + switch (charAttributes) { + case 0: + break; + case 1: + lineHasWhitespace = true; + break; + case 2: + case 3: + if (newlines > 0) { + if (content.length > 0) { + const useNewlineCount = Math.min(remainder, newlines); + content += '\n'.repeat(useNewlineCount); + remainder -= useNewlineCount; + newlines -= useNewlineCount; + } else { + newlines = 0; + } + lineHasContent = false; + lineHasWhitespace = false; + if (remainder <= 0) { + offset -= char.length; // Revert character offset + done = true; + break; + } + } + + lineHasContent = (charAttributes === 2); // 3 = character is a newline + + if (lineHasWhitespace) { + if (lineHasContent) { + content += ' '; + lineHasWhitespace = false; + if (--remainder <= 0) { + offset -= char.length; // Revert character offset + done = true; + break; + } + } else { + lineHasWhitespace = false; + } + } + + content += char; + + if (--remainder <= 0) { + done = true; + break; + } + } + + return {done, lineHasWhitespace, lineHasContent, content, offset, remainder, newlines}; + } + + /** + * @param {string} char + * @param {import('dom-text-scanner').CharacterAttributesEnum} charAttributes + * @param {import('dom-text-scanner').SeekTextNoteDetails} seekTextNoteDetails + * @returns {import('dom-text-scanner').SeekTextNoteDetails} + */ + _checkCharacterBackward(char, charAttributes, seekTextNoteDetails) { + let {done, lineHasWhitespace, lineHasContent, content, offset, remainder, newlines} = seekTextNoteDetails; + + switch (charAttributes) { + case 0: + break; + case 1: + lineHasWhitespace = true; + break; + case 2: + case 3: + if (newlines > 0) { + if (content.length > 0) { + const useNewlineCount = Math.min(remainder, newlines); + content = '\n'.repeat(useNewlineCount) + content; + remainder -= useNewlineCount; + newlines -= useNewlineCount; + } else { + newlines = 0; + } + lineHasContent = false; + lineHasWhitespace = false; + if (remainder <= 0) { + offset += char.length; // Revert character offset + done = true; + break; + } + } + + lineHasContent = (charAttributes === 2); // 3 = character is a newline + + if (lineHasWhitespace) { + if (lineHasContent) { + content = ' ' + content; + lineHasWhitespace = false; + if (--remainder <= 0) { + offset += char.length; // Revert character offset + done = true; + break; + } + } else { + lineHasWhitespace = false; + } + } + + content = char + content; + + if (--remainder <= 0) { + done = true; + break; + } + } + + return {done, lineHasWhitespace, lineHasContent, content, offset, remainder, newlines}; + } + // Static helpers /** @@ -468,11 +515,7 @@ export class DOMTextScanner { * @param {string} character A string containing a single character. * @param {boolean} preserveNewlines Whether or not newlines should be preserved. * @param {boolean} preserveWhitespace Whether or not whitespace should be preserved. - * @returns {number} An integer representing the attributes of the character. - * 0: Character should be ignored. - * 1: Character is collapsible whitespace. - * 2: Character should be added to the content. - * 3: Character should be added to the content and is a newline. + * @returns {import('dom-text-scanner').CharacterAttributesEnum} An enum representing the attributes of the character. */ static getCharacterAttributes(character, preserveNewlines, preserveWhitespace) { switch (character.charCodeAt(0)) { |