Merge branch 'main' into projectionist-live-component-json-view

mhanberg · web-flow · commit 9c0d99d04dac · 2023-06-07T09:58:43.000-04:00
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -1,6 +1,9 @@
 name: Tests
 
 on: [push, pull_request]
+concurrency:
+  group: ci-${{ github.ref }}
+  cancel-in-progress: true
 
 jobs:
   unit_tests:
@@ -17,23 +20,32 @@ jobs:
             manager: sudo apt-get
             packages: -y fd-find esl-erlang elixir
           - os: ubuntu-20.04
-            url: https://github.com/neovim/neovim/releases/download/v0.9.0/nvim-linux64.tar.gz
+            url: https://github.com/neovim/neovim/releases/download/v0.9.1/nvim-linux64.tar.gz
             manager: sudo apt-get
             packages: -y fd-find esl-erlang elixir
           - os: ubuntu-20.04
             url: https://github.com/neovim/neovim/releases/download/v0.8.3/nvim-linux64.tar.gz
             manager: sudo apt-get
             packages: -y fd-find esl-erlang elixir
-          # - os: macos-11
-          #   url: https://github.com/neovim/neovim/releases/download/nightly/nvim-macos.tar.gz
-          #   manager: brew
-          #   packages: fd elixir
-          # - os: macos-11
-          #   url: https://github.com/neovim/neovim/releases/download/v0.6.0/nvim-macos.tar.gz
-          #   manager: brew
-          #   packages: fd elixir
+          - os: macos-12
+            url: https://github.com/neovim/neovim/releases/download/nightly/nvim-macos.tar.gz
+            manager: brew
+            packages: fd elixir
+          - os: macos-12
+            url: https://github.com/neovim/neovim/releases/download/v0.9.1/nvim-macos.tar.gz
+            manager: brew
+            packages: fd elixir
+          - os: macos-12
+            url: https://github.com/neovim/neovim/releases/download/v0.8.3/nvim-macos.tar.gz
+            manager: brew
+            packages: fd elixir
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
+      - uses: JohnnyMorganz/stylua-action@v3
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          version: latest
+          args: --check .
 
       - run: date +%F > todays-date
       - name: Restore from todays cache
@@ -54,11 +66,14 @@ jobs:
             mkdir -p _neovim
             curl -sL ${{ matrix.url }} | tar xzf - --strip-components=1 -C "${PWD}/_neovim"
           }
-          mkdir -p ~/.local/share/nvim/site/pack/vendor/start
-          git clone --depth 1 https://github.com/nvim-lua/plenary.nvim ~/.local/share/nvim/site/pack/vendor/start/plenary.nvim
-          ln -s "$(pwd)" ~/.local/share/nvim/site/pack/vendor/start
+          # mkdir -p ~/.local/share/nvim/site/pack/vendor/start
+          # git clone --depth 1 https://github.com/nvim-lua/plenary.nvim ~/.local/share/nvim/site/pack/vendor/start/plenary.nvim
+          # git clone --depth 1 https://github.com/tpope/vim-projectionist ~/.local/share/nvim/site/pack/vendor/start/vim-projectionist
+          # ln -s "$(pwd)" ~/.local/share/nvim/site/pack/vendor/start
 
       - name: Run tests
+        env:
+          BUSTED_TIMEOUT: 600000
         run: |
           export PATH="${PWD}/_neovim/bin:${PATH}"
           export VIM="${PWD}/_neovim/share/nvim/runtime"
diff --git a/README.md b/README.md
@@ -36,7 +36,7 @@ Requires 0.8
     elixir.setup {
       credo = {},
       elixirls = {
-        enabled = true,
+        enable = true,
         settings = elixirls.settings {
           dialyzerEnabled = false,
           enableTestLenses = false,
@@ -71,7 +71,7 @@ The minimal setup will configure both ElixirLS and credo-language-server.
 require("elixir").setup()
 ```
 
-ElixirLS and credo-language-server can be disabled by setting the `enabled` flag in the respective options table.
+ElixirLS and credo-language-server can be disabled by setting the `enable` flag in the respective options table.
 
 ```lua
 require("elixir").setup({
@@ -94,6 +94,7 @@ elixir.setup {
   credo = {
     port = 9000, -- connect via TCP with the given port. mutually exclusive with `cmd`
     cmd = "path/to/credo-language-server", -- path to the executable. mutually exclusive with `port`
+    version = "0.1.0-rc.3", -- version of credo-language-server to install and use. defaults to 0.0.5
     on_attach = function(client, bufnr)
       -- custom keybinds
     end
@@ -102,7 +103,7 @@ elixir.setup {
     -- specify a repository and branch
     repo = "mhanberg/elixir-ls", -- defaults to elixir-lsp/elixir-ls
     branch = "mh/all-workspace-symbols", -- defaults to nil, just checkouts out the default branch, mutually exclusive with the `tag` option
-    tag = "v0.13.0", -- defaults to nil, mutually exclusive with the `branch` option
+    tag = "v0.14.6", -- defaults to nil, mutually exclusive with the `branch` option
 
     -- alternatively, point to an existing elixir-ls installation (optional)
     -- not currently supported by elixirls, but can be a table if you wish to pass other args `{"path/to/elixirls", "--foo"}`
@@ -175,10 +176,10 @@ ElixirLS provides a codelens to identify and run your tests. If you configure `e
 : Open the output panel that displays logs and compiler information from the server.
 
 ```lua
-require("elixir").open_output_panel()
-require("elixir").open_output_panel({ window = "split" })
-require("elixir").open_output_panel({ window = "vsplit" })
-require("elixir").open_output_panel({ window = "float" })
+require("elixir.elixirls").open_output_panel()
+require("elixir.elixirls").open_output_panel({ window = "split" })
+require("elixir.elixirls").open_output_panel({ window = "vsplit" })
+require("elixir.elixirls").open_output_panel({ window = "float" })
 ```
 
 ## credo-language-server
diff --git a/bin/credo-language-server b/bin/credo-language-server
@@ -1,12 +1,7 @@
-#!/usr/bin/env elixir
+#!/usr/bin/env elixir --sname undefined
 
 System.no_halt(true)
 
-{%{credo: {_, :credo, credo_version, _, _, _, _, _}}, _} = Code.eval_file(System.get_env("CREDO_MIX_LOCK_PATH", "./mix.lock"))
-
-Mix.install([
-  {:credo_language_server, "0.0.5"},
-  {:credo, credo_version}
-])
+Mix.install([ {:credo_language_server, System.get_env("CREDO_LSP_VERSION")}, ])
 
 Application.ensure_all_started(:credo_language_server)
diff --git a/bin/test b/bin/test
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-nvim --headless --noplugin -u support/minimal_init.vim -c "PlenaryBustedDirectory tests/ {minimal_init = 'support/minimal_init.vim', timeout = 180000}"
+NVIM_APPNAME=elixirtoolsplenary nvim --headless -u support/minimal_init.lua -c "PlenaryBustedDirectory ${1:-tests} {init = 'support/minimal_init.lua', timeout = ${BUSTED_TIMEOUT:-180000}}"
diff --git a/bin/test-local b/bin/test-local
diff --git a/doc/elixir-tools.nvim.txt b/doc/elixir-tools.nvim.txt
@@ -1,4 +1,4 @@
-*elixir-tools.nvim.txt*        For NVIM v0.8.0        Last change: 2023 May 13
+*elixir-tools.nvim.txt*        For NVIM v0.8.0       Last change: 2023 June 07
 
 ==============================================================================
 Table of Contents                        *elixir-tools.nvim-table-of-contents*
@@ -59,7 +59,7 @@ LAZY.NVIM                                *elixir-tools.nvim-install-lazy.nvim*
         elixir.setup {
           credo = {},
           elixirls = {
-            enabled = true,
+            enable = true,
             settings = elixirls.settings {
               dialyzerEnabled = false,
               enableTestLenses = false,
@@ -98,8 +98,8 @@ The minimal setup will configure both ElixirLS and credo-language-server.
     require("elixir").setup()
 <
 
-ElixirLS and credo-language-server can be disabled by setting the `enabled`
-flag in the respective options table.
+ElixirLS and credo-language-server can be disabled by setting the `enable` flag
+in the respective options table.
 
 >lua
     require("elixir").setup({
@@ -125,6 +125,7 @@ default to the latest release.
       credo = {
         port = 9000, -- connect via TCP with the given port. mutually exclusive with `cmd`
         cmd = "path/to/credo-language-server", -- path to the executable. mutually exclusive with `port`
+        version = "0.1.0-rc.3", -- version of credo-language-server to install and use. defaults to 0.0.5
         on_attach = function(client, bufnr)
           -- custom keybinds
         end
@@ -133,7 +134,7 @@ default to the latest release.
         -- specify a repository and branch
         repo = "mhanberg/elixir-ls", -- defaults to elixir-lsp/elixir-ls
         branch = "mh/all-workspace-symbols", -- defaults to nil, just checkouts out the default branch, mutually exclusive with the `tag` option
-        tag = "v0.13.0", -- defaults to nil, mutually exclusive with the `branch` option
+        tag = "v0.14.6", -- defaults to nil, mutually exclusive with the `branch` option
     
         -- alternatively, point to an existing elixir-ls installation (optional)
         -- not currently supported by elixirls, but can be a table if you wish to pass other args `{"path/to/elixirls", "--foo"}`
@@ -231,10 +232,10 @@ COMMANDS ~
 
 
 >lua
-    require("elixir").open_output_panel()
-    require("elixir").open_output_panel({ window = "split" })
-    require("elixir").open_output_panel({ window = "vsplit" })
-    require("elixir").open_output_panel({ window = "float" })
+    require("elixir.elixirls").open_output_panel()
+    require("elixir.elixirls").open_output_panel({ window = "split" })
+    require("elixir.elixirls").open_output_panel({ window = "vsplit" })
+    require("elixir.elixirls").open_output_panel({ window = "float" })
 <
 
 
diff --git a/lua/elixir/credo/init.lua b/lua/elixir/credo/init.lua
@@ -1,5 +1,9 @@
 local M = {}
 
+if not vim.uv then
+  vim.uv = vim.loop
+end
+
 function M.setup(opts)
   local credo = vim.api.nvim_create_augroup("elixir-tools.credo", { clear = true })
 
@@ -8,7 +12,7 @@ function M.setup(opts)
     pattern = { "elixir" },
     callback = function()
       local matches = vim.fs.find({ "mix.lock" }, {
-        stop = vim.loop.os_homedir(),
+        stop = vim.uv.os_homedir(),
         upward = true,
         path = vim.fs.dirname(vim.api.nvim_buf_get_name(0)),
       })
@@ -43,7 +47,9 @@ function M.setup(opts)
         vim.lsp.start {
           name = "Credo",
           cmd = cmd,
-          cmd_env = { CREDO_MIX_LOCK_PATH = file },
+          cmd_env = {
+            CREDO_LSP_VERSION = opts.version,
+          },
           settings = {},
           root_dir = vim.fs.dirname(file),
           on_attach = opts.on_attach or function() end,
diff --git a/lua/elixir/elixirls/compile.lua b/lua/elixir/elixirls/compile.lua
@@ -45,7 +45,7 @@ function M.compile(source_path, install_path, opts)
 
   -- sync is just for testing
   if do_sync then
-    compile:sync(180000)
+    compile:sync(300000)
   else
     compile:start()
   end
diff --git a/lua/elixir/elixirls/download.lua b/lua/elixir/elixirls/download.lua
@@ -22,7 +22,7 @@ function M.clone(dir, opts)
     enable_recording = true,
   }
 
-  clone:sync()
+  clone:sync(60000)
 
   assert(clone.code == 0, "Failed to clone")
 
diff --git a/lua/elixir/elixirls/init.lua b/lua/elixir/elixirls/init.lua
@@ -9,7 +9,7 @@ local Utils = require("elixir.utils")
 local capabilities = vim.lsp.protocol.make_client_capabilities()
 capabilities.textDocument.completion.completionItem.snippetSupport = true
 
-local default_install_tag = "tags/v0.13.0"
+local default_install_tag = "tags/v0.14.6"
 
 local elixir_nvim_output_bufnr
 
diff --git a/lua/elixir/init.lua b/lua/elixir/init.lua
@@ -16,6 +16,8 @@ M.credo.default_bin = (
   vim.fn.fnamemodify(debug.getinfo(1).source, ":h") .. "/../../bin/credo-language-server"
 ):gsub("^@", "")
 
+M.credo.default_version = "0.0.5"
+
 local enabled = function(value)
   return value == nil or value == true
 end
@@ -30,6 +32,10 @@ function M.setup(opts)
     opts.credo.cmd = M.credo.default_bin
   end
 
+  if not opts.credo.version then
+    opts.credo.version = M.credo.default_version
+  end
+
   mix.setup()
   projectionist.setup()
   if enabled(opts.elixirls.enable) then
diff --git a/lua/elixir/mix/exs.lua b/lua/elixir/mix/exs.lua
@@ -1,13 +1,17 @@
 local git = require("elixir.mix.git")
 
+if not vim.uv then
+  vim.uv = vim.loop
+end
+
 local M = {}
 
 function M.path_mix_exs()
   local git_workdir_path = git.workdir_path()
   local git_mix_exs_path = git.find_file("mix.exs")
   local mix_exs_fullpath = table.concat({ git_workdir_path, git_mix_exs_path }, "/")
 
-  local file_exists = not vim.tbl_isempty(vim.loop.fs_stat(mix_exs_fullpath) or {})
+  local file_exists = not vim.tbl_isempty(vim.uv.fs_stat(mix_exs_fullpath) or {})
   return {
     mix_file = mix_exs_fullpath,
     mix_dir = vim.fn.fnamemodify(mix_exs_fullpath, ":p:h"),
diff --git a/support/minimal_init.lua b/support/minimal_init.lua
@@ -0,0 +1,37 @@
+local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim"
+if not vim.loop.fs_stat(lazypath) then
+  vim.fn.system {
+    "git",
+    "clone",
+    "--filter=blob:none",
+    "https://github.com/folke/lazy.nvim.git",
+    "--branch=stable", -- latest stable release
+    lazypath,
+  }
+end
+vim.opt.rtp:prepend(lazypath)
+
+require("lazy").setup({
+  { "elixir-tools/elixir-tools.nvim", dir = vim.loop.cwd() },
+  { "nvim-lua/plenary.nvim" },
+  { "tpope/vim-projectionist" },
+}, {
+  concurrency = 30,
+  install = {
+    missing = true,
+  },
+  performance = {
+    rtp = {
+      disabled_plugins = {
+        "gzip",
+        "matchit",
+        "matchparen",
+        "netrwPlugin",
+        "tarPlugin",
+        "tohtml",
+        "tutor",
+        "zipPlugin",
+      },
+    },
+  },
+})
diff --git a/support/minimal_init.vim b/support/minimal_init.vim
@@ -1,2 +1,3 @@
 set rtp+=.
 runtime plugin/plenary.vim
+runtime plugin/projectionist.vim
diff --git a/tests/compile_spec.lua b/tests/compile_spec.lua
@@ -5,23 +5,23 @@ local Compile = require("elixir.elixirls.compile")
 local versions = require("elixir.elixirls.version").get()
 
 describe("compile", function()
-	before_each(function()
-		if not Path:new("tmp/clones/elixir-ls/mix.exs"):exists() then
-			Path:new("tmp/clones"):mkdir({ mode = 493, parents = true })
-			vim.fn.system("git -C tmp/clones clone https://github.com/elixir-lsp/elixir-ls.git")
-		end
+  before_each(function()
+    if not Path:new("tmp/clones/elixir-ls/mix.exs"):exists() then
+      Path:new("tmp/clones"):mkdir { mode = 493, parents = true }
+      vim.fn.system("git -C tmp/clones clone https://github.com/elixir-lsp/elixir-ls.git")
+    end
 
-		vim.fn.system("rm -rf tmp/installs")
-		vim.fn.system("mkdir -p tmp/installs")
-	end)
+    vim.fn.system("rm -rf tmp/installs")
+    vim.fn.system("mkdir -p tmp/installs")
+  end)
 
-	it("can compile elixir ls", function()
-		local source_path = "tmp/clones/elixir-ls"
-		local install_path = Path:new("tmp/installs/mhanberg/elixir-ls/HEAD", versions):absolute()
-		local job = Compile.compile(source_path, install_path, { sync = true })
+  it("can compile elixir ls", function()
+    local source_path = "tmp/clones/elixir-ls"
+    local install_path = Path:new("tmp/installs/mhanberg/elixir-ls/HEAD", versions):absolute()
+    local job = Compile.compile(source_path, install_path, { sync = true })
 
-		eq(job.code, 0)
+    eq(job.code, 0)
 
-		assert.True(Path:new("tmp/installs/mhanberg/elixir-ls/HEAD", versions, "language_server.sh"):exists())
-	end)
+    assert.True(Path:new("tmp/installs/mhanberg/elixir-ls/HEAD", versions, "language_server.sh"):exists())
+  end)
 end)
diff --git a/tests/download_spec.lua b/tests/download_spec.lua
diff --git a/tests/elixirls_spec.lua b/tests/elixirls_spec.lua
diff --git a/tests/projectionist_spec.lua b/tests/projectionist_spec.lua
diff --git a/tests/utils_spec.lua b/tests/utils_spec.lua

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`	`1`	`#!/bin/sh`
`2`	`2`
`3`		`-nvim --headless --noplugin -u support/minimal_init.vim -c "PlenaryBustedDirectory tests/ {minimal_init = 'support/minimal_init.vim', timeout = 180000}"`
	`3`	`+NVIM_APPNAME=elixirtoolsplenary nvim --headless -u support/minimal_init.lua -c "PlenaryBustedDirectory ${1:-tests} {init = 'support/minimal_init.lua', timeout = ${BUSTED_TIMEOUT:-180000}}"`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ function M.clone(dir, opts)`
`22`	`22`	`enable_recording = true,`
`23`	`23`	`}`
`24`	`24`
`25`		`- clone:sync()`
	`25`	`+ clone:sync(60000)`
`26`	`26`
`27`	`27`	`assert(clone.code == 0, "Failed to clone")`
`28`	`28`