Fix/paredit config config per doc

.changeset/slick-owls-watch.md

@@ -0,0 +1,5 @@
+---
+"emacs-mcx": patch
+---
+
+Paredit config effective per document rather than globally

README.md

@@ -189,7 +189,7 @@ When true, line-move moves point by visual lines (same as an Emacs variable line
 
 ### `emacs-mcx.paredit.parentheses`
 
-Key-value pairs of parentheses like the following example to be used in the ParEdit commands.
+Key-value pairs of parentheses to be used in the ParEdit commands like the following example.
 
 ```json
 {
@@ -199,6 +199,22 @@ Key-value pairs of parentheses like the following example to be used in the ParE
 }
 ```
 
+User-defined pairs are merged with the default pairs.
+You can also override the default pairs or disable them by setting `null` as the value. For example:
+
+```json
+"emacs-mcx.paredit.parentheses": {
+  "<": ">",  // New pair
+  "{": null,  // Default pair disabled
+}
+// This will result in the following configuration for files of the language:
+// {
+//   "[": "]",
+//   "(": ")",
+//   "<": ">"
+// }
+```
+
 ### `emacs-mcx.subwordMode`
 
 When true, word-oriented move and edit commands, including M-f, M-b, M-d will

package.json

@@ -175,15 +175,19 @@
           "type": "object",
           "patternProperties": {
             "^\\S$": {
-              "type": "string",
+              "type": [
+                "string",
+                "null"
+              ],
               "pattern": "^\\S$"
             }
           },
           "default": {
             "[": "]",
             "(": ")",
             "{": "}"
-          }
+          },
+          "scope": "language-overridable"
         },
         "emacs-mcx.subwordMode": {
           "type": "boolean",

src/commands/paredit.ts

@@ -1,13 +1,31 @@
 import * as paredit from "paredit.js";
 import { TextDocument, Selection, Range, TextEditor, Position } from "vscode";
+import * as vscode from "vscode";
 import { EmacsCommand } from ".";
 import { KillYankCommand } from "./kill";
 import { AppendDirection } from "../kill-yank";
 import { revealPrimaryActive } from "./helpers/reveal";
 import { MessageManager } from "../message";
+import { Logger } from "../logger";
+
+const logger = Logger.get("paredit");
 
 type PareditNavigatorFn = (ast: paredit.AST, idx: number) => number;
 
+function getPareditParenthesesConfig(document: vscode.TextDocument): { [key: string]: string } {
+  const config = vscode.workspace.getConfiguration("emacs-mcx", document);
+  const parentheses = config.get<{ [key: string]: string | null }>("paredit.parentheses", {});
+  // parentheses[open] can be null to explicitly disable a pair
+  const filteredParentheses: { [key: string]: string } = {};
+  for (const open in parentheses) {
+    const close = parentheses[open];
+    if (close != null) {
+      filteredParentheses[open] = close;
+    }
+  }
+  return filteredParentheses;
+}
+
 // Languages in which semicolon represents comment
 const languagesSemicolonComment = new Set(["clojure", "lisp", "scheme"]);
 
@@ -19,8 +37,13 @@ const makeSexpTravelFunc = (doc: TextDocument, pareditNavigatorFn: PareditNaviga
     // However, in other languages, semicolon should be treated as one entity, but not comment for convenience.
     // To do so, ";" is replaced with another character which is not treated as comment by paredit.js
     // if the document is not lisp or lisp-like languages.
-    src = src.split(";").join("_"); // split + join = replaceAll
+    src = src.replaceAll(";", "_");
   }
+
+  const parentheses = getPareditParenthesesConfig(doc);
+  logger.debug(`Using paredit parentheses: ${JSON.stringify(parentheses)}`);
+  paredit.reader.setParentheses(parentheses);
+
   const ast = paredit.parse(src);
 
   return (position: Position, repeat: number): Position => {

src/configuration/configuration.ts

@@ -4,8 +4,7 @@
 
 import { Logger } from "../logger";
 import * as vscode from "vscode";
-import { IConfiguration, IDebugConfiguration, IPareditConfiguration } from "./iconfiguration";
-import * as paredit from "paredit.js";
+import { IConfiguration, IDebugConfiguration } from "./iconfiguration";
 
 export class Configuration implements IConfiguration, vscode.Disposable {
   /**
@@ -81,10 +80,6 @@
     return this.scrollDownCommandBehavior;
   }
 
-  public paredit: IPareditConfiguration = {
-    parentheses: { "[": "]", "(": ")", "{": "}" },
-  };
-
   public debug: IDebugConfiguration = {
     silent: false,
     loggingLevelForAlert: "error",
@@ -124,9 +119,6 @@
     }
 
     Logger.configChanged(this);
-
-    // Update configs in the third-party libraries.
-    paredit.reader.setParentheses(this.paredit.parentheses);
   }
 
   private static unproxify(obj: { [key: string]: unknown }) {

src/configuration/iconfiguration.ts

@@ -1,7 +1,3 @@
-export interface IPareditConfiguration {
-  parentheses: { [key: string]: string };
-}
-
 export interface IDebugConfiguration {
   /**
    * Boolean indicating whether all logs should be suppressed
@@ -59,11 +55,6 @@ export interface IConfiguration {
   scrollDownCommandBehavior: "vscode" | "emacs";
   wordNavigationStyle: "vscode" | "emacs";
 
-  /**
-   * Paredit configuration
-   */
-  paredit: IPareditConfiguration;
-
   /**
    * Extension debugging settings
    */

src/test/suite/extension.native.test.ts

@@ -67,7 +67,7 @@ suite("package.json", () => {
         return false;
       }
 
-      if (keyFirstSegment == "subwordMode") {
+      if (keyFirstSegment && ["subwordMode", "paredit"].includes(keyFirstSegment)) {
         // Special case subwordMode. It's handled by wordSeparators.ts.
         return false;
       }