Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Trim trailing whitespace parsing cabal.project #2254

Merged
merged 2 commits into from
Oct 6, 2024
Merged

Trim trailing whitespace parsing cabal.project #2254

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7df6d10
Trim trailing whitespace parsing cabal.project
hamishmack Sep 24, 2024
0c537a7
Merge remote-tracking branch 'origin/master' into hkm/trim-cabal-proj…
hamishmack Oct 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion lib/cabal-project-parser.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,8 @@ let
let
# Look for a new attribute name
pair = builtins.match "([^ :]*): *(.*)" s;
trim = x: let m = builtins.match "(.*[^ \t])[ \t]*" x;
in pkgs.lib.optionalString (m != null) (builtins.head m);

# Function to build the next parse state when the attribute name is known
nextState = name: value: {
Expand All @@ -62,7 +64,7 @@ let
if pair != null
then
# First line of a new attribute
nextState (builtins.head pair) (builtins.elemAt pair 1)
nextState (builtins.head pair) (trim (builtins.elemAt pair 1))
else
if name != null
then nextState name s # Append another line to the current attribute
Expand Down
Loading