fix: CM5 / CM6 script loading logic

cqroot · Mar 29, 2024 · ad69afa · ad69afa
1 parent ca74eb4
commit ad69afa
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 21 deletions.
diff --git a/src/codeMirror5Scroller.js b/src/codeMirror5Scroller.js
@@ -1,4 +1,6 @@
 function plugin(CodeMirror) {
+  if (CodeMirror.cm6) { return; }
+
   CodeMirror.defineExtension('scrollToLine', function scrollToLine(lineno) {
     // temporary fix: sometimes the first coordinate is incorrect,
     // resulting in a difference about +- 10 px,

diff --git a/src/codeMirror6Scroller.ts b/src/codeMirror6Scroller.ts
@@ -5,30 +5,27 @@ import { EditorView } from '@codemirror/view';
 export default (context: ContentScriptContext): MarkdownEditorContentScriptModule => {
 	return {
 		plugin: (editorControl: any) => {
-			if (editorControl.cm6) {
-        // Running in CM6
-        editorControl.registerCommand('scrollToLine', (lineNumber: number) => {
-          const editor: EditorView = editorControl.editor;
-          console.log('scrollToLine', lineNumber);
+			if (!editorControl.cm6) { return; }
 
-          // Bounds checking
-          if (lineNumber < 0) {
-            lineNumber = 0;
-          }
-          if (lineNumber > editor.state.doc.lines) {
-            lineNumber = editor.state.doc.lines;
-          }
+      // Running in CM6
+      editorControl.registerCommand('scrollToLine', (lineNumber: number) => {
+        const editor: EditorView = editorControl.editor;
+        console.log('scrollToLine', lineNumber);
 
-          // Scroll to line, place the line at the *top* of the editor
-          const lineInfo = editor.state.doc.line(lineNumber);
-          editor.dispatch(editor.state.update({
-              effects: EditorView.scrollIntoView(lineInfo.from, {y: 'start'})
-          }));
-        });
+        // Bounds checking
+        if (lineNumber < 0) {
+          lineNumber = 0;
+        }
+        if (lineNumber > editor.state.doc.lines) {
+          lineNumber = editor.state.doc.lines;
+        }
 
-      } else {
-        // Running in CM5, see codeMirror5Scroller.js
-      }
+        // Scroll to line, place the line at the *top* of the editor
+        const lineInfo = editor.state.doc.line(lineNumber);
+        editor.dispatch(editor.state.update({
+            effects: EditorView.scrollIntoView(lineInfo.from, {y: 'start'})
+        }));
+      });
 		},
 	};
 };