Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions src/widgets/GitBranch.ts
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ import {
getSymbolKeybind,
renderSymbolOverrideEditor
} from './shared/symbol-override';
import { getGraphemes } from './shared/text-cursor';

const DEFAULT_SYMBOL = '⎇';
const LINK_KEY = 'linkToRepo';
Expand Down Expand Up @@ -180,9 +181,9 @@ export class GitBranchWidget implements Widget {
}
const parts = branch.split('/');
if (parts.length === 1) {
return Array.from(branch)[0] ?? '';
return getGraphemes(branch)[0] ?? '';
}
return parts.map((part, index) => (index === parts.length - 1 ? part : Array.from(part)[0] ?? '')).join('/');
return parts.map((part, index) => (index === parts.length - 1 ? part : getGraphemes(part)[0] ?? '')).join('/');
}

// jj finds its workspace from the nearest .jj above, past a git repo's own
Expand Down
5 changes: 3 additions & 2 deletions src/widgets/GitWorktree.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ import {
getSymbolKeybind,
renderSymbolOverrideEditor
} from './shared/symbol-override';
import { getGraphemes } from './shared/text-cursor';

const DEFAULT_SYMBOL = '𖠰';

Expand Down Expand Up @@ -88,9 +89,9 @@ export class GitWorktreeWidget implements Widget {
}
const parts = worktree.split('/');
if (parts.length === 1) {
return Array.from(worktree)[0] ?? '';
return getGraphemes(worktree)[0] ?? '';
}
return parts.map((part, index) => (index === parts.length - 1 ? part : Array.from(part)[0] ?? '')).join('/');
return parts.map((part, index) => (index === parts.length - 1 ? part : getGraphemes(part)[0] ?? '')).join('/');
}

private getGitWorktree(context: RenderContext): string | null {
Expand Down
7 changes: 7 additions & 0 deletions src/widgets/__tests__/GitBranch.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -355,6 +355,13 @@ describe('GitBranchWidget', () => {

describe('fish style', () => {
it.each([
{ name: 'preserves a flag in a single segment', branch: '🇨🇳release', expected: '⎇ 🇨🇳' },
{ name: 'preserves a ZWJ emoji in a single segment', branch: '👩‍💻tools', expected: '⎇ 👩‍💻' },
{ name: 'preserves a combining mark in a single segment', branch: 'e\u0301quipe', expected: '⎇ e\u0301' },
{ name: 'preserves skin tone modifiers', branch: '👍🏽fix/topic', expected: '⎇ 👍🏽/topic' },
{ name: 'preserves variation selectors', branch: '❤️health/topic', expected: '⎇ ❤️/topic' },
{ name: 'preserves graphemes in every abbreviated segment', branch: '🇨🇳release/👩‍💻tools/e\u0301quipe/topic', expected: '⎇ 🇨🇳/👩‍💻/e\u0301/topic' },
{ name: 'keeps the final grapheme-bearing segment full', branch: 'feature/👩‍💻tools', expected: '⎇ f/👩‍💻tools' },
{ name: 'collapses a plain branch to its first letter', branch: 'main', expected: '⎇ m' },
{ name: 'keeps the last segment full', branch: 'feature/worktree', expected: '⎇ f/worktree' },
{ name: 'preserves a non-BMP character in a single segment', branch: '🚀launch', expected: '⎇ 🚀' },
Expand Down
7 changes: 7 additions & 0 deletions src/widgets/__tests__/GitWorktree.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -172,6 +172,13 @@ describe('GitWorktreeWidget', () => {

describe('fish style', () => {
it.each([
{ name: 'preserves a flag in a single segment', gitDir: '/some/path/.git/worktrees/🇨🇳release\n/some/path/.git\n', expected: '𖠰 🇨🇳' },
{ name: 'preserves a ZWJ emoji in a single segment', gitDir: '/some/path/.git/worktrees/👩‍💻tools\n/some/path/.git\n', expected: '𖠰 👩‍💻' },
{ name: 'preserves a combining mark in a single segment', gitDir: '/some/path/.git/worktrees/e\u0301quipe\n/some/path/.git\n', expected: '𖠰 e\u0301' },
{ name: 'preserves skin tone modifiers', gitDir: '/some/path/.git/worktrees/👍🏽fix/topic\n/some/path/.git\n', expected: '𖠰 👍🏽/topic' },
{ name: 'preserves variation selectors', gitDir: '/some/path/.git/worktrees/❤️health/topic\n/some/path/.git\n', expected: '𖠰 ❤️/topic' },
{ name: 'preserves graphemes in every abbreviated segment', gitDir: '/some/path/.git/worktrees/🇨🇳release/👩‍💻tools/e\u0301quipe/topic\n/some/path/.git\n', expected: '𖠰 🇨🇳/👩‍💻/e\u0301/topic' },
{ name: 'keeps the final grapheme-bearing segment full', gitDir: '/some/path/.git/worktrees/feature/👩‍💻tools\n/some/path/.git\n', expected: '𖠰 f/👩‍💻tools' },
{ name: 'collapses the main worktree to its first letter', gitDir: '.git\n/some/path\n', expected: '𖠰 m' },
{ name: 'keeps the last segment full', gitDir: '/some/path/.git/worktrees/some-dir/some-worktree\n/some/path/.git\n', expected: '𖠰 s/some-worktree' },
{ name: 'preserves a non-BMP character in a single segment', gitDir: '/some/path/.git/worktrees/🚀launch\n/some/path/.git\n', expected: '𖠰 🚀' },
Expand Down
Loading