feat: divide dependencies into normal, build, dev sections

saecki · saecki · commit fe73e29d8205 · 2022-08-02T17:55:11.000+02:00
diff --git a/README.md b/README.md
@@ -228,6 +228,9 @@ require('crates').setup {
             feature = "  %s",
             enabled = " %s",
             transitive = " %s",
+            normal_dependencies_title = " Dependencies",
+            build_dependencies_title = " Build dependencies",
+            dev_dependencies_title = " Dev dependencies",
             dependency = "  %s",
             optional = " %s",
             dependency_version = "  %s",
@@ -261,6 +264,9 @@ require('crates').setup {
             feature = "CratesNvimPopupFeature",
             enabled = "CratesNvimPopupEnabled",
             transitive = "CratesNvimPopupTransitive",
+            normal_dependencies_title = "CratesNvimPopupNormalDependenciesTitle",
+            build_dependencies_title = "CratesNvimPopupBuildDependenciesTitle",
+            dev_dependencies_title = "CratesNvimPopupDevDependenciesTitle",
             dependency = "CratesNvimPopupDependency",
             optional = "CratesNvimPopupOptional",
             dependency_version = "CratesNvimPopupDependencyVersion",
diff --git a/doc/crates.txt b/doc/crates.txt
@@ -136,6 +136,9 @@ For more information about individual config options see |crates-config|.
                 feature = "  %s",
                 enabled = " %s",
                 transitive = " %s",
+                normal_dependencies_title = " Dependencies",
+                build_dependencies_title = " Build dependencies",
+                dev_dependencies_title = " Dev dependencies",
                 dependency = "  %s",
                 optional = " %s",
                 dependency_version = "  %s",
@@ -169,6 +172,9 @@ For more information about individual config options see |crates-config|.
                 feature = "CratesNvimPopupFeature",
                 enabled = "CratesNvimPopupEnabled",
                 transitive = "CratesNvimPopupTransitive",
+                normal_dependencies_title = "CratesNvimPopupNormalDependenciesTitle",
+                build_dependencies_title = "CratesNvimPopupBuildDependenciesTitle",
+                dev_dependencies_title = "CratesNvimPopupDevDependenciesTitle",
                 dependency = "CratesNvimPopupDependency",
                 optional = "CratesNvimPopupOptional",
                 dependency_version = "CratesNvimPopupDependencyVersion",
@@ -831,6 +837,27 @@ popup.text.transitive                    *crates-config-popup-text-transitive*
     Format string used for transitively enabled features.
 
 
+                          *crates-config-popup-text-normal_dependencies_title*
+popup.text.normal_dependencies_title
+    Type: `string`, Default: `" Dependencies"`
+
+    Format string used for the title of the normal dependencies section.
+
+
+                           *crates-config-popup-text-build_dependencies_title*
+popup.text.build_dependencies_title
+    Type: `string`, Default: `" Build dependencies"`
+
+    Format string used for the title of the build dependencies section.
+
+
+                             *crates-config-popup-text-dev_dependencies_title*
+popup.text.dev_dependencies_title
+    Type: `string`, Default: `" Dev dependencies"`
+
+    Format string used for the title of the dev dependencies section.
+
+
 popup.text.dependency                    *crates-config-popup-text-dependency*
     Type: `string`, Default: `"  %s"`
 
@@ -1033,6 +1060,27 @@ popup.highlight.transitive          *crates-config-popup-highlight-transitive*
     Highlight group used for transitively enabled features inside the popup.
 
 
+                     *crates-config-popup-highlight-normal_dependencies_title*
+popup.highlight.normal_dependencies_title
+    Type: `string`, Default: `"CratesNvimPopupNormalDependenciesTitle"`
+
+    Highlight group used for the title of the normal dependencies section.
+
+
+                      *crates-config-popup-highlight-build_dependencies_title*
+popup.highlight.build_dependencies_title
+    Type: `string`, Default: `"CratesNvimPopupBuildDependenciesTitle"`
+
+    Highlight group used for the title of the build dependencies section.
+
+
+                        *crates-config-popup-highlight-dev_dependencies_title*
+popup.highlight.dev_dependencies_title
+    Type: `string`, Default: `"CratesNvimPopupDevDependenciesTitle"`
+
+    Highlight group used for the title of the dev dependencies section.
+
+
 popup.highlight.dependency          *crates-config-popup-highlight-dependency*
     Type: `string`, Default: `"CratesNvimPopupDependency"`
 
@@ -1276,6 +1324,18 @@ CratesNvimPopupEnabled                      *crates-hl-CratesNvimPopupEnabled*
 CratesNvimPopupTransitive                *crates-hl-CratesNvimPopupTransitive*
     Default: `ctermfg=4 guifg=#238bb9`
 
+                            *crates-hl-CratesNvimPopupNormalDependenciesTitle*
+CratesNvimPopupNormalDependenciesTitle
+    Default: links to |Statement|
+
+                             *crates-hl-CratesNvimPopupBuildDependenciesTitle*
+CratesNvimPopupBuildDependenciesTitle
+    Default: links to |Statement|
+
+                               *crates-hl-CratesNvimPopupDevDependenciesTitle*
+CratesNvimPopupDevDependenciesTitle
+    Default: links to |Statement|
+
 CratesNvimPopupDependency                *crates-hl-CratesNvimPopupDependency*
     Default: links to |None|
 
diff --git a/lua/crates/config.lua b/lua/crates/config.lua
@@ -200,6 +200,12 @@ local M = {Config = {TextConfig = {}, HighlightConfig = {}, DiagnosticConfig = {
 
 
 
+
+
+
+
+
+
 
 
 
@@ -808,6 +814,27 @@ entry(schema_popup_text, "transitive", {
     ]],
 })
 
+entry(schema_popup_text, "normal_dependencies_title", {
+   type = "string",
+   default = " Dependencies",
+   description = [[
+        Format string used for the title of the normal dependencies section.
+    ]],
+})
+entry(schema_popup_text, "build_dependencies_title", {
+   type = "string",
+   default = " Build dependencies",
+   description = [[
+        Format string used for the title of the build dependencies section.
+    ]],
+})
+entry(schema_popup_text, "dev_dependencies_title", {
+   type = "string",
+   default = " Dev dependencies",
+   description = [[
+        Format string used for the title of the dev dependencies section.
+    ]],
+})
 entry(schema_popup_text, "dependency", {
    type = "string",
    default = "  %s",
@@ -1046,6 +1073,27 @@ entry(schema_popup_hi, "transitive", {
     ]],
 })
 
+entry(schema_popup_hi, "normal_dependencies_title", {
+   type = "string",
+   default = "CratesNvimPopupNormalDependenciesTitle",
+   description = [[
+        Highlight group used for the title of the normal dependencies section.
+    ]],
+})
+entry(schema_popup_hi, "build_dependencies_title", {
+   type = "string",
+   default = "CratesNvimPopupBuildDependenciesTitle",
+   description = [[
+        Highlight group used for the title of the build dependencies section.
+    ]],
+})
+entry(schema_popup_hi, "dev_dependencies_title", {
+   type = "string",
+   default = "CratesNvimPopupDevDependenciesTitle",
+   description = [[
+        Highlight group used for the title of the dev dependencies section.
+    ]],
+})
 entry(schema_popup_hi, "dependency", {
    type = "string",
    default = "CratesNvimPopupDependency",
diff --git a/lua/crates/popup/dependencies.lua b/lua/crates/popup/dependencies.lua
@@ -153,7 +153,10 @@ function M.open_deps(ctx, crate_name, version, opts)
 
    local title = string.format(state.cfg.popup.text.title, crate_name .. " " .. version.num)
    local deps_width = 0
-   local deps_text = {}
+   local deps_text_index = {}
+   local normal_deps_text = {}
+   local build_deps_text = {}
+   local dev_deps_text = {}
 
    for _, d in ipairs(deps) do
       local t = {}
@@ -165,13 +168,21 @@ function M.open_deps(ctx, crate_name, version, opts)
          t.hl = state.cfg.popup.highlight.dependency
       end
 
-      table.insert(deps_text, { t })
+      local line = { t }
+      if d.kind == "normal" then
+         table.insert(normal_deps_text, line)
+      elseif d.kind == "build" then
+         table.insert(build_deps_text, line)
+      elseif d.kind == "dev" then
+         table.insert(dev_deps_text, line)
+      end
+      table.insert(deps_text_index, line)
       deps_width = math.max(vim.fn.strdisplaywidth(t.text), deps_width)
    end
 
    local vers_width = 0
    if state.cfg.popup.show_dependency_version then
-      for i, line in ipairs(deps_text) do
+      for i, line in ipairs(deps_text_index) do
          local dep_text = line[1]
          local diff = deps_width - vim.fn.strdisplaywidth(dep_text.text)
          local vers = deps[i].vers.text
@@ -187,8 +198,28 @@ function M.open_deps(ctx, crate_name, version, opts)
       end
    end
 
+   local deps_text = {}
+   if #normal_deps_text > 0 then
+      table.insert(deps_text, { { text = state.cfg.popup.text.normal_dependencies_title, hl = state.cfg.popup.highlight.normal_dependencies_title } })
+      vim.list_extend(deps_text, normal_deps_text)
+   end
+   if #build_deps_text > 0 then
+      if #deps_text > 0 then
+         table.insert(deps_text, {})
+      end
+      table.insert(deps_text, { { text = state.cfg.popup.text.build_dependencies_title, hl = state.cfg.popup.highlight.build_dependencies_title } })
+      vim.list_extend(deps_text, build_deps_text)
+   end
+   if #dev_deps_text > 0 then
+      if #deps_text > 0 then
+         table.insert(deps_text, {})
+      end
+      table.insert(deps_text, { { text = state.cfg.popup.text.dev_dependencies_title, hl = state.cfg.popup.highlight.dev_dependencies_title } })
+      vim.list_extend(deps_text, dev_deps_text)
+   end
+
    local width = popup.win_width(title, deps_width + vers_width)
-   local height = popup.win_height(deps)
+   local height = popup.win_height(deps_text)
 
    if opts.update then
       popup.update_win(width, height, title, deps_text, opts)
diff --git a/plugin/crates.vim b/plugin/crates.vim
@@ -6,21 +6,24 @@ highlight default link CratesNvimNoMatch     DiagnosticVirtualTextError
 highlight default link CratesNvimUpgrade     DiagnosticVirtualTextWarn
 highlight default link CratesNvimError       DiagnosticVirtualTextError
 
-highlight default link CratesNvimPopupTitle              Title
-highlight default CratesNvimPopupPillText                ctermfg=15 ctermbg=242 guifg=#e0e0e0 guibg=#3a3a3a
-highlight default CratesNvimPopupPillBorder              ctermfg=242 guifg=#3a3a3a
-highlight default link CratesNvimPopupDescription        Comment
-highlight default link CratesNvimPopupLabel              Identifier
-highlight default link CratesNvimPopupValue              String
-highlight default link CratesNvimPopupUrl                Underlined
-highlight default link CratesNvimPopupVersion            None
-highlight default link CratesNvimPopupPreRelease         DiagnosticVirtualTextWarn
-highlight default link CratesNvimPopupYanked             DiagnosticVirtualTextError
-highlight default link CratesNvimPopupVersionDate        Comment
-highlight default link CratesNvimPopupFeature            None
-highlight default CratesNvimPopupEnabled                 ctermfg=2 guifg=#23ab49
-highlight default CratesNvimPopupTransitive              ctermfg=4 guifg=#238bb9
-highlight default link CratesNvimPopupDependency         None
-highlight default link CratesNvimPopupOptional           Comment
-highlight default link CratesNvimPopupDependencyVersion  String
-highlight default link CratesNvimPopupLoading            Special
+highlight default link CratesNvimPopupTitle                    Title
+highlight default CratesNvimPopupPillText                      ctermfg=15 ctermbg=242 guifg=#e0e0e0 guibg=#3a3a3a
+highlight default CratesNvimPopupPillBorder                    ctermfg=242 guifg=#3a3a3a
+highlight default link CratesNvimPopupDescription              Comment
+highlight default link CratesNvimPopupLabel                    Identifier
+highlight default link CratesNvimPopupValue                    String
+highlight default link CratesNvimPopupUrl                      Underlined
+highlight default link CratesNvimPopupVersion                  None
+highlight default link CratesNvimPopupPreRelease               DiagnosticVirtualTextWarn
+highlight default link CratesNvimPopupYanked                   DiagnosticVirtualTextError
+highlight default link CratesNvimPopupVersionDate              Comment
+highlight default link CratesNvimPopupFeature                  None
+highlight default CratesNvimPopupEnabled                       ctermfg=2 guifg=#23ab49
+highlight default CratesNvimPopupTransitive                    ctermfg=4 guifg=#238bb9
+highlight default link CratesNvimPopupNormalDependenciesTitle  Statement
+highlight default link CratesNvimPopupBuildDependenciesTitle   Statement
+highlight default link CratesNvimPopupDevDependenciesTitle     Statement
+highlight default link CratesNvimPopupDependency               None
+highlight default link CratesNvimPopupOptional                 Comment
+highlight default link CratesNvimPopupDependencyVersion        String
+highlight default link CratesNvimPopupLoading                  Special
diff --git a/teal/crates/config.tl b/teal/crates/config.tl
@@ -104,6 +104,9 @@ local record M
             enabled: string
             transitive: string
 
+            normal_dependencies_title: string
+            build_dependencies_title: string
+            dev_dependencies_title: string
             dependency: string
             optional: string
             dependency_version: string
@@ -142,6 +145,9 @@ local record M
             enabled: string
             transitive: string
 
+            normal_dependencies_title: string
+            build_dependencies_title: string
+            dev_dependencies_title: string
             dependency: string
             optional: string
             dependency_version: string
@@ -808,6 +814,27 @@ entry(schema_popup_text, "transitive", {
     ]],
 })
 -- dependencies
+entry(schema_popup_text, "normal_dependencies_title", {
+    type = "string",
+    default = " Dependencies",
+    description = [[
+        Format string used for the title of the normal dependencies section.
+    ]],
+})
+entry(schema_popup_text, "build_dependencies_title", {
+    type = "string",
+    default = " Build dependencies",
+    description = [[
+        Format string used for the title of the build dependencies section.
+    ]],
+})
+entry(schema_popup_text, "dev_dependencies_title", {
+    type = "string",
+    default = " Dev dependencies",
+    description = [[
+        Format string used for the title of the dev dependencies section.
+    ]],
+})
 entry(schema_popup_text, "dependency", {
     type = "string",
     default = "  %s",
@@ -1046,6 +1073,27 @@ entry(schema_popup_hi, "transitive", {
     ]],
 })
 -- dependencies
+entry(schema_popup_hi, "normal_dependencies_title", {
+    type = "string",
+    default = "CratesNvimPopupNormalDependenciesTitle",
+    description = [[
+        Highlight group used for the title of the normal dependencies section.
+    ]],
+})
+entry(schema_popup_hi, "build_dependencies_title", {
+    type = "string",
+    default = "CratesNvimPopupBuildDependenciesTitle",
+    description = [[
+        Highlight group used for the title of the build dependencies section.
+    ]],
+})
+entry(schema_popup_hi, "dev_dependencies_title", {
+    type = "string",
+    default = "CratesNvimPopupDevDependenciesTitle",
+    description = [[
+        Highlight group used for the title of the dev dependencies section.
+    ]],
+})
 entry(schema_popup_hi, "dependency", {
     type = "string",
     default = "CratesNvimPopupDependency",
diff --git a/teal/crates/popup/dependencies.tl b/teal/crates/popup/dependencies.tl
