Move SetComposingLength to TextRange::set_*

Adds set_base, set_extent, set_start, set_end methods to TextRange.

Author: cbracken

shell/platform/common/cpp/text_input_model.cc

@@ -78,7 +78,7 @@ void TextInputModel::UpdateComposingText(const std::string& composing_text) {
   }
   DeleteSelected();
   text_.replace(composing_range_.start(), composing_range_.length(), text);
-  SetComposingLength(text.length());
+  composing_range_.set_end(composing_range_.start() + text.length());
   selection_ = TextRange(composing_range_.end());
 }
 
@@ -110,16 +110,6 @@ bool TextInputModel::DeleteSelected() {
   return true;
 }
 
-void TextInputModel::SetComposingLength(size_t length) {
-  if (composing_range_.reversed()) {
-    size_t extent = composing_range_.extent();
-    composing_range_ = TextRange(extent + length, extent);
-  } else {
-    size_t base = composing_range_.base();
-    composing_range_ = TextRange(base, base + length);
-  }
-}
-
 void TextInputModel::AddCodePoint(char32_t c) {
   if (c <= 0xFFFF) {
     AddText(std::u16string({static_cast<char16_t>(c)}));
@@ -140,7 +130,7 @@ void TextInputModel::AddText(const std::u16string& text) {
     // Delete the current composing text, set the cursor to composing start.
     text_.erase(composing_range_.start(), composing_range_.length());
     selection_ = TextRange(composing_range_.start());
-    SetComposingLength(text.length());
+    composing_range_.set_end(composing_range_.start() + text.length());
   }
   size_t position = selection_.position();
   text_.insert(position, text);
@@ -164,7 +154,7 @@ bool TextInputModel::Backspace() {
     text_.erase(position - count, count);
     selection_ = TextRange(position - count);
     if (composing_) {
-      SetComposingLength(composing_range_.length() - count);
+      composing_range_.set_end(composing_range_.end() - count);
     }
     return true;
   }
@@ -181,7 +171,7 @@ bool TextInputModel::Delete() {
     int count = IsLeadingSurrogate(text_.at(position)) ? 2 : 1;
     text_.erase(position, count);
     if (composing_) {
-      SetComposingLength(composing_range_.length() - count);
+      composing_range_.set_end(composing_range_.end() - count);
     }
     return true;
   }
@@ -224,7 +214,7 @@ bool TextInputModel::DeleteSurrounding(int offset_from_cursor, int count) {
 
   // Adjust composing range.
   if (composing_) {
-    SetComposingLength(composing_range_.length() - deleted_length);
+    composing_range_.set_end(composing_range_.end() - deleted_length);
   }
   return true;
 }

shell/platform/common/cpp/text_input_model.h

@@ -172,9 +172,6 @@ class TextInputModel {
   // reset to the start of the selected range.
   bool DeleteSelected();
 
-  // Adjusts the composing range to |length|.
-  void SetComposingLength(size_t length);
-
   // Returns the currently editable text range.
   //
   // In composing mode, returns the composing range; otherwise, returns a range

shell/platform/common/cpp/text_range.h

@@ -21,27 +21,51 @@ class TextRange {
 
   virtual ~TextRange() = default;
 
-  // Returns the base position of the range.
+  // The base position of the range.
   size_t base() const { return base_; }
 
-  // Returns the extent position of the range.
+  // Sets the base position of the range.
+  void set_base(size_t pos) { base_ = pos; }
+
+  // The extent position of the range.
   size_t extent() const { return extent_; }
 
-  // Returns the lesser of the base and extent positions.
+  // Sets the extent position of the range.
+  void set_extent(size_t pos) { extent_ = pos; }
+
+  // The lesser of the base and extent positions.
   size_t start() const { return std::min(base_, extent_); }
 
-  // Returns the greater of the base and extent positions.
+  // Sets the start position of the range.
+  void set_start(size_t pos) {
+    if (base_ <= extent_) {
+      base_ = pos;
+    } else {
+      extent_ = pos;
+    }
+  }
+
+  // The greater of the base and extent positions.
   size_t end() const { return std::max(base_, extent_); }
 
-  // Returns the position of a collapsed range.
+  // Sets the end position of the range.
+  void set_end(size_t pos) {
+    if (base_ <= extent_) {
+      extent_ = pos;
+    } else {
+      base_ = pos;
+    }
+  }
+
+  // The position of a collapsed range.
   //
   // Asserts that the range is of length 0.
   size_t position() const {
     FML_DCHECK(base_ == extent_);
     return extent_;
   }
 
-  // Returns the length of the range.
+  // The length of the range.
   size_t length() const { return end() - start(); }
 
   // Returns true if the range is of length 0.

shell/platform/common/cpp/text_range_unittests.cc

@@ -50,6 +50,62 @@ TEST(TextRange, TextRangeFromReversedRange) {
   EXPECT_FALSE(range.collapsed());
 }
 
+TEST(TextRange, SetBase) {
+  TextRange range(3, 7);
+  range.set_base(4);
+  EXPECT_EQ(range.base(), size_t(4));
+  EXPECT_EQ(range.extent(), size_t(7));
+}
+
+TEST(TextRange, SetBaseReversed) {
+  TextRange range(7, 3);
+  range.set_base(5);
+  EXPECT_EQ(range.base(), size_t(5));
+  EXPECT_EQ(range.extent(), size_t(3));
+}
+
+TEST(TextRange, SetExtent) {
+  TextRange range(3, 7);
+  range.set_extent(6);
+  EXPECT_EQ(range.base(), size_t(3));
+  EXPECT_EQ(range.extent(), size_t(6));
+}
+
+TEST(TextRange, SetExtentReversed) {
+  TextRange range(7, 3);
+  range.set_extent(4);
+  EXPECT_EQ(range.base(), size_t(7));
+  EXPECT_EQ(range.extent(), size_t(4));
+}
+
+TEST(TextRange, SetStart) {
+  TextRange range(3, 7);
+  range.set_start(5);
+  EXPECT_EQ(range.base(), size_t(5));
+  EXPECT_EQ(range.extent(), size_t(7));
+}
+
+TEST(TextRange, SetStartReversed) {
+  TextRange range(7, 3);
+  range.set_start(5);
+  EXPECT_EQ(range.base(), size_t(7));
+  EXPECT_EQ(range.extent(), size_t(5));
+}
+
+TEST(TextRange, SetEnd) {
+  TextRange range(3, 7);
+  range.set_end(6);
+  EXPECT_EQ(range.base(), size_t(3));
+  EXPECT_EQ(range.extent(), size_t(6));
+}
+
+TEST(TextRange, SetEndReversed) {
+  TextRange range(7, 3);
+  range.set_end(5);
+  EXPECT_EQ(range.base(), size_t(5));
+  EXPECT_EQ(range.extent(), size_t(3));
+}
+
 TEST(TextRange, ContainsPreStartPosition) {
   TextRange range(2, 6);
   EXPECT_FALSE(range.Contains(1));