From 2061126b609810f0c249521f53ca9b69dc099b37 Mon Sep 17 00:00:00 2001 From: Alisue Date: Fri, 4 Mar 2022 03:39:18 +0900 Subject: [PATCH 1/6] :coffee: Update `Makefile` --- .github/workflows/udd.yml | 40 +++++++++++++++++++++++++++++---------- .gitignore | 2 +- Makefile | 20 ++++++++------------ deno.jsonc | 12 ++++++++++++ 4 files changed, 51 insertions(+), 23 deletions(-) create mode 100644 deno.jsonc diff --git a/.github/workflows/udd.yml b/.github/workflows/udd.yml index 606ec3e..aca07a3 100644 --- a/.github/workflows/udd.yml +++ b/.github/workflows/udd.yml @@ -12,17 +12,37 @@ jobs: - uses: denoland/setup-deno@v1 with: deno-version: "1.x" - - run: | - make tools - make update + - name: Update dependencies + run: | + make deps > ../output.txt + env: + NO_COLOR: 1 + - name: Read ../output.txt + id: log + uses: juliangruber/read-file-action@v1 + with: + path: ../output.txt + - name: Commit changes + run: | + git config user.name '${{ github.actor }}' + git config user.email '${{ github.actor }}@users.noreply.github.com' + git commit -a -F- < + The output of `make update` is + + ``` + ${{ steps.log.outputs.content }} + ``` + labels: automation + branch: automation/update-dependencies delete-branch: true diff --git a/.gitignore b/.gitignore index 07a9008..5c1cd7a 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/.tools +/.deno diff --git a/Makefile b/Makefile index 24c4941..842c297 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -TOOLS := ${CURDIR}/.tools +TARGETS := $$(find . \( -name '*.ts' -or -name '*.md' \) -not -path './.deno/*') .DEFAULT_GOAL := help @@ -7,27 +7,23 @@ help: perl -ne 'print if /^\w+.*##/;' | \ perl -pe 's/(.*):.*##\s*/sprintf("%-20s",$$1)/eg;' -tools: FORCE ## Install development tools - @mkdir -p ${TOOLS} - @deno install -A -f -n udd --root ${TOOLS} https://deno.land/x/udd@0.4.0/main.ts - fmt: FORCE ## Format code - @deno fmt --ignore=.deno + @deno fmt --config deno.jsonc fmt-check: FORCE ## Format check - @deno fmt --check --ignore=.deno + @deno fmt --check --config deno.jsonc lint: FORCE ## Lint code - @deno lint --ignore=.deno + @deno lint --config deno.jsonc type-check: FORCE ## Type check - @deno test --unstable --no-run $$(find . -name '*.ts' -not -name '.deno') + @deno test --unstable --no-run ${TARGETS} test: FORCE ## Test - @deno test --unstable -A --jobs + @deno test --unstable -A --no-check --jobs -update: FORCE ## Update dependencies - @${TOOLS}/bin/udd $$(find . -name '*.ts' -not -name '.deno') +deps: FORCE ## Update dependencies + @deno run -A https://deno.land/x/udd@0.7.2/main.ts ${TARGETS} @make fmt FORCE: diff --git a/deno.jsonc b/deno.jsonc new file mode 100644 index 0000000..1361af2 --- /dev/null +++ b/deno.jsonc @@ -0,0 +1,12 @@ +{ + "lint": { + "files": { + "exclude": [".deno"] + } + }, + "fmt": { + "files": { + "exclude": [".deno"] + } + } +} From df7fcdc00e189d551bb96d718248a33f7d04fa79 Mon Sep 17 00:00:00 2001 From: Alisue Date: Fri, 4 Mar 2022 03:39:28 +0900 Subject: [PATCH 2/6] :coffee: Apply `make fmt` --- denops/guise/editor.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/denops/guise/editor.ts b/denops/guise/editor.ts index 186338f..4984381 100644 --- a/denops/guise/editor.ts +++ b/denops/guise/editor.ts @@ -19,7 +19,9 @@ export async function open(denops: Denops): Promise { */ export async function edit(denops: Denops, filename: string): Promise { let opener = await vars.g.get(denops, "guise_edit_opener", "tab drop"); - await denops.cmd(`silent noswapfile ${opener} \`=filename\` | edit`, { filename }); + await denops.cmd(`silent noswapfile ${opener} \`=filename\` | edit`, { + filename, + }); const [winid, bufnr] = await batch.gather(denops, async (denops) => { await fn.win_getid(denops); await fn.bufnr(denops); From d18a0a857a36b881cf779b2815dac0ceb75ed1d2 Mon Sep 17 00:00:00 2001 From: Alisue Date: Fri, 4 Mar 2022 03:40:00 +0900 Subject: [PATCH 3/6] :coffee: Fix lint --- denops/guise/editor.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/denops/guise/editor.ts b/denops/guise/editor.ts index 4984381..6cd28d1 100644 --- a/denops/guise/editor.ts +++ b/denops/guise/editor.ts @@ -18,7 +18,7 @@ export async function open(denops: Denops): Promise { * Open a `filename` buffer in a new tab page and wait the buffer is closed. */ export async function edit(denops: Denops, filename: string): Promise { - let opener = await vars.g.get(denops, "guise_edit_opener", "tab drop"); + const opener = await vars.g.get(denops, "guise_edit_opener", "tab drop"); await denops.cmd(`silent noswapfile ${opener} \`=filename\` | edit`, { filename, }); From a10d9c18781de2a056ef6f23fe06b97db96f581e Mon Sep 17 00:00:00 2001 From: Alisue Date: Fri, 4 Mar 2022 03:41:21 +0900 Subject: [PATCH 4/6] :package: Update dependencies --- denops/guise/editor.ts | 16 ++++++++-------- denops/guise/main.ts | 8 ++++---- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/denops/guise/editor.ts b/denops/guise/editor.ts index 6cd28d1..105fd64 100644 --- a/denops/guise/editor.ts +++ b/denops/guise/editor.ts @@ -1,11 +1,11 @@ -import type { Denops } from "https://deno.land/x/denops_std@v2.1.3/mod.ts"; -import * as autocmd from "https://deno.land/x/denops_std@v2.1.3/autocmd/mod.ts"; -import * as anonymous from "https://deno.land/x/denops_std@v2.1.3/anonymous/mod.ts"; -import * as batch from "https://deno.land/x/denops_std@v2.1.3/batch/mod.ts"; -import * as fn from "https://deno.land/x/denops_std@v2.1.3/function/mod.ts"; -import * as vars from "https://deno.land/x/denops_std@v2.1.3/variable/mod.ts"; -import * as option from "https://deno.land/x/denops_std@v2.1.3/option/mod.ts"; -import { deferred } from "https://deno.land/std@0.111.0/async/mod.ts"; +import type { Denops } from "https://deno.land/x/denops_std@v3.1.4/mod.ts"; +import * as autocmd from "https://deno.land/x/denops_std@v3.1.4/autocmd/mod.ts"; +import * as anonymous from "https://deno.land/x/denops_std@v3.1.4/anonymous/mod.ts"; +import * as batch from "https://deno.land/x/denops_std@v3.1.4/batch/mod.ts"; +import * as fn from "https://deno.land/x/denops_std@v3.1.4/function/mod.ts"; +import * as vars from "https://deno.land/x/denops_std@v3.1.4/variable/mod.ts"; +import * as option from "https://deno.land/x/denops_std@v3.1.4/option/mod.ts"; +import { deferred } from "https://deno.land/std@0.128.0/async/mod.ts"; /** * Open a scratch buffer in a new tab page and return immediately. diff --git a/denops/guise/main.ts b/denops/guise/main.ts index ac0851b..eab4655 100644 --- a/denops/guise/main.ts +++ b/denops/guise/main.ts @@ -1,7 +1,7 @@ -import type { Denops } from "https://deno.land/x/denops_std@v2.1.3/mod.ts"; -import * as batch from "https://deno.land/x/denops_std@v2.1.3/batch/mod.ts"; -import * as helper from "https://deno.land/x/denops_std@v2.1.3/helper/mod.ts"; -import * as vars from "https://deno.land/x/denops_std@v2.1.3/variable/mod.ts"; +import type { Denops } from "https://deno.land/x/denops_std@v3.1.4/mod.ts"; +import * as batch from "https://deno.land/x/denops_std@v3.1.4/batch/mod.ts"; +import * as helper from "https://deno.land/x/denops_std@v3.1.4/helper/mod.ts"; +import * as vars from "https://deno.land/x/denops_std@v3.1.4/variable/mod.ts"; import * as unknownutil from "https://deno.land/x/unknownutil@v1.1.4/mod.ts"; import { Session as VimSession, From d0f18a9ea06037e9f89e3b7f9da20722a2c6d6d6 Mon Sep 17 00:00:00 2001 From: Alisue Date: Fri, 4 Mar 2022 03:41:32 +0900 Subject: [PATCH 5/6] :package: Upgrade unknownutil to v2 --- denops/guise/main.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/denops/guise/main.ts b/denops/guise/main.ts index eab4655..3ffbd1e 100644 --- a/denops/guise/main.ts +++ b/denops/guise/main.ts @@ -2,7 +2,7 @@ import type { Denops } from "https://deno.land/x/denops_std@v3.1.4/mod.ts"; import * as batch from "https://deno.land/x/denops_std@v3.1.4/batch/mod.ts"; import * as helper from "https://deno.land/x/denops_std@v3.1.4/helper/mod.ts"; import * as vars from "https://deno.land/x/denops_std@v3.1.4/variable/mod.ts"; -import * as unknownutil from "https://deno.land/x/unknownutil@v1.1.4/mod.ts"; +import * as unknownutil from "https://deno.land/x/unknownutil@v2.0.0/mod.ts"; import { Session as VimSession, } from "https://deno.land/x/vim_channel_command@v1.0.0/mod.ts"; @@ -80,7 +80,7 @@ function getDispatcher(denops: Denops): Dispatcher { }, edit(filename: unknown) { - unknownutil.ensureString(filename); + unknownutil.assertString(filename); return editor.edit(denops, filename); }, @@ -88,8 +88,8 @@ function getDispatcher(denops: Denops): Dispatcher { exception: unknown, throwpoint: unknown, ) { - unknownutil.ensureString(exception); - unknownutil.ensureString(throwpoint); + unknownutil.assertString(exception); + unknownutil.assertString(throwpoint); const message = [exception, throwpoint].join("\n"); return helper.echo(denops, message); }, From b714ae52423a698becc339cdce9c814d0302b910 Mon Sep 17 00:00:00 2001 From: Alisue Date: Fri, 4 Mar 2022 03:42:55 +0900 Subject: [PATCH 6/6] :coffee: Follow the latest denops support version --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 4e50a16..5fc492a 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -35,7 +35,7 @@ jobs: runner: - ubuntu-latest version: - - "1.14.0" + - "1.17.1" - "1.x" runs-on: ${{ matrix.runner }} steps: