mirror of
https://github.com/ThePrimeagen/harpoon
synced 2024-09-16 13:34:03 +02:00
Merge branch 'master' of github.com:ThePrimeagen/harpoon
This commit is contained in:
commit
1605603235
5 changed files with 75 additions and 4 deletions
26
.github/workflows/format.yml
vendored
Normal file
26
.github/workflows/format.yml
vendored
Normal file
|
@ -0,0 +1,26 @@
|
|||
name: Format
|
||||
|
||||
on: [push, pull_request]
|
||||
|
||||
jobs:
|
||||
format:
|
||||
name: Stylua
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- uses: actions/checkout@v2
|
||||
- run: date +%W > weekly
|
||||
|
||||
- name: Restore cache
|
||||
id: cache
|
||||
uses: actions/cache@v2
|
||||
with:
|
||||
path: |
|
||||
~/.cargo/bin
|
||||
key: ${{ runner.os }}-cargo-${{ hashFiles('weekly') }}
|
||||
|
||||
- name: Install
|
||||
if: steps.cache.outputs.cache-hit != 'true'
|
||||
run: cargo install stylua
|
||||
|
||||
- name: Format
|
||||
run: stylua --check lua/ --config-path=.stylua.toml
|
18
.github/workflows/lint.yml
vendored
Normal file
18
.github/workflows/lint.yml
vendored
Normal file
|
@ -0,0 +1,18 @@
|
|||
name: Lint
|
||||
|
||||
on: [push, pull_request]
|
||||
|
||||
jobs:
|
||||
lint:
|
||||
name: Luacheck
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- uses: actions/checkout@v2
|
||||
- name: Setup
|
||||
run: |
|
||||
sudo apt-get update
|
||||
sudo apt-get install luarocks
|
||||
sudo luarocks install luacheck
|
||||
|
||||
- name: Lint
|
||||
run: luacheck lua/harpoon
|
10
.luacheckrc
Normal file
10
.luacheckrc
Normal file
|
@ -0,0 +1,10 @@
|
|||
std = luajit
|
||||
cache = true
|
||||
codes = true
|
||||
|
||||
globals = {
|
||||
"HarpoonConfig",
|
||||
"Harpoon_bufh",
|
||||
"Harpoon_win_id",
|
||||
}
|
||||
read_globals = { "vim" }
|
|
@ -27,6 +27,25 @@ local function create_terminal()
|
|||
return buf_id, term_id
|
||||
end
|
||||
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
M.getCmd = function(idx)
|
||||
log.trace("getCmd()")
|
||||
local cmd
|
||||
if type(idx) == "number" then
|
||||
cmd = harpoon.get_term_config().cmds[idx]
|
||||
else
|
||||
log.error("getCmd(): Index is expected to be a number.")
|
||||
end
|
||||
|
||||
if cmd then
|
||||
return cmd
|
||||
else
|
||||
error("Command does not exist for that id.")
|
||||
end
|
||||
end
|
||||
|
||||
>>>>>>> 2d37262466380a38ba9d54bdf6754d005d801030
|
||||
local function find_terminal(idx)
|
||||
log.trace("_find_terminal(): Terminal:", idx)
|
||||
local term_handle = terminals[idx]
|
||||
|
|
|
@ -1,5 +1,3 @@
|
|||
-- TODO: Harpooned
|
||||
local Marker = require('harpoon.mark')
|
||||
local eq = assert.are.same
|
||||
|
||||
|
||||
-- local Marker = require('harpoon.mark')
|
||||
-- local eq = assert.are.same
|
||||
|
|
Loading…
Reference in a new issue