コードブロック本体のインデント計算処理を分けた

Author: MijinkoSD

browser/websocket/_codeBlock.ts

@@ -1,8 +1,8 @@
-import { Change, InsertCommit, Socket, wrap } from "../../deps/socket.ts";
+import { Change, Socket, wrap } from "../../deps/socket.ts";
 import { HeadData } from "./pull.ts";
-import { createNewLineId, getProjectId, getUserId } from "./id.ts";
-import { CodeFile } from "./updateCodeFile.ts";
+import { getProjectId, getUserId } from "./id.ts";
 import { pushWithRetry } from "./_fetch.ts";
+import { TinyCodeBlock } from "./getCodeBlocks.ts";
 
 /** コミットを送信する一連の処理 */
 export async function applyCommit(
@@ -28,30 +28,10 @@ export async function applyCommit(
   });
 }
 
-/** 新規コードブロックのコミットを作成する */
-export function* makeCommitsNewCodeBlock(
-  code: CodeFile,
-  insertLineId: string,
-  { userId }: { userId: string },
-): Generator<InsertCommit, void, unknown> {
-  const codeName = code.filename + (code.lang ? `(${code.lang})` : "");
-  const codeBody = Array.isArray(code.content)
-    ? code.content
-    : code.content.split("\n");
-  yield {
-    _insert: insertLineId,
-    lines: {
-      id: createNewLineId(userId),
-      text: `code:${codeName}`,
-    },
-  };
-  for (const bodyLine of codeBody) {
-    yield {
-      _insert: insertLineId,
-      lines: {
-        id: createNewLineId(userId),
-        text: " " + bodyLine,
-      },
-    };
-  }
+/** コードブロック本文のインデント数を計算する */
+export function countBodyIndent(
+  codeBlock: Pick<TinyCodeBlock, "titleLine">,
+): number {
+  return codeBlock.titleLine.text.length -
+    codeBlock.titleLine.text.trimStart().length + 1;
 }

browser/websocket/updateCodeFile.ts

@@ -10,7 +10,7 @@ import { pull } from "./pull.ts";
 import { getCodeBlocks, TinyCodeBlock } from "./getCodeBlocks.ts";
 import { createNewLineId, getUserId } from "./id.ts";
 import { diff, toExtendedChanges } from "../../deps/onp.ts";
-import { applyCommit } from "./_codeBlock.ts";
+import { applyCommit, countBodyIndent } from "./_codeBlock.ts";
 
 /** コードブロックの上書きに使う情報のinterface */
 export interface CodeFile {
@@ -107,8 +107,7 @@ export const updateCodeFile = async (
  */
 function flatCodeBodies(codeBlocks: readonly TinyCodeBlock[]): Line[] {
   return codeBlocks.map((block) => {
-    const title = block.titleLine.text;
-    const indent = title.length - title.trimStart().length + 1;
+    const indent = countBodyIndent(block);
     return block.bodyLines.map((body) => {
       return { ...body, text: body.text.slice(indent) };
     });
@@ -131,9 +130,7 @@ function* makeCommits(
   },
 ): Generator<DeleteCommit | InsertCommit | UpdateCommit, void, unknown> {
   function makeIndent(codeBlock: Pick<TinyCodeBlock, "titleLine">): string {
-    const title = codeBlock.titleLine.text;
-    const count = title.length - title.trimStart().length + 1;
-    return " ".repeat(count);
+    return " ".repeat(countBodyIndent(codeBlock));
   }
 
   const codeBlocks: Pick<