fix analysis errors

Author: yjbanov

lib/web_ui/lib/src/engine/canvaskit/text.dart

@@ -726,9 +726,11 @@ class CkStrutStyle implements ui.StrutStyle {
   }
 
   @override
-  int get hashCode => Object.hash(
+  int get hashCode {
+    final List<String>? fontFamilyFallback = _fontFamilyFallback;
+    return Object.hash(
         _fontFamily,
-        _fontFamilyFallback != null ? Object.hashAll(_fontFamilyFallback) : null,
+        fontFamilyFallback != null ? Object.hashAll(fontFamilyFallback) : null,
         _fontSize,
         _height,
         _leading,
@@ -737,6 +739,7 @@ class CkStrutStyle implements ui.StrutStyle {
         _fontStyle,
         _forceStrutHeight,
       );
+  }
 }
 
 SkFontStyle toSkFontStyle(ui.FontWeight? fontWeight, ui.FontStyle? fontStyle) {

lib/web_ui/lib/src/engine/skwasm/skwasm_impl/paragraph.dart

@@ -650,17 +650,20 @@ final class SkwasmStrutStyle extends SkwasmObjectWrapper<RawStrutStyle> implemen
   }
 
   @override
-  int get hashCode => Object.hash(
-    _fontFamily,
-    _fontFamilyFallback != null ? Object.hashAll(_fontFamilyFallback) : null,
-    _fontSize,
-    _height,
-    _leading,
-    _leadingDistribution,
-    _fontWeight,
-    _fontStyle,
-    _forceStrutHeight,
-  );
+  int get hashCode {
+    final List<String>? fontFamilyFallback = _fontFamilyFallback;
+    return Object.hash(
+      _fontFamily,
+      fontFamilyFallback != null ? Object.hashAll(fontFamilyFallback) : null,
+      _fontSize,
+      _height,
+      _leading,
+      _leadingDistribution,
+      _fontWeight,
+      _fontStyle,
+      _forceStrutHeight,
+    );
+  }
 }
 
 class SkwasmParagraphStyle extends SkwasmObjectWrapper<RawParagraphStyle> implements ui.ParagraphStyle {

lib/web_ui/lib/src/engine/text/paragraph.dart

@@ -846,9 +846,11 @@ class EngineStrutStyle implements ui.StrutStyle {
   }
 
   @override
-  int get hashCode => Object.hash(
+  int get hashCode {
+    final List<String>? fontFamilyFallback = _fontFamilyFallback;
+    return Object.hash(
         _fontFamily,
-        _fontFamilyFallback != null ? Object.hashAll(_fontFamilyFallback) : null,
+        fontFamilyFallback != null ? Object.hashAll(fontFamilyFallback) : null,
         _fontSize,
         _height,
         _leading,
@@ -857,6 +859,7 @@ class EngineStrutStyle implements ui.StrutStyle {
         _fontStyle,
         _forceStrutHeight,
       );
+  }
 }
 
 /// Holds information for a placeholder in a paragraph.

lib/web_ui/test/canvaskit/text_test.dart

@@ -105,23 +105,23 @@ void testMain() {
       test('The default test font is used when a non-test fontFamily is specified', () {
         final String defaultTestFontFamily = testFonts.first;
 
-        expect(CkTextStyle(fontFamily: 'BogusFontFamily').fontFamily, defaultTestFontFamily);
-        expect(CkParagraphStyle(fontFamily: 'BogusFontFamily').getTextStyle().fontFamily, defaultTestFontFamily);
+        expect(CkTextStyle(fontFamily: 'BogusFontFamily').effectiveFontFamily, defaultTestFontFamily);
+        expect(CkParagraphStyle(fontFamily: 'BogusFontFamily').getTextStyle().effectiveFontFamily, defaultTestFontFamily);
         expect(CkStrutStyle(fontFamily: 'BogusFontFamily'), CkStrutStyle(fontFamily: defaultTestFontFamily));
       });
 
       test('The default test font is used when fontFamily is unspecified', () {
         final String defaultTestFontFamily = testFonts.first;
 
-        expect(CkTextStyle().fontFamily, defaultTestFontFamily);
-        expect(CkParagraphStyle().getTextStyle().fontFamily, defaultTestFontFamily);
+        expect(CkTextStyle().effectiveFontFamily, defaultTestFontFamily);
+        expect(CkParagraphStyle().getTextStyle().effectiveFontFamily, defaultTestFontFamily);
         expect(CkStrutStyle(), CkStrutStyle(fontFamily: defaultTestFontFamily));
       });
 
       test('Can specify test fontFamily to use', () {
         for (final String testFont in testFonts) {
-          expect(CkTextStyle(fontFamily: testFont).fontFamily, testFont);
-          expect(CkParagraphStyle(fontFamily: testFont).getTextStyle().fontFamily, testFont);
+          expect(CkTextStyle(fontFamily: testFont).effectiveFontFamily, testFont);
+          expect(CkParagraphStyle(fontFamily: testFont).getTextStyle().effectiveFontFamily, testFont);
         }
       });
     });