adjust generator to setup lsp-based services, expose partials for these

too
eclipse-langium · Dec 7, 2023 · 437c575 · 437c575
1 parent d3b1ef8
commit 437c575
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 4 deletions.
diff --git 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
@@ -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<LangiumLSPServices>
 
 /**
- * Shared services to be partially overridden via dependency injection.
+ * Language-specific services to be partially overridden via dependency injection.
+ */
+export type PartialLangiumServices = DeepPartial<LangiumServices>
+
+/**
+ * Shared LSP services to be partially overridden via dependency injection.
  */
 export type PartialLangiumSharedLSPServices = DeepPartial<LangiumSharedLSPServices>
+
+/**
+ * Shared services to be partially overridden via dependency injection.
+ */
+export type PartialLangiumSharedServices = DeepPartial<LangiumSharedServices>