rebase on grammar export, tests good, still needs update to createSer…

…vicesForGrammar
eclipse-langium · Dec 1, 2023 · 7de1f83 · 7de1f83
1 parent 9ebcb1f
commit 7de1f83
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 16 deletions.
diff --git a/packages/langium/src/grammar/internal-grammar-util.ts b/packages/langium/src/grammar/internal-grammar-util.ts
@@ -16,7 +16,8 @@ import type { IParserConfig } from '../parser/parser-config.js';
 import type { LanguageMetaData } from '../languages/language-meta-data.js';
 import type { Module} from '../dependency-injection.js';
 import { inject } from '../dependency-injection.js';
-import type { LangiumGeneratedServices, LangiumGeneratedSharedServices, LangiumServices, LangiumSharedServices, PartialLangiumServices, PartialLangiumSharedServices } from '../services.js';
+import type { LangiumGeneratedServices, LangiumGeneratedSharedServices, PartialLangiumCoreServices, PartialLangiumSharedCoreServices } from '../services.js';
+import type { LangiumServices, LangiumSharedServices, PartialLangiumLSPServices, PartialLangiumSharedLSPServices,  } from '../lsp/lsp-services.js';
 import { EmptyFileSystem } from '../workspace/file-system-provider.js';
 import { interpretAstReflection } from './ast-reflection-interpreter.js';
 import { createDefaultModule, createDefaultSharedModule } from '../default-module.js';
@@ -162,8 +163,8 @@ export async function createServicesForGrammar(config: {
     grammarServices?: LangiumGrammarServices,
     parserConfig?: IParserConfig,
     languageMetaData?: LanguageMetaData,
-    module?: Module<LangiumServices, PartialLangiumServices>
-    sharedModule?: Module<LangiumSharedServices, PartialLangiumSharedServices>
+    module?: Module<LangiumServices, PartialLangiumCoreServices & PartialLangiumLSPServices>
+    sharedModule?: Module<LangiumSharedServices, PartialLangiumSharedCoreServices & PartialLangiumSharedLSPServices>
 }): Promise<LangiumServices> {
     const grammarServices = config.grammarServices ?? createLangiumGrammarServices(EmptyFileSystem).grammar;
     const uri = URI.parse('memory:///grammar.langium');

diff --git a/packages/langium/src/lsp/grammar-util.ts b/packages/langium/src/lsp/grammar-util.ts
@@ -6,13 +6,13 @@
 
 import type { Module } from '../dependency-injection.js';
 import type { LangiumGrammarServices } from '../grammar/langium-grammar-module.js';
-import type { LanguageMetaData } from '../grammar/language-meta-data.js';
+import type { LanguageMetaData } from '../languages/language-meta-data.js';
 import type { IParserConfig } from '../parser/parser-config.js';
 import type { LangiumGeneratedServices, LangiumGeneratedSharedServices, LangiumCoreServices, LangiumSharedCoreServices, PartialLangiumCoreServices, PartialLangiumSharedCoreServices } from '../services.js';
 import { createDefaultModule, createDefaultSharedModule } from '../default-module.js';
 import { inject } from '../dependency-injection.js';
 import { interpretAstReflection } from '../grammar/ast-reflection-interpreter.js';
-import type * as ast from '../grammar/generated/ast.js';
+import type * as ast from '../languages/generated/ast.js';
 import { createLangiumGrammarServices } from '../grammar/langium-grammar-module.js';
 import { getDocument } from '../utils/ast-util.js';
 import { EmptyFileSystem } from '../workspace/file-system-provider.js';

diff --git a/packages/langium/src/lsp/langium-lsp-module.ts b/packages/langium/src/lsp/langium-lsp-module.ts
@@ -24,7 +24,7 @@ import { TextDocument } from 'vscode-languageserver-textdocument';
 import type { LangiumSharedCoreServices, PartialLangiumSharedCoreServices } from '../services.js';
 import { LangiumGrammarModule, type LangiumGrammarServices } from '../grammar/langium-grammar-module.js';
 import { LangiumGrammarGeneratedModule, LangiumGrammarGeneratedSharedModule } from '../grammar/generated/module.js';
-import { registerValidationChecks } from '../grammar/internal-grammar-util.js';
+import { registerValidationChecks } from '../grammar/validation/validator.js';
 import { registerTypeValidationChecks } from '../grammar/validation/types-validator.js';
 import { LSPConfigurationProvider } from './workspace/default-configuration.js';
 import { LSPLangiumDocumentFactory } from './workspace/documents.js';

diff --git a/packages/langium/src/utils/grammar-loader.ts b/packages/langium/src/utils/grammar-loader.ts
@@ -6,14 +6,14 @@
 
 import type { Mutable } from './ast-util.js';
 import type { Module } from '../dependency-injection.js';
-import type { LangiumServices, LangiumSharedServices, PartialLangiumServices, PartialLangiumSharedServices } from '../services.js';
+import type { LangiumCoreServices, LangiumSharedCoreServices, PartialLangiumCoreServices, PartialLangiumSharedCoreServices } from '../services.js';
 import * as ast from '../languages/generated/ast.js';
 import { inject } from '../dependency-injection.js';
 import { createDefaultModule, createDefaultSharedModule } from '../default-module.js';
 import { EmptyFileSystem } from '../workspace/file-system-provider.js';
 import { URI } from './uri-util.js';
 
-const minimalGrammarModule: Module<LangiumServices, PartialLangiumServices> = {
+const minimalGrammarModule: Module<LangiumCoreServices, PartialLangiumCoreServices> = {
     Grammar: () => undefined as unknown as ast.Grammar,
     LanguageMetaData: () => ({
         caseInsensitive: false,
@@ -22,11 +22,11 @@ const minimalGrammarModule: Module<LangiumServices, PartialLangiumServices> = {
     })
 };
 
-const minimalSharedGrammarModule: Module<LangiumSharedServices, PartialLangiumSharedServices> = {
+const minimalSharedGrammarModule: Module<LangiumSharedCoreServices, PartialLangiumSharedCoreServices> = {
     AstReflection: () => new ast.LangiumGrammarAstReflection()
 };
 
-function createMinimalGrammarServices(): LangiumServices {
+function createMinimalGrammarServices(): LangiumCoreServices {
     const shared = inject(
         createDefaultSharedModule(EmptyFileSystem),
         minimalSharedGrammarModule

diff --git a/packages/langium/test/lsp/workspace-symbol.test.ts b/packages/langium/test/lsp/workspace-symbol.test.ts
@@ -5,7 +5,7 @@
  ******************************************************************************/
 
 import { describe, test } from 'vitest';
-import { createServicesForGrammar } from 'langium/grammar';
+import { createServicesForGrammarWithLSP } from 'langium/lsp';
 import { expectWorkspaceSymbols, parseHelper } from 'langium/test';
 
 const grammar = `
@@ -19,7 +19,7 @@ const grammar = `
 describe('Workspace symbols', () => {
 
     test('Should show all workspace symbols', async () => {
-        const helloWorldServices = await createServicesForGrammar({
+        const helloWorldServices = await createServicesForGrammarWithLSP({
             grammar
         });
         const symbols = expectWorkspaceSymbols(helloWorldServices.shared);
@@ -35,7 +35,7 @@ describe('Workspace symbols', () => {
     });
 
     test('Should show all workspace symbols matching the query', async () => {
-        const helloWorldServices = await createServicesForGrammar({
+        const helloWorldServices = await createServicesForGrammarWithLSP({
             grammar
         });
         const symbols = expectWorkspaceSymbols(helloWorldServices.shared);

diff --git a/packages/langium/test/workspace/document-builder.test.ts b/packages/langium/test/workspace/document-builder.test.ts
@@ -9,8 +9,7 @@ import { describe, expect, test } from 'vitest';
 import { CancellationTokenSource } from 'vscode-languageserver';
 import { TextDocument } from 'vscode-languageserver-textdocument';
 import { isOperationCancelled, DocumentState, URI } from 'langium';
-import { createServicesForGrammar } from 'langium/grammar';
-import { type LangiumServices } from 'langium/lsp';
+import { createServicesForGrammarWithLSP, type LangiumServices } from 'langium/lsp';
 
 describe('DefaultDocumentBuilder', () => {
     async function createServices() {
@@ -26,7 +25,7 @@ describe('DefaultDocumentBuilder', () => {
             terminal ID: /[_a-zA-Z][\\w_]*/;
             hidden terminal WS: /\\s+/;
         `;
-        const services = await createServicesForGrammar({ grammar });
+        const services = await createServicesForGrammarWithLSP({ grammar });
         const fastChecks: ValidationChecks<TestAstType> = {
             Foo: (node, accept) => {
                 if (node.value > 10) {