Fix formatting

builtin.cpp

@@ -1617,24 +1617,24 @@ static int builtin_echo(parser_t &parser, wchar_t **argv)
                 {
                     case L'n':
                         print_newline = false;
-                    break;
+                        break;
                     case L'e':
                         interpret_special_chars = true;
-                    break;
+                        break;
                     case L's':
                         // fish-specific extension,
                         // which we should try to nix
                         print_spaces = false;
-                    break;
+                        break;
                     case L'E':
                         interpret_special_chars = false;
-                    break;
+                        break;
                 }
             }
         }
         else
         {
-            invalid_echo_option:
+invalid_echo_option:
             break;
         }
         argv++;

complete.cpp

@@ -1627,7 +1627,7 @@ void completer_t::complete_param_expand(const wcstring &sstr, bool do_file)
 
     if (expand_string(comp_str,
                       this->completions,
-                      flags ) == EXPAND_ERROR)
+                      flags) == EXPAND_ERROR)
     {
         debug(3, L"Error while expanding string '%ls'", comp_str);
     }

expand.cpp

@@ -1760,7 +1760,7 @@ int expand_string(const wcstring &input, std::vector<completion_t> &output, expa
             // Don't do wildcard expansion for executables. See #785. So do nothing here.
         }
         else if (((flags & ACCEPT_INCOMPLETE) && (!(flags & EXPAND_SKIP_WILDCARDS))) ||
-                has_wildcard)
+                 has_wildcard)
         {
             const wchar_t *start, *rest;
 

fish.cpp

@@ -366,9 +366,12 @@ static int fish_parse_opt(int argc, char **argv, std::vector<std::string> *out_c
     is_login |= (strcmp(argv[0], "-fish") == 0);
 
     /* We are an interactive session if we are either forced, or have not been given an explicit command to execute and stdin is a tty. */
-    if (force_interactive) {
+    if (force_interactive)
+    {
         is_interactive_session = true;
-    } else if (is_interactive_session) {
+    }
+    else if (is_interactive_session)
+    {
         is_interactive_session = ! has_cmd && (my_optind == argc) && isatty(STDIN_FILENO);
     }
 

parser.cpp

@@ -2049,7 +2049,7 @@ int parser_t::parse_job(process_t *p,
 
                             /* Looks like a command */
                             debug(0,
-                                  _( L"Unknown command '%ls'. Did you mean to run %ls with a modified environment? Try 'env %ls=%ls %ls%ls'. See the help section on the set command by typing 'help set'."),
+                                  _(L"Unknown command '%ls'. Did you mean to run %ls with a modified environment? Try 'env %ls=%ls %ls%ls'. See the help section on the set command by typing 'help set'."),
                                   cmd,
                                   next_str.c_str(),
                                   name_str.c_str(),

proc.h

@@ -373,7 +373,10 @@ public:
     unsigned int flags;
 
     /* Returns the block IO redirections associated with the job. These are things like the IO redirections associated with the begin...end statement. */
-    const io_chain_t &block_io_chain() const { return this->block_io; }
+    const io_chain_t &block_io_chain() const
+    {
+        return this->block_io;
+    }
 
     /* Fetch all the IO redirections associated with the job */
     io_chain_t all_io_redirections() const;

reader.cpp

@@ -984,9 +984,9 @@ void reader_init()
     // PCA disable VDSUSP (typically control-Y), which is a funny job control
     // function available only on OS X and BSD systems
     // This lets us use control-Y for yank instead
-  #ifdef VDSUSP
+#ifdef VDSUSP
     shell_modes.c_cc[VDSUSP] = _POSIX_VDISABLE;
-  #endif
+#endif
 #endif
 }