Initial pass reformatting all code.

Use clang-format, LuaFormatter, and 100 character limit on lines.

Author: orbitalquark

LICENSE

@@ -1,6 +1,6 @@
 The MIT License
 
-Copyright (c) 2015-2020 Mitchell
+Copyright (c) 2015-2021 Mitchell
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

Makefile

@@ -18,18 +18,15 @@ CROSS_OSX = x86_64-apple-darwin17-c++
 
 diff.so: diff.o ; $(CXX) -shared $(CXXFLAGS) -o $@ $^ $(LDFLAGS)
 diff.dll: diff-win.o lua.la
-	$(CROSS_WIN)$(CXX) -shared -static-libgcc -static-libstdc++ $(CXXFLAGS) -o \
-		$@ $^ $(LDFLAGS)
+	$(CROSS_WIN)$(CXX) -shared -static-libgcc -static-libstdc++ $(CXXFLAGS) -o $@ $^ $(LDFLAGS)
 diff-curses.dll: diff-win.o lua-curses.la
-	$(CROSS_WIN)$(CXX) -shared -static-libgcc -static-libstdc++ $(CXXFLAGS) -o \
-		$@ $^ $(LDFLAGS)
+	$(CROSS_WIN)$(CXX) -shared -static-libgcc -static-libstdc++ $(CXXFLAGS) -o $@ $^ $(LDFLAGS)
 diffosx.so: diff-osx.o
 	$(CROSS_OSX) -shared $(CXXFLAGS_OSX) -undefined dynamic_lookup -o $@ $^
 
 diff.o: diff.cxx ; $(CXX) -c $(CXXFLAGS) -I$(ta_lua) -o $@ $^
 diff-win.o: diff.cxx
-	$(CROSS_WIN)$(CXX) -c $(CXXFLAGS) -DLUA_BUILD_AS_DLL -DLUA_LIB -I$(ta_lua) \
-		-o $@ $^
+	$(CROSS_WIN)$(CXX) -c $(CXXFLAGS) -DLUA_BUILD_AS_DLL -DLUA_LIB -I$(ta_lua) -o $@ $^
 diff-osx.o: diff.cxx ; $(CROSS_OSX) -c $(CXXFLAGS_OSX) -I$(ta_lua) -o $@ $^
 
 lua.def:
@@ -58,8 +55,7 @@ luadoc: init.lua
 deps: diff_match_patch.h
 
 diff_match_patch_zip = 7f95b37e554453262e2bcda830724fc362614103.zip
-$(diff_match_patch_zip):
-	wget https://github.com/leutloff/diff-match-patch-cpp-stl/archive/$@
+$(diff_match_patch_zip): ; wget https://github.com/leutloff/diff-match-patch-cpp-stl/archive/$@
 diff_match_patch.h: | $(diff_match_patch_zip) ; unzip -j $| "*/$@"
 
 # Releases.

README.md

@@ -2,42 +2,39 @@
 
 Two-way file comparison for Textadept.
 
-Install this module by copying it into your *~/.textadept/modules/* directory
-or Textadept's *modules/* directory, and then putting the following in your
-*~/.textadept/init.lua*:
+Install this module by copying it into your *~/.textadept/modules/* directory or Textadept's
+*modules/* directory, and then putting the following in your *~/.textadept/init.lua*:
 
     require('file_diff')
 
 ## Usage
 
 A sample workflow is this:
 
-1. Start comparing two files via the "Compare Files" submenu in the "Tools"
-   menu.
+1. Start comparing two files via the "Compare Files" submenu in the "Tools" menu.
 2. The caret is initially placed in the file on the left.
 3. Go to the next change via menu or key binding.
-4. Merge the change from the other buffer into the current one (right to
-   left) via menu or key binding.
+4. Merge the change from the other buffer into the current one (right to left) via menu or
+  key binding.
 5. Go to the next change via menu or key binding.
-6. Merge the change from the current buffer into the other one (left to
-   right) via menu or key binding.
+6. Merge the change from the current buffer into the other one (left to right) via menu or
+  key binding.
 7. Repeat as necessary.
 
-Note: merging can be performed wherever the caret is placed when jumping
-between changes, even if one buffer has a change and the other does not
-(additions or deletions).
+Note: merging can be performed wherever the caret is placed when jumping between changes,
+even if one buffer has a change and the other does not (additions or deletions).
 
 ## Key Bindings
 
-Windows, Linux, BSD|macOS|Terminal|Command
--------------------|-----|--------|-------
-**Tools**          |     |        |
-F6                 |F6   |F6      |Compare files...
-Shift+F6           |⇧F6  |S-F6    |Compare the buffers in two split views
-Alt+Down           |⌥⇣   |M-Down  |Goto next difference
-Alt+Up             |⌥⇡   |M-Up    |Goto previous difference
-Alt+Left           |⌥⇠   |M-Left  |Merge left
-Alt+Right          |⌥⇢   |M-Right |Merge right
+Windows, Linux, BSD | macOS | Terminal | Command
+-|-|-|-
+**Tools**| | |
+F6 | F6 | F6 | Compare files...
+Shift+F6 | ⇧F6 | S-F6 | Compare the buffers in two split views
+Alt+Down | ⌥⇣ | M-Down | Goto next difference
+Alt+Up | ⌥⇡ | M-Up | Goto previous difference
+Alt+Left | ⌥⇠ | M-Left | Merge left
+Alt+Right | ⌥⇢ | M-Right | Merge right
 
 
 ## Fields defined by `file_diff`
@@ -71,10 +68,9 @@ The marker for line modifications.
 ### `file_diff.theme` (string)
 
 The theme to use, either 'dark' or 'light'.
-  This is not the theme used with Textadept.
-  Depending on this setting, additions will be colored 'dark_green' or
-  'light_green', deletions will be colored 'dark_red' or 'light_red', and so
-  on.
+  This is not the theme used with Textadept. Depending on this setting, additions will be
+  colored 'dark_green' or 'light_green', deletions will be colored 'dark_red' or 'light_red',
+  and so on.
   The default value is auto-detected.
 
 
@@ -83,11 +79,10 @@ The theme to use, either 'dark' or 'light'.
 <a id="_G.diff"></a>
 ### `_G.diff`(*text1, text2*)
 
-Returns a list that represents the differences between strings *text1* and
-*text2*.
-Each consecutive pair of elements in the returned list represents a "diff".
-The first element is an integer: 0 for a deletion, 1 for an insertion, and 2
-for equality. The second element is the associated diff text.
+Returns a list that represents the differences between strings *text1* and *text2*.
+Each consecutive pair of elements in the returned list represents a "diff". The first element
+is an integer: 0 for a deletion, 1 for an insertion, and 2 for equality. The second element
+is the associated diff text.
 
 Parameters:
 
@@ -106,20 +101,18 @@ Return:
 <a id="file_diff.goto_change"></a>
 ### `file_diff.goto_change`(*next*)
 
-Jumps to the next or previous difference between the two files depending on
-boolean *next*.
+Jumps to the next or previous difference between the two files depending on boolean *next*.
 [`file_diff.start()`](#file_diff.start) must have been called previously.
 
 Parameters:
 
-* *`next`*: Whether to go to the next or previous difference relative to the
-  current line.
+* *`next`*: Whether to go to the next or previous difference relative to the current line.
 
 <a id="file_diff.merge"></a>
 ### `file_diff.merge`(*left*)
 
-Merges a change from one buffer to another, depending on the change under
-the caret and the merge direction.
+Merges a change from one buffer to another, depending on the change under the caret and the
+merge direction.
 
 Parameters:
 
@@ -128,18 +121,16 @@ Parameters:
 <a id="file_diff.start"></a>
 ### `file_diff.start`(*file1, file2, horizontal*)
 
-Highlight differences between files *file1* and *file2*, or the user-selected
-files.
+Highlight differences between files *file1* and *file2*, or the user-selected files.
 
 Parameters:
 
-* *`file1`*: Optional name of the older file. If `-`, uses the current
-  buffer. If `nil`, the user is prompted for a file.
-* *`file2`*: Optional name of the newer file. If `-`, uses the current
-  buffer. If `nil`, the user is prompted for a file.
-* *`horizontal`*: Optional flag specifying whether or not to split the view
-  horizontally. The default value is `false`, comparing the two files
-  side-by-side.
+* *`file1`*: Optional name of the older file. If `-`, uses the current buffer. If `nil`,
+  the user is prompted for a file.
+* *`file2`*: Optional name of the newer file. If `-`, uses the current buffer. If `nil`,
+  the user is prompted for a file.
+* *`horizontal`*: Optional flag specifying whether or not to split the view horizontally. The
+  default value is `false`, comparing the two files side-by-side.
 
 
 ---

diff.cxx

@@ -11,28 +11,21 @@ extern "C" {
 /** diff() Lua function. */
 static int diff(lua_State *L) {
   diff_match_patch<std::string> dmp;
-  auto diffs = dmp.diff_main(
-    luaL_checkstring(L, 1), luaL_checkstring(L, 2), false);
+  auto diffs = dmp.diff_main(luaL_checkstring(L, 1), luaL_checkstring(L, 2), false);
   dmp.diff_cleanupSemantic(diffs);
   lua_createtable(L, diffs.size() * 2, 0);
   int len = 1;
-  for(auto& diff : diffs) {
+  for (auto &diff : diffs) {
     lua_pushnumber(L, diff.operation), lua_rawseti(L, -2, len++);
     lua_pushstring(L, diff.text.c_str()), lua_rawseti(L, -2, len++);
   }
   return 1;
 }
 
 extern "C" {
-int luaopen_diff(lua_State *L) {
-  return (lua_pushcfunction(L, diff), 1);
-}
+int luaopen_diff(lua_State *L) { return (lua_pushcfunction(L, diff), 1); }
 
 // Platform-specific Lua library entry points.
-LUALIB_API int luaopen_file_diff_diff(lua_State *L) {
-  return luaopen_diff(L);
-}
-LUALIB_API int luaopen_file_diff_diffosx(lua_State *L) {
-  return luaopen_diff(L);
-}
+LUALIB_API int luaopen_file_diff_diff(lua_State *L) { return luaopen_diff(L); }
+LUALIB_API int luaopen_file_diff_diffosx(lua_State *L) { return luaopen_diff(L); }
 }