fix incorrect type definition of text search match nodes

rhysd · Jun 19, 2024 · 4ef46f5 · 4ef46f5
1 parent 2b920df
commit 4ef46f5
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 26 deletions.
diff --git a/v2/package.json b/v2/package.json
@@ -7,7 +7,7 @@
   "scripts": {
     "watch": "concurrently -c auto npm:watch:bundle npm:watch:ts npm:watch:rs",
     "watch:bundle": "npm run bundle -- --watch",
-    "watch:ts": "npm run lint:tsc -- --watch --preserveWatchOutput --pretty",
+    "watch:ts": "npm run lint:tsc -- --watch --preserveWatchOutput",
     "watch:rs": "cargo watch --watch src --watch bench/benches -- cargo check --all --benches --color always",
     "bundle": "node scripts/bundle.mjs",
     "release": "npm run bundle -- --minify",
@@ -16,7 +16,7 @@
     "fix:prettier": "prettier --write \"web/**/*.ts\" \"web/**/*.tsx\" scripts/bundle.mjs web/style.css",
     "fix:eslint": "eslint --fix \"web/**/*.ts\" \"web/**/*.tsx\"",
     "lint": "concurrently -c auto npm:lint:tsc npm:lint:clippy npm:lint:prettier npm:lint:rustfmt npm:lint:eslint npm:lint:stylelint",
-    "lint:tsc": "tsc --noEmit -p .",
+    "lint:tsc": "tsc --noEmit -p . --pretty",
     "lint:clippy": "cargo clippy --color always --all-features --all --benches -- -D warnings",
     "lint:prettier": "prettier --check \"web/**/*.ts\" \"web/**/*.tsx\" scripts/bundle.mjs web/style.css",
     "lint:rustfmt": "cargo fmt --all --check -- --color always",

diff --git a/v2/web/ipc.ts b/v2/web/ipc.ts
@@ -181,19 +181,15 @@ export type RenderTreeElem =
       }
     | {
           t: 'match'; // Text search match tokens after match-start
-          c: RenderTreeElem[];
       }
     | {
           t: 'match-current'; // Current text search match tokens after match-current-start
-          c: RenderTreeElem[];
       }
     | {
           t: 'match-start'; // First text search match token
-          c: RenderTreeElem[];
       }
     | {
           t: 'match-current-start'; // First current text search match token
-          c: RenderTreeElem[];
       };
 
 export type MessageFromMain =

diff --git a/v2/web/markdown.tsx b/v2/web/markdown.tsx
@@ -504,31 +504,15 @@ class RenderTreeToReact {
             case 'modified':
                 return this.lastModified(key);
             case 'match':
-                return (
-                    <span key={key} className="search-text">
-                        {await this.renderAll(elem.c)}
-                    </span>
-                );
+                return <span key={key} className="search-text" />;
             case 'match-current':
-                return (
-                    <span key={key} className="search-text-current">
-                        {await this.renderAll(elem.c)}
-                    </span>
-                );
+                return <span key={key} className="search-text-current" />;
             case 'match-start':
                 this.matchCount++;
-                return (
-                    <span key={key} className="search-text-start">
-                        {await this.renderAll(elem.c)}
-                    </span>
-                );
+                return <span key={key} className="search-text-start" />;
             case 'match-current-start':
                 this.matchCount++;
-                return (
-                    <span key={key} className="search-text-current-start">
-                        {await this.renderAll(elem.c)}
-                    </span>
-                );
+                return <span key={key} className="search-text-current-start" />;
             default:
                 log.error('Unknown render tree element:', JSON.stringify(elem));
                 return null;