From d3c7ec4653d1bb74551e98b8ae64aba63ebed973 Mon Sep 17 00:00:00 2001 From: kuuote Date: Mon, 10 Feb 2025 12:42:24 +0900 Subject: [PATCH] =?UTF-8?q?=E4=BE=9D=E5=AD=98=E3=82=92=E3=81=BB=E3=81=BC?= =?UTF-8?q?=E3=83=90=E3=83=BC=E3=82=B8=E3=83=A7=E3=83=B3=E6=9C=AA=E6=8C=87?= =?UTF-8?q?=E5=AE=9Ajsr=E3=81=AB=E7=BD=AE=E3=81=8D=E6=8F=9B=E3=81=88?= =?UTF-8?q?=E3=81=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- conf/dpp.ts | 79 ++++++++++++--------- conf/plug/ddc/main.ts | 7 +- conf/plug/ddc/manual.ts | 11 ++- conf/plug/ddu.toml | 4 +- conf/plug/ddu.vim | 2 - conf/plug/ddu/ff.ts | 39 +++++----- conf/plug/ddu/filer.ts | 12 ++-- conf/plug/ddu/lib/helper.ts | 7 +- conf/plug/ddu/main.ts | 24 +++---- conf/plug/ddu/template.ts | 4 +- denops/@ddc-filters/sorter_file.ts | 3 +- denops/@ddc-filters/sorter_fzf.ts | 3 +- denops/@ddc-filters/sorter_ngram.ts | 7 +- denops/@ddc-filters/template.ts | 3 +- denops/@ddc-sources/list.ts | 8 +-- denops/@ddc-sources/skk_okuri/okuri.ts | 2 +- denops/@ddc-sources/skk_okuri/split_test.ts | 2 +- denops/@ddc-sources/skkeleton_okuri.ts | 10 +-- denops/@ddu-filters/converter_color.ts | 3 +- denops/@ddu-filters/sorter_alpha_path.ts | 5 +- denops/@ddu-filters/sorter_ngram.ts | 7 +- denops/@ddu-filters/sorter_shuffle.ts | 7 +- denops/@ddu-filters/template.ts | 3 +- denops/@ddu-kinds/callback.ts | 4 +- denops/@ddu-sources/kenshou_1s.ts | 5 +- denops/@ddu-sources/list.ts | 9 +-- denops/@ddu-sources/template.ts | 3 +- denops/@deps/ddc.ts | 16 ----- denops/@deps/ddu-kind-file.ts | 1 - denops/@deps/ddu-kinds.ts | 2 - denops/@deps/ddu.ts | 15 ---- denops/@deps/deno_std | 1 - denops/@deps/denops_std.ts | 11 --- denops/@deps/unknownutil.ts | 2 - denops/@lspoints/config.ts | 10 ++- denops/@lspoints/lsputil.ts | 4 +- denops/@vimrc/blocksort.ts | 12 ++-- denops/@vimrc/lib/denops.ts | 2 +- denops/@vimrc/lib/lambda/autocmd.ts | 4 +- denops/@vimrc/lib/lambda/map.ts | 11 +-- denops/@vimrc/loader.ts | 8 +-- denops/@vimrc/template.ts | 2 +- denops/@vimrc/tmux.ts | 2 +- denops/@vimrc/yank.ts | 4 +- script/build/build.ts | 16 ++--- script/gitupdate/denops_view.ts | 9 +-- script/gitupdate/dpp_dump.ts | 4 +- script/gitupdate/run.ts | 4 +- script/gitupdate/snap/diff.ts | 2 +- script/gitupdate/snap/dps_diff.ts | 8 +-- script/gitupdate/snap/dps_shot.ts | 4 +- script/gitupdate/snap/libsnapshot.ts | 4 +- script/gitupdate/util.ts | 4 +- snippets/vim.ts | 2 +- 54 files changed, 197 insertions(+), 240 deletions(-) delete mode 100644 conf/plug/ddu.vim delete mode 100644 denops/@deps/ddc.ts delete mode 100644 denops/@deps/ddu-kind-file.ts delete mode 100644 denops/@deps/ddu-kinds.ts delete mode 100644 denops/@deps/ddu.ts delete mode 120000 denops/@deps/deno_std delete mode 100644 denops/@deps/denops_std.ts delete mode 100644 denops/@deps/unknownutil.ts diff --git a/conf/dpp.ts b/conf/dpp.ts index 7371db88..6cd7f489 100644 --- a/conf/dpp.ts +++ b/conf/dpp.ts @@ -1,27 +1,23 @@ +import { ensure, is } from "jsr:@core/unknownutil"; +import { Denops } from "jsr:@denops/std"; import { - ensure, - is, -} from "/data/vim/repos/github.com/lambdalisue/deno-unknownutil/mod.ts"; + Ext as LazyExt, + LazyMakeStateResult, + Params as LazyParams, +} from "jsr:@shougo/dpp-ext-lazy"; +import { Ext as TomlExt, Params as TomlParams } from "jsr:@shougo/dpp-ext-toml"; import { BaseConfig, + ConfigArguments, ConfigReturn, -} from "/data/vim/repos/github.com/Shougo/dpp.vim/denops/dpp/base/config.ts"; -import { Denops } from "/data/vim/repos/github.com/Shougo/dpp.vim/denops/dpp/deps.ts"; -import { - ContextBuilder, - Dpp, - Plugin, -} from "/data/vim/repos/github.com/Shougo/dpp.vim/denops/dpp/types.ts"; +} from "jsr:@shougo/dpp-vim/config"; +import { Protocol } from "jsr:@shougo/dpp-vim/protocol"; +import { ExtOptions, Plugin } from "jsr:@shougo/dpp-vim/types"; type Toml = { plugins: Plugin[]; }; -type LazyMakeStateResult = { - plugins: Plugin[]; - stateLines: string[]; -}; - const isStringArray = is.ArrayOf(is.String); async function glob(denops: Denops, path: string): Promise { @@ -32,12 +28,7 @@ async function glob(denops: Denops, path: string): Promise { } export class Config extends BaseConfig { - override async config(args: { - contextBuilder: ContextBuilder; - denops: Denops; - basePath: string; - dpp: Dpp; - }): Promise { + override async config(args: ConfigArguments): Promise { const vim = args.denops.meta.host === "vim"; const nvim = args.denops.meta.host === "nvim"; // X @@ -55,6 +46,10 @@ export class Config extends BaseConfig { }); const [context, options] = await args.contextBuilder.get(args.denops); + const protocols = await args.denops.dispatcher.getProtocols() as Record< + string, + Protocol + >; const plugins: Plugin[] = []; const profiles = new Set(); @@ -76,19 +71,26 @@ export class Config extends BaseConfig { profiles.add("nvim_lsp"); // profiles.add("vim_lsp"); + const [tomlExt, tomlOptions, tomlParams]: [ + TomlExt | undefined, + ExtOptions, + TomlParams, + ] = await args.denops.dispatcher.getExt( + "toml", + ) as [TomlExt | undefined, ExtOptions, TomlParams]; const tomls = await glob(args.denops, "$MYVIMDIR/conf/plug/**/*.toml"); for (const tomlPath of tomls) { - console.log("load toml: " + tomlPath); - const toml = await args.dpp.extAction( - args.denops, + const toml = await tomlExt!.actions.load.callback({ + denops: args.denops, context, options, - "toml", - "load", - { + protocols, + extOptions: tomlOptions, + extParams: tomlParams, + actionParams: { path: tomlPath, }, - ) as Toml; + }) as Toml; const profileVim = tomlPath.match(/\/vim\//) != null; const profileNvim = tomlPath.match(/\/nvim\//) != null; @@ -127,16 +129,25 @@ export class Config extends BaseConfig { p.path = p.repo; } } - const lazyResult = await args.dpp.extAction( - args.denops, + + const [lazyExt, lazyOptions, lazyParams]: [ + LazyExt | undefined, + ExtOptions, + LazyParams, + ] = await args.denops.dispatcher.getExt( + "lazy", + ) as [LazyExt | undefined, ExtOptions, LazyParams]; + const lazyResult = await lazyExt!.actions.makeState.callback({ + denops: args.denops, context, options, - "lazy", - "makeState", - { + protocols, + extOptions: lazyOptions, + extParams: lazyParams, + actionParams: { plugins, }, - ) as LazyMakeStateResult; + }) as LazyMakeStateResult; // プラギン置き場として/data/vimを使う const repos = args.basePath + "/repos"; diff --git a/conf/plug/ddc/main.ts b/conf/plug/ddc/main.ts index f1caf8aa..0a1cf675 100644 --- a/conf/plug/ddc/main.ts +++ b/conf/plug/ddc/main.ts @@ -1,8 +1,5 @@ -import { - BaseConfig, - type ConfigArguments, - type SourceOptions, -} from "../../../denops/@deps/ddc.ts"; +import { BaseConfig, ConfigArguments } from "jsr:@shougo/ddc-vim/config"; +import { SourceOptions } from "jsr:@shougo/ddc-vim/types"; type Filters = Record diff --git a/conf/plug/ddu.toml b/conf/plug/ddu.toml index 127afbd0..a25b4801 100644 --- a/conf/plug/ddu.toml +++ b/conf/plug/ddu.toml @@ -97,8 +97,8 @@ repo = 'https://github.com/Shougo/ddu-ui-filer' repo = 'https://github.com/Shougo/ddu.vim' # L hook_add = ''' -autocmd vimrc User DenopsReady source $MYVIMDIR/conf/plug/ddu.vim -" DenopsReadyのタイミングが変わってて呼び出されなくなったので無理やり呼び出しておく +autocmd vimrc User DenopsReady call ddu#custom#load_config(expand('$MYVIMDIR/conf/plug/ddu/main.ts')) +" ddu.vim自体のロードがDenopsReadyで行われるため再呼び出ししておく autocmd vimrc User DenopsReady ++once call timer_start(0, {->execute('doautocmd User DenopsReady', '')}) ''' diff --git a/conf/plug/ddu.vim b/conf/plug/ddu.vim deleted file mode 100644 index f253bf3e..00000000 --- a/conf/plug/ddu.vim +++ /dev/null @@ -1,2 +0,0 @@ -call ddu#custom#load_config(expand('$MYVIMDIR/conf/plug/ddu/main.ts')) -call ddu#custom#load_config(expand('$MYVIMDIR/conf/plug/ddu/ff.ts')) diff --git a/conf/plug/ddu/ff.ts b/conf/plug/ddu/ff.ts index 3a88fdca..2c35cfac 100644 --- a/conf/plug/ddu/ff.ts +++ b/conf/plug/ddu/ff.ts @@ -1,21 +1,20 @@ import { group, register } from "../../../denops/@vimrc/lib/lambda/autocmd.ts"; import { - ActionFlags, - BaseConfig, - BaseUiParams, - type ConfigArguments, - type SourceOptions, - type UiActionArguments, -} from "/data/vim/deps/ddu.ts"; + Denops, +} from "jsr:@denops/std"; +import * as autocmd from "jsr:@denops/std/autocmd" +import * as lambda from "jsr:@denops/std/lambda" +import * as mapping from "jsr:@denops/std/mapping" +import * as option from "jsr:@denops/std/option" +import { assert, is } from "jsr:@core/unknownutil"; +import { Params as DduUiFFParams } from "jsr:@shougo/ddu-ui-ff"; +import { BaseConfig, ConfigArguments } from "jsr:@shougo/ddu-vim/config"; import { - autocmd, - type Denops, - lambda, - mapping, - option, -} from "/data/vim/deps/denops_std.ts"; -import { is, u } from "/data/vim/deps/unknownutil.ts"; -import { Params as DduUiFFParams } from "/data/vim/repos/github.com/Shougo/ddu-ui-ff/denops/@ddu-uis/ff.ts"; + ActionFlags, + SourceOptions, + UiActionArguments, +} from "jsr:@shougo/ddu-vim/types"; +import { BaseParams } from "jsr:@shougo/ddu-vim/types"; type Filter = { matchers: SourceOptions["matchers"]; @@ -23,7 +22,7 @@ type Filter = { converters: SourceOptions["converters"]; }; -function updateFilter(args: UiActionArguments, filter: Filter) { +function updateFilter(args: UiActionArguments, filter: Filter) { const sources = args.options.sources.map((s) => { if (is.String(s)) { s = { name: s }; @@ -36,9 +35,9 @@ function updateFilter(args: UiActionArguments, filter: Filter) { }, }; }); - args.ddu.updateOptions({ - sources, - }); + // args.ddu.updateOptions({ + // sources, + // }); } const augroup = "vimrc#ddu-ui-ff"; @@ -204,7 +203,7 @@ async function setupFileTypeAutocmd(args: ConfigArguments) { }; const ddu_ff = register(denops, async (name: unknown) => { await setupTable["_"]?.(); - u.assert(name, is.String); + assert(name, is.String); const names = (aliases[name] ?? name).split(/:/g); for (const name of names) { await setupTable[name]?.(); diff --git a/conf/plug/ddu/filer.ts b/conf/plug/ddu/filer.ts index 9273942e..d787fc87 100644 --- a/conf/plug/ddu/filer.ts +++ b/conf/plug/ddu/filer.ts @@ -1,7 +1,9 @@ import { register } from "../../../denops/@vimrc/lib/lambda/autocmd.ts"; -import { BaseConfig, ConfigArguments, DduItem } from "/data/vim/deps/ddu.ts"; -import { autocmd, lambda, mapping } from "/data/vim/deps/denops_std.ts"; -import { is, u } from "/data/vim/deps/unknownutil.ts"; +import * as autocmd from "jsr:@denops/std/autocmd" +import * as lambda from "jsr:@denops/std/lambda" +import * as mapping from "jsr:@denops/std/mapping" +import { assert, is } from "jsr:@core/unknownutil"; +import { BaseConfig, ConfigArguments } from "jsr:@shougo/ddu-vim/config"; const augroup = "vimrc#ddu-ui-filer"; @@ -46,7 +48,7 @@ async function setupFileTypeAutocmd(args: ConfigArguments) { }; const ddu_filer = register(denops, async (name: unknown) => { await setupTable["_"]?.(); - u.assert(name, is.String); + assert(name, is.String); // const names = (aliases[name] ?? name).split(/:/g); // for (const name of names) { // await setupTable[name]?.(); @@ -61,7 +63,7 @@ async function setupFileTypeAutocmd(args: ConfigArguments) { }); } export class Config extends BaseConfig { - async config(args: ConfigArguments) { + override async config(args: ConfigArguments) { const nvim = args.denops.meta.host === "nvim"; args.contextBuilder.patchGlobal({ uiParams: { diff --git a/conf/plug/ddu/lib/helper.ts b/conf/plug/ddu/lib/helper.ts index 3e15bcf6..42734e37 100644 --- a/conf/plug/ddu/lib/helper.ts +++ b/conf/plug/ddu/lib/helper.ts @@ -1,8 +1,5 @@ -import { - DduItem, - DduOptions, -} from "../../../../denops/@deps/ddu.ts"; -import { Denops } from "../../../../denops/@deps/denops_std.ts"; +import { Denops } from "jsr:@denops/std"; +import { DduItem, DduOptions } from "jsr:@shougo/ddu-vim/types"; // 型wrapper // いるものしか定義してないので適宜増やすこと diff --git a/conf/plug/ddu/main.ts b/conf/plug/ddu/main.ts index 4dfcf423..611f588b 100644 --- a/conf/plug/ddu/main.ts +++ b/conf/plug/ddu/main.ts @@ -1,18 +1,17 @@ import * as sourceList from "../../../denops/@ddu-sources/list.ts"; -import { type KindGitStatusActionData } from "../../../denops/@deps/ddu-kinds.ts"; -import { is, u } from "../../../denops/@deps/unknownutil.ts"; -import { group, register } from "../../../denops/@vimrc/lib/lambda/autocmd.ts"; +// import { KindGitStatusActionData } from "../../../denops/@deps/ddu-kinds.ts"; import { cmd, map } from "../../../denops/@vimrc/lib/lambda/map.ts"; import { dduHelper } from "./lib/helper.ts"; +import { is } from "jsr:@core/unknownutil"; +import { Denops } from "jsr:@denops/std"; +import * as autocmd from "jsr:@denops/std/autocmd"; +import { BaseConfig, ConfigArguments } from "jsr:@shougo/ddu-vim/config"; import { ActionFlags, - BaseConfig, - type ConfigArguments, - type DduOptions, - type SourceOptions, -} from "/data/vim/deps/ddu.ts"; -import * as stdpath from "/data/vim/deps/deno_std/path/mod.ts"; -import { autocmd, type Denops } from "/data/vim/deps/denops_std.ts"; + DduOptions, + SourceOptions, +} from "jsr:@shougo/ddu-vim/types"; +import * as stdpath from "jsr:@std/path"; const augroup = "vimrc#ddu"; @@ -465,7 +464,7 @@ async function selectorConfig(args: ConfigArguments) { } export class Config extends BaseConfig { - async config(args: ConfigArguments) { + override async config(args: ConfigArguments) { await autocmd.group(args.denops, augroup, (helper) => { helper.remove("*"); helper.define( @@ -477,6 +476,7 @@ export class Config extends BaseConfig { }); mainConfig(args); await selectorConfig(args); - autocmd.emit(args.denops, "User", "vimrc#ddu#ready"); + await new (await import("./ff.ts")).Config().config(args); + await autocmd.emit(args.denops, "User", "vimrc#ddu#ready"); } } diff --git a/conf/plug/ddu/template.ts b/conf/plug/ddu/template.ts index a38a616e..b2181ce6 100644 --- a/conf/plug/ddu/template.ts +++ b/conf/plug/ddu/template.ts @@ -1,9 +1,9 @@ import { BaseConfig, ConfigArguments, -} from "/data/vim/repos/github.com/Shougo/ddu.vim/denops/ddu/base/config.ts"; +} from "jsr:@shougo/ddu-vim/config"; export class Config extends BaseConfig { - async config(args: ConfigArguments) { + override async config(args: ConfigArguments) { } } diff --git a/denops/@ddc-filters/sorter_file.ts b/denops/@ddc-filters/sorter_file.ts index 5e598298..23d690ec 100644 --- a/denops/@ddc-filters/sorter_file.ts +++ b/denops/@ddc-filters/sorter_file.ts @@ -1,4 +1,5 @@ -import { BaseFilter, Item } from "../@deps/ddc.ts"; +import { BaseFilter } from "jsr:@shougo/ddc-vim/filter"; +import { Item } from "jsr:@shougo/ddc-vim/types"; const rank: Record = { dir: 1, diff --git a/denops/@ddc-filters/sorter_fzf.ts b/denops/@ddc-filters/sorter_fzf.ts index 4125cebe..575b0e6f 100644 --- a/denops/@ddc-filters/sorter_fzf.ts +++ b/denops/@ddc-filters/sorter_fzf.ts @@ -1,4 +1,5 @@ -import { BaseFilter, FilterArguments, Item } from "../@deps/ddc.ts"; +import { BaseFilter, FilterArguments } from "jsr:@shougo/ddc-vim/filter"; +import { Item } from "jsr:@shougo/ddc-vim/types"; // @deno-types=./sorter_fzf/fzf_type.ts import { Fzf } from "npm:fzf@0.5.2"; diff --git a/denops/@ddc-filters/sorter_ngram.ts b/denops/@ddc-filters/sorter_ngram.ts index 38c07699..46b0dd06 100644 --- a/denops/@ddc-filters/sorter_ngram.ts +++ b/denops/@ddc-filters/sorter_ngram.ts @@ -1,9 +1,6 @@ -import { - BaseFilter, - FilterArguments, -} from "https://deno.land/x/ddc_vim@v4.1.0/base/filter.ts"; -import { Item } from "https://deno.land/x/ddc_vim@v4.1.0/types.ts"; import { makeTrie, match } from "./ngram/ngram.ts"; +import { BaseFilter, FilterArguments } from "jsr:@shougo/ddc-vim/filter"; +import { Item } from "jsr:@shougo/ddc-vim/types"; function byteLength(input: string): number { return new TextEncoder().encode(input).length; diff --git a/denops/@ddc-filters/template.ts b/denops/@ddc-filters/template.ts index df57348f..de760cfb 100644 --- a/denops/@ddc-filters/template.ts +++ b/denops/@ddc-filters/template.ts @@ -1,4 +1,5 @@ -import { BaseFilter, FilterArguments, Item } from "../@deps/ddc.ts"; +import { BaseFilter, FilterArguments } from "jsr:@shougo/ddc-vim/filter"; +import { Item } from "jsr:@shougo/ddc-vim/types"; type Never = Record; diff --git a/denops/@ddc-sources/list.ts b/denops/@ddc-sources/list.ts index 70d866bf..14daaddb 100644 --- a/denops/@ddc-sources/list.ts +++ b/denops/@ddc-sources/list.ts @@ -1,10 +1,10 @@ +import { is, maybe } from "jsr:@core/unknownutil"; import { BaseSource, GatherArguments, - Item, OnCompleteDoneArguments, -} from "../@deps/ddc.ts"; -import { is, u } from "../@deps/unknownutil.ts"; +} from "jsr:@shougo/ddc-vim/source"; +import { Item } from "jsr:@shougo/ddc-vim/types"; export type Params = { candidates: Array; @@ -25,7 +25,7 @@ export class Source extends BaseSource { } else { return { ...candidate, - user_data: u.maybe(candidate.user_data, is.Record) ?? {}, + user_data: maybe(candidate.user_data, is.Record) ?? {}, }; } }), diff --git a/denops/@ddc-sources/skk_okuri/okuri.ts b/denops/@ddc-sources/skk_okuri/okuri.ts index 3e31e4df..3f68f00d 100644 --- a/denops/@ddc-sources/skk_okuri/okuri.ts +++ b/denops/@ddc-sources/skk_okuri/okuri.ts @@ -1,4 +1,4 @@ - const okuriTable: Record = { +const okuriTable: Record = { "ぁ": "x", "あ": "a", "ぃ": "x", diff --git a/denops/@ddc-sources/skk_okuri/split_test.ts b/denops/@ddc-sources/skk_okuri/split_test.ts index c1b0551f..ef96264f 100644 --- a/denops/@ddc-sources/skk_okuri/split_test.ts +++ b/denops/@ddc-sources/skk_okuri/split_test.ts @@ -1,4 +1,4 @@ -import { assertEquals } from "/data/vim/repos/github.com/denoland/deno_std/assert/equals.ts"; +import { assertEquals } from "jsr:@std/assert"; import { split } from "./split.ts"; Deno.test({ diff --git a/denops/@ddc-sources/skkeleton_okuri.ts b/denops/@ddc-sources/skkeleton_okuri.ts index c8a2938f..07dc1b96 100644 --- a/denops/@ddc-sources/skkeleton_okuri.ts +++ b/denops/@ddc-sources/skkeleton_okuri.ts @@ -1,12 +1,12 @@ +import { parse } from "./skk_okuri/dict.ts"; +import { getOkuriStr } from "./skk_okuri/okuri.ts"; +import { split } from "./skk_okuri/split.ts"; import { BaseSource, GatherArguments, GetCompletePositionArguments, - Item, -} from "../@deps/ddc.ts"; -import { parse } from "./skk_okuri/dict.ts"; -import { getOkuriStr } from "./skk_okuri/okuri.ts"; -import { split } from "./skk_okuri/split.ts"; +} from "jsr:@shougo/ddc-vim/source"; +import { Item } from "jsr:@shougo/ddc-vim/types"; type Never = Record; diff --git a/denops/@ddu-filters/converter_color.ts b/denops/@ddu-filters/converter_color.ts index 858f7dc1..db6cd6f2 100644 --- a/denops/@ddu-filters/converter_color.ts +++ b/denops/@ddu-filters/converter_color.ts @@ -1,4 +1,5 @@ -import { BaseFilter, DduItem, FilterArguments } from "../@deps/ddu.ts"; +import { BaseFilter, FilterArguments } from "jsr:@shougo/ddu-vim/filter"; +import { DduItem } from "jsr:@shougo/ddu-vim/types"; const params = { group: "", diff --git a/denops/@ddu-filters/sorter_alpha_path.ts b/denops/@ddu-filters/sorter_alpha_path.ts index ee50b95a..b0a61d44 100644 --- a/denops/@ddu-filters/sorter_alpha_path.ts +++ b/denops/@ddu-filters/sorter_alpha_path.ts @@ -1,5 +1,6 @@ -import { ActionData } from "../@deps/ddu-kind-file.ts"; -import { BaseFilter, DduItem } from "../@deps/ddu.ts"; +import { ActionData } from "jsr:@shougo/ddu-kind-file"; +import { BaseFilter } from "jsr:@shougo/ddu-vim/filter"; +import { DduItem } from "jsr:@shougo/ddu-vim/types"; type Params = Record; diff --git a/denops/@ddu-filters/sorter_ngram.ts b/denops/@ddu-filters/sorter_ngram.ts index 91c1fe82..7a822d67 100644 --- a/denops/@ddu-filters/sorter_ngram.ts +++ b/denops/@ddu-filters/sorter_ngram.ts @@ -1,9 +1,6 @@ -import { - BaseFilter, - FilterArguments, -} from "https://deno.land/x/ddu_vim@v3.10.0/base/filter.ts"; -import { DduItem } from "https://deno.land/x/ddu_vim@v3.10.0/types.ts"; import { makeTrie, match } from "./ngram/ngram.ts"; +import { BaseFilter, FilterArguments } from "jsr:@shougo/ddu-vim/filter"; +import { DduItem } from "jsr:@shougo/ddu-vim/types"; function byteLength(input: string): number { return new TextEncoder().encode(input).length; diff --git a/denops/@ddu-filters/sorter_shuffle.ts b/denops/@ddu-filters/sorter_shuffle.ts index efb2bdf0..96b7efbf 100644 --- a/denops/@ddu-filters/sorter_shuffle.ts +++ b/denops/@ddu-filters/sorter_shuffle.ts @@ -1,8 +1,5 @@ -import { - BaseFilter, - FilterArguments, -} from "https://deno.land/x/ddu_vim@v3.5.0/base/filter.ts"; -import { Context, DduItem } from "https://deno.land/x/ddu_vim@v3.5.0/types.ts"; +import { BaseFilter, FilterArguments } from "jsr:@shougo/ddu-vim/filter"; +import { Context, DduItem } from "jsr:@shougo/ddu-vim/types"; const defaultParams = { disableAtNarrowing: false, diff --git a/denops/@ddu-filters/template.ts b/denops/@ddu-filters/template.ts index 3f58b943..762ae0dd 100644 --- a/denops/@ddu-filters/template.ts +++ b/denops/@ddu-filters/template.ts @@ -1,4 +1,5 @@ -import { BaseFilter, DduItem, FilterArguments } from "../@deps/ddu.ts"; +import { BaseFilter, FilterArguments } from "jsr:@shougo/ddu-vim/filter"; +import { DduItem } from "jsr:@shougo/ddu-vim/types"; const params = { _: null, diff --git a/denops/@ddu-kinds/callback.ts b/denops/@ddu-kinds/callback.ts index f2a8ef90..f377167b 100644 --- a/denops/@ddu-kinds/callback.ts +++ b/denops/@ddu-kinds/callback.ts @@ -1,9 +1,9 @@ +import { BaseKind } from "jsr:@shougo/ddu-vim/kind"; import { ActionArguments, ActionFlags, - BaseKind, DduItem, -} from "../@deps/ddu.ts"; +} from "jsr:@shougo/ddu-vim/types"; export type Callback = string | ((items: DduItem[]) => Promise); diff --git a/denops/@ddu-sources/kenshou_1s.ts b/denops/@ddu-sources/kenshou_1s.ts index fe821498..b888a1f7 100644 --- a/denops/@ddu-sources/kenshou_1s.ts +++ b/denops/@ddu-sources/kenshou_1s.ts @@ -1,5 +1,6 @@ -import { abortable } from "/data/vim/deps/deno_std/async/abortable.ts"; -import { BaseSource, Item } from "https://deno.land/x/ddu_vim@v3.6.0/types.ts"; +import { BaseSource } from "jsr:@shougo/ddu-vim/source"; +import { Item } from "jsr:@shougo/ddu-vim/types"; +import { abortable } from "jsr:@std/async"; type Never = Record; diff --git a/denops/@ddu-sources/list.ts b/denops/@ddu-sources/list.ts index 3ca086ce..2aecf585 100644 --- a/denops/@ddu-sources/list.ts +++ b/denops/@ddu-sources/list.ts @@ -1,11 +1,6 @@ -import { - BaseSource, - DduItem, - DduOptions, - GatherArguments, - Item, -} from "../@deps/ddu.ts"; import { Callback } from "../@ddu-kinds/callback.ts"; +import { BaseSource, GatherArguments } from "jsr:@shougo/ddu-vim/source"; +import { DduItem, DduOptions, Item } from "jsr:@shougo/ddu-vim/types"; type Items = Array; diff --git a/denops/@ddu-sources/template.ts b/denops/@ddu-sources/template.ts index 6cc8cdf0..fcfebccc 100644 --- a/denops/@ddu-sources/template.ts +++ b/denops/@ddu-sources/template.ts @@ -1,4 +1,5 @@ -import { BaseSource, GatherArguments, Item } from "../@deps/ddu.ts"; +import { BaseSource, GatherArguments } from "jsr:@shougo/ddu-vim/source"; +import { Item } from "jsr:@shougo/ddu-vim/types"; type Never = Record; diff --git a/denops/@deps/ddc.ts b/denops/@deps/ddc.ts deleted file mode 100644 index 32d6523f..00000000 --- a/denops/@deps/ddc.ts +++ /dev/null @@ -1,16 +0,0 @@ -export { - BaseConfig, - type ConfigArguments, -} from "/data/vim/repos/github.com/Shougo/ddc.vim/denops/ddc/base/config.ts"; -export { - BaseFilter, - type FilterArguments, -} from "/data/vim/repos/github.com/Shougo/ddc.vim/denops/ddc/base/filter.ts"; -export { - BaseSource, - type GatherArguments, - type GetCompletePositionArguments, - type OnCompleteDoneArguments, - type OnInitArguments, -} from "/data/vim/repos/github.com/Shougo/ddc.vim/denops/ddc/base/source.ts"; -export type * from "/data/vim/repos/github.com/Shougo/ddc.vim/denops/ddc/types.ts"; diff --git a/denops/@deps/ddu-kind-file.ts b/denops/@deps/ddu-kind-file.ts deleted file mode 100644 index dd4a7839..00000000 --- a/denops/@deps/ddu-kind-file.ts +++ /dev/null @@ -1 +0,0 @@ -export type { ActionData } from "/data/vim/repos/github.com/Shougo/ddu-kind-file/denops/@ddu-kinds/file.ts"; diff --git a/denops/@deps/ddu-kinds.ts b/denops/@deps/ddu-kinds.ts deleted file mode 100644 index d37abe9c..00000000 --- a/denops/@deps/ddu-kinds.ts +++ /dev/null @@ -1,2 +0,0 @@ -export type { ActionData as KindGitStatusActionData } from "/data/vim/repos/github.com/kuuote/ddu-source-git_status/denops/@ddu-kinds/git_status.ts"; -export type { ActionData as KindFileActionData } from "/data/vim/repos/github.com/Shougo/ddu-kind-file/denops/@ddu-kinds/file.ts"; diff --git a/denops/@deps/ddu.ts b/denops/@deps/ddu.ts deleted file mode 100644 index ca2572d7..00000000 --- a/denops/@deps/ddu.ts +++ /dev/null @@ -1,15 +0,0 @@ -export { - BaseConfig, - type ConfigArguments, -} from "/data/vim/repos/github.com/Shougo/ddu.vim/denops/ddu/base/config.ts"; -export { - BaseFilter, - type FilterArguments, -} from "/data/vim/repos/github.com/Shougo/ddu.vim/denops/ddu/base/filter.ts"; -export { - BaseSource, - type GatherArguments, -} from "/data/vim/repos/github.com/Shougo/ddu.vim/denops/ddu/base/source.ts"; -export { ActionFlags } from "/data/vim/repos/github.com/Shougo/ddu.vim/denops/ddu/types.ts"; -export { BaseKind } from "/data/vim/repos/github.com/Shougo/ddu.vim/denops/ddu/base/kind.ts"; -export type * from "/data/vim/repos/github.com/Shougo/ddu.vim/denops/ddu/types.ts"; diff --git a/denops/@deps/deno_std b/denops/@deps/deno_std deleted file mode 120000 index 2d682c62..00000000 --- a/denops/@deps/deno_std +++ /dev/null @@ -1 +0,0 @@ -/data/vim/repos/github.com/denoland/deno_std \ No newline at end of file diff --git a/denops/@deps/denops_std.ts b/denops/@deps/denops_std.ts deleted file mode 100644 index e6fe2825..00000000 --- a/denops/@deps/denops_std.ts +++ /dev/null @@ -1,11 +0,0 @@ -export * as autocmd from "/data/vim/repos/github.com/vim-denops/deno-denops-std/autocmd/mod.ts"; -export { - batch, - collect, -} from "/data/vim/repos/github.com/vim-denops/deno-denops-std/batch/mod.ts"; -export * as fn from "/data/vim/repos/github.com/vim-denops/deno-denops-std/function/mod.ts"; -export * as lambda from "/data/vim/repos/github.com/vim-denops/deno-denops-std/lambda/mod.ts"; -export * as mapping from "/data/vim/repos/github.com/vim-denops/deno-denops-std/mapping/mod.ts"; -export type { Denops } from "/data/vim/repos/github.com/vim-denops/deno-denops-std/mod.ts"; -export * as option from "/data/vim/repos/github.com/vim-denops/deno-denops-std/option/mod.ts"; -export * as variable from "/data/vim/repos/github.com/vim-denops/deno-denops-std/variable/mod.ts"; diff --git a/denops/@deps/unknownutil.ts b/denops/@deps/unknownutil.ts deleted file mode 100644 index d38d5c3d..00000000 --- a/denops/@deps/unknownutil.ts +++ /dev/null @@ -1,2 +0,0 @@ -export * as u from "/data/vim/repos/github.com/lambdalisue/deno-unknownutil/mod.ts"; -export * from "/data/vim/repos/github.com/jsr-core/unknownutil/mod.ts"; diff --git a/denops/@lspoints/config.ts b/denops/@lspoints/config.ts index facab4e2..aafbfcf9 100644 --- a/denops/@lspoints/config.ts +++ b/denops/@lspoints/config.ts @@ -1,12 +1,18 @@ import { BaseExtension, Lspoints } from "../@deps/lspoints.ts"; -import { Denops, variable } from "../@deps/denops_std.ts"; +import { Denops } from "jsr:@denops/std"; +import * as variable from "jsr:@denops/std/variable"; export class Extension extends BaseExtension { override async initialize(denops: Denops, lspoints: Lspoints) { lspoints.settings.patch({ startOptions: { denols: { - cmd: [await variable.g.get(denops, "denops#deno", "deno"), "lsp"], + cmd: [ + "/data/code/deno/lsptrace.ts", + "/tmp/lsptrace/deno__date__", + await variable.g.get(denops, "denops#deno", "deno"), + "lsp", + ], settings: { deno: { enable: true, diff --git a/denops/@lspoints/lsputil.ts b/denops/@lspoints/lsputil.ts index b0b4629d..520c0f5a 100644 --- a/denops/@lspoints/lsputil.ts +++ b/denops/@lspoints/lsputil.ts @@ -1,9 +1,9 @@ -import { Denops } from "../@deps/denops_std.ts"; import { BaseExtension, Lspoints } from "../@deps/lspoints.ts"; +import { Denops } from "jsr:@denops/std"; import { makePositionParams, TextDocumentPositionParams, -} from "/data/vim/repos/github.com/uga-rosa/deno-denops-lsputil/lsputil/mod.ts"; +} from "jsr:@uga-rosa/denops-lsputil"; export class Extension extends BaseExtension { override initialize(denops: Denops, lspoints: Lspoints) { diff --git a/denops/@vimrc/blocksort.ts b/denops/@vimrc/blocksort.ts index d5efe189..2135a5be 100644 --- a/denops/@vimrc/blocksort.ts +++ b/denops/@vimrc/blocksort.ts @@ -1,5 +1,5 @@ -import { Denops } from "../@deps/denops_std.ts"; -import { is, u } from "../@deps/unknownutil.ts"; +import { assert, is } from "jsr:@core/unknownutil"; +import { Denops } from "jsr:@denops/std"; // 例えば↑のimportを整理するにはvip後に // call vimrc#denops#request('blocksort', 'do', [line("'<"), line("'>"), 'import', ' from .*']) @@ -15,10 +15,10 @@ export function main(denops: Denops) { findRegExpStr: unknown, keyRegExpStr: unknown, ) { - u.assert(start, is.Number); - u.assert(end, is.Number); - u.assert(findRegExpStr, is.String); - u.assert(keyRegExpStr, is.String); + assert(start, is.Number); + assert(end, is.Number); + assert(findRegExpStr, is.String); + assert(keyRegExpStr, is.String); const findRegExp = new RegExp(findRegExpStr); // 複数行に跨るのでdotAllを入れておく const keyRegExp = new RegExp(keyRegExpStr, "s"); diff --git a/denops/@vimrc/lib/denops.ts b/denops/@vimrc/lib/denops.ts index 5c0a8705..1ecf9bc2 100644 --- a/denops/@vimrc/lib/denops.ts +++ b/denops/@vimrc/lib/denops.ts @@ -1,4 +1,4 @@ -import { Denops } from "../../@deps/denops_std.ts"; +import { Denops } from "jsr:@denops/std"; export type GenerateDenopsCallOptions = { async?: boolean; diff --git a/denops/@vimrc/lib/lambda/autocmd.ts b/denops/@vimrc/lib/lambda/autocmd.ts index 26f340c9..c3bee4bb 100644 --- a/denops/@vimrc/lib/lambda/autocmd.ts +++ b/denops/@vimrc/lib/lambda/autocmd.ts @@ -1,6 +1,8 @@ -import { autocmd, Denops, lambda } from "../../../@deps/denops_std.ts"; import { find } from "../ahocorasick.ts"; import { generateDenopsCall, GenerateDenopsCallOptions } from "../denops.ts"; +import { Denops } from "jsr:@denops/std"; +import * as autocmd from "jsr:@denops/std/autocmd"; +import * as lambda from "jsr:@denops/std/lambda"; const dispatchName = "lambda.autocmd#" + performance.now(); const dispatcher = new Map(); diff --git a/denops/@vimrc/lib/lambda/map.ts b/denops/@vimrc/lib/lambda/map.ts index 568698bd..f63b0d18 100644 --- a/denops/@vimrc/lib/lambda/map.ts +++ b/denops/@vimrc/lib/lambda/map.ts @@ -1,5 +1,8 @@ -import { Denops, fn, lambda, mapping } from "../../../@deps/denops_std.ts"; -import { is, u } from "../../../@deps/unknownutil.ts"; +import { is, maybe } from "jsr:@core/unknownutil"; +import { Denops } from "jsr:@denops/std"; +import * as fn from "jsr:@denops/std/function"; +import * as lambda from "jsr:@denops/std/lambda"; +import * as mapping from "jsr:@denops/std/mapping"; const { bufnr } = fn; @@ -15,8 +18,8 @@ export async function map( denops.dispatcher[dispatchName] = (functionName: unknown) => dispatcher.get(String(functionName))?.() ?? Promise.resolve(); const mode = options.mode; - const modeStr = u.maybe(mode, is.Array)?.join("") ?? - u.maybe(mode, is.String) ?? + const modeStr = maybe(mode, is.Array)?.join("") ?? + maybe(mode, is.String) ?? ""; const bufNr = options.buffer ? await bufnr(denops) : -1; const lhsEscaped = lhs.replaceAll(/ & { end: boolean; diff --git a/script/gitupdate/dpp_dump.ts b/script/gitupdate/dpp_dump.ts index 8a27bedc..0f4b37c4 100644 --- a/script/gitupdate/dpp_dump.ts +++ b/script/gitupdate/dpp_dump.ts @@ -1,6 +1,6 @@ -import { Denops } from "../../denops/@deps/denops_std.ts"; -import { as, ensure, is } from "../../denops/@deps/unknownutil.ts"; import { Task } from "./run.ts"; +import { as, ensure, is } from "jsr:@core/unknownutil"; +import { type Denops } from "jsr:@denops/std"; // sort keys for JSON.stringify export function stringifyReplacer(_key: string, value: unknown): unknown { diff --git a/script/gitupdate/run.ts b/script/gitupdate/run.ts index c055c76f..84a4a1ea 100644 --- a/script/gitupdate/run.ts +++ b/script/gitupdate/run.ts @@ -1,5 +1,5 @@ -import { as, assert, is, Predicate } from "../../denops/@deps/unknownutil.ts"; -import { TextLineStream } from "/data/vim/deps/deno_std/streams/text_line_stream.ts"; +import { TextLineStream } from "jsr:@std/streams/text-line-stream"; +import { as, assert, is, type Predicate } from "jsr:@core/unknownutil"; export type Task = { repo: string; diff --git a/script/gitupdate/snap/diff.ts b/script/gitupdate/snap/diff.ts index b87c0252..0f0fdcc5 100644 --- a/script/gitupdate/snap/diff.ts +++ b/script/gitupdate/snap/diff.ts @@ -1,4 +1,4 @@ -import { exec, Repo } from "./libsnapshot.ts"; +import { exec, type Repo } from "./libsnapshot.ts"; await Deno.remove("/data/vim/diff", { recursive: true, diff --git a/script/gitupdate/snap/dps_diff.ts b/script/gitupdate/snap/dps_diff.ts index c105228c..906bc1c5 100644 --- a/script/gitupdate/snap/dps_diff.ts +++ b/script/gitupdate/snap/dps_diff.ts @@ -1,9 +1,9 @@ -import { Denops } from "../../../denops/@deps/denops_std.ts"; -import { is, u } from "../../../denops/@deps/unknownutil.ts"; import { exec, isRepo } from "./libsnapshot.ts"; +import { assert, ensure, is } from "jsr:@core/unknownutil"; +import { type Denops } from "jsr:@denops/std"; export async function run(denops: Denops, args: unknown) { - u.assert( + assert( args, is.TupleOf( [ @@ -13,7 +13,7 @@ export async function run(denops: Denops, args: unknown) { ); const [snapshotPath] = args; - const repos = u.ensure( + const repos = ensure( JSON.parse( await Deno.readTextFile(snapshotPath), ), diff --git a/script/gitupdate/snap/dps_shot.ts b/script/gitupdate/snap/dps_shot.ts index 6a9c15e3..03983ce3 100644 --- a/script/gitupdate/snap/dps_shot.ts +++ b/script/gitupdate/snap/dps_shot.ts @@ -1,7 +1,7 @@ -import { Denops } from "../../../denops/@deps/denops_std.ts"; -import { assert, is } from "../../../denops/@deps/unknownutil.ts"; import { loadTasks } from "../util.ts"; import { getSnapshot } from "./libsnapshot.ts"; +import { assert, is } from "jsr:@core/unknownutil"; +import { type Denops } from "jsr:@denops/std"; export async function run(args: unknown) { assert( diff --git a/script/gitupdate/snap/libsnapshot.ts b/script/gitupdate/snap/libsnapshot.ts index 82ab96ba..f79411d4 100644 --- a/script/gitupdate/snap/libsnapshot.ts +++ b/script/gitupdate/snap/libsnapshot.ts @@ -1,4 +1,4 @@ -import { is, u } from "../../../denops/@deps/unknownutil.ts"; +import { is, type Predicate } from "jsr:@core/unknownutil"; export async function exec(cmd: string[], cwd?: string): Promise { if (cwd == null) { @@ -18,7 +18,7 @@ export type Repo = { date: number; }; -export const isRepo: u.Predicate = is.ObjectOf({ +export const isRepo: Predicate = is.ObjectOf({ path: is.String, hash: is.String, date: is.Number, diff --git a/script/gitupdate/util.ts b/script/gitupdate/util.ts index 99559e3f..30a5449f 100644 --- a/script/gitupdate/util.ts +++ b/script/gitupdate/util.ts @@ -1,5 +1,5 @@ -import { is, u } from "../../denops/@deps/unknownutil.ts"; import { isTask, Task } from "./run.ts"; +import { assert, is } from "jsr:@core/unknownutil"; export async function loadTasks(pathes: string[]): Promise { const tasks = []; @@ -7,7 +7,7 @@ export async function loadTasks(pathes: string[]): Promise { try { const data = await Deno.readTextFile(path); const json = JSON.parse(data); - u.assert(json, is.ArrayOf(isTask)); + assert(json, is.ArrayOf(isTask)); tasks.push(...json); } catch (e) { console.log("skip " + path); diff --git a/snippets/vim.ts b/snippets/vim.ts index bb70c646..bb552ac4 100644 --- a/snippets/vim.ts +++ b/snippets/vim.ts @@ -1,5 +1,5 @@ import { TSSnippet } from "../denops/@deps/denippet.ts"; -import { Denops } from "../denops/@deps/denops_std.ts"; +import { Denops } from "jsr:@denops/std"; export const snippets: Record = { autoload_function: {