Skip to content

Allow escape quotes characters in actor name #180

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Allow escape quotes characters in actor name #180

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 5 additions & 2 deletions src/diagram.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,8 +89,11 @@ Diagram.Note.prototype.hasManyActors = function() {
};

Diagram.unescape = function(s) {
// Turn "\\n" into "\n"
return s.trim().replace(/^"(.*)"$/m, '$1').replace(/\\n/gm, '\n');
var unescaped = s.trim()
.replace(/^"(.*)"$/m, '$1') // remove quotes on quoted actors
.replace(/\\n/gm, '\n') // turn "\\n" into "\n"
.replace(/\\"/gm, '"'); // turn '\"' into '"'
return unescaped;
};

Diagram.LINETYPE = {
Expand Down
2 changes: 1 addition & 1 deletion src/grammar.jison
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
"title" return 'title';
"," return ',';
[^\->:,\r\n"]+ return 'ACTOR';
\"[^"]+\" return 'ACTOR';
\"(([^\"]|\\\")*[^\\])?\" return 'ACTOR'; // quoted actors
"--" return 'DOTLINE';
"-" return 'LINE';
">>" return 'OPENARROW';
Expand Down
5 changes: 5 additions & 0 deletions test/grammar-tests.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,6 +191,11 @@ test('Quoted names', function() {
assertSingleActor(Diagram.parse('Participant "->:"'), '->:');
});

test('Quoted names with escape characters', function() {
assertSingleArrow(Diagram.parse('"->\\":"->B: M'), ARROWTYPE.FILLED, LINETYPE.SOLID,
'->":', 'B', 'M');
});

test('API', function() {
// Public API
ok(typeof Diagram.parse == 'function');
Expand Down