Fix bug which broken cell repeat command

sedwards2009 · Apr 14, 2024 · 969a0df · 969a0df
1 parent d770e52
commit 969a0df
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 11 deletions.
diff --git a/main/src/emulator/TextTerm.ts b/main/src/emulator/TextTerm.ts
@@ -353,7 +353,6 @@ export class TextEmulator implements TextEmulatorApi {
     flags: FLAG_MASK_FG_CLUT | FLAG_MASK_BG_CLUT,
     style: 0,
     linkID: 0,
-    hyperlinkID: null,
     hyperlinkURL: null,
     fgClutIndex: 257,
     bgClutIndex: 256,
@@ -370,7 +369,6 @@ export class TextEmulator implements TextEmulatorApi {
     flags: FLAG_MASK_FG_CLUT | FLAG_MASK_BG_CLUT,
     style: 0,
     linkID: 0,
-    hyperlinkID: null,
     hyperlinkURL: null,
     fgClutIndex: 257,
     bgClutIndex: 256,
@@ -386,7 +384,6 @@ export class TextEmulator implements TextEmulatorApi {
     flags: 0,
     style: 0,
     linkID: 0,
-    hyperlinkID: null,
     hyperlinkURL: null,
     fgClutIndex: 257,
     bgClutIndex: 256,

diff --git a/main/src/terminal/TerminalBlock.ts b/main/src/terminal/TerminalBlock.ts
@@ -8,8 +8,7 @@ import { QPainter, QWidget, QPaintEvent, WidgetEventTypes, QMouseEvent, MouseBut
 import { getLogger, log, Logger } from "extraterm-logging";
 import { Disposable, Event } from "extraterm-event-emitter";
 import { TextureFontAtlas, RGBAToQColor, FontSlice, CursorStyle, MonospaceFontMetrics,
-  CellPainter,
-  EmbeddedImage} from "extraterm-char-render-canvas";
+  CellPainter } from "extraterm-char-render-canvas";
 import { STYLE_MASK_CURSOR } from "extraterm-char-cell-line";
 import { Color } from "extraterm-color-utilities";
 import { EventEmitter } from "extraterm-event-emitter";
@@ -25,7 +24,6 @@ import { ConfigCursorStyle } from "../config/Config.js";
 import { FontAtlasCache } from "./FontAtlasCache.js";
 import { BlobBulkFile } from "../bulk_file_handling/BlobBulkFile.js";
 import { BulkFile } from "../bulk_file_handling/BulkFile.js";
-import { TerminalEmbeddedImages } from "./TerminalEmbeddedImages.js";
 
 
 enum SelectionMode {

diff --git a/packages/text-term-api-lineimpl/src/TextLineImpl.ts b/packages/text-term-api-lineimpl/src/TextLineImpl.ts
@@ -9,7 +9,6 @@ import { CharCellLine, Cell } from "extraterm-char-cell-line";
 
 
 export interface CellWithHyperlink extends Cell {
-  hyperlinkID: string;
   hyperlinkURL: string;
 }
 
@@ -125,14 +124,14 @@ export class TextLineImpl extends CharCellLine implements Line {
 
   getCellAndLink(x: number, y: number): CellWithHyperlink {
     const cellAttrs = this.getCell(x);
-    let hyperlinkURLGroupPair: URLGroupPair = null;
-    const hyperlinkID: string = null; // FIXME needed??
 
+    let hyperlinkURL: string = null;
     if (cellAttrs.linkID !== 0) {
-      hyperlinkURLGroupPair = this._hyperlinkIDToURLMapping.get(cellAttrs.linkID);
+      const pair = this._hyperlinkIDToURLMapping.get(cellAttrs.linkID);
+      hyperlinkURL = pair.url;
     }
 
-    return {hyperlinkURL: hyperlinkURLGroupPair.url, hyperlinkID, ...cellAttrs};
+    return {hyperlinkURL: hyperlinkURL, ...cellAttrs};
   }
 
   clone(): Line {