From e8c5f248128ac42678eb30df186682b86847f732 Mon Sep 17 00:00:00 2001 From: David Goss Date: Wed, 4 Nov 2026 12:45:57 +0000 Subject: [PATCH] Include module JS/TS extensions in default glue globs --- CHANGELOG.md | 2 + src/CucumberLanguageServer.ts | 4 ++ src/node/NodeFiles.ts | 7 ++- test/CucumberLanguageServer.test.ts | 52 +++++++++++++++++-- .../default-globs/features/steps/stepdefs.cjs | 3 ++ .../default-globs/features/steps/stepdefs.cts | 3 ++ .../default-globs/features/steps/stepdefs.mjs | 3 ++ .../default-globs/features/steps/stepdefs.mts | 3 ++ 8 files changed, 73 insertions(+), 4 deletions(-) create mode 100644 testdata/default-globs/features/steps/stepdefs.cjs create mode 100644 testdata/default-globs/features/steps/stepdefs.cts create mode 100644 testdata/default-globs/features/steps/stepdefs.mjs create mode 100644 testdata/default-globs/features/steps/stepdefs.mts diff --git a/CHANGELOG.md b/CHANGELOG.md index b5260856..dc1cf368 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/). ### Fixed - User's `snippetTemplates` config is ignored +- Default `glue` globs miss `.cjs`, `.mjs`, `.cts` and `.mts` files +- Glue and feature files not found when root is not the current directory ## [1.7.0] - 2025-05-18 ### Changed diff --git a/src/CucumberLanguageServer.ts b/src/CucumberLanguageServer.ts index 19cd0691..0c8831b2 100644 --- a/src/CucumberLanguageServer.ts +++ b/src/CucumberLanguageServer.ts @@ -61,8 +61,12 @@ const defaultSettings: Settings = { 'src/test/**/*.java', // Cucumber-Js 'features/**/*.ts', + 'features/**/*.cts', + 'features/**/*.mts', 'features/**/*.tsx', 'features/**/*.js', + 'features/**/*.cjs', + 'features/**/*.mjs', 'features/**/*.jsx', // Behat 'features/**/*.php', diff --git a/src/node/NodeFiles.ts b/src/node/NodeFiles.ts index 5d64fd44..6059791a 100644 --- a/src/node/NodeFiles.ts +++ b/src/node/NodeFiles.ts @@ -24,7 +24,12 @@ export class NodeFiles implements Files { async findUris(glob: string): Promise { const cwd = url.fileURLToPath(this.rootUri) - const paths = await fg(glob, { cwd, caseSensitiveMatch: false, onlyFiles: true }) + const paths = await fg(glob, { + cwd, + absolute: true, + caseSensitiveMatch: false, + onlyFiles: true, + }) return paths.map((path) => url.pathToFileURL(path).href) } diff --git a/test/CucumberLanguageServer.test.ts b/test/CucumberLanguageServer.test.ts index cca09d0c..c02486f5 100644 --- a/test/CucumberLanguageServer.test.ts +++ b/test/CucumberLanguageServer.test.ts @@ -7,6 +7,7 @@ import { createProtocolConnection, DidChangeConfigurationNotification, type DidChangeConfigurationParams, + InitializedNotification, type InitializeParams, InitializeRequest, InsertTextFormat, @@ -27,6 +28,7 @@ import { NodeFiles } from '../src/node/NodeFiles.js' import type { Settings } from '../src/types.js' describe('CucumberLanguageServer', () => { + let rootPath = process.cwd() let inputStream: Duplex let outputStream: Duplex let clientConnection: ProtocolConnection @@ -49,7 +51,7 @@ describe('CucumberLanguageServer', () => { serverConnection.listen() const initializeParams: InitializeParams = { - rootUri: `file://${process.cwd()}`, + rootUri: `file://${rootPath}`, processId: NaN, // This id is used by vscode-languageserver. Set as NaN so that the watchdog responsible for watching this process does not run. capabilities: { workspace: { @@ -126,8 +128,8 @@ describe('CucumberLanguageServer', () => { // Note that *pushing* settings from the client to the server is deprecated in the LSP. We're only using it // here because it's easier to implement in the test. const settings: Settings = { - features: ['testdata/**/*.feature'], - glue: [`testdata/**/*.${fileExtension}`], + features: ['testdata/gherkin/*.feature'], + glue: [`testdata/{javascript,typescript}/*.${fileExtension}`], parameterTypes: [], snippetTemplates: {}, } @@ -193,6 +195,50 @@ describe('CucumberLanguageServer', () => { assert.deepStrictEqual(completionItems, expected) }) } + + context('with default settings', () => { + before(() => { + rootPath = `${process.cwd()}/testdata/default-globs` + }) + + after(() => { + rootPath = process.cwd() + }) + + it('finds glue in module-specific JavaScript and TypeScript files', async () => { + await clientConnection.sendNotification(InitializedNotification.type, {}) + + // TODO: Wait for a WorkDoneProgressEnd notification instead + await new Promise((resolve) => setTimeout(resolve, 1000)) + + documents.get = () => + TextDocument.create( + 'testdoc', + 'gherkin', + 1, + `Feature: Hello + Scenario: World + Given I have + ` + ) + const completionItems = (await clientConnection.sendRequest(CompletionRequest.type, { + textDocument: { + uri: 'features/test.feature', + }, + position: { + line: 2, + character: 16, + }, + })) as CompletionItem[] + + assert.deepStrictEqual(completionItems.map((item) => item.label).sort(), [ + 'I have {int} cjs cukes', + 'I have {int} cts cukes', + 'I have {int} mjs cukes', + 'I have {int} mts cukes', + ]) + }) + }) }) }) diff --git a/testdata/default-globs/features/steps/stepdefs.cjs b/testdata/default-globs/features/steps/stepdefs.cjs new file mode 100644 index 00000000..97d12d2b --- /dev/null +++ b/testdata/default-globs/features/steps/stepdefs.cjs @@ -0,0 +1,3 @@ +import { Given } from '@cucumber/cucumber' + +Given('I have {int} cjs cukes', () => undefined) diff --git a/testdata/default-globs/features/steps/stepdefs.cts b/testdata/default-globs/features/steps/stepdefs.cts new file mode 100644 index 00000000..9a9a683e --- /dev/null +++ b/testdata/default-globs/features/steps/stepdefs.cts @@ -0,0 +1,3 @@ +import { Given } from '@cucumber/cucumber' + +Given('I have {int} cts cukes', () => undefined) diff --git a/testdata/default-globs/features/steps/stepdefs.mjs b/testdata/default-globs/features/steps/stepdefs.mjs new file mode 100644 index 00000000..31a8564b --- /dev/null +++ b/testdata/default-globs/features/steps/stepdefs.mjs @@ -0,0 +1,3 @@ +import { Given } from '@cucumber/cucumber' + +Given('I have {int} mjs cukes', () => undefined) diff --git a/testdata/default-globs/features/steps/stepdefs.mts b/testdata/default-globs/features/steps/stepdefs.mts new file mode 100644 index 00000000..9a3d6041 --- /dev/null +++ b/testdata/default-globs/features/steps/stepdefs.mts @@ -0,0 +1,3 @@ +import { Given } from '@cucumber/cucumber' + +Given('I have {int} mts cukes', () => undefined)