fix merge conflict

packages/web/src/components/editor.tsx

@@ -16,6 +16,7 @@ import {
   langByTarget as langByTargetUntyped,
   panicCodes as panicCodesUntyped,
   targetsWithDocumentEvalMode,
+  noAutoIndent,
   webTargets,
 } from "@/settings.json";
 import { javascript } from "@codemirror/lang-javascript";
@@ -39,7 +40,7 @@ import React, { useEffect, useState } from "react";
 import { yCollab } from "y-codemirror.next";
 import { UndoManager } from "yjs";
 import themes from "@/lib/themes";
-import { toggleLineComment } from "@codemirror/commands";
+import { toggleLineComment, insertNewline } from "@codemirror/commands";
 
 const defaultLanguage = "javascript";
 const langByTarget = langByTargetUntyped as { [lang: string]: string };
@@ -69,6 +70,7 @@ const panicKeymap = (
     : [];
 };
 
+// extra keymaps
 const extraKeymap = () => {
   return keymap.of([
     // fixes the Cmd/Alt-/ issue for Spanish keyboards
@@ -79,6 +81,16 @@ const extraKeymap = () => {
   ]);
 };
 
+// overwrites the default insertNewlineAndIndent command on Enter
+const autoIndentKeymap = (doc: Document) => {
+  // if any of the targets is part of the noAutoIndent setting in settings.json
+  const noIndent = noAutoIndent.includes(doc.target);
+  // overwrite the Enter with insertNewline
+  return noIndent
+    ? Prec.high(keymap.of([{ key: "Enter", run: insertNewline }]))
+    : [];
+};
+
 interface FlokSetupOptions {
   readOnly?: boolean;
 }
@@ -100,6 +112,7 @@ const flokSetup = (
     Prec.high(evalKeymap(doc, { defaultMode, web })),
     panicKeymap(doc),
     extraKeymap(),
+    autoIndentKeymap(doc),
     yCollab(text, doc.session.awareness, {
       undoManager,
       hideCaret: readOnly,

packages/web/src/settings.json

@@ -45,6 +45,7 @@
     "sardine": "panic()",
     "dummy": "silence"
   },
+  "noAutoIndent": ["mercury", "mercury-web"],
   "webTargets": ["hydra", "mercury-web", "punctual", "strudel"],
   "repoUrl": "https://github.com/munshkr/flok",
   "changeLogUrl": "https://github.com/munshkr/flok/blob/main/CHANGELOG.md#changelog"