format: use 4-space indents in more files

Change some files which have lines whose indentation is not a multiple
of the 4 spaces specified in the editorconfig file.

Some of these changes are fixes or clear improvements (e.g. in Rust
macros which rustfmt can't format properly). Other changes don't clearly
improve the code style, and in some cases it might actually get worse.

The goal is to eventually be able to use our editorconfig for automated
style checks, but there are a lot of cases where conforming to the
limited editorconfig style spec does not make sense, so I'm not sure how
useful such automated checks can be.

Closes #12408

docker/alpine.Dockerfile

@@ -37,8 +37,8 @@ RUN adduser \
     fishuser
 
 RUN mkdir -p /home/fishuser/fish-build \
-  && mkdir /fish-source \
-  && chown -R fishuser:fishuser /home/fishuser /fish-source
+    && mkdir /fish-source \
+    && chown -R fishuser:fishuser /home/fishuser /fish-source
 
 USER fishuser
 WORKDIR /home/fishuser

docker/fedora.Dockerfile

@@ -2,24 +2,24 @@ FROM fedora:latest
 LABEL org.opencontainers.image.source=https://github.com/fish-shell/fish-shell
 
 RUN dnf install --assumeyes \
-      diffutils \
-      gcc-c++ \
-      git-core \
-      pcre2-devel \
-      python3 \
-      python3-pip \
-      openssl \
-      procps \
-      sudo && \
+        diffutils \
+        gcc-c++ \
+        git-core \
+        pcre2-devel \
+        python3 \
+        python3-pip \
+        openssl \
+        procps \
+        sudo && \
     dnf clean all
 
 RUN pip3 install pexpect
 
 RUN groupadd -g 1000 fishuser \
-  && useradd  -p $(openssl passwd -1 fish) -d /home/fishuser -m -u 1000 -g 1000 fishuser -G wheel \
-  && mkdir -p /home/fishuser/fish-build \
-  && mkdir /fish-source \
-  && chown -R fishuser:fishuser /home/fishuser /fish-source
+    && useradd  -p $(openssl passwd -1 fish) -d /home/fishuser -m -u 1000 -g 1000 fishuser -G wheel \
+    && mkdir -p /home/fishuser/fish-build \
+    && mkdir /fish-source \
+    && chown -R fishuser:fishuser /home/fishuser /fish-source
 
 USER fishuser
 WORKDIR /home/fishuser

docker/opensuse-tumbleweed.Dockerfile

@@ -5,28 +5,28 @@ ENV LANG=C.UTF-8
 ENV LC_ALL=C.UTF-8
 
 RUN zypper --non-interactive install \
-  bash \
-  diffutils \
-  gcc-c++ \
-  git-core \
-  pcre2-devel \
-  python311 \
-  python311-pip \
-  python311-pexpect \
-  openssl \
-  procps \
-  tmux \
-  sudo \
-  rust \
-  cargo
+    bash \
+    diffutils \
+    gcc-c++ \
+    git-core \
+    pcre2-devel \
+    python311 \
+    python311-pip \
+    python311-pexpect \
+    openssl \
+    procps \
+    tmux \
+    sudo \
+    rust \
+    cargo
 
 RUN usermod -p $(openssl passwd -1 fish) root
 
 RUN groupadd -g 1000 fishuser \
-  && useradd  -p $(openssl passwd -1 fish) -d /home/fishuser -m -u 1000 -g 1000 fishuser \
-  && mkdir -p /home/fishuser/fish-build \
-  && mkdir /fish-source \
-  && chown -R fishuser:fishuser /home/fishuser /fish-source
+    && useradd  -p $(openssl passwd -1 fish) -d /home/fishuser -m -u 1000 -g 1000 fishuser \
+    && mkdir -p /home/fishuser/fish-build \
+    && mkdir /fish-source \
+    && chown -R fishuser:fishuser /home/fishuser /fish-source
 
 USER fishuser
 WORKDIR /home/fishuser

docker/ubuntu-latest-lts.Dockerfile

@@ -6,37 +6,37 @@ ENV LANG=C.UTF-8
 ENV LC_ALL=C.UTF-8
 
 RUN apt-get update \
-  && apt-get -y install --no-install-recommends  \
-    cmake ninja-build \
-    build-essential \
-    ca-certificates \
-    clang \
-    curl \
-    gettext \
-    git \
-    libpcre2-dev \
-    locales \
-    openssl \
-    python3 \
-    python3-pexpect \
-    sudo \
-    tmux \
-  && locale-gen en_US.UTF-8 \
-  && apt-get clean
+    && apt-get -y install --no-install-recommends  \
+        cmake ninja-build \
+        build-essential \
+        ca-certificates \
+        clang \
+        curl \
+        gettext \
+        git \
+        libpcre2-dev \
+        locales \
+        openssl \
+        python3 \
+        python3-pexpect \
+        sudo \
+        tmux \
+    && locale-gen en_US.UTF-8 \
+    && apt-get clean
 
 RUN userdel ubuntu \
-  && groupadd -g 1000 fishuser \
-  && useradd -p $(openssl passwd -1 fish) -d /home/fishuser -m -u 1000 -g 1000 fishuser \
-       -G sudo \
-  && mkdir -p /home/fishuser/fish-build \
-  && mkdir /fish-source \
-  && chown -R fishuser:1000 /home/fishuser /fish-source
+    && groupadd -g 1000 fishuser \
+    && useradd -p $(openssl passwd -1 fish) -d /home/fishuser -m -u 1000 -g 1000 fishuser \
+        -G sudo \
+    && mkdir -p /home/fishuser/fish-build \
+    && mkdir /fish-source \
+    && chown -R fishuser:1000 /home/fishuser /fish-source
 
 USER fishuser
 WORKDIR /home/fishuser
 
 RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs > /tmp/rustup.sh \
-  && sh /tmp/rustup.sh -y --no-modify-path
+    && sh /tmp/rustup.sh -y --no-modify-path
 ENV PATH=/home/fishuser/.cargo/bin:$PATH
 
 COPY fish_run_tests.sh /

docker/ubuntu-oldest-supported.Dockerfile

@@ -6,36 +6,36 @@ ENV LANG=C.UTF-8
 ENV LC_ALL=C.UTF-8
 
 RUN apt-get update \
-  && apt-get -y install --no-install-recommends  \
-    cmake ninja-build \
-    build-essential \
-    ca-certificates \
-    clang \
-    curl \
-    gettext \
-    git \
-    libpcre2-dev \
-    locales \
-    openssl \
-    python3 \
-    python3-pexpect \
-    sudo \
-    tmux \
-  && locale-gen en_US.UTF-8 \
-  && apt-get clean
+    && apt-get -y install --no-install-recommends  \
+        cmake ninja-build \
+        build-essential \
+        ca-certificates \
+        clang \
+        curl \
+        gettext \
+        git \
+        libpcre2-dev \
+        locales \
+        openssl \
+        python3 \
+        python3-pexpect \
+        sudo \
+        tmux \
+    && locale-gen en_US.UTF-8 \
+    && apt-get clean
 
 RUN groupadd -g 1000 fishuser \
-  && useradd -p $(openssl passwd -1 fish) -d /home/fishuser -m -u 1000 -g 1000 fishuser \
-  && adduser fishuser sudo \
-  && mkdir -p /home/fishuser/fish-build \
-  && mkdir /fish-source \
-  && chown -R fishuser:fishuser /home/fishuser /fish-source
+    && useradd -p $(openssl passwd -1 fish) -d /home/fishuser -m -u 1000 -g 1000 fishuser \
+    && adduser fishuser sudo \
+    && mkdir -p /home/fishuser/fish-build \
+    && mkdir /fish-source \
+    && chown -R fishuser:fishuser /home/fishuser /fish-source
 
 USER fishuser
 WORKDIR /home/fishuser
 
 RUN curl --proto '=https' --tlsv1.2 -fsS https://sh.rustup.rs > /tmp/rustup.sh \
-  && sh /tmp/rustup.sh -y --no-modify-path
+    && sh /tmp/rustup.sh -y --no-modify-path
 ENV PATH=/home/fishuser/.cargo/bin:$PATH
 
 COPY fish_run_tests.sh /