Skip to content
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

Allow Semicolons in Timeline Titles, Sections, Periods, and Events #5335

Merged
merged 9 commits into from
Aug 20, 2024
Merged

Allow Semicolons in Timeline Titles, Sections, Periods, and Events #5335

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
1169cb9
Changes to timeline.jison
FutzMonitor Feb 27, 2024
f13beab
Merge branch 'develop' into 4175Issue-allowSemicolons
FutzMonitor Feb 27, 2024
9e3ebf1
Run the pnpm lint:fix command to fix linting problems
FutzMonitor Feb 27, 2024
fab6987
Merge branch 'develop' into 4175Issue-allowSemicolons
FutzMonitor Feb 27, 2024
e433b95
Merge branch 'develop' into 4175Issue-allowSemicolons
FutzMonitor Mar 18, 2024
cf88f06
Changes to timeline.spec.js
FutzMonitor Mar 19, 2024
c239b6e
Merge branch 'develop' into 4175Issue-allowSemicolons
FutzMonitor Mar 30, 2024
f63eb45
Merge branch 'develop' into pr/FutzMonitor/5335
sidharthv96 Aug 20, 2024
262bf4e
chore: Simplify unit test
sidharthv96 Aug 20, 2024
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
8 changes: 4 additions & 4 deletions packages/mermaid/src/diagrams/timeline/parser/timeline.jison
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,19 +18,19 @@
\#[^\n]* /* skip comments */

"timeline" return 'timeline';
"title"\s[^#\n;]+ return 'title';
"title"\s[^#\n]+ return 'title';
accTitle\s*":"\s* { this.begin("acc_title");return 'acc_title'; }
<acc_title>(?!\n|;|#)*[^\n]* { this.popState(); return "acc_title_value"; }
accDescr\s*":"\s* { this.begin("acc_descr");return 'acc_descr'; }
<acc_descr>(?!\n|;|#)*[^\n]* { this.popState(); return "acc_descr_value"; }
accDescr\s*"{"\s* { this.begin("acc_descr_multiline");}
<acc_descr_multiline>[\}] { this.popState(); }
<acc_descr_multiline>[^\}]* return "acc_descr_multiline_value";
"section"\s[^#:\n;]+ return 'section';
"section"\s[^#:\n]+ return 'section';

// event starting with "==>" keyword
":"\s[^#:\n;]+ return 'event';
[^#:\n;]+ return 'period';
":"\s[^#:\n]+ return 'event';
[^#:\n]+ return 'period';


<<EOF>> return 'EOF';
Expand Down
16 changes: 16 additions & 0 deletions packages/mermaid/src/diagrams/timeline/timeline.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { parser as timeline } from './parser/timeline.jison';
import * as timelineDB from './timelineDb.js';
import * as commonDb from '../common/commonDb.js';
import { setLogLevel } from '../../diagram-api/diagramAPI.js';

describe('when parsing a timeline ', function () {
Expand Down Expand Up @@ -98,5 +99,20 @@ describe('when parsing a timeline ', function () {
}
});
});

it('TL-6 should handle a title, section, task, and events with semicolons', function () {
let str = `timeline
title ;my;title;
section ;a;bc-123;
;ta;sk1;: ;ev;ent1; : ;ev;ent2; : ;ev;ent3;
`;
timeline.parse(str);
expect(commonDb.getDiagramTitle()).equal(';my;title;');
expect(timelineDB.getSections()).to.deep.equal([';a;bc-123;']);
expect(timelineDB.getTasks()[0].task).equal(';ta;sk1;');
expect(timelineDB.getTasks()[0].events[0]).equal(';ev;ent1; ');
expect(timelineDB.getTasks()[0].events[1]).equal(';ev;ent2; ');
expect(timelineDB.getTasks()[0].events[2]).equal(';ev;ent3;');
});
});
});
Loading