Fix prj 1 -> 2 conversion 'retatlive' option in load paths

Allen Webster · Allen Webster · commit 1eff9eaa9031 · 2021-01-19T19:38:52.000-08:00
diff --git a/custom/4coder_default_hooks.cpp b/custom/4coder_default_hooks.cpp
@@ -305,8 +305,7 @@ default_render_buffer(Application_Links *app, View_ID view_id, Face_ID face_id,
                 {string_u8_litexpr("NOTE"), finalize_color(defcolor_comment_pop, 0)},
                 {string_u8_litexpr("TODO"), finalize_color(defcolor_comment_pop, 1)},
             };
-            draw_comment_highlights(app, buffer, text_layout_id,
-                                    &token_array, pairs, ArrayCount(pairs));
+            draw_comment_highlights(app, buffer, text_layout_id, &token_array, pairs, ArrayCount(pairs));
         }
         
 #if 0
diff --git a/custom/4coder_prj_v1.cpp b/custom/4coder_prj_v1.cpp
@@ -381,7 +381,7 @@ prj_v1_to_v2(Application_Links *app, String8 dir, Config *parsed){
             Variable_Handle path_var = vars_new_variable(os_var, key);
             vars_new_variable(path_var, path_id, vars_save_string(load_path->path));
             vars_new_variable(path_var, recursive_id, load_path->recursive?true_id:false_id);
-            vars_new_variable(path_var, relative_id, load_path->recursive?true_id:false_id);
+            vars_new_variable(path_var, relative_id, load_path->relative?true_id:false_id);
         }
     }
     
diff --git a/custom/generated/command_metadata.h b/custom/generated/command_metadata.h

Original file line number	Diff line number	Diff line change
`@@ -305,8 +305,7 @@ default_render_buffer(Application_Links *app, View_ID view_id, Face_ID face_id,`
`305`	`305`	`{string_u8_litexpr("NOTE"), finalize_color(defcolor_comment_pop, 0)},`
`306`	`306`	`{string_u8_litexpr("TODO"), finalize_color(defcolor_comment_pop, 1)},`
`307`	`307`	`};`
`308`		`- draw_comment_highlights(app, buffer, text_layout_id,`
`309`		`- &token_array, pairs, ArrayCount(pairs));`
	`308`	`+ draw_comment_highlights(app, buffer, text_layout_id, &token_array, pairs, ArrayCount(pairs));`
`310`	`309`	`}`
`311`	`310`
`312`	`311`	`#if 0`
Original file line number	Diff line number	Diff line change
`@@ -381,7 +381,7 @@ prj_v1_to_v2(Application_Links app, String8 dir, Config parsed){`
`381`	`381`	`Variable_Handle path_var = vars_new_variable(os_var, key);`
`382`	`382`	`vars_new_variable(path_var, path_id, vars_save_string(load_path->path));`
`383`	`383`	`vars_new_variable(path_var, recursive_id, load_path->recursive?true_id:false_id);`
`384`		`- vars_new_variable(path_var, relative_id, load_path->recursive?true_id:false_id);`
	`384`	`+ vars_new_variable(path_var, relative_id, load_path->relative?true_id:false_id);`
`385`	`385`	`}`
`386`	`386`	`}`
`387`	`387`