Skip to content

Fix regex pattern in linkPart3 when editing a link tag #531

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
juanpablo-santos merged 3 commits into from
Sep 16, 2026
+22 −6
Merged

Fix regex pattern in linkPart3 when editing a link tag #531

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
df2c055
Refine link suggestion regex patterns
udittmer Sep 14, 2026
83a4f4f
Refine regex for linkPart3 suggestions
udittmer Sep 14, 2026
7f54fa0
Add link snippets for 'more' and 'class' in Snipe.js
udittmer Sep 14, 2026
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
9 changes: 6 additions & 3 deletions jspwiki-main/src/main/javascript/Wiki.Snips.JSPWiki.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -397,9 +397,12 @@ Wiki.Snips = {


linkPart3:{
// Dialog must open after the second "|" even when "]" is not typed yet.
// Prefer matching up to "]" when present (attributes may contain spaces);
// otherwise only match non-whitespace so prose after the caret is not swallowed.
suggest: {
lback: "\\[(?:[^\\|\\]]+\\|[^\\|\\]]+\\|)([^\\|\\[\\]\\n\\r]*)$",
match: "^[^\\|\\]\\n\\r]*"
lback: "\\[(?:[^\\|\\]]+\\|[^\\|\\]]+\\|)([^\\|\\[\\]\\n\\r]*)$",
match: "^(?:[^\\|\\[\\]\\n\\r]*(?=\\])|[^\\|\\[\\]\\n\\r\\s]*)"
},
linkPart3: [ Dialog.Selection, {

Expand Down Expand Up @@ -666,4 +669,4 @@ Wiki.Snips = {
};
window.addEventListener("load", function() {
Wiki.Snips.loadPlugins();
});
});
9 changes: 6 additions & 3 deletions jspwiki-markdown/src/main/javascript/Wiki.Snips.Markdown.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -397,9 +397,12 @@ Wiki.Snips = {


linkPart3:{
// Dialog must open after the second "|" even when "]" is not typed yet.
// Prefer matching up to "]" when present (attributes may contain spaces);
// otherwise only match non-whitespace so prose after the caret is not swallowed.
suggest: {
lback: "\\[(?:[^\\|\\]]+\\|[^\\|\\]]+\\|)([^\\|\\[\\]\\n\\r]*)$",
match: "^[^\\|\\]\\n\\r]*"
lback: "\\[(?:[^\\|\\]]+\\|[^\\|\\]]+\\|)([^\\|\\[\\]\\n\\r]*)$",
match: "^(?:[^\\|\\[\\]\\n\\r]*(?=\\])|[^\\|\\[\\]\\n\\r\\s]*)"
},
linkPart3: [ Dialog.Selection, {

Expand Down Expand Up @@ -656,4 +659,4 @@ Wiki.Snips = {

window.addEventListener("load", function() {
Wiki.Snips.loadPlugins();
});
});
10 changes: 10 additions & 0 deletions jspwiki-war/src/main/scripts/wiki-edit/Snipe.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -763,12 +763,22 @@ var Snipe = new Class({
Selection will become "test", and snippet will become "wiki-page"
[te$st] => lback = "te", match = "test", snippet ="team-page"
Selection will become "st", and snippet will become "am-page"
[link|url|$ more] => lback = "", match = "", snippet = "target='_blank'"
Inserts at the caret; " more" is kept
[link|url|cla$ more] => lback = "cla", match = "cla", snippet = "class='viewer'"
Replaces only "cla"; " more" is kept
*/
suggestAction: function( txta, snippet, lback, match){

var start = txta.getSelectionRange().start,
len = match.length;

// If the forward match stopped early (e.g. at whitespace) but the user
// already typed more in the look-back, replace the whole look-back.
if( len < lback.length ){
len = lback.length;
}

//console.log("Snipe:suggestAction ",snippet,lback,match );
if( snippet.startsWith( lback ) ){

Expand Down