move profiles and tools in separated directories

src/language/lsp/document-update-handler.ts

@@ -1,5 +1,4 @@
-import type { TextDocument } from 'langium';
-import { URI } from 'langium';
+import { URI, TextDocument } from 'langium';
 import { DefaultDocumentUpdateHandler } from 'langium/lsp';
 import type { TextDocumentChangeEvent } from 'vscode-languageserver';
 import type { XsmpSharedServices } from '../xsmp-module.js';
@@ -21,12 +20,12 @@ export class XsmpDocumentUpdateHandler extends DefaultDocumentUpdateHandler {
         if (this.serviceRegistry.hasServices(uri)) {
             // Only fire the document generation when the workspace manager is ready
             // Otherwise, we might miss the initial indexing of the workspace
-            this.workspaceManager.ready.then(() => {
-                this.workspaceLock.write(token =>  this.documentGenerator.generate(uri, token));
-            }).catch(err => {
-                // This should never happen, but if it does, we want to know about it
-                console.error('Workspace initialization failed. Could not perform document generation.', err);
-            });
+
+            this.workspaceManager.ready.then(() => this.workspaceLock.read(() => this.documentGenerator.generate(uri)))
+                .catch(err => {
+                    // This should never happen, but if it does, we want to know about it
+                    console.error('Workspace initialization failed. Could not perform document generation.', err);
+                });
 
         }
     }

src/language/generator/cpp/xsmp-sdk-generator.ts → src/language/profiles/xsmp-sdk/generator.ts

@@ -1,6 +1,6 @@
-import { GapPatternCppGenerator } from './gap-pattern-generator.js';
+import { GapPatternCppGenerator } from '../../generator/cpp/gap-pattern-generator.js';
 import type { XsmpSharedServices } from '../../xsmp-module.js';
-import { CxxStandard } from './generator.js';
+import { CxxStandard } from '../../generator/cpp/generator.js';
 import type * as ast from '../../generated/ast.js';
 
 import { expandToString as s } from 'langium/generate';

src/language/generator/smp/generator.ts → src/language/tools/smp/generator.ts

@@ -10,7 +10,7 @@ import { AstUtils, UriUtils } from 'langium';
 import * as fs from 'fs';
 import * as Solver from '../../utils/solver.js';
 import { Duration, Instant } from '@js-joda/core';
-import type { TaskAcceptor, XsmpGenerator } from '../generator.js';
+import type { TaskAcceptor, XsmpGenerator } from '../../generator/generator.js';
 import { create } from 'xmlbuilder2';
 
 export class SmpGenerator implements XsmpGenerator {

src/language/workspace/document-generator.ts

@@ -3,10 +3,10 @@ import type { Cancellation, DocumentBuilder, IndexManager, LangiumDocument, Lang
 import * as ast from '../generated/ast.js';
 import { findProjectContainingUri } from '../utils/project-utils.js';
 import { DiagnosticSeverity } from 'vscode-languageserver';
-import { SmpGenerator } from '../generator/smp/generator.js';
+import { SmpGenerator } from '../tools/smp/generator.js';
 import pLimit from 'p-limit';
 import type { Task, TaskAcceptor } from '../generator/generator.js';
-import { XsmpSdkGenerator } from '../generator/cpp/xsmp-sdk-generator.js';
+import { XsmpSdkGenerator } from '../profiles/xsmp-sdk/generator.js';
 import type { XsmpSharedServices } from '../xsmp-module.js';
 
 const limit = pLimit(8);
@@ -32,7 +32,7 @@ export class XsmpDocumentGenerator {
         return document.state === DocumentState.Validated && document.parseResult.parserErrors.length === 0 && !document.diagnostics?.some(d => d.severity === DiagnosticSeverity.Error);
     }
 
-    async generate(uri: URI, _cancelToken: Cancellation.CancellationToken): Promise<void> {
+    async generate(uri: URI, _cancelToken?: Cancellation.CancellationToken): Promise<void> {
         const document = this.langiumDocuments.getDocument(uri);
         if (!document || !this.isValid(document)) {
             return;