Detect Vim mode.

Signed-off-by: Ryan McQuen <rpcm@linux.com>
ryanpcmcquen · May 14, 2021 · 500b856 · 500b856
1 parent 9450ea9
commit 500b856
Show file tree

Hide file tree

Showing 4 changed files with 52 additions and 42 deletions.
diff --git a/manifest.json b/manifest.json
@@ -1,7 +1,7 @@
 {
     "id": "obsidian-org-mode",
     "name": "Org Mode",
-    "version": "1.1.1",
+    "version": "1.2.0",
     "minAppVersion": "0.10.12",
     "description": "Add Org Mode support to Obsidian.",
     "author": "ryanpcmcquen",

diff --git a/package.json b/package.json
@@ -1,23 +1,23 @@
 {
-  "name": "obsidian-org-mode",
-  "version": "1.1.1",
-  "description": "Add Org Mode support to Obsidian.",
-  "main": "main.js",
-  "scripts": {
-    "dev": "rollup --config rollup.config.js -w",
-    "build": "rollup --config rollup.config.js --environment BUILD:production"
-  },
-  "keywords": [],
-  "author": "",
-  "license": "MPL-2.0",
-  "devDependencies": {
-    "@rollup/plugin-commonjs": "^18.0.0",
-    "@rollup/plugin-node-resolve": "^11.2.1",
-    "@rollup/plugin-typescript": "^8.2.1",
-    "@types/node": "^14.14.37",
-    "obsidian": "^0.12.0",
-    "rollup": "^2.32.1",
-    "tslib": "^2.2.0",
-    "typescript": "^4.2.4"
-  }
+    "name": "obsidian-org-mode",
+    "version": "1.2.0",
+    "description": "Add Org Mode support to Obsidian.",
+    "main": "main.js",
+    "scripts": {
+        "dev": "rollup --config rollup.config.js -w",
+        "build": "rollup --config rollup.config.js --environment BUILD:production"
+    },
+    "keywords": [],
+    "author": "",
+    "license": "MPL-2.0",
+    "devDependencies": {
+        "@rollup/plugin-commonjs": "^18.0.0",
+        "@rollup/plugin-node-resolve": "^11.2.1",
+        "@rollup/plugin-typescript": "^8.2.1",
+        "@types/node": "^14.14.37",
+        "obsidian": "^0.12.0",
+        "rollup": "^2.32.1",
+        "tslib": "^2.2.0",
+        "typescript": "^4.2.4"
+    }
 }
diff --git a/src/main.ts b/src/main.ts
@@ -1,24 +1,24 @@
-import './lib/codemirror.js';
-import './mode/simple/simple.min.js';
-import './mode/orgmode/orgmode-fold.min.js';
-import './mode/orgmode/orgmode-mode.min.js';
-import { Plugin, WorkspaceLeaf, TextFileView } from 'obsidian';
+import "./lib/codemirror.js";
+import "./mode/simple/simple.min.js";
+import "./mode/orgmode/orgmode-fold.min.js";
+import "./mode/orgmode/orgmode-mode.min.js";
+import { Plugin, TextFileView, WorkspaceLeaf } from "obsidian";
 
 export default class OrgMode extends Plugin {
     async onload() {
         super.onload();
-        console.log('Loading Org Mode plugin ...');
+        console.log("Loading Org Mode plugin ...");
 
-        this.registerView('orgmode', this.orgViewCreator);
-        this.registerExtensions(['org'], 'orgmode');
+        this.registerView("orgmode", this.orgViewCreator);
+        this.registerExtensions(["org"], "orgmode");
     }
 
     orgViewCreator = (leaf: WorkspaceLeaf) => {
         return new OrgView(leaf);
     };
 
     onunload() {
-        console.log('Unloading Org Mode plugin ...');
+        console.log("Unloading Org Mode plugin ...");
     }
 }
 
@@ -37,20 +37,20 @@ class OrgView extends TextFileView {
         super(leaf);
         // @ts-ignore
         this.codeMirror = CodeMirror(this.extContentEl, {
-            theme: 'obsidian',
+            theme: "obsidian",
 
             // I am not sure autofocus is necessary ...
             autofocus: true,
             foldGutter: {
                 minFoldSize: 1,
             },
             foldOptions: {
-                widget: ' ...',
+                widget: " ...",
             },
-            gutters: ['CodeMirror-foldgutter'],
+            gutters: ["CodeMirror-foldgutter"],
         });
 
-        this.codeMirror.on('changes', this.changed);
+        this.codeMirror.on("changes", this.changed);
     }
 
     // When the view is resized, refresh CodeMirror (thanks Licat!).
@@ -59,8 +59,8 @@ class OrgView extends TextFileView {
     }
 
     changed = async (
-        instance: CodeMirror.Editor,
-        changes: CodeMirror.EditorChangeLinkedList[]
+        _instance: CodeMirror.Editor,
+        _changes: CodeMirror.EditorChangeLinkedList[]
     ) => {
         this.requestSave();
     };
@@ -72,10 +72,19 @@ class OrgView extends TextFileView {
     setViewData = (data: string, clear: boolean) => {
         if (clear) {
             // @ts-ignore
-            this.codeMirror.swapDoc(CodeMirror.Doc(data, 'orgmode'));
+            this.codeMirror.swapDoc(CodeMirror.Doc(data, "orgmode"));
         } else {
             this.codeMirror.setValue(data);
         }
+
+        // HACK:
+        // Ideally this would actually be able to find the user defined
+        // keyMap, and not just check the 'vimMode' boolean.
+        // @ts-ignore
+        if (this.app?.vault?.config?.vimMode) {
+            this.codeMirror.setOption("keyMap", "vim");
+        }
+
         // This seems to fix some odd visual bugs:
         this.codeMirror.refresh();
 
@@ -85,23 +94,23 @@ class OrgView extends TextFileView {
     };
 
     clear = () => {
-        this.codeMirror.setValue('');
+        this.codeMirror.setValue("");
         this.codeMirror.clearHistory();
     };
 
     getDisplayText() {
         if (this.file) {
             return this.file.basename;
         } else {
-            return 'org (no file)';
+            return "org (No File)";
         }
     }
 
     canAcceptExtension(extension: string) {
-        return extension === 'org';
+        return extension === "org";
     }
 
     getViewType() {
-        return 'orgmode';
+        return "orgmode";
     }
 }
diff --git a/versions.json b/versions.json
@@ -1,4 +1,5 @@
 {
+    "1.2.0": "0.10.12",
     "1.1.1": "0.10.12",
     "1.1.0": "0.10.12",
     "1.0.1": "0.10.12",