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

Fix issue with generic class not rendering #5098

Merged
merged 3 commits into from
Dec 4, 2023
Merged

Fix issue with generic class not rendering #5098

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
8de1bde
Split type from generic class name
jgreywolf Dec 4, 2023
93a920c
test: Add unit test for generic classname and namespace
sidharthv96 Dec 4, 2023
761fa27
chore: Rename test
sidharthv96 Dec 4, 2023
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
12 changes: 7 additions & 5 deletions packages/mermaid/src/diagrams/class/classDb.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -446,11 +446,13 @@
* @public
*/
export const addClassesToNamespace = function (id: string, classNames: string[]) {
if (namespaces[id] !== undefined) {
classNames.map((className) => {
classes[className].parent = id;
namespaces[id].classes[className] = classes[className];
});
if (namespaces[id] === undefined) {
return;

Check warning on line 450 in packages/mermaid/src/diagrams/class/classDb.ts

View check run for this annotation

Codecov / codecov/patch

packages/mermaid/src/diagrams/class/classDb.ts#L450 

Added line #L450 was not covered by tests
}
for (const name of classNames) {
const { className } = splitClassNameAndType(name);
classes[className].parent = id;
namespaces[id].classes[className] = classes[className];
}
};

Expand Down
13 changes: 13 additions & 0 deletions packages/mermaid/src/diagrams/class/classDiagram.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1043,6 +1043,19 @@ foo()
`;
parser.parse(str);
});

it('should handle namespace with generic types', () => {
parser.parse(`classDiagram

namespace space {
class Square~Shape~{
int id
List~int~ position
setPoints(List~int~ points)
getPoints() List~int~
}
}`);
});
});
});

Expand Down
Loading