Merge pull request #191 from noborus/add-tail-section

Clarification of the role of the lastSection move
noborus · May 19, 2022 · 9f20a13 · 9f20a13
2 parents 138a08c + 0a791e7
commit 9f20a13
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 6 deletions.
diff --git a/oviewer/action.go b/oviewer/action.go
@@ -434,6 +434,17 @@ func (root *Root) TailSync() {
 	root.ViewSync()
 }
 
+// tailSection moves to the last section
+// and adjusts to its original position.
+func (root *Root) tailSection() {
+	moved := root.Doc.topLN - root.Doc.lastSectionPosNum
+	root.lastSection()
+	if moved > 0 && (root.Doc.topLN+moved) < root.Doc.BufEndNum() {
+		root.moveLine(root.Doc.topLN + moved)
+	}
+	root.Doc.lastSectionPosNum = root.Doc.topLN
+}
+
 // prepareStartX prepares startX.
 func (root *Root) prepareStartX() {
 	root.startX = 0

diff --git a/oviewer/event.go b/oviewer/event.go
@@ -185,11 +185,7 @@ func (root *Root) follow() {
 
 	root.skipDraw = false
 	if root.Doc.FollowSection {
-		moved := root.Doc.topLN - root.Doc.lastSectionPosNum
-		root.lastSection()
-		if moved > 0 && (root.Doc.topLN+moved) < root.Doc.BufEndNum() {
-			root.moveLine(root.Doc.topLN + moved)
-		}
+		root.tailSection()
 	} else {
 		root.TailSync()
 	}

diff --git a/oviewer/move.go b/oviewer/move.go
@@ -337,7 +337,6 @@ func (root *Root) lastSection() {
 		return
 	}
 	n = (n - root.Doc.firstLine()) + root.Doc.SectionStartPosition
-	m.lastSectionPosNum = n
 	root.moveLine(n)
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -337,7 +337,6 @@ func (root *Root) lastSection() { @@
     		return
     	}
     	n = (n - root.Doc.firstLine()) + root.Doc.SectionStartPosition
-    	m.lastSectionPosNum = n
     	root.moveLine(n)
     }
@@ Expand Down @@