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.

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

upgrade to support latest flutter version #69

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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: 3 additions & 5 deletions lib/src/builders/mermaid_builder.dart
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,7 @@ class MermaidBuilder implements DiagramBuilder {
rightBracket: '~',
stripParens: true,
);
_lines.add(
'$_currentClass : $visibilityPrefix$name$staticSuffix$abstractSuffix $type');
_lines.add('$_currentClass : $visibilityPrefix$name$staticSuffix$abstractSuffix $type');
}

@override
Expand All @@ -56,8 +55,7 @@ class MermaidBuilder implements DiagramBuilder {
final abstractSuffix = element.isAbstract ? '*' : '';
final name = element.name;
final type = element.returnType.getDisplayString(withNullability: true);
_lines.add(
'$_currentClass : $visibilityPrefix$name()$staticSuffix$abstractSuffix $type');
_lines.add('$_currentClass : $visibilityPrefix$name()$staticSuffix$abstractSuffix $type');
}

@override
Expand All @@ -81,7 +79,7 @@ class MermaidBuilder implements DiagramBuilder {
if (element.isAbstract) {
_lines.add('<<abstract>> $_currentClass');
}
if (element.isEnum) {
if (element.isDartCoreEnum) {
_lines.add('<<enumeration>> $_currentClass');
}
}
Expand Down
7 changes: 3 additions & 4 deletions lib/src/builders/nomnoml_builder.dart
Original file line number Diff line number Diff line change
Expand Up @@ -106,14 +106,13 @@ class NomnomlBuilder implements DiagramBuilder {
final visibilityPrefix = getVisibility(element);
final staticPrefix = element.isStatic ? '<static>' : '';
final methodName = element.name;
final methodType =
element.returnType.getDisplayString(withNullability: true);
final methodType = element.returnType.getDisplayString(withNullability: true);
return ' $staticPrefix$visibilityPrefix$methodType $methodName()';
}).join(';\n'));
}

String fullClassName(ClassElement element) {
final abstractModifier = element.isAbstract ? '<abstract>' : '';
String fullClassName(InterfaceElement element) {
final abstractModifier = '<interface>';
final className = typeName(element, withNullability: false);
return '$abstractModifier$className';
}
Expand Down
8 changes: 3 additions & 5 deletions lib/src/class_element_collector.dart
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ class ClassElementCollector extends RecursiveElementVisitor<void> {
}

@override
void visitExportElement(ExportElement element) {
void visitLibraryExportElement(LibraryExportElement element) {
if (!_exportOnly) {
return;
}
Expand Down Expand Up @@ -53,10 +53,8 @@ class ClassElementCollector extends RecursiveElementVisitor<void> {
return true;
}

final shouldShow =
_shownNames.isNotEmpty && _shownNames.contains(element.name);
final shouldHide =
_hiddenNames.isNotEmpty && _hiddenNames.contains(element.name);
final shouldShow = _shownNames.isNotEmpty && _shownNames.contains(element.name);
final shouldHide = _hiddenNames.isNotEmpty && _hiddenNames.contains(element.name);
return _exportOnly ? (shouldShow && !shouldHide) : true;
}

Expand Down
Loading