Merge pull request #43 from lstreckeisen/CMI-90-Relationship-arrows-aren-t-included-in-autocomplete

Cmi 90 relationship arrows aren t included in autocomplete

Author: lstreckeisen

.eslintrc.json

@@ -61,7 +61,7 @@ jobs:
         uses: JetBrains/qodana-action@v2024.3
         with:
           pr-mode: false
-          args: --linter,jetbrains/qodana-js:2024.3
+          args: --baseline,qodana.serif.json,--fail-threshold,2
         env:
           QODANA_TOKEN: ${{ secrets.QODANA_TOKEN_379728607 }}
           QODANA_ENDPOINT: 'https://qodana.cloud'

.github/workflows/build.yml

@@ -0,0 +1,31 @@
+import eslint from '@eslint/js'
+import typescriptEslint from 'typescript-eslint';
+
+export default typescriptEslint.config({
+        ignores: [
+            'esbuild.mjs',
+            'eslint.config.mjs',
+            '**/generated/**'
+        ],
+    },
+    eslint.configs.recommended,
+    typescriptEslint.configs.recommendedTypeChecked,
+    typescriptEslint.configs.stylisticTypeChecked,
+    {
+        languageOptions: {
+            parserOptions: {
+                project: ['./tsconfig.json']
+            }
+        },
+        rules: {
+            '@typescript-eslint/no-unused-vars': [
+                'error',
+                {
+                    'argsIgnorePattern': '^_',
+                    'varsIgnorePattern': '^_',
+                    'caughtErrorsIgnorePattern': '^_'
+                }
+            ]
+        }
+    }
+);

.yarn/install-state.gz

@@ -32,26 +32,23 @@
         "clean": "rm -rf src/language/generated && rm -rf cml-ls/ && rm -rf dist/"
     },
     "dependencies": {
-        "langium": "~3.4.0",
+        "langium": "~3.5.0",
         "vscode-languageserver": "~9.0.1",
         "vscode-languageserver-types": "~3.17.5"
     },
     "devDependencies": {
-        "@types/node": "^18.0.0",
-        "@typescript-eslint/eslint-plugin": "~7.3.1",
-        "@typescript-eslint/parser": "~7.3.1",
+        "@eslint/js": "^9.26.0",
+        "@types/node": "^22.15.17",
         "@vercel/ncc": "^0.38.3",
-        "@vitest/coverage-v8": "^3.1.1",
-        "concurrently": "~8.2.1",
-        "esbuild": "~0.20.2",
-        "eslint": "~8.57.0",
-        "eslint-config-standard": "^17.1.0",
-        "eslint-plugin-import": "^2.31.0",
-        "eslint-plugin-n": "^17.17.0",
-        "eslint-plugin-promise": "^7.2.1",
-        "langium-cli": "~3.4.0",
-        "typescript": "~5.1.6",
-        "vitest": "^3.1.1"
+        "@vitest/coverage-v8": "^3.1.3",
+        "concurrently": "~9.1.2",
+        "esbuild": "~0.25.4",
+        "eslint": "~9.26.0",
+        "jiti": "^2.4.2",
+        "langium-cli": "~3.5.0",
+        "typescript": "~5.8.3",
+        "typescript-eslint": "^8.32.0",
+        "vitest": "^3.1.3"
     },
     "packageManager": "yarn@4.8.1"
 }

eslint.config.mjs

@@ -21,15 +21,16 @@ import { KeywordHoverRegistry } from './hover/KeywordHoverRegistry.js'
 import { ContextMapperDslNodeKindProvider } from './shared/ContextMapperDslNodeKindProvider.js'
 import { ContextMapperDslFormatter } from './formatting/ContextMapperDslFormatter.js'
 import { ContextMapperFormatterRegistry } from './formatting/ContextMapperFormatterRegistry.js'
+import { ContextMapperDslCompletionProvider } from './completion/ContextMapperDslCompletionProvider.js'
 
 /**
  * Declaration of custom services - add your own service classes here.
  */
-export type ContextMapperDslAddedServices = {
+export interface ContextMapperDslAddedServices {
   validation: {
     ContextMapperDslValidator: ContextMapperDslValidator
   }
-};
+}
 
 /**
  * Union of Langium default services and your custom services - use this as constructor parameter
@@ -57,7 +58,8 @@ export const ContextMapperDslModule: Module<ContextMapperDslServices, ModuleType
     SemanticTokenProvider: (services) => new ContextMapperDslSemanticTokenProvider(services, semanticTokenProviderRegistry),
     FoldingRangeProvider: (services) => new ContextMapperDslFoldingRangeProvider(services),
     HoverProvider: (services) => new ContextMapperDslHoverProvider(services, new KeywordHoverRegistry()),
-    Formatter: () => new ContextMapperDslFormatter(new ContextMapperFormatterRegistry())
+    Formatter: () => new ContextMapperDslFormatter(new ContextMapperFormatterRegistry()),
+    CompletionProvider: (services) => new ContextMapperDslCompletionProvider(services)
   },
   references: {
     ScopeProvider: (services) => new ContextMapperDslScopeProvider(services),
@@ -102,7 +104,7 @@ export function createContextMapperDslServices (context: DefaultSharedModuleCont
   if (!context.connection) {
     // We don't run inside a language server
     // Therefore, initialize the configuration provider instantly
-    shared.workspace.ConfigurationProvider.initialized({})
+    void shared.workspace.ConfigurationProvider.initialized({})
   }
   return { shared, ContextMapperDsl }
 }

package.json

@@ -0,0 +1,13 @@
+import { CompletionContext, DefaultCompletionProvider } from 'langium/lsp'
+import { GrammarAST } from 'langium'
+
+export class ContextMapperDslCompletionProvider extends DefaultCompletionProvider {
+  /*
+  Langium hides non-alphabetical keywords by default. (see https://github.com/eclipse-langium/langium/pull/697)
+  This causes relationship arrows like '<->' to not be suggested in autocomplete.
+  Overriding this function allows all keywords to be suggested.
+   */
+  protected override filterKeyword (_context: CompletionContext, _keyword: GrammarAST.Keyword): boolean {
+    return true
+  }
+}

src/language/ContextMapperDslModule.ts

@@ -6,6 +6,7 @@ import { KeywordHoverRegistry } from './KeywordHoverRegistry.js'
 
 export class ContextMapperDslHoverProvider extends MultilineCommentHoverProvider {
   private readonly _keywordHoverRegistry: KeywordHoverRegistry
+
   constructor (services: LangiumServices, keywordHoverRegistry: KeywordHoverRegistry) {
     super(services)
     this._keywordHoverRegistry = keywordHoverRegistry

src/language/completion/ContextMapperDslCompletionProvider.ts

@@ -1,5 +1,5 @@
 export class KeywordHoverRegistry {
-  private readonly _registry: Map<string, string> = new Map([
+  private readonly _registry = new Map<string, string>([
     [
       'BoundedContext',
       `**Bounded Context**: A description of a boundary (typically a subsystem, or the work of a particular team) within which a particular model is defined and applicable. \

src/language/hover/ContextMapperDslHoverProvider.ts

@@ -7,7 +7,10 @@ import { createContextMapperDslServices } from './ContextMapperDslModule.js'
 const connection = createConnection(ProposedFeatures.all)
 
 // Inject the shared services and language-specific services
-const { shared } = createContextMapperDslServices({ connection, ...NodeFileSystem })
+const { shared } = createContextMapperDslServices({
+  connection,
+  ...NodeFileSystem
+})
 
 // Start the language server with the shared services
 startLanguageServer(shared)