coc-vscode-loader 1.3.0 → 1.4.0

package/converter/src/transforms/strip-volar.test.ts

@@ -0,0 +1,35 @@
+import { describe, it, expect } from 'vitest'
+import { Project, ScriptKind } from 'ts-morph'
+
+async function applyStripVolar(source: string): Promise<string> {
+  const project = new Project({ useInMemoryFileSystem: true })
+  const file = project.createSourceFile('test.ts', source, { scriptKind: ScriptKind.TS })
+  const { transformStripVolar } = await import('./strip-volar.js')
+  transformStripVolar({ file, project })
+  return file.getText()
+}
+
+describe('strip-volar transform', () => {
+  it('removes @volar/vscode import', async () => {
+    const result = await applyStripVolar(`import { activate } from '@volar/vscode'\nconst x = 1`)
+    expect(result).not.toContain('@volar/vscode')
+    expect(result).toContain('const x = 1')
+  })
+
+  it('removes reactive-vscode import', async () => {
+    const result = await applyStripVolar(`import { useCommand } from 'reactive-vscode'\nconst x = 1`)
+    expect(result).not.toContain('reactive-vscode')
+    expect(result).toContain('const x = 1')
+  })
+
+  it('removes @volar/vscode/node import', async () => {
+    const result = await applyStripVolar(`import * as lsp from '@volar/vscode/node'\nconst x = 1`)
+    expect(result).not.toContain('@volar/vscode/node')
+    expect(result).toContain('const x = 1')
+  })
+
+  it('leaves unrelated code unchanged', async () => {
+    const input = `import { workspace } from 'coc.nvim'\nconst x = 1`
+    expect(await applyStripVolar(input)).toBe(input)
+  })
+})

package/converter/src/types.ts

@@ -3,6 +3,8 @@ import { Project, SourceFile } from 'ts-morph'
 export interface TransformContext {
   file: SourceFile
   project: Project
+  /** Plugin name from origPkg (for transforms that need it) */
+  pluginName?: string
 }
 
 export type Transform = (ctx: TransformContext) => void

package/converter/vitest.config.ts

@@ -0,0 +1,8 @@
+import { defineConfig } from 'vitest/config'
+
+export default defineConfig({
+  test: {
+    include: ['src/**/*.test.ts'],
+    environment: 'node',
+  },
+})

package/lib/index.js

@@ -39,7 +39,7 @@ var require_package = __commonJS({
   "package.json"(exports2, module2) {
     module2.exports = {
       name: "coc-vscode-loader",
-      version: "1.3.0",
+      version: "1.4.0",
       description: "Run VS Code extensions seamlessly in coc.nvim",
       main: "lib/index.js",
       keywords: [
@@ -1195,6 +1195,7 @@ var TUI = class _TUI {
     await nvim.command("highlight default link CocConverterType Type");
     await nvim.command("highlight default link CocConverterSection Title");
     await nvim.command("highlight default link CocConverterTotal Identifier");
+    await nvim.command("highlight default link CocConverterSearchMatch Search");
     const buf = await nvim.createNewBuffer(false, true);
     this.bufnr = buf.id;
     const editorLines = await nvim.call("nvim_get_option", ["lines"]);
@@ -1236,13 +1237,16 @@ var TUI = class _TUI {
         event: "WinEnter",
         request: true,
         callback: async () => {
-          if (!this.winid) return;
-          const curWin = await nvim.call("win_getid");
-          if (curWin === this.winid) return;
-          const curBuf = await nvim.call("winbufnr", [curWin]);
-          const bt = await nvim.call("getbufvar", [curBuf, "&buftype"]);
-          if (bt !== "nofile" && bt !== "prompt") {
-            await this.close();
+          try {
+            if (!this.winid) return;
+            const curWin = await nvim.call("win_getid");
+            if (curWin === this.winid) return;
+            const curBuf = await nvim.call("winbufnr", [curWin]);
+            const bt = await nvim.call("getbufvar", [curBuf, "&buftype"]);
+            if (bt !== "nofile" && bt !== "prompt") {
+              await this.close();
+            }
+          } catch {
           }
         }
       })
@@ -1351,25 +1355,30 @@ var TUI = class _TUI {
       return;
     }
     if (id === "G") {
-      const filtered = this.state.getFilteredPackages();
+      const filtered2 = this.state.getFilteredPackages();
       const visibleCount = Math.max(1, this.windowHeight - _TUI.HEADER_LINES - _TUI.FOOTER_LINES);
-      this.state.setScrollOffset(Math.max(0, filtered.length - visibleCount));
-      this.focusIndex = Math.max(0, filtered.length - 1);
+      this.state.setScrollOffset(Math.max(0, filtered2.length - visibleCount));
+      this.focusIndex = Math.max(0, filtered2.length - 1);
       return;
     }
     if (id === "j") {
-      const filtered = this.state.getFilteredPackages();
-      if (this.focusIndex < filtered.length - 1) {
+      const filtered2 = this.state.getFilteredPackages();
+      if (this.focusIndex < filtered2.length - 1) {
         this.focusIndex++;
         this.focusLineOffset = 0;
         const s2 = this.state.getState();
         const visibleCount = Math.max(1, this.windowHeight - _TUI.HEADER_LINES - _TUI.FOOTER_LINES);
         if (this.focusIndex >= s2.scrollOffset + visibleCount) {
-          s2.scrollOffset = Math.min(Math.max(0, filtered.length - visibleCount), s2.scrollOffset + 1);
+          s2.scrollOffset = Math.min(Math.max(0, filtered2.length - visibleCount), s2.scrollOffset + 1);
           await this.render();
+          const focused2 = filtered2[this.focusIndex];
+          const pkgLine2 = [...this.pkgLineMap.entries()].find(([l, n]) => n === focused2.info.name)?.[0];
+          if (pkgLine2 !== void 0) {
+            await import_coc2.workspace.nvim.call("nvim_win_set_cursor", [this.winid, [pkgLine2 + 1, 0]]);
+          }
           return;
         }
-        const focused = filtered[this.focusIndex];
+        const focused = filtered2[this.focusIndex];
         const pkgLine = [...this.pkgLineMap.entries()].find(([l, n]) => n === focused.info.name)?.[0];
         if (pkgLine !== void 0) {
           await import_coc2.workspace.nvim.call("nvim_win_set_cursor", [this.winid, [pkgLine + 1, 0]]);
@@ -1385,10 +1394,16 @@ var TUI = class _TUI {
         if (this.focusIndex < s2.scrollOffset) {
           s2.scrollOffset = Math.max(0, s2.scrollOffset - 1);
           await this.render();
+          const filtered3 = this.state.getFilteredPackages();
+          const focused2 = filtered3[this.focusIndex];
+          const pkgLine2 = [...this.pkgLineMap.entries()].find(([l, n]) => n === focused2.info.name)?.[0];
+          if (pkgLine2 !== void 0) {
+            await import_coc2.workspace.nvim.call("nvim_win_set_cursor", [this.winid, [pkgLine2 + 1, 0]]);
+          }
           return;
         }
-        const filtered = this.state.getFilteredPackages();
-        const focused = filtered[this.focusIndex];
+        const filtered2 = this.state.getFilteredPackages();
+        const focused = filtered2[this.focusIndex];
         const pkgLine = [...this.pkgLineMap.entries()].find(([l, n]) => n === focused.info.name)?.[0];
         if (pkgLine !== void 0) {
           await import_coc2.workspace.nvim.call("nvim_win_set_cursor", [this.winid, [pkgLine + 1, 0]]);
@@ -1437,6 +1452,9 @@ var TUI = class _TUI {
     if (!pkgName) return;
     const entry = this.state.getPackage(pkgName);
     if (!entry) return;
+    const filtered = this.state.getFilteredPackages();
+    const focusIdx = filtered.findIndex((p) => p.info.name === pkgName);
+    if (focusIdx >= 0) this.focusIndex = focusIdx;
     if (id === "x") {
       this.state.toggleMark(pkgName);
       return;
@@ -1459,7 +1477,7 @@ var TUI = class _TUI {
       return;
     }
     if (id === "close-detail") {
-      this.closeDetailPopup();
+      await this.closeDetailPopup();
       return;
     }
     if (id === "cr") {
@@ -1509,7 +1527,7 @@ var TUI = class _TUI {
     this.disposables = [];
     if (this.detailWinid) {
       try {
-        import_coc2.workspace.nvim.call("nvim_win_close", [this.detailWinid, true]);
+        await import_coc2.workspace.nvim.call("nvim_win_close", [this.detailWinid, true]);
       } catch {
       }
       this.detailWinid = 0;
@@ -1564,6 +1582,8 @@ var TUI = class _TUI {
         this.updateDetailPopup().catch(() => {
         });
       }
+      this.pkgLineMap = result.pkgLineMap;
+      this.logLineSet = result.logLines;
       if (!state.showHelp && result.pkgLineMap.size > 0) {
         const visibleCount = Math.max(1, this.windowHeight - _TUI.HEADER_LINES - _TUI.FOOTER_LINES);
         if (this.focusIndex < state.scrollOffset) {
@@ -1581,8 +1601,6 @@ var TUI = class _TUI {
           }
         }
       }
-      this.pkgLineMap = result.pkgLineMap;
-      this.logLineSet = result.logLines;
     } finally {
       this.rendering = false;
       if (this.pendingRender) this.render();
@@ -1640,6 +1658,10 @@ var TUI = class _TUI {
     buf.append(`F:${filterLabel}(f)`, "CocConverterPill");
     buf.append(`  `);
     buf.append(`S:${sortLabel}(s)`, "CocConverterPill");
+    if (state.searchQuery) {
+      buf.append("  |  ");
+      buf.append(`Search: /${state.searchQuery}/`, "CocConverterSearchMatch");
+    }
     if (state.statusMessage) {
       buf.append("  \xB7  ");
       buf.append(state.statusMessage, "Comment");
@@ -1683,7 +1705,7 @@ var TUI = class _TUI {
     }
     buf.append(icon, iconHl);
     buf.append(" ");
-    buf.append(entry.info.displayName);
+    this.appendHighlightedText(buf, entry.info.displayName);
     let statusText = "";
     let statusHl = "";
     if (entry.progress) {
@@ -1720,6 +1742,28 @@ var TUI = class _TUI {
     }
     buf.nl();
   }
+  appendHighlightedText(buf, text) {
+    const q = this.state.getState().searchQuery;
+    if (!q) {
+      buf.append(text);
+      return;
+    }
+    const lower = text.toLowerCase();
+    const qLower = q.toLowerCase();
+    let pos = 0;
+    let idx = lower.indexOf(qLower, pos);
+    if (idx === -1) {
+      buf.append(text);
+      return;
+    }
+    while (idx !== -1) {
+      if (idx > pos) buf.append(text.slice(pos, idx));
+      buf.append(text.slice(idx, idx + q.length), "CocConverterSearchMatch");
+      pos = idx + q.length;
+      idx = lower.indexOf(qLower, pos);
+    }
+    if (pos < text.length) buf.append(text.slice(pos));
+  }
   buildDetailLines(entry, mode = "info") {
     const lines = [];
     if (mode === "log") {
@@ -1749,7 +1793,7 @@ var TUI = class _TUI {
     return lines;
   }
   async showDetailPopup(name) {
-    if (this.detailWinid) this.closeDetailPopup();
+    if (this.detailWinid) await this.closeDetailPopup();
     this.detailPkgName = name;
     const nvim = import_coc2.workspace.nvim;
     const entry = this.state.getPackage(name);
@@ -1790,39 +1834,44 @@ var TUI = class _TUI {
     if (!entry) return;
     const lines = this.buildDetailLines(entry, this.detailMode);
     const nvim = import_coc2.workspace.nvim;
-    await nvim.call("nvim_buf_set_lines", [this.detailBufnr, 0, -1, false, lines]);
-    await nvim.call("nvim_buf_clear_namespace", [this.detailBufnr, this.ns, 0, -1]);
-    for (let i = 0; i < lines.length; i++) {
-      const line = lines[i];
-      if (line.startsWith("  [")) {
-        const endBracket = line.indexOf("]");
-        if (endBracket > 0) {
-          nvim.call("nvim_buf_set_extmark", [this.detailBufnr, this.ns, i, 2, { end_col: endBracket + 1, hl_group: "CocConverterKey" }]);
-          nvim.call("nvim_buf_set_extmark", [this.detailBufnr, this.ns, i, endBracket + 1, { end_col: line.length, hl_group: "Comment" }]);
-        }
-      } else if (line.startsWith("  $ ")) {
-        nvim.call("nvim_buf_set_extmark", [this.detailBufnr, this.ns, i, 0, { end_col: line.length, hl_group: "Comment" }]);
-      } else if (line.includes("\u2717") || line.includes("Error:")) {
-        nvim.call("nvim_buf_set_extmark", [this.detailBufnr, this.ns, i, 0, { end_col: line.length, hl_group: "ErrorMsg" }]);
-      } else if (line.match(/^\s{4}at\s/) || line.match(/^\s{4}Node\.js/)) {
-        nvim.call("nvim_buf_set_extmark", [this.detailBufnr, this.ns, i, 0, { end_col: line.length, hl_group: "Comment" }]);
-      } else if (line.match(/^\s{2}\w+\s{3,}/)) {
-        const parts = line.substring(2).split(/\s{2,}/);
-        if (parts.length >= 2 && ["desc", "type", "status", "source", "langs", "cats", "link", "commit", "server"].includes(parts[0])) {
-          const labelEnd = 2 + parts[0].length + line.substring(2 + parts[0].length).match(/^\s*/)[0].length;
-          nvim.call("nvim_buf_set_extmark", [this.detailBufnr, this.ns, i, 2, { end_col: labelEnd, hl_group: "CocConverterKey" }]);
-          nvim.call("nvim_buf_set_extmark", [this.detailBufnr, this.ns, i, labelEnd, { end_col: line.length, hl_group: "Comment" }]);
+    nvim.pauseNotification();
+    try {
+      nvim.call("nvim_buf_set_lines", [this.detailBufnr, 0, -1, false, lines], true);
+      nvim.call("nvim_buf_clear_namespace", [this.detailBufnr, this.ns, 0, -1], true);
+      for (let i = 0; i < lines.length; i++) {
+        const line = lines[i];
+        if (line.startsWith("  [")) {
+          const endBracket = line.indexOf("]");
+          if (endBracket > 0) {
+            nvim.call("nvim_buf_set_extmark", [this.detailBufnr, this.ns, i, 2, { end_col: endBracket + 1, hl_group: "CocConverterKey" }], true);
+            nvim.call("nvim_buf_set_extmark", [this.detailBufnr, this.ns, i, endBracket + 1, { end_col: line.length, hl_group: "Comment" }], true);
+          }
+        } else if (line.startsWith("  $ ")) {
+          nvim.call("nvim_buf_set_extmark", [this.detailBufnr, this.ns, i, 0, { end_col: line.length, hl_group: "Comment" }], true);
+        } else if (line.includes("\u2717") || line.includes("Error:")) {
+          nvim.call("nvim_buf_set_extmark", [this.detailBufnr, this.ns, i, 0, { end_col: line.length, hl_group: "ErrorMsg" }], true);
+        } else if (line.match(/^\s{4}at\s/) || line.match(/^\s{4}Node\.js/)) {
+          nvim.call("nvim_buf_set_extmark", [this.detailBufnr, this.ns, i, 0, { end_col: line.length, hl_group: "Comment" }], true);
+        } else if (line.match(/^\s{2}\w+\s{3,}/)) {
+          const parts = line.substring(2).split(/\s{2,}/);
+          if (parts.length >= 2 && ["desc", "type", "status", "source", "langs", "cats", "link", "commit", "server"].includes(parts[0])) {
+            const labelEnd = 2 + parts[0].length + line.substring(2 + parts[0].length).match(/^\s*/)[0].length;
+            nvim.call("nvim_buf_set_extmark", [this.detailBufnr, this.ns, i, 2, { end_col: labelEnd, hl_group: "CocConverterKey" }], true);
+            nvim.call("nvim_buf_set_extmark", [this.detailBufnr, this.ns, i, labelEnd, { end_col: line.length, hl_group: "Comment" }], true);
+          }
         }
       }
-    }
-    if (this.detailMode === "log") {
-      await nvim.call("nvim_win_set_cursor", [this.detailWinid, [lines.length, 0]]);
+      if (this.detailMode === "log") {
+        nvim.call("nvim_win_set_cursor", [this.detailWinid, [lines.length, 0]], true);
+      }
+    } finally {
+      await nvim.resumeNotification();
     }
   }
-  closeDetailPopup() {
+  async closeDetailPopup() {
     if (!this.detailWinid) return;
     try {
-      import_coc2.workspace.nvim.call("nvim_win_close", [this.detailWinid, true]);
+      await import_coc2.workspace.nvim.call("nvim_win_close", [this.detailWinid, true]);
     } catch {
     }
     this.detailWinid = 0;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "coc-vscode-loader",
-  "version": "1.3.0",
+  "version": "1.4.0",
   "description": "Run VS Code extensions seamlessly in coc.nvim",
   "main": "lib/index.js",
   "keywords": [