Merge pull request #2 from oeyoews/convert-to-class

Convert to class
oeyoews · Oct 22, 2023 · 2f31c71 · 2f31c71
2 parents 0b3264c + 57d4f98
commit 2f31c71
Show file tree

Hide file tree

Showing 8 changed files with 65 additions and 178 deletions.
diff --git a/package.json b/package.json
@@ -54,6 +54,7 @@
     "@codemirror/lint": "^6.4.2",
     "@codemirror/search": "^6.5.4",
     "@codemirror/state": "^6.3.1",
+    "@codemirror/theme-one-dark": "^6.1.2",
     "@codemirror/view": "^6.21.3",
     "@lezer/common": "^1.1.0",
     "@lezer/highlight": "^1.1.6",

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/src/tiddlywiki-codemirror-6/engine.ts b/src/tiddlywiki-codemirror-6/engine.ts
@@ -1,18 +1,7 @@
 // @ts-nocheck
-import { completeAnyWord } from '@codemirror/autocomplete';
-import { tags } from '@lezer/highlight';
-import { Vim, vim } from '@replit/codemirror-vim';
-import { html, htmlLanguage } from '@codemirror/lang-html';
-import { json, jsonLanguage } from '@codemirror/lang-json';
-import { css, cssLanguage } from '@codemirror/lang-css';
-import {
-  markdown,
-  markdownLanguage,
-  markdownKeymap,
-} from '@codemirror/lang-markdown';
-import { javascript, javascriptLanguage } from '@codemirror/lang-javascript';
-import { HighlightStyle, syntaxHighlighting } from '@codemirror/language';
+// @language
 import {
+  HighlightStyle,
   indentUnit,
   defaultHighlightStyle,
   syntaxHighlighting,
@@ -21,16 +10,26 @@ import {
   foldGutter,
   foldKeymap,
 } from '@codemirror/language';
+import { html, htmlLanguage } from '@codemirror/lang-html';
+import { json, jsonLanguage } from '@codemirror/lang-json';
+import { css, cssLanguage } from '@codemirror/lang-css';
+import {
+  markdown,
+  markdownLanguage,
+  markdownKeymap,
+} from '@codemirror/lang-markdown';
+import { javascript, javascriptLanguage } from '@codemirror/lang-javascript';
+
 import { EditorState, EditorSelection, Prec } from '@codemirror/state';
 import {
   searchKeymap,
   highlightSelectionMatches,
   openSearchPanel,
   closeSearchPanel,
 } from '@codemirror/search';
-
 import {
   autocompletion,
+  completeAnyWord,
   completionKeymap,
   closeBrackets,
   closeBracketsKeymap,
@@ -59,13 +58,10 @@ import {
   placeholder,
   tooltips,
 } from '@codemirror/view';
-import {
-  indentWithTab,
-  history,
-  historyKeymap,
-  undo,
-  redo,
-} from '@codemirror/commands';
+import { tags } from '@lezer/highlight';
+import { Vim, vim } from '@replit/codemirror-vim';
+// import { oneDarkTheme, oneDarkHighlightStyle, } from '@codemirror/theme-one-dark';
+
 // import { tiddlywiki, tiddlywikiLanguage } from '@codemirror/lang-tiddlywiki';
 
 class CodeMirrorEngine {
@@ -92,8 +88,22 @@ class CodeMirrorEngine {
     this.openSearchPanel = openSearchPanel;
     this.closeSearchPanel = closeSearchPanel;
 
-    this.solarizedLightTheme = EditorView.theme({}, { dark: false });
-    this.solarizedDarkTheme = EditorView.theme({}, { dark: true });
+    this.solarizedLightTheme = EditorView.theme(
+      {
+        '&.cm-focused': {
+          outline: 'none',
+        },
+      },
+      { dark: false },
+    );
+    this.solarizedDarkTheme = EditorView.theme(
+      {
+        '&.cm-focused': {
+          outline: 'none',
+        },
+      },
+      { dark: true },
+    );
 
     this.solarizedLightHighlightStyle =
       $tw.utils.codemirror.getSolarizedLightHighlightStyle(
@@ -324,10 +334,12 @@ class CodeMirrorEngine {
       editorExtensions.push(keymap.of([indentWithTab]));
     }
 
+    // vim
     editorExtensions.push(vim());
     Vim.map('jk', '<Esc>', 'insert'); // in insert mode
     Vim.map('H', '0', 'normal');
     Vim.map('L', '$', 'normal');
+    // editorExtensions.push(oneDarkTheme);
 
     if (
       this.widget.wiki.getTiddlerText(

diff --git a/src/tiddlywiki-codemirror-6/files/lib/one-dark.js b/src/tiddlywiki-codemirror-6/files/lib/one-dark.js
diff --git a/src/tiddlywiki-codemirror-6/files/tiddlywiki.files b/src/tiddlywiki-codemirror-6/files/tiddlywiki.files
@@ -1,13 +1,5 @@
 {
 	"tiddlers": [
-		{
-			"file": "lib/one-dark.js",
-			"fields": {
-				"type": "application/javascript",
-				"title": "$:/plugins/BTC/tiddlywiki-codemirror-6/lib/one-dark.js",
-				"module-type": "library"
-			}
-		},
 		{
 			"file": "modules/startup/load-codemirror-modules.js",
 			"fields": {

diff --git a/src/tiddlywiki-codemirror-6/readme.tid b/src/tiddlywiki-codemirror-6/readme.tid
@@ -9,6 +9,14 @@ If you like the plugin, feel free to leave me a star on [ext[GitHub|https://gith
 !! TODO
 
 * [x] 字体大小问题
+* lsp: https://github.com/FurqanSoftware/codemirror-languageserver
+* [ ] autocompletion better
+* [ ] multi cursor
+* [ ] toggle line wrap config option
+* subplugin for different language
+* lang-tiddlywiki
 * refactor engine.js to es6 class
 * 焦点残留问题
-* 调色板问题
+* theme: https://github.com/codemirror/theme-one-dark
+* tab to completion
+* min completion length
diff --git a/wiki/tiddlers/22nd October 2023.js b/wiki/tiddlers/22nd October 2023.js
@@ -0,0 +1,3 @@
+const demo  = 1;
+
+	console.log(demo)
diff --git a/wiki/tiddlers/22nd October 2023.js.meta b/wiki/tiddlers/22nd October 2023.js.meta
@@ -0,0 +1,5 @@
+created: 20231022083508728
+modified: 20231022083643066
+tags: Journal
+title: 22nd October 2023
+type: application/javascript