From 9b1072ebed825826f162cd79e755cc5cec03729d Mon Sep 17 00:00:00 2001 From: Dan Field Date: Tue, 13 Jul 2021 11:56:29 -0700 Subject: [PATCH 1/3] fix this --- ci/analyze.sh | 2 +- lib/snapshot/BUILD.gn | 8 ++------ lib/ui/semantics.dart | 4 ++-- 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/ci/analyze.sh b/ci/analyze.sh index abd8d9619e7c3..11d1f3364689e 100755 --- a/ci/analyze.sh +++ b/ci/analyze.sh @@ -62,7 +62,7 @@ function analyze() ( echo "Analyzing dart:ui library..." analyze \ --options "$FLUTTER_DIR/analysis_options.yaml" \ - "$SRC_DIR/out/host_debug_unopt/gen/sky/bindings/dart_ui/ui.dart" + "$SRC_DIR/out/host_debug_unopt/gen/dart-pkg/sky_engine/lib/ui/ui.dart" echo "Analyzing spirv library..." analyze \ diff --git a/lib/snapshot/BUILD.gn b/lib/snapshot/BUILD.gn index 7615abf994b6c..89e744ed13b2b 100644 --- a/lib/snapshot/BUILD.gn +++ b/lib/snapshot/BUILD.gn @@ -8,13 +8,9 @@ import("//flutter/common/config.gni") import("//flutter/lib/ui/dart_ui.gni") import("//third_party/dart/utils/compile_platform.gni") -bindings_output_dir = "$root_gen_dir/sky/bindings" - -copy("generate_dart_ui") { +# TODO(dnfield): Remove this when recipes are updated to not use it. +group("generate_dart_ui") { visibility = [ ":*" ] - sources = dart_ui_files - - outputs = [ "$bindings_output_dir/dart_ui/{{source_file_part}}" ] } compiled_action("generate_snapshot_bin") { diff --git a/lib/ui/semantics.dart b/lib/ui/semantics.dart index 4418019b2c66b..af66413fe3318 100644 --- a/lib/ui/semantics.dart +++ b/lib/ui/semantics.dart @@ -662,10 +662,10 @@ abstract class StringAttribute extends NativeFieldWrapperClass1 { required this.range, }); - // The range of the text to which this attribute applies. + /// The range of the text to which this attribute applies. final TextRange range; - // Returns a copy of this atttribute with the given range. + /// Returns a copy of this atttribute with the given range. StringAttribute copy({required TextRange range}); } From 58f4642adfc7a3cb04af606f714f6b275ad01995 Mon Sep 17 00:00:00 2001 From: Dan Field Date: Tue, 13 Jul 2021 12:02:16 -0700 Subject: [PATCH 2/3] update docs --- lib/ui/semantics.dart | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/lib/ui/semantics.dart b/lib/ui/semantics.dart index af66413fe3318..b702109bc4244 100644 --- a/lib/ui/semantics.dart +++ b/lib/ui/semantics.dart @@ -665,7 +665,13 @@ abstract class StringAttribute extends NativeFieldWrapperClass1 { /// The range of the text to which this attribute applies. final TextRange range; - /// Returns a copy of this atttribute with the given range. + /// Creates a new attribute with all properties copied except for range, which + /// is updated to the specified value. + /// + /// For example, the [LocaleStringAttribute] specifies a [Locale] for its + /// range of characters. Copying it will result in a new + /// [LocaleStringAttribute] that has the same locale but an updated + /// [TextRange]. StringAttribute copy({required TextRange range}); } From 1d3162a3b863952cc3ed8b3a06ed7a74f0cc759c Mon Sep 17 00:00:00 2001 From: Dan Field Date: Tue, 13 Jul 2021 12:57:33 -0700 Subject: [PATCH 3/3] Update BUILD.gn --- lib/snapshot/BUILD.gn | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/snapshot/BUILD.gn b/lib/snapshot/BUILD.gn index 89e744ed13b2b..0b0713c50e100 100644 --- a/lib/snapshot/BUILD.gn +++ b/lib/snapshot/BUILD.gn @@ -9,6 +9,7 @@ import("//flutter/lib/ui/dart_ui.gni") import("//third_party/dart/utils/compile_platform.gni") # TODO(dnfield): Remove this when recipes are updated to not use it. +# https://flutter-review.googlesource.com/c/recipes/+/15420 group("generate_dart_ui") { visibility = [ ":*" ] }