Add function to indent things in blocks for nix-indent-line #61
Conversation
|
What does it do in this case? |
|
@grahamc let
splitString = _sep: _s: builtins.filter
(x: builtins.typeOf x == "string")
(builtins.split _sep _s);
in # whateverBut before that would result in: let
splitString = _sep: _s: builtins.filter
(x: builtins.typeOf x == "string")
(builtins.split _sep _s);
in # whateverfor me, so still better than before. |
|
Confirming it fixes these cases: {
x86 = [
{
name = "t1.small.x86";
}
];
}let
x = [
(let y = 1; in y)
{ foo = 1; }
[ 1 2 3 ]
x
];
in x(though I note on the first line, tabbing will indent let
mozilla-overlay =
import
(
builtins.fetchTarball
https://github.com/mozilla/nixpkgs-mozilla/archive/master.tar.gz
);
in mozilla-overlayLooks like #60 can be closed with this merge! |
|
@grahamc I have now fixed the regression that it endlessly indented the first line. I've also made some more comments to make it easier to understand and moved logic around to not have weird things (like return -2 because I add +2 at a later place to get 0, instead I return 0 in one place and return a value that is already +2 added to in the other place). |
|
One case it doesn't handle I realized is if there's an empty line in between like this: let
x = [
(let y = 1; in y)
{ foo = 1; }
[ 1 2 3 ]
x
];
in xEDIT: And that is now fixed. |
Add a function `nix-indent-first-line-in-block` that checks if the
last word on the previous line is one of "let, import, [, =, (, {".
Then it adds two spaces of indent to the one of the previous line.
And if you stand on the first line of a file, it defaults to indenting
the line to zero spaces.
|
Awesome! Thanks |
Add a function
nix-indent-first-line-in-blockthat checks if the last word on the previous line is one of "let, import, [, =, (, {". Then it adds two spaces of indent to the one of the previous line.This is a shot at improving based on the examples is #60.
It works with all examples in #60 and just by going through my configuration.nix it seems a lot better than before.
It's not perfect in all the cases like this:
But it wasn't before either, in fact it behaves exactly the same as before in that case as far as I can see.