diff --git a/.cirrus.yml b/.cirrus.yml
index eb063efe7b..2433c6df47 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -67,16 +67,15 @@ task:
       - date
       - which flutter
   matrix:
-    # TODO(flutter): https://github.com/flutter/flutter/issues/87517 analyze linux is only failing on Cirrus due to an unknown snippets issue
-    # - name: analyze-linux # linux-only
-    #   only_if: "$CIRRUS_PR != ''"
-    #   environment:
-    #     # Empirically, the analyze-linux shard runs surprisingly fast (under 15 minutes) with just 1
-    #     # CPU.  We noticed OOM failures with 6GB 4/2020, so we increased the memory.
-    #     CPU: 1
-    #     MEMORY: 8G
-    #   script:
-    #     - dart --enable-asserts ./dev/bots/analyze.dart
+    - name: analyze-linux # linux-only
+      only_if: "$CIRRUS_PR != ''"
+      environment:
+        # Empirically, the analyze-linux shard runs surprisingly fast (under 15 minutes) with just 1
+        # CPU.  We noticed OOM failures with 6GB 4/2020, so we increased the memory.
+        CPU: 1
+        MEMORY: 8G
+      script:
+        - dart --enable-asserts ./dev/bots/analyze.dart
 
     - name: framework_tests-widgets-linux
       only_if: "changesInclude('.cirrus.yml', 'dev/**', 'packages/flutter/**', 'packages/flutter_test/**', 'packages/flutter_tools/lib/src/test/**', 'bin/**') && $CIRRUS_PR != ''"
diff --git a/dev/bots/analyze.dart b/dev/bots/analyze.dart
index 0b1de1a3e3..1c45e428c3 100644
--- a/dev/bots/analyze.dart
+++ b/dev/bots/analyze.dart
@@ -106,7 +106,7 @@ Future<void> run(List<String> arguments) async {
   // Analyze all the sample code in the repo
   print('$clock Sample code...');
   await runCommand(dart,
-    <String>[path.join(flutterRoot, 'dev', 'bots', 'analyze_sample_code.dart')],
+    <String>[path.join(flutterRoot, 'dev', 'bots', 'analyze_sample_code.dart'), '--verbose'],
     workingDirectory: flutterRoot,
   );
 
diff --git a/packages/flutter/lib/src/cupertino/context_menu.dart b/packages/flutter/lib/src/cupertino/context_menu.dart
index b4f2194ea6..81cb79fa02 100644
--- a/packages/flutter/lib/src/cupertino/context_menu.dart
+++ b/packages/flutter/lib/src/cupertino/context_menu.dart
@@ -212,7 +212,7 @@ class CupertinoContextMenu extends StatefulWidget {
   ///       onPressed: () {},
   ///     ),
   ///   ],
-  /// ),
+  /// )
   /// ```
   ///
   /// {@end-tool}
diff --git a/packages/flutter/lib/src/material/list_tile.dart b/packages/flutter/lib/src/material/list_tile.dart
index eb79192df1..2c7702786e 100644
--- a/packages/flutter/lib/src/material/list_tile.dart
+++ b/packages/flutter/lib/src/material/list_tile.dart
@@ -429,7 +429,7 @@ enum ListTileControlAffinity {
 ///   ),
 ///   title: const Text('title'),
 ///   dense: false,
-/// ),
+/// )
 /// ```
 /// {@end-tool}
 ///
diff --git a/packages/flutter/lib/src/material/progress_indicator_theme.dart b/packages/flutter/lib/src/material/progress_indicator_theme.dart
index 0023be9cfc..57603a5871 100644
--- a/packages/flutter/lib/src/material/progress_indicator_theme.dart
+++ b/packages/flutter/lib/src/material/progress_indicator_theme.dart
@@ -138,16 +138,15 @@ class ProgressIndicatorThemeData with Diagnosticable {
 /// {@tool snippet}
 ///
 /// Here is an example of a progress indicator theme that applies a red indicator
-/// color with a slightly transparent red for the background track color.
+/// color.
 ///
 /// ```dart
-/// ProgressIndicatorTheme(
+/// const ProgressIndicatorTheme(
 ///   data: ProgressIndicatorThemeData(
 ///     color: Colors.red,
-///     backgroundColor: Colors.red.withOpacity(0.25),
 ///   ),
 ///   child: LinearProgressIndicator()
-/// ),
+/// )
 /// ```
 /// {@end-tool}
 class ProgressIndicatorTheme extends InheritedTheme {
diff --git a/packages/flutter/lib/src/material/text_selection_theme.dart b/packages/flutter/lib/src/material/text_selection_theme.dart
index b239913631..4b01b9613a 100644
--- a/packages/flutter/lib/src/material/text_selection_theme.dart
+++ b/packages/flutter/lib/src/material/text_selection_theme.dart
@@ -128,7 +128,7 @@ class TextSelectionThemeData with Diagnosticable {
 ///     selectionHandleColor: Colors.lightBlue,
 ///   ),
 ///   child: TextField(),
-/// ),
+/// )
 /// ```
 /// {@end-tool}
 class TextSelectionTheme extends InheritedTheme {
diff --git a/packages/flutter/lib/src/material/tooltip_theme.dart b/packages/flutter/lib/src/material/tooltip_theme.dart
index 95845b0f56..5fb34ea8a6 100644
--- a/packages/flutter/lib/src/material/tooltip_theme.dart
+++ b/packages/flutter/lib/src/material/tooltip_theme.dart
@@ -239,7 +239,7 @@ class TooltipThemeData with Diagnosticable {
 ///       onPressed: () {},
 ///     ),
 ///   ),
-/// ),
+/// )
 /// ```
 /// {@end-tool}
 class TooltipTheme extends InheritedTheme {
diff --git a/packages/flutter/lib/src/painting/strut_style.dart b/packages/flutter/lib/src/painting/strut_style.dart
index 6e029713ec..0b6e30f82e 100644
--- a/packages/flutter/lib/src/painting/strut_style.dart
+++ b/packages/flutter/lib/src/painting/strut_style.dart
@@ -282,7 +282,7 @@ import 'text_style.dart';
 ///     fontSize: 14,
 ///     forceStrutHeight: true,
 ///   ),
-/// ),
+/// )
 /// ```
 /// {@end-tool}
 ///