Further improve branch getter function

source/features/latest-tag-button.tsx

@@ -110,7 +110,7 @@ async function init(): Promise<false | void> {
  }
 
  const defaultBranch = await getDefaultBranch();
- if (currentBranch === defaultBranch) {
+ if (pageDetect.isRepoHome() || currentBranch === defaultBranch) {
  link.append(<sup> +{aheadBy}</sup>);
  link.setAttribute(
  'aria-label',

source/features/more-dropdown.tsx

@@ -8,7 +8,7 @@ import {DiffIcon, GitBranchIcon, HistoryIcon, PackageIcon} from '@primer/octicon
 import features from '.';
 import {appendBefore} from '../helpers/dom-utils';
 import getDefaultBranch from '../github-helpers/get-default-branch';
-import {buildRepoURL, getCurrentCommittish} from '../github-helpers';
+import {buildRepoURL, getCurrentCommittishAnywhere} from '../github-helpers';
 
 function createDropdown(): void {
  // Markup copied from native GHE dropdown
@@ -59,7 +59,7 @@ async function init(): Promise<void> {
  '.UnderlineNav-body'
  ].join());
 
- const reference = getCurrentCommittish() ?? await getDefaultBranch();
+ const reference = await getCurrentCommittishAnywhere() ?? await getDefaultBranch();
  const compareUrl = buildRepoURL('compare', reference);
  const commitsUrl = buildRepoURL('commits', reference);
  const branchesUrl = buildRepoURL('branches');

source/github-helpers/github-url.ts

@@ -37,17 +37,18 @@ export default class GitHubURL {
  ambiguousReference: string[]
  ): {branch: string; filePath: string} {
  const branch = ambiguousReference[0];
+ const currentBranch = getCurrentCommittish();
  // History pages might use search parameters
+ const branchFromSearch = this.searchParams.get('branch');
  const filePathFromSearch = this.searchParams.getAll('path[]').join('/');
  if (filePathFromSearch) {
+ this.searchParams.delete('branch');
  this.searchParams.delete('path[]');
- return {branch, filePath: filePathFromSearch};
+ return {branch: branchFromSearch ?? currentBranch ?? branch, filePath: filePathFromSearch};
  }
 
- const filePath = ambiguousReference.slice(1).join('/');
-
- const currentBranch = getCurrentCommittish();
  const currentBranchSections = currentBranch?.split('/');
+ const filePath = ambiguousReference.slice(1).join('/');
  if (
  !currentBranch || // Current branch could not be determined (1/2)
  !currentBranchSections || // Current branch could not be determined (2/2)

source/github-helpers/index.ts

@@ -34,9 +34,35 @@ export const getCurrentCommittish = (pathname = location.pathname, title = docum
  return parsedTitle.groups!.branch;
  }
 
+ // TODO [2021-08-12]: .last needed for #2799 // GHE
+ const feedLink = select.last('link[type="application/atom+xml"]');
+ if (feedLink) {
+ return new URL(feedLink.href)
+ .pathname
+ .split('/')
+ .slice(4) // Drops the initial /user/repo/route/ part
+ .join('/')
+ .replace(/\.atom$/, '');
+ }
+
  return unslashedCommittish;
 };
 
+// Used on `isRepoHome` where can also determine the branch from the feedLink
+export const getCurrentCommittishAnywhere = async (): Promise<string | undefined> => {
+ const committish = getCurrentCommittish();
+ if (committish || !pageDetect.isRepoHome()) {
+ return committish;
+ }
+
+ const feedLink = await elementReady('a[data-hotkey="t"]')!;
+ if (!feedLink) {
+ return;
+ }
+
+ return decodeURIComponent(feedLink.pathname.split('/').pop()!);
+};
+
 export const isFirefox = navigator.userAgent.includes('Firefox/');
 
 // The type requires at least one parameter https://stackoverflow.com/a/49910890

test/github-url.ts

@@ -3,6 +3,8 @@ import test from 'ava';
 import './fixtures/globals';
 import GitHubURL from '../source/github-helpers/github-url';
 
+document.head.insertAdjacentHTML('beforeend', '<a hidden="" data-hotkey="t" data-pjax="true" href="https://github.com/sindresorhus/refined-github/find/Slash%2Fslash"></a>');
+
 test('branch', t => {
  const url = new GitHubURL('https://github.com/microsoft/TypeScript/tree/master');
  t.is(url.user, 'microsoft');
@@ -79,3 +81,17 @@ test('get filePath from search', t => {
  t.is(url.search, '?after=f23b687b3b89aa95a76193722cdfeff740646670+34');
  t.is(String(url), 'https://github.com/yakov116/refined-github/commits/f23b687b3b89aa95a76193722cdfeff740646670/source/features/release-download-count.tsx?after=f23b687b3b89aa95a76193722cdfeff740646670+34');
 });
+
+test('get branch and filePath from search', t => {
+ const url = new GitHubURL('https://github.com/sindresorhus/refined-github/commits/Slash/slash?after=ee8b6422d2ddd1199f557594d03e7ee850e843f0+34&branch=Slash%2Fslash&path%5B%5D=webpack.config.ts');
+ t.is(url.user, 'sindresorhus');
+ t.is(url.repository, 'refined-github');
+ t.is(url.route, 'commits');
+ t.is(url.branch, 'Slash/slash');
+ t.is(url.filePath, 'webpack.config.ts');
+ t.is(url.pathname, '/sindresorhus/refined-github/commits/Slash/slash/webpack.config.ts');
+ t.is(url.href, 'https://github.com/sindresorhus/refined-github/commits/Slash/slash/webpack.config.ts?after=ee8b6422d2ddd1199f557594d03e7ee850e843f0+34');
+ t.is(url.search, '?after=ee8b6422d2ddd1199f557594d03e7ee850e843f0+34');
+ t.is(String(url), 'https://github.com/sindresorhus/refined-github/commits/Slash/slash/webpack.config.ts?after=ee8b6422d2ddd1199f557594d03e7ee850e843f0+34');
+});
+document.querySelector('[data-hotkey="t"]')!.remove();

test/helpers.ts

@@ -221,15 +221,17 @@ test('getCurrentCommittish', t => {
  'github.com'
  ));
 
+ document.head.insertAdjacentHTML('beforeend', '<a data-hotkey="t" href="https://github.com/typescript-eslint/typescript-eslint/find/cool%2Fdefault%2Fbranch"></a>');
  // Root
  t.is(getCurrentCommittish(
  '/typescript-eslint/typescript-eslint',
  'typescript-eslint/typescript-eslint: Monorepo for all the tooling which enables ESLint to support TypeScript'
- ), undefined);
+ ), 'cool/default/branch');
  t.is(getCurrentCommittish(
  '/typescript-eslint/typescript-eslint/tree/chore/lerna-4',
  'typescript-eslint/typescript-eslint at chore/lerna-4'
  ), 'chore/lerna-4');
+ document.querySelector('[data-hotkey="t"]')!.remove();
 
  // Sub folder
  t.is(getCurrentCommittish(
@@ -289,7 +291,7 @@ test('getCurrentCommittish', t => {
  t.is(getCurrentCommittish(
  '/typescript-eslint/typescript-eslint/commits/chore/lerna-4/docs/getting-started/README.md',
  'History for docs/getting-started/README.md - typescript-eslint/typescript-eslint'
- ), 'chore'); // Wrong, but
+ ), 'master'); // Uses the feedlink
 
  // Single commit
  t.is(getCurrentCommittish(