diff --git a/packages/langium-cli/src/generator/module-generator.ts b/packages/langium-cli/src/generator/module-generator.ts index 182f3eec3..0623e0a7f 100644 --- a/packages/langium-cli/src/generator/module-generator.ts +++ b/packages/langium-cli/src/generator/module-generator.ts @@ -25,14 +25,16 @@ export function generateModule(grammars: Grammar[], config: LangiumConfig, gramm import type { LanguageMetaData } from '../../languages/language-meta-data${config.importExtension}'; import { ${config.projectName}AstReflection } from '../../languages/generated/ast${config.importExtension}'; import type { Module } from '../../dependency-injection${config.importExtension}'; - import type { LangiumGeneratedServices, LangiumGeneratedSharedServices, LangiumSharedServices, LangiumServices } from '../../services${config.importExtension}'; + import type { LangiumGeneratedServices, LangiumGeneratedSharedServices } from '../../services${config.importExtension}'; + import type { LangiumSharedServices, LangiumServices } from '../../lsp/lsp-services${config.importExtension}'; `.appendTemplateIf(hasIParserConfigImport)` import type { IParserConfig } from '../../parser/parser-config${config.importExtension}'; ` ).appendTemplateIf(!config.langiumInternal)` - import type { LangiumGeneratedServices, LangiumGeneratedSharedServices, LangiumSharedServices, LangiumServices, LanguageMetaData, Module${hasIParserConfigImport ? ', IParserConfig' : ''} } from 'langium'; + import type { LangiumGeneratedServices, LangiumGeneratedSharedServices, LanguageMetaData, Module${hasIParserConfigImport ? ', IParserConfig' : ''} } from 'langium'; + import type { LangiumSharedServices, LangiumServices } from 'langium/lsp'; import { ${config.projectName}AstReflection } from './ast${config.importExtension}'; `.appendTemplate` diff --git a/packages/langium/src/lsp/lsp-services.ts b/packages/langium/src/lsp/lsp-services.ts index eb5a3605c..e5c218bc4 100644 --- a/packages/langium/src/lsp/lsp-services.ts +++ b/packages/langium/src/lsp/lsp-services.ts @@ -126,11 +126,21 @@ export type LangiumSharedLSPServices = { }; /** - * Language-specific services to be partially overridden via dependency injection. + * Language-specific LSP services to be partially overridden via dependency injection. */ export type PartialLangiumLSPServices = DeepPartial /** - * Shared services to be partially overridden via dependency injection. + * Language-specific services to be partially overridden via dependency injection. + */ +export type PartialLangiumServices = DeepPartial + +/** + * Shared LSP services to be partially overridden via dependency injection. */ export type PartialLangiumSharedLSPServices = DeepPartial + +/** + * Shared services to be partially overridden via dependency injection. + */ +export type PartialLangiumSharedServices = DeepPartial