path: refactor logic for to reduce code branches

This refactoring makes sure some code branches will not be hit if they do not have to be reached. PR-URL: #25278 Reviewed-By: Michaël Zasso <[email protected]>
nodejs · Mar 1, 2019 · 55d6b49 · 55d6b49
1 parent 6c7cd9e
commit 55d6b49
Showing 1 changed file with 16 additions and 14 deletions.
diff --git a/lib/path.js b/lib/path.js
@@ -224,23 +224,25 @@ const win32 = {
         isAbsolute = true;
       }
 
-      if (device.length > 0 &&
-          resolvedDevice.length > 0 &&
-          device.toLowerCase() !== resolvedDevice.toLowerCase()) {
-        // This path points to another device so it is not applicable
-        continue;
+      if (device.length > 0) {
+        if (resolvedDevice.length > 0) {
+          if (device.toLowerCase() !== resolvedDevice.toLowerCase())
+            // This path points to another device so it is not applicable
+            continue;
+        } else {
+          resolvedDevice = device;
+        }
       }
 
-      if (resolvedDevice.length === 0 && device.length > 0) {
-        resolvedDevice = device;
-      }
-      if (!resolvedAbsolute) {
-        resolvedTail = path.slice(rootEnd) + '\\' + resolvedTail;
+      if (resolvedAbsolute) {
+        if (resolvedDevice.length > 0)
+          break;
+      } else {
+        resolvedTail = `${path.slice(rootEnd)}\\${resolvedTail}`;
         resolvedAbsolute = isAbsolute;
-      }
-
-      if (resolvedDevice.length > 0 && resolvedAbsolute) {
-        break;
+        if (isAbsolute && resolvedDevice.length > 0) {
+          break;
+        }
       }
     }