fedi/forgejo
1
0
Fork 0
mirror of https://codeberg.org/forgejo/forgejo.git synced 2024-12-23 17:14:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Ignore line anchor links with leading zeroes (#21728)

Browse source 
Fixes: https://github.com/go-gitea/gitea/issues/21722

Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
This commit is contained in:
silverwind 2022-11-11 11:22:36 +01:00 committed by GitHub
parent 50dd32ede4
commit 9db221780f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 39 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
web_src/js/features/repo-code.js
View file

@ -5,6 +5,8 @@ import {createTippy, showTemporaryTooltip} from '../modules/tippy.js';
import {copyToClipboard} from './clipboard.js'; import {copyToClipboard} from './clipboard.js';
const {i18n} = window.config; const {i18n} = window.config;
export const singleAnchorRegex = /^#(L|n)([1-9][0-9]*)$/;
export const rangeAnchorRegex = /^#(L[1-9][0-9]*)-(L[1-9][0-9]*)$/;
function changeHash(hash) { function changeHash(hash) {
if (window.history.pushState) { if (window.history.pushState) {
@ -149,7 +151,7 @@ export function initRepoCodeView() {
}); });
$(window).on('hashchange', () => { $(window).on('hashchange', () => {
let m = window.location.hash.match(/^#(L\d+)-(L\d+)$/); let m = window.location.hash.match(rangeAnchorRegex);
let $list; let $list;
if ($('div.blame').length) { if ($('div.blame').length) {
$list = $('.code-view td.lines-code.blame-code'); $list = $('.code-view td.lines-code.blame-code');
@ -159,6 +161,7 @@ export function initRepoCodeView() {
let $first; let $first;
if (m) { if (m) {
$first = $list.filter(`[rel=${m[1]}]`); $first = $list.filter(`[rel=${m[1]}]`);
if ($first.length) {
selectRange($list, $first, $list.filter(`[rel=${m[2]}]`)); selectRange($list, $first, $list.filter(`[rel=${m[2]}]`));
// show code view menu marker (don't show in blame page) // show code view menu marker (don't show in blame page)
@ -169,9 +172,11 @@ export function initRepoCodeView() {
$('html, body').scrollTop($first.offset().top - 200); $('html, body').scrollTop($first.offset().top - 200);
return; return;
} }
m = window.location.hash.match(/^#(L|n)(\d+)$/); }
m = window.location.hash.match(singleAnchorRegex);
if (m) { if (m) {
$first = $list.filter(`[rel=L${m[2]}]`); $first = $list.filter(`[rel=L${m[2]}]`);
if ($first.length) {
selectRange($list, $first); selectRange($list, $first);
// show code view menu marker (don't show in blame page) // show code view menu marker (don't show in blame page)
@ -181,6 +186,7 @@ export function initRepoCodeView() {
$('html, body').scrollTop($first.offset().top - 200); $('html, body').scrollTop($first.offset().top - 200);
} }
}
}).trigger('hashchange'); }).trigger('hashchange');
} }
$(document).on('click', '.fold-file', ({currentTarget}) => { $(document).on('click', '.fold-file', ({currentTarget}) => {

18
web_src/js/features/repo-code.test.js Normal file
View file

@ -0,0 +1,18 @@
import {test, expect} from 'vitest';
import {singleAnchorRegex, rangeAnchorRegex} from './repo-code.js';
test('singleAnchorRegex', () => {
expect(singleAnchorRegex.test('#L0')).toEqual(false);
expect(singleAnchorRegex.test('#L1')).toEqual(true);
expect(singleAnchorRegex.test('#L01')).toEqual(false);
expect(singleAnchorRegex.test('#n0')).toEqual(false);
expect(singleAnchorRegex.test('#n1')).toEqual(true);
expect(singleAnchorRegex.test('#n01')).toEqual(false);
});
test('rangeAnchorRegex', () => {
expect(rangeAnchorRegex.test('#L0-L10')).toEqual(false);
expect(rangeAnchorRegex.test('#L1-L10')).toEqual(true);
expect(rangeAnchorRegex.test('#L01-L10')).toEqual(false);
expect(rangeAnchorRegex.test('#L1-L01')).toEqual(false);
});