👍 remove unnecessary 'foldmethod' changes

Author: Milly

Diff for: buffer/buffer.ts

@@ -57,21 +57,16 @@ async function ensurePrerequisites(denops: Denops): Promise<string> {
   function! DenopsStdBufferAppend_${suffix}(bufnr, lnum, repl) abort
     let modified = getbufvar(a:bufnr, '&modified')
     let modifiable = getbufvar(a:bufnr, '&modifiable')
-    let foldmethod = getbufvar(a:bufnr, '&foldmethod')
     call setbufvar(a:bufnr, '&modifiable', 1)
-    call setbufvar(a:bufnr, '&foldmethod', 'manual')
     call appendbufline(a:bufnr, a:lnum, a:repl)
     call setbufvar(a:bufnr, '&modified', modified)
     call setbufvar(a:bufnr, '&modifiable', modifiable)
-    call setbufvar(a:bufnr, '&foldmethod', foldmethod)
   endfunction
 
   function! DenopsStdBufferReplace_${suffix}(bufnr, repl, fileformat, fileencoding) abort
     let modified = getbufvar(a:bufnr, '&modified')
     let modifiable = getbufvar(a:bufnr, '&modifiable')
-    let foldmethod = getbufvar(a:bufnr, '&foldmethod')
     call setbufvar(a:bufnr, '&modifiable', 1)
-    call setbufvar(a:bufnr, '&foldmethod', 'manual')
     if a:fileformat isnot# v:null
       call setbufvar(a:bufnr, '&fileformat', a:fileformat)
     endif
@@ -82,7 +77,6 @@ async function ensurePrerequisites(denops: Denops): Promise<string> {
     call deletebufline(a:bufnr, len(a:repl) + 1, '$')
     call setbufvar(a:bufnr, '&modified', modified)
     call setbufvar(a:bufnr, '&modifiable', modifiable)
-    call setbufvar(a:bufnr, '&foldmethod', foldmethod)
   endfunction
 
   function! DenopsStdBufferConcreteRestore_${suffix}() abort
@@ -321,7 +315,7 @@ export interface DecodeResult {
  * }
  * ```
  *
- * It temporary change `modified`, `modifiable`, and `foldmethod` options to append
+ * It temporary change `modified` and `modifiable` options to append
  * the content of the `buffer` buffer without unmodifiable error or so on.
  */
 export async function append(
@@ -361,8 +355,8 @@ export interface AppendOptions {
  * }
  * ```
  *
- * It temporary change `modified`, `modifiable`, and `foldmethod` options to
- * replace the content of the `buffer` buffer without unmodifiable error or so on.
+ * It temporary change `modified` and `modifiable` options to replace
+ * the content of the `buffer` buffer without unmodifiable error or so on.
  */
 export async function replace(
   denops: Denops,
@@ -518,25 +512,20 @@ export async function modifiable<T>(
   bufnr: number,
   executor: () => T,
 ): Promise<T> {
-  const [modified, modifiable, foldmethod] = await batch.collect(
+  const [modified, modifiable] = await batch.collect(
     denops,
     (denops) => [
       op.modified.getBuffer(denops, bufnr),
       op.modifiable.getBuffer(denops, bufnr),
-      op.foldmethod.getBuffer(denops, bufnr),
     ],
   );
-  await batch.batch(denops, async (denops) => {
-    await fn.setbufvar(denops, bufnr, "&modifiable", 1);
-    await fn.setbufvar(denops, bufnr, "&foldmethod", "manual");
-  });
+  await fn.setbufvar(denops, bufnr, "&modifiable", 1);
   try {
     return await executor();
   } finally {
     await batch.batch(denops, async (denops) => {
       await fn.setbufvar(denops, bufnr, "&modified", modified);
       await fn.setbufvar(denops, bufnr, "&modifiable", modifiable);
-      await fn.setbufvar(denops, bufnr, "&foldmethod", foldmethod);
     });
   }
 }

Diff for: buffer/buffer_test.ts

@@ -302,6 +302,69 @@ test({
             assertEquals(0, await fn.getbufvar(denops, bufnr, "&modifiable"));
           },
         });
+        await t.step({
+          name: "appends content of a 'foldmethod=marker' buffer",
+          fn: async () => {
+            await denops.cmd("enew");
+            const bufnr = await fn.bufnr(denops);
+            await fn.setbufvar(denops, bufnr, "&foldmethod", "marker");
+            await fn.setbufvar(denops, bufnr, "&foldmarker", "{{{,}}}");
+            await append(denops, bufnr, [
+              "Hello {{{",
+              "Darkness",
+              "My }}}",
+              "Old friend",
+            ]);
+            assertEquals([
+              "",
+              "Hello {{{",
+              "Darkness",
+              "My }}}",
+              "Old friend",
+            ], await fn.getline(denops, 1, "$"));
+            assertEquals(
+              await fn.getbufvar(denops, bufnr, "&foldmethod"),
+              "marker",
+            );
+
+            await fn.setbufvar(denops, bufnr, "&foldlevel", 0);
+            await append(denops, bufnr, [
+              "Joking",
+            ]);
+            assertEquals([
+              "",
+              "Joking",
+              "Hello {{{",
+              "Darkness",
+              "My }}}",
+              "Old friend",
+            ], await fn.getline(denops, 1, "$"));
+            assertEquals(
+              await fn.getbufvar(denops, bufnr, "&foldmethod"),
+              "marker",
+            );
+
+            await fn.setbufvar(denops, bufnr, "&foldlevel", 0);
+            await append(denops, bufnr, [
+              "Foo",
+            ], {
+              lnum: 3,
+            });
+            assertEquals([
+              "",
+              "Joking",
+              "Hello {{{",
+              "Foo",
+              "Darkness",
+              "My }}}",
+              "Old friend",
+            ], await fn.getline(denops, 1, "$"));
+            assertEquals(
+              await fn.getbufvar(denops, bufnr, "&foldmethod"),
+              "marker",
+            );
+          },
+        });
       },
     });
 
@@ -361,6 +424,42 @@ test({
             assertEquals(0, await fn.getbufvar(denops, bufnr, "&modifiable"));
           },
         });
+        await t.step({
+          name: "replaces content of an 'foldmethod=marker' buffer",
+          fn: async () => {
+            const bufnr = await fn.bufnr(denops);
+            await fn.setbufvar(denops, bufnr, "&foldmethod", "marker");
+            await fn.setbufvar(denops, bufnr, "&foldmarker", "{{{,}}}");
+            await replace(denops, bufnr, [
+              "Hello {{{",
+              "Darkness",
+              "My }}}",
+              "Old friend",
+            ]);
+            assertEquals([
+              "Hello {{{",
+              "Darkness",
+              "My }}}",
+              "Old friend",
+            ], await fn.getline(denops, 1, "$"));
+            assertEquals(
+              await fn.getbufvar(denops, bufnr, "&foldmethod"),
+              "marker",
+            );
+
+            await fn.setbufvar(denops, bufnr, "&foldlevel", 0);
+            await replace(denops, bufnr, [
+              "Joking {{{1",
+            ]);
+            assertEquals([
+              "Joking {{{1",
+            ], await fn.getline(denops, 1, "$"));
+            assertEquals(
+              await fn.getbufvar(denops, bufnr, "&foldmethod"),
+              "marker",
+            );
+          },
+        });
       },
     });