feat: configure word separator and pattern specific for typst (#990)

* feat: configure word separator and pattern specific for typst * dev: async and catch
Myriad-Dreamin · Dec 12, 2024 · 511ec2b · 511ec2b
1 parent 382d73d
commit 511ec2b
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 0 deletions.
diff --git a/editors/vscode/package.json b/editors/vscode/package.json
@@ -624,6 +624,14 @@
     "configurationDefaults": {
       "[typst]": {
         "editor.wordWrap": "on",
+        "editor.wordSeparators": "`~!@#$%^&*()=+[{]}\\|;:'\",.<>/?",
+        "editor.semanticHighlighting.enabled": true,
+        "editor.tabSize": 2,
+        "editor.inlayHints.enabled": "off"
+      },
+      "[typst-code]": {
+        "editor.wordWrap": "on",
+        "editor.wordSeparators": "`~!@#$%^&*()=+[{]}\\|;:'\",.<>/?",
         "editor.semanticHighlighting.enabled": true,
         "editor.tabSize": 2,
         "editor.inlayHints.enabled": "off"

diff --git a/editors/vscode/src/extension.ts b/editors/vscode/src/extension.ts
@@ -74,6 +74,19 @@ export async function doActivate(context: ExtensionContext): Promise<void> {
   extensionState.features.onEnter = !!config.onEnterEvent;
   extensionState.features.renderDocs = config.renderDocs === "enable";
 
+  // Configures advanced editor settings to affect the host process
+  let configWordSeparators = async () => {
+    const wordSeparators = "`~!@#$%^&*()=+[{]}\\|;:'\",.<>/?";
+    const config1 = vscode.workspace.getConfiguration("", { languageId: "typst" });
+    await config1.update("editor.wordSeparators", wordSeparators, false, true);
+    const config2 = vscode.workspace.getConfiguration("", { languageId: "typst-code" });
+    await config2.update("editor.wordSeparators", wordSeparators, false, true);
+  };
+  // Runs configuration asynchronously to avoid blocking the activation
+  configWordSeparators().catch((e) =>
+    console.error("cannot change editor.wordSeparators for typst", e),
+  );
+
   // Configures advanced language configuration
   tinymist.configureLanguage(config["typingContinueCommentsOnNewline"]);
   context.subscriptions.push(

diff --git a/editors/vscode/src/lsp.ts b/editors/vscode/src/lsp.ts
@@ -365,9 +365,13 @@ class LanguageState {
       ];
     }
 
+    const wordPattern =
+      /(-?\d*.\d\w*)|([^\`\~\!\@\#\%\^\&\*\(\)\=\+\[\{\]\}\\\|\;\:\'\"\,\.<\>\/\?\s]+)/;
+
     console.log("Setting up language configuration", typingContinueCommentsOnNewline);
     this.configureLang = vscode.languages.setLanguageConfiguration("typst", {
       onEnterRules,
+      wordPattern,
     });
   }
 }