From 1f25cd4b1cfe7b6171b5405dbb4d9fb363cec12a Mon Sep 17 00:00:00 2001
From: Jan De Dobbeleer <jan.de.dobbeleer@gmail.com>
Date: Sun, 18 Apr 2021 07:16:38 +0200
Subject: [PATCH] fix(node): stop when yarn is detected

---
 src/segment_node.go      | 1 +
 src/segment_node_test.go | 1 +
 2 files changed, 2 insertions(+)

diff --git a/src/segment_node.go b/src/segment_node.go
index a764fe38f1ce..70c411a7df49 100644
--- a/src/segment_node.go
+++ b/src/segment_node.go
@@ -49,6 +49,7 @@ func (n *node) loadContext() {
 	}
 	if n.language.env.hasFiles("yarn.lock") {
 		n.packageManagerIcon = n.language.props.getString(YarnIcon, " \uF61A")
+		return
 	}
 	if n.language.env.hasFiles("package-lock.json") || n.language.env.hasFiles("package.json") {
 		n.packageManagerIcon = n.language.props.getString(NPMIcon, " \uE71E")
diff --git a/src/segment_node_test.go b/src/segment_node_test.go
index c7bc720685a4..8cb5b593dbd9 100644
--- a/src/segment_node_test.go
+++ b/src/segment_node_test.go
@@ -49,6 +49,7 @@ func TestNodeInContext(t *testing.T) {
 		{Case: "npm", hasNPM: true, ExpectedString: "npm", PkgMgrEnabled: true},
 		{Case: "default", hasDefault: true, ExpectedString: "npm", PkgMgrEnabled: true},
 		{Case: "disabled", HasYarn: true, ExpectedString: "", PkgMgrEnabled: false},
+		{Case: "yarn and npm", HasYarn: true, hasNPM: true, ExpectedString: "yarn", PkgMgrEnabled: true},
 	}
 
 	for _, tc := range cases {