Merge branch 'ChainedParentsFix' into dev

Author: Neko-Box-Coder

README.md

@@ -17,6 +17,7 @@
 > - [Add the ability lock settings.json and bindings.json for plugins #3618](https://github.com/zyedidia/micro/pull/3618)
 > - [Adding error screen for lua functions running in status line #3691](https://github.com/zyedidia/micro/pull/3691)
 > - [Adding lua function to use result of RunBackgroundShell #3692](https://github.com/zyedidia/micro/pull/3692)
+> - [Fix unable to perform proportional resize caused by chained parents after quiting a nested HSplit inside a VSplit #3708](https://github.com/zyedidia/micro/pull/3708)
 >
 > To see the diff between this and upstream master, click [here](https://github.com/zyedidia/micro/compare/master...Neko-Box-Coder:micro-dev:dev)
 

internal/views/splits.go

@@ -479,9 +479,32 @@ func (n *Node) Unsplit() bool {
 	if n.parent.IsLeaf() {
 		return n.parent.Unsplit()
 	}
+
+	n.parent.simplify()
 	return true
 }
 
+// Simplify removes unnecessary chained parents
+func (n *Node) simplify() {
+	if n.parent == nil || len(n.children) != 1 {
+		return
+	}
+
+	ind := 0
+	for i, c := range n.parent.children {
+		if c.id == n.id {
+			ind = i
+		}
+	}
+
+	parent := n.parent
+	kind := n.Kind
+	parent.children[ind] = n.children[0]
+	parent.children[ind].parent = parent
+	parent.children[ind].Kind = kind
+	parent.simplify()
+}
+
 // String returns the string form of the node and all children (used for debugging)
 func (n *Node) String() string {
 	var strf func(n *Node, ident int) string