From 1923e46493f43cece53d1d720b8e2fb991f5e6c3 Mon Sep 17 00:00:00 2001
From: Nathan Hammond <Nathan Hammond>
Date: Fri, 14 Jul 2023 10:51:52 +0800
Subject: [PATCH] Style and naming adjustments.

---
 crates/turborepo-lib/src/rewrite_json.rs | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/crates/turborepo-lib/src/rewrite_json.rs b/crates/turborepo-lib/src/rewrite_json.rs
index cdc9641fcdb331..b1bbdeb23c9d79 100644
--- a/crates/turborepo-lib/src/rewrite_json.rs
+++ b/crates/turborepo-lib/src/rewrite_json.rs
@@ -13,7 +13,7 @@ pub enum RewriteError {
  */
 enum GenerateType {
     Object,
-    Path,
+    Member,
 }
 
 /**
@@ -61,11 +61,11 @@ pub fn set_path(
 
     // Figure out what we should be generating:
     // - An object to be assigned to an existing member. ("object")
-    // - A member to add to an existing object. ("path")
+    // - A member to add to an existing object. ("member")
     let generate_type: GenerateType = if closest_path.len() > 0 {
         GenerateType::Object
     } else {
-        GenerateType::Path
+        GenerateType::Member
     };
 
     // Identify the token replacement metadata: start, end, and possible trailing
@@ -80,7 +80,7 @@ pub fn set_path(
             start = range.start;
             end = range.end;
         }
-        GenerateType::Path => {
+        GenerateType::Member => {
             if property_count > 0 {
                 separator = ",";
             } else {
@@ -97,13 +97,14 @@ pub fn set_path(
     let missing_path_segments = path[closest_path.len()..].to_vec();
     let computed_object = match generate_type {
         GenerateType::Object => generate_object(missing_path_segments, json_value),
-        GenerateType::Path => generate_path(missing_path_segments, json_value, separator),
+        GenerateType::Member => generate_member(missing_path_segments, json_value, separator),
     };
 
     // Generate a new document!
     let mut output: String = json_document_string.to_owned();
     output.replace_range(start..end, &computed_object);
-    return Ok(output);
+
+    Ok(output)
 }
 
 /**
@@ -136,16 +137,18 @@ fn get_closest_node<'a>(
     current_path: Vec<&'a str>,
 ) -> (Vec<&'a str>, &'a jsonc_parser::ast::Value<'a>) {
     // No target_path? We've arrived.
-    if target_path.len() == 0 {
+    if target_path.is_empty() {
         return (current_path, current_node);
     }
 
     match current_node {
         // Only objects can have key paths.
         jsonc_parser::ast::Value::Object(obj) => {
+            // Grab the last property (member) which matches the current target_path
+            // element.
             let object_property = obj.properties.iter().rev().find(|property| {
                 let current_property_name = property.name.as_str();
-                return target_path[0] == current_property_name;
+                target_path[0] == current_property_name
             });
 
             // See if we found a matching key. If so, recurse.
@@ -194,7 +197,7 @@ fn generate_object(path_segments: Vec<&str>, value: &str) -> String {
  * Given path segments, generate a JSON object member with an optional
  * trailing separator.
  */
-fn generate_path(path_segments: Vec<&str>, value: &str, separator: &str) -> String {
+fn generate_member(path_segments: Vec<&str>, value: &str, separator: &str) -> String {
     let mut output = String::new();
     output.push_str("\"");
     output.push_str(path_segments[0]);
@@ -264,7 +267,7 @@ fn find_all_paths<'a>(
     let mut ranges: Vec<Range> = vec![];
 
     // Early exit when it's impossible to have matching ranges.
-    if target_path.len() == 0 {
+    if target_path.is_empty() {
         return ranges;
     }