RGBCube/alejandra
1
Fork 0
mirror of https://github.com/RGBCube/alejandra synced 2025-07-31 04:27:45 +00:00
Code Issues Activity

string_interp: update tests and self-lint

Browse source
This commit is contained in:
Tom Bereknyei 2022-02-01 15:27:49 -05:00
parent 3daca47b2c
commit 06b541ed66
4 changed files with 19 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

4
default.nix
View file

@ -5,9 +5,9 @@ let
flakeCompatSrc = flakeCompatSrc =
builtins.fetchTarball builtins.fetchTarball
{ {
url = "https://github.com/edolstra/flake-compat/archive/${ flakeCompat.rev }.tar.gz"; url = "https://github.com/edolstra/flake-compat/archive/${flakeCompat.rev}.tar.gz";
sha256 = flakeCompat.narHash; sha256 = flakeCompat.narHash;
}; };
flake = import flakeCompatSrc { src = ./.; }; flake = import flakeCompatSrc { src = ./.; };
in in
flake.defaultNix.defaultPackage flake.defaultNix.defaultPackage

4
flake.nix
View file

@ -30,7 +30,7 @@
checks = { defaultPackage = inputs.self.defaultPackage.${ system }; }; checks = { defaultPackage = inputs.self.defaultPackage.${ system }; };
defaultApp = { defaultApp = {
type = "app"; type = "app";
program = "${ inputs.self.defaultPackage.${ system } }/bin/alejandra"; program = "${inputs.self.defaultPackage.${ system }}/bin/alejandra";
}; };
defaultPackage = defaultPackage =
fenixPlatform.buildRustPackage fenixPlatform.buildRustPackage
@ -41,7 +41,7 @@
commit = inputs.self.shortRev or "dirty"; commit = inputs.self.shortRev or "dirty";
date = inputs.self.lastModifiedDate or inputs.self.lastModified or "19700101"; date = inputs.self.lastModifiedDate or inputs.self.lastModified or "19700101";
in in
"${ builtins.substring 0 8 date }_${ commit }"; "${builtins.substring 0 8 date}_${commit}";
src = inputs.self.sourceInfo; src = inputs.self.sourceInfo;
cargoLock.lockFile = ./Cargo.lock; cargoLock.lockFile = ./Cargo.lock;
meta = { meta = {

28
tests/cases/string/out
View file

@ -5,7 +5,7 @@
" "
### ###
"a "a
${ x } ${x}
b b
" "
### ###
@ -13,9 +13,9 @@
### ###
''a'' ''a''
### ###
''${ "" }'' ''${""}''
### ###
'' ${ "" } '' ${""}
'' ''
### ###
@ -34,10 +34,10 @@
### ###
'' ''
a a
${ "" } ${""}
b b
${ "" } ${""}
c ${ "" } d c ${""} d
e e
'' ''
### ###
@ -46,7 +46,7 @@
### ###
'' ''
declare -a makefiles=(./*.mak) declare -a makefiles=(./*.mak)
sed -i -f ${ makefile-sed } "''${makefiles[@]}" sed -i -f ${makefile-sed} "''${makefiles[@]}"
### assign Makefile variables eagerly & change backticks to `$(shell …)` ### assign Makefile variables eagerly & change backticks to `$(shell …)`
sed -i -e 's/ = `\([^`]\+\)`/ := $(shell \1)/' \ sed -i -e 's/ = `\([^`]\+\)`/ := $(shell \1)/' \
-e 's/`\([^`]\+\)`/$(shell \1)/' \ -e 's/`\([^`]\+\)`/$(shell \1)/' \
@ -54,29 +54,29 @@
'' ''
### ###
'' ''
[${ mkSectionName sectName }] [${mkSectionName sectName}]
'' ''
### ###
''-couch_ini ${ cfg.package }/etc/default.ini ${ configFile } ${ ''-couch_ini ${cfg.package}/etc/default.ini ${configFile} ${
pkgs.writeText "couchdb-extra.ini" cfg.extraConfig pkgs.writeText "couchdb-extra.ini" cfg.extraConfig
} ${ cfg.configFile }'' } ${cfg.configFile}''
### ###
''exec i3-input -F "mark %s" -l 1 -P 'Mark: ' '' ''exec i3-input -F "mark %s" -l 1 -P 'Mark: ' ''
### ###
''exec i3-input -F '[con_mark="%s"] focus' -l 1 -P 'Go to: ' '' ''exec i3-input -F '[con_mark="%s"] focus' -l 1 -P 'Go to: ' ''
### ###
''"${ pkgs.name or "<unknown-name>" }";'' ''"${pkgs.name or "<unknown-name>"}";''
### ###
'' ''
${ pkgs.replace-secret }/bin/replace-secret '${ placeholder }' '${ secretFile }' '${ targetFile }' '' ${pkgs.replace-secret}/bin/replace-secret '${placeholder}' '${secretFile}' '${targetFile}' ''
### ###
'' ''
mkdir -p "$out/lib/modules/${ kernel.modDirVersion }/kernel/net/wireless/" mkdir -p "$out/lib/modules/${kernel.modDirVersion}/kernel/net/wireless/"
'' ''
### ###
'' <?xml version="1.0" encoding="UTF-8"?> '' <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> <!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0"> <plist version="1.0">
${ expr "" v } ${expr "" v}
</plist>'' </plist>''
] ]

2
tests/cases/string_interpol/out
View file

@ -6,7 +6,7 @@
/* /*
b b
*/ */
"${ c }" "${c}"
}" }"
/* /*
d d