Merge #5395 from justinmk/log

10 files changed, 40 insertions, 44 deletions

diff --git a/src/nvim/diff.c b/src/nvim/diff.c
index ef5acf4845..f7b96ba3e1 100644
--- a/src/nvim/diff.c
+++ b/src/nvim/diff.c
@@ -906,8 +906,7 @@ void ex_diffpatch(exarg_T *eap)
     eval_patch((char *) tmp_orig, (char *) eap->arg, (char *) tmp_new);
 #endif  // ifdef UNIX
   } else {
-    // Build the patch command and execute it. Ignore errors. Switch to
-    // cooked mode to allow the user to respond to prompts.
+    // Build the patch command and execute it. Ignore errors.
 #ifdef UNIX
     vim_snprintf((char *)buf, buflen, "patch -o %s %s < \"%s\"",
                  tmp_new, tmp_orig, fullname != NULL ? fullname : eap->arg);
@@ -915,8 +914,7 @@ void ex_diffpatch(exarg_T *eap)
     vim_snprintf((char *)buf, buflen, "patch -o %s %s < \"%s\"",
                  tmp_new, tmp_orig, eap->arg);
 #endif  // ifdef UNIX
-    // Avoid ShellCmdPost stuff
-    block_autocmds();
+    block_autocmds();  // Avoid ShellCmdPost stuff
     (void)call_shell(buf, kShellOptFilter, NULL);
     unblock_autocmds();
   }
diff --git a/src/nvim/event/queue.c b/src/nvim/event/queue.c
index c5ef22d426..ee224b0a25 100644
--- a/src/nvim/event/queue.c
+++ b/src/nvim/event/queue.c
@@ -8,7 +8,7 @@
 // - removing a node from a child queue will remove the corresponding link node
 //   in the parent queue
 //
-// These properties allow neovim to organize and process events from different
+// These properties allow Nvim to organize and process events from different
 // sources with a certain degree of control. Here's how the queue is used:
 //
 //                         +----------------+
@@ -26,20 +26,20 @@
 //    +-----------+   +-----------+    +---------+    +---------+
 //
 //
-// In the above diagram, the lower boxes represents event emitters, each with
-// it's own private queue that have the event loop queue as the parent.
+// The lower boxes represents event emitters, each with its own private queue
+// having the event loop queue as the parent.
 //
 // When idle, the main loop spins the event loop which queues events from many
-// sources(channels, jobs, user...). Each event emitter pushes events to its own
+// sources (channels, jobs, user...). Each event emitter pushes events to its
 // private queue which is propagated to the event loop queue. When the main loop
 // consumes an event, the corresponding event is removed from the emitter's
 // queue.
 //
 // The main reason for this queue hierarchy is to allow focusing on a single
 // event emitter while blocking the main loop. For example, if the `jobwait`
-// vimscript function is called on job1, the main loop will temporarily stop
-// polling the event loop queue and poll job1 queue instead. Same with channels,
-// when calling `rpcrequest`, we want to temporarily stop processing events from
+// VimL function is called on job1, the main loop will temporarily stop polling
+// the event loop queue and poll job1 queue instead. Same with channels, when
+// calling `rpcrequest` we want to temporarily stop processing events from
 // other sources and focus on a specific channel.
 
 #include <assert.h>
diff --git a/src/nvim/ex_cmds.c b/src/nvim/ex_cmds.c
index c36c3a7b0e..0226499e78 100644
--- a/src/nvim/ex_cmds.c
+++ b/src/nvim/ex_cmds.c
@@ -1154,15 +1154,11 @@ static void do_filter(
   }
   read_linecount = curbuf->b_ml.ml_line_count;
 
-  /*
-   * When call_shell() fails wait_return() is called to give the user a
-   * chance to read the error messages. Otherwise errors are ignored, so you
-   * can see the error messages from the command that appear on stdout; use
-   * 'u' to fix the text
-   * Switch to cooked mode when not redirecting stdin, avoids that something
-   * like ":r !cat" hangs.
-   * Pass on the kShellDoOut flag when the output is being redirected.
-   */
+  // When call_shell() fails wait_return() is called to give the user a chance
+  // to read the error messages. Otherwise errors are ignored, so you can see
+  // the error messages from the command that appear on stdout; use 'u' to fix
+  // the text.
+  // Pass on the kShellDoOut flag when the output is being redirected.
   if (call_shell(
         cmd_buf,
         kShellOptFilter | shell_flags,
diff --git a/src/nvim/globals.h b/src/nvim/globals.h
index 57d12d396e..87fb928b30 100644
--- a/src/nvim/globals.h
+++ b/src/nvim/globals.h
@@ -927,9 +927,9 @@ EXTERN FILE     *scriptin[NSCRIPT];         /* streams to read script from */
 EXTERN int curscript INIT(= 0);             /* index in scriptin[] */
 EXTERN FILE     *scriptout INIT(= NULL);    /* stream to write script to */
 
-/* volatile because it is used in signal handler catch_sigint(). */
-EXTERN volatile int got_int INIT(= FALSE);    /* set to TRUE when interrupt
-                                                 signal occurred */
+// volatile because it is used in a signal handler.
+EXTERN volatile int got_int INIT(= false);  // set to true when interrupt
+                                            // signal occurred
 EXTERN int bangredo INIT(= FALSE);          /* set to TRUE with ! command */
 EXTERN int searchcmdlen;                    /* length of previous search cmd */
 EXTERN int reg_do_extmatch INIT(= 0);       /* Used when compiling regexp:
diff --git a/src/nvim/log.c b/src/nvim/log.c
index c31af6b287..bbb4dfb944 100644
--- a/src/nvim/log.c
+++ b/src/nvim/log.c
@@ -146,10 +146,10 @@ static bool v_do_log_to_file(FILE *log_file, int log_level,
                              const char* fmt, va_list args)
 {
   static const char *log_levels[] = {
-    [DEBUG_LOG_LEVEL] = "debug",
-    [INFO_LOG_LEVEL] = "info",
-    [WARNING_LOG_LEVEL] = "warning",
-    [ERROR_LOG_LEVEL] = "error"
+    [DEBUG_LOG_LEVEL]   = "DEBUG",
+    [INFO_LOG_LEVEL]    = "INFO ",
+    [WARNING_LOG_LEVEL] = "WARN ",
+    [ERROR_LOG_LEVEL]   = "ERROR"
   };
   assert(log_level >= DEBUG_LOG_LEVEL && log_level <= ERROR_LOG_LEVEL);
 
@@ -166,8 +166,8 @@ static bool v_do_log_to_file(FILE *log_file, int log_level,
 
   // print the log message prefixed by the current timestamp and pid
   int64_t pid = os_get_pid();
-  if (fprintf(log_file, "%s [%s @ %s:%d] %" PRId64 " - ", date_time,
-              log_levels[log_level], func_name, line_num, pid) < 0) {
+  if (fprintf(log_file, "%s %s %" PRId64 "/%s:%d: ", date_time,
+              log_levels[log_level], pid, func_name, line_num) < 0) {
     return false;
   }
   if (vfprintf(log_file, fmt, args) < 0) {
diff --git a/src/nvim/os/shell.c b/src/nvim/os/shell.c
index 661b12accc..617a505367 100644
--- a/src/nvim/os/shell.c
+++ b/src/nvim/os/shell.c
@@ -162,7 +162,7 @@ int os_call_shell(char_u *cmd, ShellOpts opts, char_u *extra_args)
 /// @param input The input to the shell (NULL for no input), passed to the
 ///              stdin of the resulting process.
 /// @param len The length of the input buffer (not used if `input` == NULL)
-/// @param[out] output A pointer to to a location where the output will be
+/// @param[out] output Pointer to a location where the output will be
 ///                    allocated and stored. Will point to NULL if the shell
 ///                    command did not output anything. If NULL is passed,
 ///                    the shell output will be ignored.
@@ -227,7 +227,7 @@ static int do_os_system(char **argv,
 
   // We want to deal with stream events as fast a possible while queueing
   // process events, so reset everything to NULL. It prevents closing the
-  // streams while there's still data in the OS buffer(due to the process
+  // streams while there's still data in the OS buffer (due to the process
   // exiting before all data is read).
   if (input != NULL) {
     proc->in->events = NULL;
diff --git a/src/nvim/rbuffer.h b/src/nvim/rbuffer.h
index 454972c69d..a8dfcac580 100644
--- a/src/nvim/rbuffer.h
+++ b/src/nvim/rbuffer.h
@@ -1,4 +1,4 @@
-// Ring buffer implementation. This is basically an array that wraps read/write
+// Specialized ring buffer. This is basically an array that wraps read/write
 // pointers around the memory region. It should be more efficient than the old
 // RBuffer which required memmove() calls to relocate read/write positions.
 //
diff --git a/src/nvim/tui/tui.c b/src/nvim/tui/tui.c
index fc2a2604d6..6f90742928 100644
--- a/src/nvim/tui/tui.c
+++ b/src/nvim/tui/tui.c
@@ -1,3 +1,5 @@
+// Terminal UI functions. Invoked (by ui_bridge.c) on the TUI thread.
+
 #include <assert.h>
 #include <stdbool.h>
 #include <stdio.h>
@@ -17,13 +19,13 @@
 #include "nvim/api/private/helpers.h"
 #include "nvim/event/loop.h"
 #include "nvim/event/signal.h"
-#include "nvim/tui/tui.h"
-#include "nvim/tui/input.h"
 #include "nvim/os/input.h"
 #include "nvim/os/os.h"
 #include "nvim/strings.h"
 #include "nvim/ugrid.h"
-#include "nvim/ui_bridge.h"
+#include "nvim/tui/input.h"
+#include "nvim/tui/tui.h"
+#include "nvim/tui/ui_bridge.h"
 
 // Space reserved in the output buffer to restore the cursor to normal when
 // flushing. No existing terminal will require 32 bytes to do that.
diff --git a/src/nvim/ui_bridge.c b/src/nvim/tui/ui_bridge.c
index 34b95baf6c..48f4b1bda6 100644
--- a/src/nvim/ui_bridge.c
+++ b/src/nvim/tui/ui_bridge.c
@@ -1,5 +1,5 @@
-// FIXME(tarruda): This module is very repetitive. It might be a good idea to
-// automatically generate it with a lua script during build
+// UI wrapper for the built-in TUI. Sends UI requests to the TUI thread.
+
 #include <assert.h>
 #include <stdbool.h>
 #include <stdio.h>
@@ -9,11 +9,11 @@
 #include "nvim/vim.h"
 #include "nvim/ui.h"
 #include "nvim/memory.h"
-#include "nvim/ui_bridge.h"
 #include "nvim/ugrid.h"
+#include "nvim/tui/ui_bridge.h"
 
 #ifdef INCLUDE_GENERATED_DECLARATIONS
-# include "ui_bridge.c.generated.h"
+# include "tui/ui_bridge.c.generated.h"
 #endif
 
 #define UI(b) (((UIBridgeData *)b)->ui)
diff --git a/src/nvim/ui_bridge.h b/src/nvim/tui/ui_bridge.h
index 561ddb6b24..003ed3c2c1 100644
--- a/src/nvim/ui_bridge.h
+++ b/src/nvim/tui/ui_bridge.h
@@ -1,6 +1,6 @@
 // Bridge used for communication between a builtin UI thread and nvim core
-#ifndef NVIM_UI_BRIDGE_H
-#define NVIM_UI_BRIDGE_H
+#ifndef NVIM_TUI_UI_BRIDGE_H
+#define NVIM_TUI_UI_BRIDGE_H
 
 #include <uv.h>
 
@@ -11,7 +11,7 @@ typedef struct ui_bridge_data UIBridgeData;
 typedef void(*ui_main_fn)(UIBridgeData *bridge, UI *ui);
 struct ui_bridge_data {
   UI bridge;  // actual UI passed to ui_attach
-  UI *ui;     // UI pointer that will have it's callback called in
+  UI *ui;     // UI pointer that will have its callback called in
               // another thread
   event_scheduler scheduler;
   uv_thread_t ui_thread;
@@ -39,6 +39,6 @@ struct ui_bridge_data {
 
 
 #ifdef INCLUDE_GENERATED_DECLARATIONS
-# include "ui_bridge.h.generated.h"
+# include "tui/ui_bridge.h.generated.h"
 #endif
-#endif  // NVIM_UI_BRIDGE_H
+#endif  // NVIM_TUI_UI_BRIDGE_H