Put icons on all language servers

Author: thomasjm

modules/exporters/typst/language_server_tinymist/default.nix

@@ -23,6 +23,8 @@ in
 common.writeTextDirWithMetaAndPassthru tinymist.meta passthru "lib/codedown/language-servers/typst-${kernelName}-tinymist-language-server.yaml" (lib.generators.toYAML {} [{
   name = languageServerName;
   version = tinymist.version;
+  icon = ../typst.png;
+  icon_monochrome = ../typst.svg;
   extensions = ["typ"];
   notebook_suffix = ".typ";
   attrs = ["typst"];

modules/kernels/bash/language_server_bash/default.nix

@@ -39,6 +39,8 @@ in
 common.writeTextDirWithMetaAndPassthru bashLanguageServerWithMan.meta passthru "lib/codedown/language-servers/bash-${kernelName}-bash-language-server.yaml" (lib.generators.toYAML {} [{
   name = languageServerName;
   version = bashLanguageServer.version;
+  icon = ../bash-logo-128x128.png;
+  icon_monochrome = ../gnubash-monochrome.svg;
   extensions = ["sh" "bash"];
   notebook_suffix = ".bash";
   attrs = ["bash"];

modules/kernels/cpp/language_server_clangd/default.nix

@@ -40,6 +40,8 @@ in
 common.writeTextDirWithMetaAndPassthru clangd.meta passthru "lib/codedown/language-servers/cpp-${kernelName}-${languageServerName}.yaml" (lib.generators.toYAML {} [{
   name = languageServerName;
   version = clangd.version;
+  icon = ../cplusplus.svg;
+  icon_monochrome = ../cplusplus.svg;
   extensions = ["cpp" "hpp" "cxx" "hxx" "c" "h"];
   notebook_suffix = "";
   attrs = ["cpp"];

modules/kernels/python/language_servers/language_server_flake8/config.nix

@@ -28,6 +28,8 @@ common.writeTextDirWithMetaAndPassthru python.pkgs.flake8.meta passthru "lib/cod
     version = python.pkgs.flake8.version;
     display_name = "Flake8";
     description = python.pkgs.flake8.meta.description;
+    icon = ../../python-logo-64x64.png;
+    icon_monochrome = ../../python-monochrome.svg;
     extensions = ["py"];
     notebook_suffix = ".py";
     kernel_name = kernelName;

modules/kernels/python/language_servers/language_server_microsoft/config.nix

@@ -78,6 +78,8 @@ common.writeTextDirWithMetaAndPassthru python-language-server.meta passthru "lib
     version = python-language-server.version;
     display_name = "Python Language Server";
     description = python-language-server.meta.description;
+    icon = ../../python-logo-64x64.png;
+    icon_monochrome = ../../python-monochrome.svg;
     extensions = ["py"];
     notebook_suffix = ".py";
     kernel_name = kernelName;

modules/kernels/python/language_servers/language_server_palantir/config.nix

@@ -54,6 +54,8 @@ common.writeTextDirWithMetaAndPassthru python.pkgs.python-language-server.meta p
     version = python.pkgs.python-language-server.version;
     display_name = "Python Language Server";
     description = python.pkgs.python-language-server.meta.description;
+    icon = ../../python-logo-64x64.png;
+    icon_monochrome = ../../python-monochrome.svg;
     extensions = ["py"];
     notebook_suffix = ".py";
     kernel_name = kernelName;

modules/kernels/python/language_servers/language_server_pycodestyle/config.nix

@@ -29,6 +29,8 @@ common.writeTextDirWithMetaAndPassthru python.pkgs.pycodestyle.meta passthru "li
     version = python.pkgs.pycodestyle.version;
     display_name = "pycodestyle";
     description = python.pkgs.pycodestyle.meta.description;
+    icon = ../../python-logo-64x64.png;
+    icon_monochrome = ../../python-monochrome.svg;
     extensions = ["py"];
     notebook_suffix = ".py";
     kernel_name = kernelName;

modules/kernels/python/language_servers/language_server_pythonlsp/config.nix

@@ -55,6 +55,8 @@ common.writeTextDirWithMetaAndPassthru python.pkgs.python-lsp-server.meta passth
     version = python.pkgs.python-lsp-server.version;
     display_name = "Python LSP Server";
     description = python.pkgs.python-lsp-server.meta.description;
+    icon = ../../python-logo-64x64.png;
+    icon_monochrome = ../../python-monochrome.svg;
     extensions = ["py"];
     notebook_suffix = ".py";
     kernel_name = kernelName;

modules/kernels/r/language-server-languageserver/default.nix

@@ -30,7 +30,7 @@ common.writeTextDirWithMetaAndPassthru languageserver.meta passthru "lib/codedow
   version = languageserver.version;
   display_name = "";
   description = "An implementation of the Language Server Protocol for R";
-  icon = null;
+  icon = ../r-logo-64x64.png;
   icon_monochrome = ../r-monochrome.svg;
   extensions = ["r"];
   notebook_suffix = ".r";

tests/app/Spec/Tests/SampleEnvironments.hs

@@ -87,14 +87,14 @@ validateLanguageServerConfig path obj = do
   case aesonLookup "name" obj of
     Just (A.String name) -> info [i|Checking language server config: #{name} (#{path})|]
     _ -> expectationFailure [i|Language server config missing 'name': #{path}|]
-  -- If icon is present and non-null, icon_monochrome must also be present
   case aesonLookup "icon" obj of
-    Just A.Null -> return ()
-    Just _ -> case aesonLookup "icon_monochrome" obj of
-      Nothing -> expectationFailure [i|Language server config has 'icon' but missing 'icon_monochrome': #{path}|]
-      Just A.Null -> expectationFailure [i|Language server config has 'icon' but 'icon_monochrome' is null: #{path}|]
-      Just _ -> return ()
-    Nothing -> return ()
+    Nothing -> expectationFailure [i|Language server config missing 'icon': #{path}|]
+    Just A.Null -> expectationFailure [i|Language server config has null 'icon': #{path}|]
+    Just _ -> return ()
+  case aesonLookup "icon_monochrome" obj of
+    Nothing -> expectationFailure [i|Language server config missing 'icon_monochrome': #{path}|]
+    Just A.Null -> expectationFailure [i|Language server config has null 'icon_monochrome': #{path}|]
+    Just _ -> return ()
 
 validatePackage :: (MonadLoggerIO m, MonadFail m) => FilePath -> Text -> NixPackage -> m ()
 validatePackage envRoot attr (NixPackage {nixPackageMeta=(NixMeta {..}), ..}) = do