From c6d0cc2ec5fdc9337d23dc4cd51544f70498415b Mon Sep 17 00:00:00 2001 From: Phil Quitslund Date: Tue, 12 Nov 2024 13:13:49 -0800 Subject: [PATCH 1/4] [lint] fix a renamed method parameter --- packages/vector_graphics_compiler/lib/src/svg/visitor.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/vector_graphics_compiler/lib/src/svg/visitor.dart b/packages/vector_graphics_compiler/lib/src/svg/visitor.dart index b92d3746a42..5b715546d39 100644 --- a/packages/vector_graphics_compiler/lib/src/svg/visitor.dart +++ b/packages/vector_graphics_compiler/lib/src/svg/visitor.dart @@ -45,7 +45,7 @@ abstract class Visitor { S visitEmptyNode(Node node, V data); /// Visit a [PatternNode]. - S visitPatternNode(PatternNode node, V data); + S visitPatternNode(PatternNode patternNode, V data); /// Visit a [ResolvedTextPositionNode]. S visitResolvedTextPositionNode( From da21c9f70cfe975128f7350b87978fe8eecfdf14 Mon Sep 17 00:00:00 2001 From: Phil Quitslund Date: Tue, 12 Nov 2024 13:46:22 -0800 Subject: [PATCH 2/4] Update resolver.dart --- .../lib/src/svg/resolver.dart | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/vector_graphics_compiler/lib/src/svg/resolver.dart b/packages/vector_graphics_compiler/lib/src/svg/resolver.dart index 76f34b43c35..a5c40c108b3 100644 --- a/packages/vector_graphics_compiler/lib/src/svg/resolver.dart +++ b/packages/vector_graphics_compiler/lib/src/svg/resolver.dart @@ -287,13 +287,13 @@ class ResolvingVisitor extends Visitor { } @override - Node visitPatternNode(PatternNode node, AffineMatrix data) { - final AttributedNode? resolvedPattern = node.resolver(node.patternId); + Node visitPatternNode(PatternNode patternNode, AffineMatrix data) { + final AttributedNode? resolvedPattern = patternNode.resolver(node.patternId); if (resolvedPattern == null) { - return node.child.accept(this, data); + return patternNode.child.accept(this, data); } - final Node child = node.child.accept(this, data); - final AffineMatrix childTransform = node.concatTransform(data); + final Node child = patternNode.child.accept(this, data); + final AffineMatrix childTransform = patternNode.concatTransform(data); final Node pattern = resolvedPattern.accept(this, childTransform); return ResolvedPatternNode( @@ -304,7 +304,7 @@ class ResolvingVisitor extends Visitor { width: resolvedPattern.attributes.width!, height: resolvedPattern.attributes.height!, transform: data, - id: node.patternId, + id: patternNode.patternId, ); } From ca5ae1e80e66f51a7ea6f6c60a9654804757527f Mon Sep 17 00:00:00 2001 From: Phil Quitslund Date: Tue, 12 Nov 2024 14:09:24 -0800 Subject: [PATCH 3/4] Update resolver.dart --- packages/vector_graphics_compiler/lib/src/svg/resolver.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/vector_graphics_compiler/lib/src/svg/resolver.dart b/packages/vector_graphics_compiler/lib/src/svg/resolver.dart index a5c40c108b3..1ec6fdfb9fe 100644 --- a/packages/vector_graphics_compiler/lib/src/svg/resolver.dart +++ b/packages/vector_graphics_compiler/lib/src/svg/resolver.dart @@ -288,7 +288,7 @@ class ResolvingVisitor extends Visitor { @override Node visitPatternNode(PatternNode patternNode, AffineMatrix data) { - final AttributedNode? resolvedPattern = patternNode.resolver(node.patternId); + final AttributedNode? resolvedPattern = patternNode.resolver(patternNode.patternId); if (resolvedPattern == null) { return patternNode.child.accept(this, data); } From e33187d9254df4cb92eee4ef016424e2222a3525 Mon Sep 17 00:00:00 2001 From: Phil Quitslund Date: Tue, 12 Nov 2024 14:29:04 -0800 Subject: [PATCH 4/4] Update resolver.dart --- packages/vector_graphics_compiler/lib/src/svg/resolver.dart | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/vector_graphics_compiler/lib/src/svg/resolver.dart b/packages/vector_graphics_compiler/lib/src/svg/resolver.dart index 1ec6fdfb9fe..ffac6ee71ac 100644 --- a/packages/vector_graphics_compiler/lib/src/svg/resolver.dart +++ b/packages/vector_graphics_compiler/lib/src/svg/resolver.dart @@ -288,7 +288,8 @@ class ResolvingVisitor extends Visitor { @override Node visitPatternNode(PatternNode patternNode, AffineMatrix data) { - final AttributedNode? resolvedPattern = patternNode.resolver(patternNode.patternId); + final AttributedNode? resolvedPattern = + patternNode.resolver(patternNode.patternId); if (resolvedPattern == null) { return patternNode.child.accept(this, data); }