From 35a8231963662815bab57457b1a8c48ee34903f5 Mon Sep 17 00:00:00 2001 From: Serhat Sevki Dincer Date: Thu, 23 Feb 2023 22:41:03 +1100 Subject: [PATCH] text,widget: remove ineffective assignments Signed-off-by: Serhat Sevki Dincer --- text/gotext_test.go | 2 +- widget/editor_test.go | 8 ++++---- widget/selectable.go | 1 - 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/text/gotext_test.go b/text/gotext_test.go index a1aad337..579c2626 100644 --- a/text/gotext_test.go +++ b/text/gotext_test.go @@ -258,7 +258,7 @@ func makeTestText(shaper *shaperImpl, primaryDir system.TextDirection, fontSize, } simpleText := shaper.shapeAndWrapText(shaper.orderer.sortedFacesForStyle(Font{}), Parameters{PxPerEm: fixed.I(fontSize)}, lineWidth, locale, []rune(simpleSource)) complexText := shaper.shapeAndWrapText(shaper.orderer.sortedFacesForStyle(Font{}), Parameters{PxPerEm: fixed.I(fontSize)}, lineWidth, locale, []rune(complexSource)) - shaper = testShaper(rtlFace, ltrFace) + testShaper(rtlFace, ltrFace) return simpleText, complexText } diff --git a/widget/editor_test.go b/widget/editor_test.go index 528edc91..debe07c3 100644 --- a/widget/editor_test.go +++ b/widget/editor_test.go @@ -117,12 +117,12 @@ func TestEditorReadOnly(t *testing.T) { if cStart != cEnd { t.Errorf("unexpected initial caret positions") } - dims := e.Layout(gtx, cache, font, fontSize, nil) + e.Layout(gtx, cache, font, fontSize, nil) // Select everything. gtx.Ops.Reset() gtx.Queue = &testQueue{events: []event.Event{key.Event{Name: "A", Modifiers: key.ModShortcut}}} - dims = e.Layout(gtx, cache, font, fontSize, nil) + e.Layout(gtx, cache, font, fontSize, nil) textContent := e.Text() cStart2, cEnd2 := e.Selection() if cStart2 > cEnd2 { @@ -138,7 +138,7 @@ func TestEditorReadOnly(t *testing.T) { // Type some new characters. gtx.Ops.Reset() gtx.Queue = &testQueue{events: []event.Event{key.EditEvent{Range: key.Range{Start: cStart2, End: cEnd2}, Text: "something else"}}} - dims = e.Layout(gtx, cache, font, fontSize, nil) + e.Layout(gtx, cache, font, fontSize, nil) textContent2 := e.Text() if textContent2 != textContent { t.Errorf("readonly editor modified by key.EditEvent") @@ -147,7 +147,7 @@ func TestEditorReadOnly(t *testing.T) { // Try to delete selection. gtx.Ops.Reset() gtx.Queue = &testQueue{events: []event.Event{key.Event{Name: key.NameDeleteBackward}}} - dims = e.Layout(gtx, cache, font, fontSize, nil) + dims := e.Layout(gtx, cache, font, fontSize, nil) textContent2 = e.Text() if textContent2 != textContent { t.Errorf("readonly editor modified by delete key.Event") diff --git a/widget/selectable.go b/widget/selectable.go index ee88935c..8af50c2c 100644 --- a/widget/selectable.go +++ b/widget/selectable.go @@ -45,7 +45,6 @@ func (s stringSource) ReadAt(b []byte, offset int64) (int, error) { // ReplaceRunes is unimplemented, as a stringSource is immutable. func (s stringSource) ReplaceRunes(byteOffset, runeCount int64, str string) { - return } // Selectable holds text selection state. -- 2.38.5