Merge branch 'mouse-and-clipboard' into copy-paste-images

Author: nedtwigg

lib/src/components/SelectionOverlay.tsx

@@ -80,9 +80,9 @@ function computeRects(
   for (let r = firstRow; r <= lastRow; r++) {
     let c0 = 0;
     let c1 = cols;
-   if (r === n.r0) c0 = n.c0;
+    if (r === n.r0) c0 = n.c0;
     if (r === n.r1) c1 = n.c1 + 1;
-   if (c1 <= c0) continue;
+    if (c1 <= c0) continue;
     rects.push({
       top: (r - viewportStart) * cellHeight,
       left: c0 * cellWidth,

lib/src/lib/mouse-mode-observer.test.ts

@@ -93,21 +93,8 @@ describe('attachMouseModeObserver', () => {
   });
 
   it('dispose tears down both handlers', () => {
-    const { terminal } = buildMockTerminal();
-    const mockDispose1 = vi.fn();
-    const mockDispose2 = vi.fn();
-    const realParser = terminal.parser;
-    (terminal as unknown as { parser: unknown }).parser = {
-      registerCsiHandler(_id: unknown, _cb: unknown) {
-        return realParser === terminal.parser
-          ? { dispose: mockDispose1 }
-          : { dispose: mockDispose2 };
-      },
-    };
-
-    // Simpler: build a fresh mock with explicit disposables
     const disposables: Array<{ dispose: ReturnType<typeof vi.fn> }> = [];
-    const term2 = {
+    const terminal = {
       parser: {
         registerCsiHandler() {
           const d = { dispose: vi.fn() };
@@ -118,7 +105,7 @@ describe('attachMouseModeObserver', () => {
       modes: { mouseTrackingMode: 'none', bracketedPasteMode: false },
     } as unknown as Terminal;
 
-    const observer = attachMouseModeObserver('a', term2);
+    const observer = attachMouseModeObserver('a', terminal);
     observer.dispose();
 
     expect(disposables).toHaveLength(2);

lib/src/lib/mouse-selection.test.ts

@@ -4,6 +4,7 @@ import {
   __resetMouseSelectionForTests,
   beginDrag,
   endDrag,
+  flashCopy,
   getMouseSelectionSnapshot,
   getMouseSelectionState,
   isDragging,
@@ -272,6 +273,23 @@ describe('mouse-selection: drag lifecycle', () => {
   });
 });
 
+describe('mouse-selection: flashCopy race', () => {
+  it('beginDrag during a flash clears copyFlash so the timer does not nuke the new selection', () => {
+    beginDrag('a', { row: 0, col: 0, altKey: false, startedInScrollback: false });
+    updateDrag('a', { row: 3, col: 5, altKey: false });
+    endDrag('a');
+
+    // Simulate flashCopy — but we call beginDrag before the timer fires.
+    flashCopy('a', 'raw', 500);
+    expect(getMouseSelectionState('a').copyFlash).toBe('raw');
+
+    // New drag starts before the 500ms timer.
+    beginDrag('a', { row: 10, col: 2, altKey: false, startedInScrollback: false });
+    expect(getMouseSelectionState('a').copyFlash).toBeNull();
+    expect(getMouseSelectionState('a').selection?.startRow).toBe(10);
+  });
+});
+
 describe('mouse-selection: snapshot caching', () => {
   it('returns the same snapshot reference between changes', () => {
     setMouseReporting('a', 'vt200');

lib/src/lib/mouse-selection.ts

@@ -149,6 +149,9 @@ export function beginDrag(
   args: { row: number; col: number; altKey: boolean; startedInScrollback: boolean },
 ): void {
   const s = ensure(id);
+  // Clear any in-flight copy flash so its timer won't null out this new
+  // selection when it fires (the timer checks `copyFlash !== kind`).
+  s.copyFlash = null;
   s.selection = {
     startRow: args.row,
     startCol: args.col,

lib/src/lib/selection-text.ts

@@ -52,9 +52,9 @@ export function extractSelectionText(terminal: Terminal, sel: Selection): string
   for (let r = n.r0; r <= n.r1; r++) {
     const line = buf.getLine(r);
     if (!line) continue;
-   const c0 = r === n.r0 ? n.c0 : 0;
+    const c0 = r === n.r0 ? n.c0 : 0;
     const c1 = r === n.r1 ? n.c1 + 1 : terminal.cols;
-   lines.push(line.translateToString(false, c0, c1).replace(/\s+$/, ''));
+    lines.push(line.translateToString(false, c0, c1).replace(/\s+$/, ''));
   }
   return lines.join('\n');
 }

lib/src/lib/smart-token.test.ts

@@ -87,6 +87,11 @@ describe('detectTokenAt: path', () => {
     expect(t?.text).toBe('src/foo.ts:42:7');
   });
 
+  it('error location with trailing period is detected after stripping', () => {
+    const t = at('Error at src/foo.ts:42. See docs.', 'src/');
+    expect(t).toMatchObject({ kind: 'path', text: 'src/foo.ts:42' });
+  });
+
   it('strips trailing period on absolute path', () => {
     const t = detectTokenAt('/tmp/a.', 0);
     expect(t?.text).toBe('/tmp/a');

lib/src/lib/smart-token.ts

@@ -16,19 +16,16 @@ export interface DetectedToken {
 interface Pattern {
   kind: 'url' | 'path';
   re: RegExp;
-  /** When true, trailing-punctuation stripping is skipped — the pattern's
-   *  trailing characters are significant (e.g. error-location `:line:col`). */
-  skipStrip?: boolean;
 }
 
 const PATTERNS: Pattern[] = [
-  { kind: 'url', re: /^https?:\/\/\S+$/ },
-  { kind: 'url', re: /^file:\/\/\S+$/ },
-  { kind: 'path', re: /^\S+:\d+(:\d+)?$/, skipStrip: true }, // error-location first (so it beats generic path)
-  { kind: 'path', re: /^~\/\S*$/ },
-  { kind: 'path', re: /^\/\S+$/ },
-  { kind: 'path', re: /^\.\.?\/\S*$/ },
-  { kind: 'path', re: /^[A-Za-z]:\\\S*$/ },
+  { kind: 'url', re: new RegExp('^https?://\\S+$') },
+  { kind: 'url', re: new RegExp('^file://\\S+$') },
+  { kind: 'path', re: new RegExp('^\\S+:\\d+(:\\d+)?$') }, // error-location first (so it beats generic path)
+  { kind: 'path', re: new RegExp('^~/\\S*$') },
+  { kind: 'path', re: new RegExp('^/\\S+$') },
+  { kind: 'path', re: new RegExp('^\\.{1,2}/\\S*$') },
+  { kind: 'path', re: new RegExp('^[A-Za-z]:\\\\\\S*$') },
 ];
 
 const TRAILING_PUNCT = /[.,;:!?'"]+$/;
@@ -88,11 +85,16 @@ export function detectTokenAt(line: string, col: number): DetectedToken | null {
   const raw = line.slice(start, end);
   if (!raw) return null;
 
-  for (const { kind, re, skipStrip } of PATTERNS) {
-    if (!re.test(raw)) continue;
-    const text = skipStrip ? raw : stripTrailing(raw);
-    if (!text) continue;
-    return { kind, start, end: start + text.length, text };
+  // Strip trailing punctuation once, then test all patterns against the
+  // cleaned token. This ensures error-location patterns like `file:42` are
+  // found even when the original token had a trailing period (e.g. in
+  // compiler output "Error at src/foo.ts:42.").
+  const cleaned = stripTrailing(raw);
+  if (!cleaned) return null;
+
+  for (const { kind, re } of PATTERNS) {
+    if (!re.test(cleaned)) continue;
+    return { kind, start, end: start + cleaned.length, text: cleaned };
   }
   return null;
 }