From 1f8789e7ebd37b1f53b251bad59a7bbb62e7c125 Mon Sep 17 00:00:00 2001
From: charlie <3140647@qq.com>
Date: Fri, 18 Nov 2022 17:35:01 +0800
Subject: [PATCH] RemoveAt

---
 collections/list/linked_list.go      | 22 ++++++++++++----------
 collections/list/linked_list_test.go | 15 ++++++++++-----
 2 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/collections/list/linked_list.go b/collections/list/linked_list.go
index 177a820..8599c68 100644
--- a/collections/list/linked_list.go
+++ b/collections/list/linked_list.go
@@ -14,6 +14,7 @@ type LinkedNode[T any] struct {
 	Prev, Next *LinkedNode[T]
 }
 
+// NewLinkedList 初始化链表
 func NewLinkedList[T any](elems ...T) *LinkedList[T] {
 	l :=
 		&LinkedList[T]{
@@ -99,6 +100,9 @@ func (l *LinkedList[T]) Remove(n *LinkedNode[T]) {
 		l.front = n.Next
 	}
 
+	n.Next = nil
+	n.Prev = nil
+
 	l.size--
 }
 
@@ -107,24 +111,22 @@ func (l *LinkedList[T]) RemoveAt(index int) {
 	defer l.locker.Unlock()
 
 	var i int
-	var prev *LinkedNode[T]
-
-	prev = l.front
-	for current := l.front; current != nil; {
-
+	for current := l.front; current != nil; current = current.Next {
 		if i == index {
-			prev.Next = current.Next
+
+			// 重连接
+			current.Prev.Next = current.Next
+			current.Next.Prev = current.Prev
+
+			current.Prev = nil
 			current.Next = nil
 
 			l.size--
-			return
+			break
 		}
 
-		prev = current
-		current = current.Next
 		i++
 	}
-
 }
 
 func (l *LinkedList[T]) pushBackNode(n *LinkedNode[T]) {
diff --git a/collections/list/linked_list_test.go b/collections/list/linked_list_test.go
index 78bb811..ffb995a 100644
--- a/collections/list/linked_list_test.go
+++ b/collections/list/linked_list_test.go
@@ -87,12 +87,17 @@ func BenchmarkLinkedList(b *testing.B) {
 }
 
 func TestRemoveNode(t *testing.T) {
-	l := list.NewLinkedList(1, 2, 4)
+	l := list.NewLinkedList(1, 2, 3, 4, 5)
 
-	l.ForEach(func(i int) bool {
-		t.Log(i)
+	// l.ForEach(func(i int) bool {
+	// 	t.Log(i)
 
-		return false
-	})
+	// 	return false
+	// })
+
+	l.RemoveAt(1)
+	for currnet := l.FrontNode(); currnet != nil; currnet = currnet.Next {
+		t.Logf("%p   %+v", currnet, currnet)
+	}
 
 }