From 1131fc0f217505383d160adb8a8472a186cab3ae Mon Sep 17 00:00:00 2001 From: 3w36zj6 <52315048+3w36zj6@users.noreply.github.com> Date: Sat, 31 Oct 2026 18:19:29 +0900 Subject: [PATCH] fix: resolve ignore patterns relative to each workspace folder --- src/server/workspace-linters.test.ts | 91 +++++++++++++++++++++------- src/server/workspace-linters.ts | 1 + 2 files changed, 70 insertions(+), 22 deletions(-) diff --git a/src/server/workspace-linters.test.ts b/src/server/workspace-linters.test.ts index 5e69ac8..c8fff22 100644 --- a/src/server/workspace-linters.test.ts +++ b/src/server/workspace-linters.test.ts @@ -1,5 +1,11 @@ import assert from "node:assert/strict"; +import { mkdir, mkdtemp, rm, writeFile } from "node:fs/promises"; +import { tmpdir } from "node:os"; +import { join } from "node:path"; import { test } from "node:test"; +import * as textlint from "textlint"; +import { TextDocument } from "vscode-languageserver-textdocument"; +import { URI } from "vscode-uri"; import { createWorkspaceLinterService, selectConfigFile, @@ -7,38 +13,29 @@ import { type WorkspaceLinterDiscovery, } from "./workspace-linters.ts"; +const settings: WorkspaceLinterDependencies["settings"] = () => ({ + configPath: null, + ignorePath: null, + nodePath: null, + run: "onSave", + trace: "off", + targetPath: "", +}); + void test("config lookup stops after finding a workspace configuration", () => { - const explored: string[] = []; const configFile = selectConfigFile({ - workspace: () => { - explored.push("workspace"); - return "/workspace/.textlintrc.json"; - }, - configured: () => { - explored.push("configured"); - return "/configured/.textlintrc.json"; - }, - home: () => { - explored.push("home"); - return "/home/user/.textlintrc.json"; - }, + workspace: () => "/workspace/.textlintrc.json", + configured: () => assert.fail("configured lookup should not run"), + home: () => assert.fail("home lookup should not run"), }); assert.strictEqual(configFile, "/workspace/.textlintrc.json"); - assert.deepStrictEqual(explored, ["workspace"]); }); void test("workspace linter reports missing configuration before missing library", async () => { const events: string[] = []; const dependencies: WorkspaceLinterDependencies = { - settings: () => ({ - configPath: null, - ignorePath: null, - nodePath: null, - run: "onSave", - trace: "off", - targetPath: "", - }), + settings, trace: () => {}, notifyNoConfig: () => { events.push("no-config"); @@ -66,3 +63,53 @@ void test("workspace linter reports missing configuration before missing library assert.deepStrictEqual(events, ["find-config", "no-config", "resolve-library", "no-library"]); }); + +void test("ignore patterns are relative to each workspace folder", async (context) => { + const directory = await mkdtemp(join(tmpdir(), "vscode-textlint-ignore-")); + context.after(() => rm(directory, { recursive: true, force: true })); + const folders = await Promise.all( + [ + { name: "A", pattern: "history/**", expected: ["ignored", "ok"] }, + { name: "B", pattern: "current.md", expected: ["ok", "ignored"] }, + ].map(async ({ name, pattern, expected }) => { + const root = join(directory, name); + await mkdir(join(root, "history"), { recursive: true }); + await Promise.all( + Object.entries({ + ".textlintrc.json": "{}", + ".textlintignore": `${pattern}\n`, + "history/old.md": "", + "current.md": "", + }).map(([file, content]) => writeFile(join(root, file), content)), + ); + return { name, root, uri: URI.file(root).toString(), expected }; + }), + ); + const service = createWorkspaceLinterService( + { + settings, + trace: () => {}, + notifyNoConfig: () => assert.fail("configuration should exist"), + notifyNoLibrary: () => assert.fail("textlint should be available"), + }, + { + findConfig: (root) => join(root, ".textlintrc.json"), + findIgnore: (root) => join(root, ".textlintignore"), + resolveModule: () => Promise.resolve(textlint), + }, + ); + await service.configure(folders); + + await Promise.all( + folders.map(async (folder) => { + const document = TextDocument.create(`${folder.uri}/current.md`, "markdown", 1, ""); + const scanFilePath = service.lookup(document)[1]?.linter.scanFilePath; + assert.ok(scanFilePath, `linter should exist for ${folder.name}`); + const scans = await Promise.all( + ["history/old.md", "current.md"].map((file) => scanFilePath(join(folder.root, file))), + ); + const actual = scans.map((scan) => scan.status); + assert.deepStrictEqual(actual, folder.expected, folder.name); + }), + ); +}); diff --git a/src/server/workspace-linters.ts b/src/server/workspace-linters.ts index bcaae54..15400bb 100644 --- a/src/server/workspace-linters.ts +++ b/src/server/workspace-linters.ts @@ -134,6 +134,7 @@ async function configureFolder( linter: module.createLinter({ descriptor, ignoreFilePath: ignoreFile, + cwd: root, }), availableExtensions: descriptor.availableExtensions, });