Merge branch 'main' into feat/remove-flutter

Makefile

@@ -89,7 +89,7 @@ emulate:
 # WARNING this can take a while to run!
 # Usage: `make test FLUTTER_TEST_BRANCH=<channel>`
 test:
- DOCKER_BUILDKIT=1 time docker build --rm --target tests -t flt-test .
+ DOCKER_BUILDKIT=1 docker build --rm --target tests -t flt-test .
  docker run --rm --name flt-tests -t flt-test --target ${FLUTTER_TEST_BRANCH}
 
 # Stop long running tests
@@ -110,13 +110,13 @@ debug-tests:
 # those will be run on the Github action.
 # Usage: `make build-image`
 build-image:
- DOCKER_BUILDKIT=1 time docker build --rm --no-cache --target build \
+ DOCKER_BUILDKIT=1 docker build --rm --no-cache --target build \
  --build-arg BUILD_CONFIGS=${BUILD_CONFIGS} -t ${BUILD_TAG} .
 
 # Build the production site & Run the link checker
 # Usage: `make check-links`
 build-image-and-check-links:
- DOCKER_BUILDKIT=1 time docker build --rm --no-cache --target checklinks \
+ DOCKER_BUILDKIT=1 docker build --rm --no-cache --target checklinks \
  --build-arg BUILD_CONFIGS=${BUILD_CONFIGS} -t ${BUILD_TAG} .
  docker run --rm -t ${BUILD_TAG}
 

src/ui/accessibility-and-localization/internationalization.md

@@ -346,6 +346,14 @@ return MaterialApp(
 
 ### Placeholders, plurals, and selects
 
+{{site.alert.tip}}
+ When using VS Code, add the [arb-editor extension][].
+ This extension adds syntax highlighting, snippets, 
+ diagnostics, and quick fixes to help edit `.arb` template files.
+{{site.alert.end}}
+
+[arb-editor extension]: https://marketplace.visualstudio.com/items?itemName=Google.arb-editor
+
 You can also include application values in a message with
 special syntax that uses a _placeholder_ to generate a method
 instead of a getter.

tool/check-code.sh

@@ -42,10 +42,10 @@ flutter --version
 if [[ $REFRESH ]]; then
  echo "=> Refreshing code excerpts..."
  (
- set -x;
+ set -x
  tool/refresh-code-excerpts.sh --keep-dart-tool
  ) || (
- echo "=> ERROR: some code excerpts were not refreshed!";
+ echo "=> ERROR: some code excerpts were not refreshed!"
  exit 1
  )
 fi
@@ -97,12 +97,12 @@ for sample in $EXAMPLE_ROOT/*/*{,/*}; do
  # Does it match our filter?
  if [[ -n "$FILTER" && ! $sample =~ $FILTER ]]; then
  echo "=> Example: $sample - skipped because of filter"
- continue;
+ continue
 
  # Skip submodules
- elif [[ "$(cd $sample ; git rev-parse --show-superproject-working-tree)" ]]; then
+ elif [[ "$(cd $sample; git rev-parse --show-superproject-working-tree)" ]]; then
  echo "=> Example: $sample - skipped because it's in a submodule."
- continue;
+ continue
 
  else
  echo "=> Example: $sample"
@@ -111,24 +111,24 @@ for sample in $EXAMPLE_ROOT/*/*{,/*}; do
  # Only hydrate the sample if we're going to test it.
  if [[ -n $TEST && -d "$sample/test" ]]; then
  (
- set -x;
- cd $ROOT;
+ set -x
+ cd $ROOT
  flutter create --no-overwrite $sample
  rm -rf $sample/integration_test # Remove unneeded integration test stubs.
  )
  fi
 
  (
- set -x;
+ set -x
  cd $sample
- flutter packages get;
- flutter analyze .;
+ flutter pub get
+ flutter analyze .
  )
 
  if [[ -n $TEST && -d "$sample/test" ]]; then
  (
- cd $sample;
- set -x;
+ cd $sample
+ set -x
  echo "=> Running tests..."
  flutter test
  )

tool/refresh-code-excerpts.sh

@@ -37,8 +37,8 @@ if [[ ${diffVersion:0:1} != "3" ]]; then
 fi
 
 if [[ -e "$FRAG" ]]; then 
- echo "=> Deleting old $FRAG"; 
- rm -Rf "$FRAG"; 
+ echo "=> Deleting old $FRAG"
+ rm -Rf "$FRAG"
 fi
 
 # Ensure package_config.json is generated