Merge branch 'eclipse-langium:main' into validation-unused-rule-cross…

…reference
eclipse-langium · Mar 8, 2024 · 59cd7b0 · 59cd7b0
2 parents 136a1f9 + f6889f2
commit 59cd7b0
Show file tree

Hide file tree

Showing 41 changed files with 190 additions and 99 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,6 +9,7 @@ We maintain separate change logs for the individual packages:
 
 ## Closed Issues and PRs
 
+* [v3.0.0](https://github.com/eclipse-langium/langium/milestone/11?closed=1)
 * [v2.1.0](https://github.com/eclipse-langium/langium/milestone/10?closed=1)
 * [v2.0.0](https://github.com/eclipse-langium/langium/milestone/9?closed=1)
 * [v1.3.0](https://github.com/eclipse-langium/langium/milestone/7?closed=1)

diff --git a/examples/arithmetics/package.json b/examples/arithmetics/package.json
@@ -1,7 +1,7 @@
 {
     "name": "langium-arithmetics-dsl",
     "displayName": "Arithmetics DSL",
-    "version": "2.1.0",
+    "version": "3.0.0",
     "description": "Example language built with Langium",
     "homepage": "https://langium.org",
     "engines": {
@@ -69,12 +69,12 @@
     "dependencies": {
         "chalk": "~5.3.0",
         "commander": "~11.0.0",
-        "langium": "~2.1.0",
+        "langium": "~3.0.0",
         "vscode-languageclient": "~9.0.1",
         "vscode-languageserver": "~9.0.1"
     },
     "devDependencies": {
-        "langium-cli": "~2.1.0"
+        "langium-cli": "~3.0.0"
     },
     "volta": {
         "node": "18.17.1",

diff --git a/examples/arithmetics/src/language-server/arithmetics-module.ts b/examples/arithmetics/src/language-server/arithmetics-module.ts
@@ -69,5 +69,10 @@ export function createArithmeticsServices(context: DefaultSharedModuleContext):
     );
     shared.ServiceRegistry.register(arithmetics);
     registerValidationChecks(arithmetics);
+    if (!context.connection) {
+        // We don't run inside a language server
+        // Therefore, initialize the configuration provider instantly
+        shared.workspace.ConfigurationProvider.initialized({});
+    }
     return { shared, arithmetics };
 }
diff --git a/examples/arithmetics/src/language-server/generated/ast.ts b/examples/arithmetics/src/language-server/generated/ast.ts
@@ -1,5 +1,5 @@
 /******************************************************************************
- * This file was generated by langium-cli 2.1.0.
+ * This file was generated by langium-cli 3.0.0.
  * DO NOT EDIT MANUALLY!
  ******************************************************************************/
 

diff --git a/examples/arithmetics/src/language-server/generated/grammar.ts b/examples/arithmetics/src/language-server/generated/grammar.ts
@@ -1,5 +1,5 @@
 /******************************************************************************
- * This file was generated by langium-cli 2.1.0.
+ * This file was generated by langium-cli 3.0.0.
  * DO NOT EDIT MANUALLY!
  ******************************************************************************/
 

diff --git a/examples/arithmetics/src/language-server/generated/module.ts b/examples/arithmetics/src/language-server/generated/module.ts
@@ -1,10 +1,9 @@
 /******************************************************************************
- * This file was generated by langium-cli 2.1.0.
+ * This file was generated by langium-cli 3.0.0.
  * DO NOT EDIT MANUALLY!
  ******************************************************************************/
 
-import type { LangiumGeneratedCoreServices, LangiumGeneratedSharedCoreServices, LanguageMetaData, Module } from 'langium';
-import type { LangiumSharedServices, LangiumServices } from 'langium/lsp';
+import type { LangiumSharedCoreServices, LangiumCoreServices, LangiumGeneratedCoreServices, LangiumGeneratedSharedCoreServices, LanguageMetaData, Module } from 'langium';
 import { ArithmeticsAstReflection } from './ast.js';
 import { ArithmeticsGrammar } from './grammar.js';
 
@@ -14,11 +13,11 @@ export const ArithmeticsLanguageMetaData = {
     caseInsensitive: true
 } as const satisfies LanguageMetaData;
 
-export const ArithmeticsGeneratedSharedModule: Module<LangiumSharedServices, LangiumGeneratedSharedCoreServices> = {
+export const ArithmeticsGeneratedSharedModule: Module<LangiumSharedCoreServices, LangiumGeneratedSharedCoreServices> = {
     AstReflection: () => new ArithmeticsAstReflection()
 };
 
-export const ArithmeticsGeneratedModule: Module<LangiumServices, LangiumGeneratedCoreServices> = {
+export const ArithmeticsGeneratedModule: Module<LangiumCoreServices, LangiumGeneratedCoreServices> = {
     Grammar: () => ArithmeticsGrammar(),
     LanguageMetaData: () => ArithmeticsLanguageMetaData,
     parser: {}

diff --git a/examples/domainmodel/package.json b/examples/domainmodel/package.json
@@ -1,7 +1,7 @@
 {
     "name": "langium-domainmodel-dsl",
     "displayName": "Domain Model DSL",
-    "version": "2.1.0",
+    "version": "3.0.0",
     "description": "Example language built with Langium",
     "homepage": "https://langium.org",
     "engines": {
@@ -60,13 +60,13 @@
     "dependencies": {
         "chalk": "~5.3.0",
         "commander": "~11.0.0",
-        "langium": "~2.1.0",
+        "langium": "~3.0.0",
         "lodash": "~4.17.21",
         "vscode-languageclient": "~9.0.1",
         "vscode-languageserver": "~9.0.1"
     },
     "devDependencies": {
-        "langium-cli": "~2.1.0"
+        "langium-cli": "~3.0.0"
     },
     "volta": {
         "node": "18.17.1",

diff --git a/examples/domainmodel/src/language-server/domain-model-module.ts b/examples/domainmodel/src/language-server/domain-model-module.ts
@@ -54,5 +54,10 @@ export function createDomainModelServices(context: DefaultSharedModuleContext):
     );
     shared.ServiceRegistry.register(domainmodel);
     registerValidationChecks(domainmodel);
+    if (!context.connection) {
+        // We don't run inside a language server
+        // Therefore, initialize the configuration provider instantly
+        shared.workspace.ConfigurationProvider.initialized({});
+    }
     return { shared, domainmodel };
 }
diff --git a/examples/domainmodel/src/language-server/generated/ast.ts b/examples/domainmodel/src/language-server/generated/ast.ts
@@ -1,5 +1,5 @@
 /******************************************************************************
- * This file was generated by langium-cli 2.1.0.
+ * This file was generated by langium-cli 3.0.0.
  * DO NOT EDIT MANUALLY!
  ******************************************************************************/
 

diff --git a/examples/domainmodel/src/language-server/generated/grammar.ts b/examples/domainmodel/src/language-server/generated/grammar.ts
@@ -1,5 +1,5 @@
 /******************************************************************************
- * This file was generated by langium-cli 2.1.0.
+ * This file was generated by langium-cli 3.0.0.
  * DO NOT EDIT MANUALLY!
  ******************************************************************************/
 

diff --git a/examples/domainmodel/src/language-server/generated/module.ts b/examples/domainmodel/src/language-server/generated/module.ts
@@ -1,10 +1,9 @@
 /******************************************************************************
- * This file was generated by langium-cli 2.1.0.
+ * This file was generated by langium-cli 3.0.0.
  * DO NOT EDIT MANUALLY!
  ******************************************************************************/
 
-import type { LangiumGeneratedCoreServices, LangiumGeneratedSharedCoreServices, LanguageMetaData, Module, IParserConfig } from 'langium';
-import type { LangiumSharedServices, LangiumServices } from 'langium/lsp';
+import type { LangiumSharedCoreServices, LangiumCoreServices, LangiumGeneratedCoreServices, LangiumGeneratedSharedCoreServices, LanguageMetaData, Module, IParserConfig } from 'langium';
 import { DomainModelAstReflection } from './ast.js';
 import { DomainModelGrammar } from './grammar.js';
 
@@ -20,11 +19,11 @@ export const parserConfig: IParserConfig = {
     maxLookahead: 3,
 };
 
-export const DomainModelGeneratedSharedModule: Module<LangiumSharedServices, LangiumGeneratedSharedCoreServices> = {
+export const DomainModelGeneratedSharedModule: Module<LangiumSharedCoreServices, LangiumGeneratedSharedCoreServices> = {
     AstReflection: () => new DomainModelAstReflection()
 };
 
-export const DomainModelGeneratedModule: Module<LangiumServices, LangiumGeneratedCoreServices> = {
+export const DomainModelGeneratedModule: Module<LangiumCoreServices, LangiumGeneratedCoreServices> = {
     Grammar: () => DomainModelGrammar(),
     LanguageMetaData: () => DomainModelLanguageMetaData,
     parser: {

diff --git a/examples/requirements/package.json b/examples/requirements/package.json
@@ -2,7 +2,7 @@
     "name": "langium-requirements-dsl",
     "displayName": "Requirements DSL",
     "description": "A demo showing how to combine two DSLs",
-    "version": "2.1.0",
+    "version": "3.0.0",
     "engines": {
         "vscode": "^1.67.0"
     },
@@ -71,12 +71,12 @@
     "dependencies": {
         "chalk": "~5.3.0",
         "commander": "~11.0.0",
-        "langium": "~2.1.0",
+        "langium": "~3.0.0",
         "vscode-languageclient": "~9.0.1",
         "vscode-languageserver": "~9.0.1"
     },
     "devDependencies": {
-        "langium-cli": "~2.1.0"
+        "langium-cli": "~3.0.0"
     },
     "volta": {
         "node": "18.17.1",

diff --git a/examples/requirements/src/language-server/generated/ast.ts b/examples/requirements/src/language-server/generated/ast.ts
@@ -1,5 +1,5 @@
 /******************************************************************************
- * This file was generated by langium-cli 2.1.0.
+ * This file was generated by langium-cli 3.0.0.
  * DO NOT EDIT MANUALLY!
  ******************************************************************************/
 

diff --git a/examples/requirements/src/language-server/generated/grammar.ts b/examples/requirements/src/language-server/generated/grammar.ts
@@ -1,5 +1,5 @@
 /******************************************************************************
- * This file was generated by langium-cli 2.1.0.
+ * This file was generated by langium-cli 3.0.0.
  * DO NOT EDIT MANUALLY!
  ******************************************************************************/
 

diff --git a/examples/requirements/src/language-server/generated/module.ts b/examples/requirements/src/language-server/generated/module.ts
@@ -1,10 +1,9 @@
 /******************************************************************************
- * This file was generated by langium-cli 2.1.0.
+ * This file was generated by langium-cli 3.0.0.
  * DO NOT EDIT MANUALLY!
  ******************************************************************************/
 
-import type { LangiumGeneratedCoreServices, LangiumGeneratedSharedCoreServices, LanguageMetaData, Module } from 'langium';
-import type { LangiumSharedServices, LangiumServices } from 'langium/lsp';
+import type { LangiumSharedCoreServices, LangiumCoreServices, LangiumGeneratedCoreServices, LangiumGeneratedSharedCoreServices, LanguageMetaData, Module } from 'langium';
 import { RequirementsAndTestsAstReflection } from './ast.js';
 import { RequirementsGrammar, TestsGrammar } from './grammar.js';
 
@@ -20,17 +19,17 @@ export const TestsLanguageMetaData = {
     caseInsensitive: false
 } as const satisfies LanguageMetaData;
 
-export const RequirementsAndTestsGeneratedSharedModule: Module<LangiumSharedServices, LangiumGeneratedSharedCoreServices> = {
+export const RequirementsAndTestsGeneratedSharedModule: Module<LangiumSharedCoreServices, LangiumGeneratedSharedCoreServices> = {
     AstReflection: () => new RequirementsAndTestsAstReflection()
 };
 
-export const RequirementsGeneratedModule: Module<LangiumServices, LangiumGeneratedCoreServices> = {
+export const RequirementsGeneratedModule: Module<LangiumCoreServices, LangiumGeneratedCoreServices> = {
     Grammar: () => RequirementsGrammar(),
     LanguageMetaData: () => RequirementsLanguageMetaData,
     parser: {}
 };
 
-export const TestsGeneratedModule: Module<LangiumServices, LangiumGeneratedCoreServices> = {
+export const TestsGeneratedModule: Module<LangiumCoreServices, LangiumGeneratedCoreServices> = {
     Grammar: () => TestsGrammar(),
     LanguageMetaData: () => TestsLanguageMetaData,
     parser: {}

diff --git a/examples/requirements/src/language-server/requirements-and-tests-lang-module.ts b/examples/requirements/src/language-server/requirements-and-tests-lang-module.ts
@@ -52,5 +52,10 @@ export function createRequirementsAndTestsLangServices(context: DefaultSharedMod
     shared.ServiceRegistry.register(tests);
     registerRequirementsValidationChecks(requirements);
     registerTestsValidationChecks(tests);
+    if (!context.connection) {
+        // We don't run inside a language server
+        // Therefore, initialize the configuration provider instantly
+        shared.workspace.ConfigurationProvider.initialized({});
+    }
     return { shared, requirements, tests };
 }
diff --git a/examples/statemachine/package.json b/examples/statemachine/package.json
@@ -1,7 +1,7 @@
 {
     "name": "langium-statemachine-dsl",
     "displayName": "State Machine DSL",
-    "version": "2.1.0",
+    "version": "3.0.0",
     "description": "Example language built with Langium",
     "homepage": "https://langium.org",
     "engines": {
@@ -59,12 +59,12 @@
     "dependencies": {
         "chalk": "~5.3.0",
         "commander": "~11.0.0",
-        "langium": "~2.1.0",
+        "langium": "~3.0.0",
         "vscode-languageclient": "~9.0.1",
         "vscode-languageserver": "~9.0.1"
     },
     "devDependencies": {
-        "langium-cli": "~2.1.0"
+        "langium-cli": "~3.0.0"
     },
     "volta": {
         "node": "18.17.1",

diff --git a/examples/statemachine/src/language-server/generated/ast.ts b/examples/statemachine/src/language-server/generated/ast.ts
@@ -1,5 +1,5 @@
 /******************************************************************************
- * This file was generated by langium-cli 2.1.0.
+ * This file was generated by langium-cli 3.0.0.
  * DO NOT EDIT MANUALLY!
  ******************************************************************************/
 

diff --git a/examples/statemachine/src/language-server/generated/grammar.ts b/examples/statemachine/src/language-server/generated/grammar.ts
@@ -1,5 +1,5 @@
 /******************************************************************************
- * This file was generated by langium-cli 2.1.0.
+ * This file was generated by langium-cli 3.0.0.
  * DO NOT EDIT MANUALLY!
  ******************************************************************************/
 

diff --git a/examples/statemachine/src/language-server/generated/module.ts b/examples/statemachine/src/language-server/generated/module.ts
@@ -1,10 +1,9 @@
 /******************************************************************************
- * This file was generated by langium-cli 2.1.0.
+ * This file was generated by langium-cli 3.0.0.
  * DO NOT EDIT MANUALLY!
  ******************************************************************************/
 
-import type { LangiumGeneratedCoreServices, LangiumGeneratedSharedCoreServices, LanguageMetaData, Module } from 'langium';
-import type { LangiumSharedServices, LangiumServices } from 'langium/lsp';
+import type { LangiumSharedCoreServices, LangiumCoreServices, LangiumGeneratedCoreServices, LangiumGeneratedSharedCoreServices, LanguageMetaData, Module } from 'langium';
 import { StatemachineAstReflection } from './ast.js';
 import { StatemachineGrammar } from './grammar.js';
 
@@ -14,11 +13,11 @@ export const StatemachineLanguageMetaData = {
     caseInsensitive: false
 } as const satisfies LanguageMetaData;
 
-export const StatemachineGeneratedSharedModule: Module<LangiumSharedServices, LangiumGeneratedSharedCoreServices> = {
+export const StatemachineGeneratedSharedModule: Module<LangiumSharedCoreServices, LangiumGeneratedSharedCoreServices> = {
     AstReflection: () => new StatemachineAstReflection()
 };
 
-export const StatemachineGeneratedModule: Module<LangiumServices, LangiumGeneratedCoreServices> = {
+export const StatemachineGeneratedModule: Module<LangiumCoreServices, LangiumGeneratedCoreServices> = {
     Grammar: () => StatemachineGrammar(),
     LanguageMetaData: () => StatemachineLanguageMetaData,
     parser: {}

diff --git a/examples/statemachine/src/language-server/statemachine-module.ts b/examples/statemachine/src/language-server/statemachine-module.ts
@@ -66,5 +66,10 @@ export function createStatemachineServices(context: DefaultSharedModuleContext):
     );
     shared.ServiceRegistry.register(statemachine);
     registerValidationChecks(statemachine);
+    if (!context.connection) {
+        // We don't run inside a language server
+        // Therefore, initialize the configuration provider instantly
+        shared.workspace.ConfigurationProvider.initialized({});
+    }
     return { shared, statemachine };
 }