Merge pull request #579 from DannyBen/fix/user-view-markers

Fix view markers for user files
DannyBen · Dec 20, 2024 · 5fbb406 · 5fbb406
2 parents 786d8db + cc3896e
commit 5fbb406
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/lib/bashly/concerns/renderable.rb b/lib/bashly/concerns/renderable.rb
@@ -32,7 +32,7 @@ def load_user_file(file, placeholder: true)
         ''
       end
 
-      Settings.production? ? content : "#{view_marker path}\n#{content}"
+      Settings.enabled?(:view_markers) ? "#{view_marker path}\n#{content}" : content
     end
 
     # Returns a path to a file in the user's source_dir. The file argument

diff --git a/lib/bashly/views/command/parse_requirements_while.gtx b/lib/bashly/views/command/parse_requirements_while.gtx
@@ -40,4 +40,4 @@ end
 > 
 >   esac
 > done
-
+>
diff --git a/lib/bashly/views/command/required_args_filter.gtx b/lib/bashly/views/command/required_args_filter.gtx
@@ -7,7 +7,8 @@ if required_args.any?
     = render(:examples_on_error).indent 2
     >   exit 1
     > fi
+    >
   end
 
   >
-end
+end
-Original file line number
+Diff line change
@@ Expand Up / @@ -32,7 +32,7 @@ def load_user_file(file, placeholder: true) @@
             ''
           end
-          Settings.production? ? content : "#{view_marker path}\n#{content}"
+          Settings.enabled?(:view_markers) ? "#{view_marker path}\n#{content}" : content
         end
         # Returns a path to a file in the user's source_dir. The file argument
@@ Expand Down @@