...

lua/ht/plugins/lsp/neodim.lua

@@ -1,6 +1,6 @@
 return {
   {
-    "TwIStOy/neodim",
+    "zbirenbaum/neodim",
     lazy = true,
     event = "LspAttach",
     config = function()

lua/ht/plugins/lsp/nvim-lspconfig.lua

@@ -15,7 +15,6 @@ return {
       "hrsh7th/nvim-cmp",
       "williamboman/mason.nvim",
       "MunifTanjim/nui.nvim",
-      "jose-elias-alvarez/null-ls.nvim",
     },
     config = function()
       --- add menus for specific types

src/conf/actions/index.ts

@@ -1,6 +1,6 @@
 import { AllPlugins } from "@conf/plugins";
 import { Plugin, PluginActionIds, TraitActionsId } from "@core/model";
-import { TupleToUnion } from "@core/type_traits";
+import { RemoveReadonlyFromTuple, TupleToUnion } from "@core/type_traits";
 import { builtinActions } from "./builtin";
 
 export type AvailableActions = TupleToUnion<
@@ -25,15 +25,6 @@ type MaybePluginOrPluginList<P> = P extends Plugin<any>[]
   ? PluginActionIds<P>
   : never;
 
-type RemoveReadonlyFromTuple<T extends readonly any[]> = T extends readonly [
-  infer A,
-  ...infer Rest,
-]
-  ? A extends readonly any[]
-    ? [RemoveReadonlyFromTuple<A>, ...RemoveReadonlyFromTuple<Rest>]
-    : [A, ...RemoveReadonlyFromTuple<Rest>]
-  : T;
-
 type MergePluginsActions<Ps extends Plugin<any>[]> = Ps extends [
   infer P,
   ...infer Rest,

src/conf/plugins/coding/crates-nvim.ts

@@ -73,7 +73,6 @@ const spec: PluginOptsBase = {
     lazy: true,
     dependencies: [
       "nvim-lua/plenary.nvim",
-      "jose-elias-alvarez/null-ls.nvim",
       "MunifTanjim/nui.nvim",
     ],
     event: {

src/conf/plugins/lsp/index.ts

@@ -3,11 +3,13 @@ import { plugin as aerial } from "./aerial";
 import { plugin as typescriptToolsNvim } from "./typescript-tools-nvim";
 import { plugin as glanceNvim } from "./glance-nvim";
 import { plugin as lspkindNvim } from "./lspkind-nvim";
+import { plugin as troubleNvim } from "./trouble-nvim";
 
 export const plugins = [
   mason,
   aerial,
   typescriptToolsNvim,
   glanceNvim,
   lspkindNvim,
+  troubleNvim,
 ] as const;

src/conf/plugins/lsp/trouble-nvim.ts

@@ -0,0 +1,93 @@
+import {
+  ActionGroupBuilder,
+  Plugin,
+  PluginOptsBase,
+  andActions,
+  removeReadonly,
+} from "@core/model";
+
+const spec: PluginOptsBase = {
+  shortUrl: "folke/trouble.nvim",
+  lazy: {
+    dependencies: ["folke/lsp-colors.nvim"],
+    lazy: true,
+    cmd: ["Trouble", "TroubleClose", "TroubleToggle", "TroubleRefresh"],
+  },
+};
+
+function generateActions() {
+  const lspActions = ActionGroupBuilder.start()
+    .category("Trouble")
+    .from("trouble.nvim")
+    .condition((buf) => {
+      return buf.lspServers.length > 0;
+    })
+    .addOpts({
+      id: "trouble.open-workspace-diagnostic",
+      title: "Open workspace diagnostic (Trouble)",
+      callback: "Trouble workspace_diagnostic",
+      keys: {
+        [1]: "<leader>xw",
+        desc: "lsp-workspace-diagnostic",
+      },
+    })
+    .addOpts({
+      id: "trouble.open-document-diagnostic",
+      title: "Open document diagnostic (Trouble)",
+      callback: "Trouble document_diagnostic",
+      keys: {
+        [1]: "<leader>xd",
+        desc: "lsp-document-diagnostic",
+      },
+    })
+    .build();
+  const commonActions = ActionGroupBuilder.start()
+    .category("Trouble")
+    .from("trouble.nvim")
+    .addOpts({
+      id: "trouble.toggle-indow",
+      title: "Toggle trouble window",
+      callback: "TroubleToggle",
+      keys: {
+        [1]: "<leader>xx",
+        desc: "trouble-toggle",
+      },
+    })
+    .build();
+  const actionsInTroubleWindow = ActionGroupBuilder.start()
+    .category("Trouble")
+    .from("trouble.nvim")
+    .condition(() => {
+      return luaRequire("trouble").is_open();
+    })
+    .addOpts({
+      id: "trouble.previous-trouble",
+      title: "Previous trouble item",
+      callback: () => {
+        luaRequire("trouble").previous({ skip_groups: true, jump: true });
+      },
+      keys: {
+        [1]: "[q]",
+        desc: "previous-trouble",
+      },
+    })
+    .addOpts({
+      id: "trouble.next-trouble",
+      title: "Next trouble item",
+      callback: () => {
+        luaRequire("trouble").next({ skip_groups: true, jump: true });
+      },
+      keys: {
+        [1]: "]q]",
+        desc: "next-trouble",
+      },
+    })
+    .build();
+  return removeReadonly([
+    ...lspActions,
+    ...commonActions,
+    ...actionsInTroubleWindow,
+  ] as const);
+}
+
+export const plugin = new Plugin(andActions(spec, generateActions));

src/core/model/action.ts

@@ -1,4 +1,9 @@
-import { GetRequired, Push, TupleToUnion } from "@core/type_traits";
+import {
+  GetRequired,
+  Push,
+  RemoveReadonlyFromTuple,
+  TupleToUnion,
+} from "@core/type_traits";
 import { VimBuffer } from "@core/vim";
 import { LazyKeySpec } from "types/plugin/lazy";
 
@@ -275,3 +280,9 @@ export class Action<Id extends string> {
     return ret;
   }
 }
+
+export function removeReadonly<T extends readonly any[]>(
+  actions: T
+): RemoveReadonlyFromTuple<T> {
+  return actions as any;
+}

src/core/type_traits.ts

@@ -54,3 +54,10 @@ export type Writeable<T> = { -readonly [P in keyof T]: T[P] };
 export type DeepWriteable<T> = {
   -readonly [P in keyof T]: DeepWriteable<T[P]>;
 };
+
+export type RemoveReadonlyFromTuple<T extends readonly any[]> =
+  T extends readonly [infer A, ...infer Rest]
+    ? A extends readonly any[]
+      ? [RemoveReadonlyFromTuple<A>, ...RemoveReadonlyFromTuple<Rest>]
+      : [A, ...RemoveReadonlyFromTuple<Rest>]
+    : T;

src/core/utils/fn.ts

@@ -1 +0,0 @@
-

src/core/utils/fs.ts

@@ -0,0 +1,29 @@
+import { VimBuffer, system } from "@core/vim";
+
+export async function inGitRepo(buffer?: VimBuffer): Promise<boolean> {
+  let cwd: string | undefined;
+  if (buffer && buffer.fullFileName) {
+    cwd = vim.fn.fnamemodify(buffer.fullFileName, ":h");
+  }
+  let ret = await system(["git", "rev-parse", "--is-inside-work-tree"], {
+    cwd,
+  });
+  return ret.code === 0;
+}
+
+export async function getCurrentRepoPath(
+  buffer?: VimBuffer
+): Promise<string | null> {
+  let cwd: string | undefined;
+  if (buffer && buffer.fullFileName) {
+    cwd = vim.fn.fnamemodify(buffer.fullFileName, ":h");
+  }
+  let ret = await system(["git", "rev-parse", "--show-toplevel"], {
+    cwd,
+  });
+  if (ret.code !== 0) {
+    return null;
+  }
+  return ret.stdout!.trim();
+}
+

src/core/vim.ts

@@ -190,3 +190,19 @@ export function highlightFg(group: string): string {
   }
   return "";
 }
+
+export function system(
+  cmd: string[],
+  opts?: any
+): Promise<vim.SystemCompleted> {
+  return new Promise<vim.SystemCompleted>((resolve, reject) => {
+    const onExit = (obj: vim.SystemCompleted) => {
+      resolve(obj);
+    };
+    try {
+      vim.system(cmd, opts, onExit);
+    } catch (e) {
+      reject(e);
+    }
+  });
+}

src/types/vim/fn.d.ts

@@ -51,7 +51,11 @@ declare namespace vim {
       list?: boolean
     ): string;
 
-    export function fnamemodify(fname: string, mods: string): string;
+    export function fnamemodify(
+      this: void,
+      fname: string,
+      mods: string
+    ): string;
 
     export function setreg(reg: string, val: any, options?: any): void;
   }