update

oeyoews · Oct 22, 2023 · 57d4f98 · 57d4f98
1 parent 4b09b88
commit 57d4f98
Show file tree

Hide file tree

Showing 8 changed files with 27 additions and 155 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
@@ -60,6 +60,7 @@ import {
 } from '@codemirror/view';
 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';
 
@@ -333,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
@@ -17,4 +17,6 @@ If you like the plugin, feel free to leave me a star on [ext[GitHub|https://gith
 * 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