Merge pull request #242 from noborus/fieldalignment

Change order by fieldalignment
noborus · Jan 3, 2023 · 29eedca · 29eedca
2 parents 62f99c1 + 0b66860
commit 29eedca
Show file tree

Hide file tree

Showing 17 changed files with 35 additions and 35 deletions.
diff --git a/oviewer/content.go b/oviewer/content.go
@@ -15,10 +15,10 @@ import (
 // content represents one character on the terminal.
 // content is a value that can be set in SetContent() of tcell.
 type content struct {
+	style tcell.Style
+	combc []rune
 	width int
 	mainc rune
-	combc []rune
-	style tcell.Style
 }
 
 // contents represents one line of contents.

diff --git a/oviewer/event.go b/oviewer/event.go
@@ -269,8 +269,8 @@ func (root *Root) MoveBottom() {
 
 // eventDocument represents a set document event.
 type eventDocument struct {
-	docNum int
 	tcell.EventTime
+	docNum int
 }
 
 // SetDocument fires the eventDocument event.

diff --git a/oviewer/input.go b/oviewer/input.go
@@ -35,22 +35,22 @@ const (
 type Input struct {
 	Event Eventer
 
-	value   string
-	cursorX int
-
 	// Candidate is prepared when the history is used as an input candidate.
 	// Header and SkipLines use numbers up and down instead of candidate.
+	DelimiterCandidate    *candidate
 	ModeCandidate         *candidate
 	SearchCandidate       *candidate
 	GoCandidate           *candidate
-	DelimiterCandidate    *candidate
 	TabWidthCandidate     *candidate
 	WatchCandidate        *candidate
 	WriteBACandidate      *candidate
 	SectionDelmCandidate  *candidate
 	SectionStartCandidate *candidate
 	MultiColorCandidate   *candidate
 	JumpTargetCandidate   *candidate
+
+	value   string
+	cursorX int
 }
 
 // NewInput returns all the various inputs.

diff --git a/oviewer/input_delimiter.go b/oviewer/input_delimiter.go
@@ -24,9 +24,9 @@ func delimiterCandidate() *candidate {
 
 // eventDelimiter represents the delimiter input mode.
 type eventDelimiter struct {
-	value string
-	clist *candidate
 	tcell.EventTime
+	clist *candidate
+	value string
 }
 
 // newDelimiterEvent returns delimiterEvent.

diff --git a/oviewer/input_goto.go b/oviewer/input_goto.go
@@ -19,9 +19,9 @@ func gotoCandidate() *candidate {
 
 // eventGoto represents the goto input mode.
 type eventGoto struct {
-	value string
-	clist *candidate
 	tcell.EventTime
+	clist *candidate
+	value string
 }
 
 // newGotoEvent returns gotoEvent.

diff --git a/oviewer/input_header.go b/oviewer/input_header.go
@@ -16,8 +16,8 @@ func (root *Root) setHeaderMode() {
 
 // eventHeader represents the goto input mode.
 type eventHeader struct {
-	value string
 	tcell.EventTime
+	value string
 }
 
 // newHeaderEvent returns headerEvent.

diff --git a/oviewer/input_jumptarget.go b/oviewer/input_jumptarget.go
@@ -19,9 +19,9 @@ func jumpTargetCandidate() *candidate {
 
 // eventJumpTarget represents the jump target input mode.
 type eventJumpTarget struct {
-	value string
-	clist *candidate
 	tcell.EventTime
+	clist *candidate
+	value string
 }
 
 // newJumpTargetEvent returns jumpTargetEvent.

diff --git a/oviewer/input_multicolor.go b/oviewer/input_multicolor.go
@@ -22,9 +22,9 @@ func multiColorCandidate() *candidate {
 
 // eventMultiColor represents the multi color input mode.
 type eventMultiColor struct {
-	value string
-	clist *candidate
 	tcell.EventTime
+	clist *candidate
+	value string
 }
 
 // newMultiColorEvent returns multiColorEvent.

diff --git a/oviewer/input_search.go b/oviewer/input_search.go
@@ -20,9 +20,9 @@ func searchCandidate() *candidate {
 
 // eventInputSearch represents the search input mode.
 type eventInputSearch struct {
-	value string
-	clist *candidate
 	tcell.EventTime
+	clist *candidate
+	value string
 }
 
 // newSearchEvent returns SearchInput.
@@ -74,9 +74,9 @@ func (root *Root) setBackSearchMode() {
 
 // eventInputBackSearch represents the back search input mode.
 type eventInputBackSearch struct {
-	value string
-	clist *candidate
 	tcell.EventTime
+	clist *candidate
+	value string
 }
 
 // newBackSearchEvent returns backSearchEvent.

diff --git a/oviewer/input_section_delimiter.go b/oviewer/input_section_delimiter.go
@@ -25,9 +25,9 @@ func sectionDelimiterCandidate() *candidate {
 
 // delimiterInput represents the delimiter input mode.
 type eventSectionDelimiter struct {
-	value string
-	clist *candidate
 	tcell.EventTime
+	clist *candidate
+	value string
 }
 
 // newSectionDelimiterEvent returns sectionDelimiterInput.

diff --git a/oviewer/input_section_start.go b/oviewer/input_section_start.go
@@ -23,9 +23,9 @@ func sectionStartCandidate() *candidate {
 
 // eventSectionStart represents the section start position input mode.
 type eventSectionStart struct {
-	value string
-	clist *candidate
 	tcell.EventTime
+	clist *candidate
+	value string
 }
 
 // newSectionStartEvent returns sectionDelimiterEvent.

diff --git a/oviewer/input_skip.go b/oviewer/input_skip.go
@@ -16,8 +16,8 @@ func (root *Root) setSkipLinesMode() {
 
 // eventSkipLines represents the goto input mode.
 type eventSkipLines struct {
-	value string
 	tcell.EventTime
+	value string
 }
 
 // newSkipLinesEvent returns skipLinesEvent.

diff --git a/oviewer/input_tabwidth.go b/oviewer/input_tabwidth.go
@@ -25,9 +25,9 @@ func tabWidthCandidate() *candidate {
 
 // eventTabWidth represents the TABWidth input mode.
 type eventTabWidth struct {
-	value string
-	clist *candidate
 	tcell.EventTime
+	clist *candidate
+	value string
 }
 
 // newTabWidthEvent returns tabWidthEvent.

diff --git a/oviewer/input_viewmode.go b/oviewer/input_viewmode.go
@@ -21,9 +21,9 @@ func viewModeCandidate() *candidate {
 
 // eventViewMode represents the mode input mode.
 type eventViewMode struct {
-	value string
-	clist *candidate
 	tcell.EventTime
+	clist *candidate
+	value string
 }
 
 // newViewModeEvent returns viewModeEvent.

diff --git a/oviewer/input_watch.go b/oviewer/input_watch.go
@@ -23,9 +23,9 @@ func watchCandidate() *candidate {
 
 // eventWatchInterval represents the WatchInteval input mode.
 type eventWatchInterval struct {
-	value string
-	clist *candidate
 	tcell.EventTime
+	clist *candidate
+	value string
 }
 
 // newWatchIntevalInputt returns watchIntervalEvent.

diff --git a/oviewer/input_writeba.go b/oviewer/input_writeba.go
@@ -19,9 +19,9 @@ func baCandidate() *candidate {
 
 // eventWriteBA represents the WatchInteval input mode.
 type eventWriteBA struct {
-	value string
-	clist *candidate
 	tcell.EventTime
+	clist *candidate
+	value string
 }
 
 // newWriteBAEvent returns writeBAEvent.

diff --git a/oviewer/search.go b/oviewer/search.go
@@ -409,8 +409,8 @@ func (root *Root) nextBackSearch(ctx context.Context, str string) {
 
 // eventNextSearch represents search event.
 type eventNextSearch struct {
-	str string
 	tcell.EventTime
+	str string
 }
 
 // setNextSearch fires the exntNextSearch event.
@@ -423,8 +423,8 @@ func (root *Root) setNextSearch() {
 
 // eventNextBackSearch represents backward search event.
 type eventNextBackSearch struct {
-	str string
 	tcell.EventTime
+	str string
 }
 
 // setNextBackSearch fires the exntNextBackSearch event.