rename Run's start/end to textStart/textEnd

Author: chearon

src/layout-text.ts

@@ -72,21 +72,21 @@ export function prevGrapheme(text: string, index: number) {
 }
 
 export class Run extends RenderItem {
-  public start: number;
-  public end: number;
+  public textStart: number;
+  public textEnd: number;
 
   static TEXT_BITS = Box.BITS.hasText
     | Box.BITS.hasForegroundInLayer
     | Box.BITS.hasForegroundInDescendent;
 
   constructor(start: number, end: number, style: Style) {
     super(style);
-    this.start = start;
-    this.end = end;
+    this.textStart = start;
+    this.textEnd = end;
   }
 
   get length() {
-    return this.end - this.start;
+    return this.textEnd - this.textStart;
   }
 
   getLogSymbol() {
@@ -113,9 +113,9 @@ export class Run extends RenderItem {
   }
 
   logName(log: Logger, options?: RenderItemLogOptions) {
-    log.text(`${this.start},${this.end}`);
+    log.text(`${this.textStart},${this.textEnd}`);
     if (options?.paragraphText) {
-      log.text(` "${loggableText(options.paragraphText.slice(this.start, this.end))}"`);
+      log.text(` "${loggableText(options.paragraphText.slice(this.textStart, this.textEnd))}"`);
     }
   }
 
@@ -126,7 +126,7 @@ export class Run extends RenderItem {
       parent.bitfield |= Run.TEXT_BITS;
     }
 
-    for (let i = this.start; i < this.end; i++) {
+    for (let i = this.textStart; i < this.textEnd; i++) {
       const code = paragraph.charCodeAt(i);
 
       if (code & NON_ASCII_MASK) {
@@ -176,12 +176,12 @@ export function collapseWhitespace(ifc: IfcInline) {
       for (let i = item.children.length - 1; i >= 0; --i) stack.push(item.children[i]);
     } else if (item.isRun()) {
       const whiteSpace = item.style.whiteSpace;
-      const originalStart = item.start;
+      const originalStart = item.textStart;
 
-      item.start -= delta;
+      item.textStart -= delta;
 
       if (whiteSpace === 'normal' || whiteSpace === 'nowrap') {
-        for (let i = originalStart; i < item.end; i++) {
+        for (let i = originalStart; i < item.textEnd; i++) {
           const isWhitespace = isSpaceOrTabOrNewline(ifc.text[i]);
 
           if (inWhitespace && isWhitespace) {
@@ -193,14 +193,14 @@ export function collapseWhitespace(ifc: IfcInline) {
           inWhitespace = isWhitespace;
         }
       } else if (whiteSpace === 'pre-line') {
-        for (let i = originalStart; i < item.end; i++) {
+        for (let i = originalStart; i < item.textEnd; i++) {
           const isWhitespace = isSpaceOrTabOrNewline(ifc.text[i]);
 
           if (isWhitespace) {
             let j = i + 1;
             let hasNewline = isNewline(ifc.text[i]);
 
-            for (; j < item.end && isSpaceOrTabOrNewline(ifc.text[j]); j++) {
+            for (; j < item.textEnd && isSpaceOrTabOrNewline(ifc.text[j]); j++) {
               hasNewline = hasNewline || isNewline(ifc.text[j]);
             }
 
@@ -228,12 +228,12 @@ export function collapseWhitespace(ifc: IfcInline) {
         }
       } else { // pre
         inWhitespace = false;
-        for (let i = originalStart; i < item.end; i++) {
+        for (let i = originalStart; i < item.textEnd; i++) {
           str[stri++] = ifc.text.charCodeAt(i);
         }
       }
 
-      item.end -= delta;
+      item.textEnd -= delta;
 
       if (item.length === 0) {
         const parent = parents.at(-1)!;