Merge pull request #23 from lukas-reineke/develop

.github/workflows/pr_check.yml

@@ -1,22 +1,43 @@
 name: Pull request check
 
 on:
-    pull_request:
+  pull_request:
 
 jobs:
-    format:
-        runs-on: ubuntu-latest
-        steps:
-            - uses: actions/checkout@v2
-            - uses: JohnnyMorganz/[email protected]
-              with:
-                  token: ${{ secrets.GITHUB_TOKEN }}
-                  args: --check .
-
-    block-fixup:
-        runs-on: ubuntu-latest
-
-        steps:
-            - uses: actions/checkout@v2
-            - name: Block Fixup Commit Merge
-              uses: 13rac1/[email protected]
+  format:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: JohnnyMorganz/[email protected]
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          args: --check .
+
+  block-fixup:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2
+      - name: Block Fixup Commit Merge
+        uses: 13rac1/[email protected]
+
+  luacheck:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@master
+
+      - uses: leafo/[email protected]
+        with:
+          luaVersion: 'luajit-2.1.0-beta3'
+
+      - uses: leafo/[email protected]
+
+      - name: build
+        run: |
+          luarocks install luacheck
+
+      - name: test
+        run: |
+          luacheck lua
+

.luacheckrc

@@ -0,0 +1,2 @@
+globals = { "vim", "_" }
+max_line_length = false

doc/format.txt

@@ -2,7 +2,7 @@
 
 
 Author: Lukas Reineke <[email protected]>
-Version: 2.1.0
+Version: 2.1.1
 
 ==============================================================================
 CONTENTS                                                          *lsp-format*
@@ -86,6 +86,9 @@ the `order` list. (same logic as |vim.lsp.buf.formatting_seq_sync()|)
 ==============================================================================
  4. CHANGELOG                                           *lsp-format-changelog*
 
+2.1.1
+  * Don't overwrite the buffer when currently in insert mode
+
 2.1.0
   * Sequentially format with all attached LSP server
   * Add special `order` format option

lua/lsp-format/init.lua

@@ -23,7 +23,8 @@ M.setup = function(format_options)
         end
         if
             vim.api.nvim_buf_get_var(ctx.bufnr, "format_changedtick")
-            == vim.api.nvim_buf_get_var(ctx.bufnr, "changedtick")
+                == vim.api.nvim_buf_get_var(ctx.bufnr, "changedtick")
+            and not vim.startswith(vim.api.nvim_get_mode().mode, "i")
         then
             local view = vim.fn.winsaveview()
             vim.lsp.util.apply_text_edits(result, ctx.bufnr, "utf-16")
@@ -32,8 +33,8 @@ M.setup = function(format_options)
                 vim.b.format_saving = true
                 vim.cmd [[update]]
                 vim.b.format_saving = false
-                M._next()
             end
+            M._next()
         end
     end
 end