@opentui/core 0.1.64 → 0.1.66

package/index.js

@@ -2840,9 +2840,10 @@ class CodeRenderable extends TextBufferRenderable {
     this._conceal = options.conceal ?? this._contentDefaultOptions.conceal;
     this._drawUnstyledText = options.drawUnstyledText ?? this._contentDefaultOptions.drawUnstyledText;
     this._streaming = options.streaming ?? this._contentDefaultOptions.streaming;
-    if (this._content.length > 0 && (this._drawUnstyledText || !this._filetype)) {
+    if (this._content.length > 0) {
       this.textBuffer.setText(this._content);
       this.updateTextInfo();
+      this._shouldRenderTextBuffer = this._drawUnstyledText || !this._filetype;
     }
     this._highlightsDirty = this._content.length > 0;
   }
@@ -2853,10 +2854,9 @@ class CodeRenderable extends TextBufferRenderable {
     if (this._content !== value) {
       this._content = value;
       this._highlightsDirty = true;
-      if (this._drawUnstyledText || !this._filetype) {
-        this.textBuffer.setText(value);
-        this.updateTextInfo();
-      }
+      this._highlightSnapshotId++;
+      this.textBuffer.setText(value);
+      this.updateTextInfo();
     }
   }
   get filetype() {
@@ -2915,14 +2915,15 @@ class CodeRenderable extends TextBufferRenderable {
       this._highlightsDirty = true;
     }
   }
+  get isHighlighting() {
+    return this._isHighlighting;
+  }
   ensureVisibleTextBeforeHighlight() {
+    if (this.isDestroyed)
+      return;
     const content = this._content;
     if (!this._filetype) {
-      if (this.isDestroyed)
-        return;
-      this.textBuffer.setText(content);
       this._shouldRenderTextBuffer = true;
-      this.updateTextInfo();
       return;
     }
     const isInitialContent = this._streaming && !this._hadInitialContent;
@@ -2933,29 +2934,17 @@ class CodeRenderable extends TextBufferRenderable {
           enabled: this._conceal
         });
         const partialStyledText = new StyledText(chunks);
-        if (this.isDestroyed)
-          return;
         this.textBuffer.setStyledText(partialStyledText);
         this._shouldRenderTextBuffer = true;
         this.updateTextInfo();
       } else {
-        if (this.isDestroyed)
-          return;
-        this.textBuffer.setText(content);
         this._shouldRenderTextBuffer = true;
-        this.updateTextInfo();
       }
     } else if (shouldDrawUnstyledNow) {
-      if (this.isDestroyed)
-        return;
       this.textBuffer.setText(content);
       this._shouldRenderTextBuffer = true;
-      this.updateTextInfo();
     } else {
-      if (this.isDestroyed)
-        return;
       this._shouldRenderTextBuffer = false;
-      this.updateTextInfo();
     }
   }
   async startHighlight() {
@@ -2989,9 +2978,9 @@ class CodeRenderable extends TextBufferRenderable {
         this.textBuffer.setText(content);
       }
       this._shouldRenderTextBuffer = true;
-      this.updateTextInfo();
       this._isHighlighting = false;
       this._highlightsDirty = false;
+      this.updateTextInfo();
       this.requestRender();
     } catch (error) {
       if (snapshotId !== this._highlightSnapshotId) {
@@ -3002,9 +2991,9 @@ class CodeRenderable extends TextBufferRenderable {
         return;
       this.textBuffer.setText(content);
       this._shouldRenderTextBuffer = true;
-      this.updateTextInfo();
       this._isHighlighting = false;
       this._highlightsDirty = false;
+      this.updateTextInfo();
       this.requestRender();
     }
   }
@@ -3013,20 +3002,14 @@ class CodeRenderable extends TextBufferRenderable {
   }
   renderSelf(buffer) {
     if (this._highlightsDirty) {
+      if (this.isDestroyed)
+        return;
       if (this._content.length === 0) {
-        if (this.isDestroyed)
-          return;
-        this.textBuffer.setText("");
         this._shouldRenderTextBuffer = false;
         this._highlightsDirty = false;
-        this.updateTextInfo();
       } else if (!this._filetype) {
-        if (this.isDestroyed)
-          return;
-        this.textBuffer.setText(this._content);
         this._shouldRenderTextBuffer = true;
         this._highlightsDirty = false;
-        this.updateTextInfo();
       } else {
         this.ensureVisibleTextBeforeHighlight();
         this._highlightsDirty = false;
@@ -4673,6 +4656,8 @@ class DiffRenderable extends Renderable {
   _lastWidth = 0;
   errorTextRenderable = null;
   errorCodeRenderable = null;
+  _waitingForHighlight = false;
+  _lineInfoChangeHandler = null;
   constructor(ctx, options) {
     super(ctx, {
       ...options,
@@ -4769,7 +4754,40 @@ class DiffRenderable extends Renderable {
       this.buildView();
     }
   }
+  handleLineInfoChange = () => {
+    if (!this._waitingForHighlight)
+      return;
+    if (!this.leftCodeRenderable || !this.rightCodeRenderable)
+      return;
+    const leftIsHighlighting = this.leftCodeRenderable.isHighlighting;
+    const rightIsHighlighting = this.rightCodeRenderable.isHighlighting;
+    if (!leftIsHighlighting && !rightIsHighlighting) {
+      this._waitingForHighlight = false;
+      this.requestRebuild();
+    }
+  };
+  attachLineInfoListeners() {
+    if (this._lineInfoChangeHandler)
+      return;
+    if (!this.leftCodeRenderable || !this.rightCodeRenderable)
+      return;
+    this._lineInfoChangeHandler = this.handleLineInfoChange;
+    this.leftCodeRenderable.on("line-info-change", this._lineInfoChangeHandler);
+    this.rightCodeRenderable.on("line-info-change", this._lineInfoChangeHandler);
+  }
+  detachLineInfoListeners() {
+    if (!this._lineInfoChangeHandler)
+      return;
+    if (this.leftCodeRenderable) {
+      this.leftCodeRenderable.off("line-info-change", this._lineInfoChangeHandler);
+    }
+    if (this.rightCodeRenderable) {
+      this.rightCodeRenderable.off("line-info-change", this._lineInfoChangeHandler);
+    }
+    this._lineInfoChangeHandler = null;
+  }
   destroyRecursively() {
+    this.detachLineInfoListeners();
     this.pendingRebuild = false;
     this.leftSideAdded = false;
     this.rightSideAdded = false;
@@ -5127,7 +5145,15 @@ class DiffRenderable extends Renderable {
     const rightCodeRenderable = this.createOrUpdateCodeRenderable("right", preRightContent, this._wrapMode, drawUnstyledText);
     let finalLeftLines;
     let finalRightLines;
-    if (canDoWrapAlignment) {
+    const leftIsHighlighting = leftCodeRenderable.isHighlighting;
+    const rightIsHighlighting = rightCodeRenderable.isHighlighting;
+    const highlightingInProgress = needsConsistentConcealing && (leftIsHighlighting || rightIsHighlighting);
+    if (highlightingInProgress) {
+      this._waitingForHighlight = true;
+      this.attachLineInfoListeners();
+    }
+    const shouldDoAlignment = canDoWrapAlignment && !highlightingInProgress;
+    if (shouldDoAlignment) {
       const leftLineInfo = leftCodeRenderable.lineInfo;
       const rightLineInfo = rightCodeRenderable.lineInfo;
       const leftSources = leftLineInfo.lineSources || [];
@@ -5269,6 +5295,7 @@ class DiffRenderable extends Renderable {
   set diff(value) {
     if (this._diff !== value) {
       this._diff = value;
+      this._waitingForHighlight = false;
       this.parseDiff();
       this.rebuildView();
     }
@@ -8962,5 +8989,5 @@ export {
   ASCIIFont
 };
 
-//# debugId=34E1AAA3BB112D5D64756E2164756E21
+//# debugId=5E4CDD3395AC328364756E2164756E21
 //# sourceMappingURL=index.js.map