Move isWhitespace

yomidevs · Feb 2, 2024 · 75a7c8c · 75a7c8c
1 parent 89faa7e
commit 75a7c8c
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 13 deletions.
diff --git a/ext/js/data/sandbox/string-util.js b/ext/js/data/sandbox/string-util.js
@@ -68,11 +68,3 @@ export function readCodePointsBackward(text, position, count) {
     }
     return result;
 }
-
-/**
- * @param {string} string
- * @returns {boolean}
- */
-export function isWhitespace(string) {
-    return string.trim().length === 0;
-}
diff --git a/ext/js/dom/text-source-generator.js b/ext/js/dom/text-source-generator.js
@@ -15,7 +15,6 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-import {isWhitespace} from '../data/sandbox/string-util.js';
 import {DocumentUtil} from './document-util.js';
 import {DOMTextScanner} from './dom-text-scanner.js';
 import {TextSourceElement} from './text-source-element.js';
@@ -169,8 +168,8 @@ export class TextSourceGenerator {
         }
 
         // Trim whitespace
-        for (; cursorStart < startLength && isWhitespace(text[cursorStart]); ++cursorStart) { /* NOP */ }
-        for (; cursorEnd > textEndAnchor && isWhitespace(text[cursorEnd - 1]); --cursorEnd) { /* NOP */ }
+        for (; cursorStart < startLength && this._isWhitespace(text[cursorStart]); ++cursorStart) { /* NOP */ }
+        for (; cursorEnd > textEndAnchor && this._isWhitespace(text[cursorEnd - 1]); --cursorEnd) { /* NOP */ }
 
         // Result
         return {
@@ -371,7 +370,7 @@ export class TextSourceGenerator {
             const {node, offset, content} = new DOMTextScanner(nodePre, offsetPre, true, false).seek(1);
             range.setEnd(node, offset);
 
-            if (!isWhitespace(content) && DocumentUtil.isPointInAnyRect(x, y, range.getClientRects())) {
+            if (!this._isWhitespace(content) && DocumentUtil.isPointInAnyRect(x, y, range.getClientRects())) {
                 return true;
             }
         } finally {
@@ -382,7 +381,7 @@ export class TextSourceGenerator {
         const {node, offset, content} = new DOMTextScanner(startContainer, range.startOffset, true, false).seek(-1);
         range.setStart(node, offset);
 
-        if (!isWhitespace(content) && DocumentUtil.isPointInAnyRect(x, y, range.getClientRects())) {
+        if (!this._isWhitespace(content) && DocumentUtil.isPointInAnyRect(x, y, range.getClientRects())) {
             // This purposefully leaves the starting offset as modified and sets the range length to 0.
             range.setEnd(node, offset);
             return true;
@@ -636,4 +635,12 @@ export class TextSourceGenerator {
     _isElementUserSelectAll(element) {
         return getComputedStyle(element).userSelect === 'all';
     }
+
+    /**
+     * @param {string} string
+     * @returns {boolean}
+     */
+    _isWhitespace(string) {
+        return string.trim().length === 0;
+    }
 }