From 8e2c9efedab99499627e3c5efd5babc8be1e9b65 Mon Sep 17 00:00:00 2001
From: Chris Bracken <chris@bracken.jp>
Date: Mon, 4 Apr 2022 13:24:33 -0700
Subject: [PATCH] Fix SemanticsAction naming consistency

Removes the `Index` suffix from kMoveCursorForwardByWord and
kMoveCursorBackwardByWord values in the SemanticsAction enum. These were
erroneously copied as-is from the private class members in the dart:ui
implementation in lib/ui/semantics/semantics.dart where the class
members refer to the enum index here. This removes the trailing `Index`
for consistency with the other enum members here.

This is also useful in the context of automated testing for API
consistency between these enums, the ones in dart:ui (native and web
implementations) and the embedder API.

Issue: https://github.com/flutter/flutter/issues/101217
---
 lib/ui/semantics/semantics_node.h                      | 4 ++--
 shell/platform/fuchsia/flutter/accessibility_bridge.cc | 9 ++++-----
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/lib/ui/semantics/semantics_node.h b/lib/ui/semantics/semantics_node.h
index 6fc4d733d6947..70c0fcf7c554b 100644
--- a/lib/ui/semantics/semantics_node.h
+++ b/lib/ui/semantics/semantics_node.h
@@ -39,8 +39,8 @@ enum class SemanticsAction : int32_t {
   kDidLoseAccessibilityFocus = 1 << 16,
   kCustomAction = 1 << 17,
   kDismiss = 1 << 18,
-  kMoveCursorForwardByWordIndex = 1 << 19,
-  kMoveCursorBackwardByWordIndex = 1 << 20,
+  kMoveCursorForwardByWord = 1 << 19,
+  kMoveCursorBackwardByWord = 1 << 20,
   kSetText = 1 << 21,
 };
 
diff --git a/shell/platform/fuchsia/flutter/accessibility_bridge.cc b/shell/platform/fuchsia/flutter/accessibility_bridge.cc
index 79c5a7bb98007..309a468cf7617 100644
--- a/shell/platform/fuchsia/flutter/accessibility_bridge.cc
+++ b/shell/platform/fuchsia/flutter/accessibility_bridge.cc
@@ -136,15 +136,14 @@ std::string NodeActionsToString(const flutter::SemanticsNode& node) {
           flutter::SemanticsAction::kMoveCursorBackwardByCharacter)) {
     output += "kMoveCursorBackwardByCharacter|";
   }
-  if (node.HasAction(
-          flutter::SemanticsAction::kMoveCursorBackwardByWordIndex)) {
-    output += "kMoveCursorBackwardByWordIndex|";
+  if (node.HasAction(flutter::SemanticsAction::kMoveCursorBackwardByWord)) {
+    output += "kMoveCursorBackwardByWord|";
   }
   if (node.HasAction(flutter::SemanticsAction::kMoveCursorForwardByCharacter)) {
     output += "kMoveCursorForwardByCharacter|";
   }
-  if (node.HasAction(flutter::SemanticsAction::kMoveCursorForwardByWordIndex)) {
-    output += "kMoveCursorForwardByWordIndex|";
+  if (node.HasAction(flutter::SemanticsAction::kMoveCursorForwardByWord)) {
+    output += "kMoveCursorForwardByWord|";
   }
   if (node.HasAction(flutter::SemanticsAction::kPaste)) {
     output += "kPaste|";