Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,13 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/)
and this project adheres to [Semantic Versioning](http://semver.org/).

## [Unreleased]
### Added
- Support Scala step definitions, found in `src/test/**/*.scala` by default

### Changed
- BREAKING CHANGE: Switch to ESM ([#155](https://github.com/cucumber/language-server/pull/155))
- Update dependency @cucumber/language-service to 2.0.0
- Update dependency vscode-languageserver to 11.0.0

### Fixed
- User's `snippetTemplates` config is ignored
Expand Down
805 changes: 92 additions & 713 deletions package-lock.json

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -78,15 +78,15 @@
"mocha": "12.0.3",
"ts-node": "10.9.2",
"typescript": "^6.0.3",
"vscode-jsonrpc": "8.2.1",
"vscode-languageserver-protocol": "3.17.2"
"vscode-jsonrpc": "10.0.0",
"vscode-languageserver-protocol": "3.18.5"
},
"dependencies": {
"@cucumber/gherkin-utils": "^12.0.0",
"@cucumber/language-service": "^1.7.0",
"@cucumber/language-service": "^2.0.0",
"fast-glob": "3.3.3",
"source-map-support": "0.5.21",
"vscode-languageserver": "8.0.2",
"vscode-languageserver": "11.0.0",
"vscode-languageserver-textdocument": "1.0.16",
"vscode-languageserver-types": "3.18.5"
}
Expand Down
1 change: 1 addition & 0 deletions src/CucumberLanguageServer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ const defaultSettings: Settings = {
glue: [
// Cucumber-JVM
'src/test/**/*.java',
'src/test/**/*.scala',
// Cucumber-Js
'features/**/*.ts',
'features/**/*.cts',
Expand Down
1 change: 1 addition & 0 deletions src/fs.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ export const glueExtByLanguageName: Record<LanguageName, string[]> = {
python: ['.py'],
rust: ['.rs'],
go: ['.go'],
scala: ['.scala'],
}

type ExtLangEntry = [string, LanguageName]
Expand Down
2 changes: 1 addition & 1 deletion src/wasm/startEmbeddedServer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { PassThrough } from 'node:stream'
import type { CucumberExpressions, ParserAdapter, Suggestion } from '@cucumber/language-service'
import { WasmParserAdapter } from '@cucumber/language-service/wasm'
import { type Connection, TextDocuments } from 'vscode-languageserver'
import { createConnection } from 'vscode-languageserver/node.js'
import { createConnection } from 'vscode-languageserver/node'
import { TextDocument } from 'vscode-languageserver-textdocument'

import { CucumberLanguageServer } from '../CucumberLanguageServer.js'
Expand Down
2 changes: 1 addition & 1 deletion src/wasm/startStandaloneServer.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { WasmParserAdapter } from '@cucumber/language-service/wasm'
import { TextDocuments } from 'vscode-languageserver'
import { createConnection, ProposedFeatures } from 'vscode-languageserver/node.js'
import { createConnection, ProposedFeatures } from 'vscode-languageserver/node'
import { TextDocument } from 'vscode-languageserver-textdocument'

import { CucumberLanguageServer } from '../CucumberLanguageServer.js'
Expand Down
9 changes: 3 additions & 6 deletions test/CucumberLanguageServer.test.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import assert from 'node:assert'
import { Duplex } from 'node:stream'
import { WasmParserAdapter } from '@cucumber/language-service/wasm'
import { NullLogger, StreamMessageReader, StreamMessageWriter } from 'vscode-jsonrpc/node.js'
import { NullLogger, StreamMessageReader, StreamMessageWriter } from 'vscode-jsonrpc/node'
import {
type Connection,
createProtocolConnection,
Expand All @@ -15,11 +15,8 @@ import {
type ProtocolConnection,
TextDocuments,
} from 'vscode-languageserver'
import { createConnection } from 'vscode-languageserver/node.js'
import {
type CompletionParams,
CompletionRequest,
} from 'vscode-languageserver-protocol/lib/common/protocol.js'
import { createConnection } from 'vscode-languageserver/node'
import { type CompletionParams, CompletionRequest } from 'vscode-languageserver-protocol'
import { TextDocument } from 'vscode-languageserver-textdocument'
import { type CompletionItem, CompletionItemKind } from 'vscode-languageserver-types'

Expand Down
2 changes: 1 addition & 1 deletion test/standalone.test.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import assert from 'node:assert'
import { type ChildProcess, fork } from 'node:child_process'
import type { Duplex } from 'node:stream'
import { NullLogger, StreamMessageReader, StreamMessageWriter } from 'vscode-jsonrpc/node.js'
import { NullLogger, StreamMessageReader, StreamMessageWriter } from 'vscode-jsonrpc/node'
import {
createProtocolConnection,
DidChangeConfigurationNotification,
Expand Down
Loading