Improvements for cancelable operations

- Use performance.now() for time measurements
- Use the startCancelableOperation function to reset the lastTick variable

packages/langium/src/utils/promise-utils.ts

@@ -74,7 +74,7 @@ export async function interruptAndCheck(token: CancellationToken): Promise<void>
         // Early exit in case cancellation was disabled by the caller
         return;
     }
-    const current = Date.now();
+    const current = performance.now();
     if (current - lastTick >= globalInterruptionPeriod) {
         lastTick = current;
         await delayNextTick();

packages/langium/src/workspace/workspace-lock.ts

@@ -4,8 +4,8 @@
  * terms of the MIT License, which is available in the project root.
  ******************************************************************************/
 
-import { CancellationToken, CancellationTokenSource } from '../utils/cancellation.js';
-import { Deferred, isOperationCancelled, type MaybePromise } from '../utils/promise-utils.js';
+import { type AbstractCancellationTokenSource, CancellationToken, CancellationTokenSource } from '../utils/cancellation.js';
+import { Deferred, isOperationCancelled, startCancelableOperation, type MaybePromise } from '../utils/promise-utils.js';
 
 /**
  * Utility service to execute mutually exclusive actions.
@@ -47,14 +47,14 @@ interface LockEntry {
 
 export class DefaultWorkspaceLock implements WorkspaceLock {
 
-    private previousTokenSource = new CancellationTokenSource();
+    private previousTokenSource: AbstractCancellationTokenSource = new CancellationTokenSource();
     private writeQueue: LockEntry[] = [];
     private readQueue: LockEntry[] = [];
     private done = true;
 
     write(action: (token: CancellationToken) => MaybePromise<void>): Promise<void> {
         this.cancelWrite();
-        const tokenSource = new CancellationTokenSource();
+        const tokenSource = startCancelableOperation();
         this.previousTokenSource = tokenSource;
         return this.enqueue(this.writeQueue, action, tokenSource.token);
     }

packages/langium/test/parser/worker-thread-async-parser.test.ts

@@ -9,8 +9,8 @@ import { WorkerThreadAsyncParser } from 'langium/node';
 import { createLangiumGrammarServices } from 'langium/grammar';
 import type { Grammar, LangiumCoreServices, ParseResult } from 'langium';
 import type { LangiumServices } from 'langium/lsp';
-import { EmptyFileSystem, GrammarUtils, CstUtils, GrammarAST, isOperationCancelled } from 'langium';
-import { CancellationToken, CancellationTokenSource } from 'vscode-languageserver';
+import { EmptyFileSystem, GrammarUtils, CstUtils, GrammarAST, isOperationCancelled, startCancelableOperation } from 'langium';
+import { CancellationToken } from 'vscode-languageserver';
 import { fail } from 'node:assert';
 import { fileURLToPath } from 'node:url';
 
@@ -46,16 +46,16 @@ describe('WorkerThreadAsyncParser', () => {
         // This file should take a few seconds to parse
         const file = createLargeFile(100000);
         const asyncParser = services.parser.AsyncParser;
-        const cancellationTokenSource = new CancellationTokenSource();
+        const cancellationTokenSource = startCancelableOperation();
         setTimeout(() => cancellationTokenSource.cancel(), 50);
-        const start = Date.now();
+        const start = performance.now();
         try {
             await asyncParser.parse<Grammar>(file, cancellationTokenSource.token);
             fail('Parsing should have been cancelled');
         } catch (err) {
             expect(isOperationCancelled(err)).toBe(true);
         }
-        const end = Date.now();
+        const end = performance.now();
         // The whole parsing process should have been successfully cancelled within a second
         expect(end - start).toBeLessThan(1000);
     });
@@ -65,7 +65,7 @@ describe('WorkerThreadAsyncParser', () => {
         // This file should take a few seconds to parse
         const file = createLargeFile(100000);
         const asyncParser = services.parser.AsyncParser;
-        const cancellationTokenSource = new CancellationTokenSource();
+        const cancellationTokenSource = startCancelableOperation();
         setTimeout(() => cancellationTokenSource.cancel(), 50);
         try {
             await asyncParser.parse<Grammar>(file, cancellationTokenSource.token);

packages/langium/test/workspace/document-builder.test.ts

@@ -5,10 +5,10 @@
  ******************************************************************************/
 
 import type { AstNode, DocumentBuilder, FileSystemProvider, LangiumDocument, LangiumDocumentFactory, LangiumDocuments, Module, Reference, ValidationChecks } from 'langium';
-import { AstUtils, DocumentState, TextDocument, URI, isOperationCancelled } from 'langium';
+import { AstUtils, DocumentState, TextDocument, URI, isOperationCancelled, startCancelableOperation } from 'langium';
 import { createServicesForGrammar } from 'langium/grammar';
 import { describe, expect, test, vi, beforeEach, afterEach } from 'vitest';
-import { CancellationToken, CancellationTokenSource } from 'vscode-languageserver';
+import { CancellationToken } from 'vscode-languageserver';
 import { fail } from 'assert';
 import type { LangiumServices, LangiumSharedServices, TextDocuments } from 'langium/lsp';
 
@@ -147,7 +147,7 @@ describe('DefaultDocumentBuilder', () => {
         documents.addDocument(document2);
 
         const builder = workspace.DocumentBuilder;
-        const tokenSource1 = new CancellationTokenSource();
+        const tokenSource1 = startCancelableOperation();
         builder.onBuildPhase(DocumentState.IndexedContent, () => {
             tokenSource1.cancel();
         });
@@ -316,7 +316,7 @@ describe('DefaultDocumentBuilder', () => {
         documents.addDocument(document);
 
         const actual: string[] = [];
-        const cancelTokenSource = new CancellationTokenSource();
+        const cancelTokenSource = startCancelableOperation();
         function wait(state: DocumentState): void {
             builder.onBuildPhase(state, async () => {
                 actual.push('B' + state);
@@ -351,7 +351,7 @@ describe('DefaultDocumentBuilder', () => {
         const document = documentFactory.fromString('', URI.parse('file:///test1.txt'));
         documents.addDocument(document);
 
-        const cancelTokenSource = new CancellationTokenSource();
+        const cancelTokenSource = startCancelableOperation();
         builder.waitUntil(DocumentState.IndexedReferences, cancelTokenSource.token).then(() => {
             fail('The test should fail here because the cancellation should reject the promise');
         }).catch(err => {
@@ -413,7 +413,7 @@ describe('DefaultDocumentBuilder', () => {
         documents.addDocument(document2);
 
         const builder = services.shared.workspace.DocumentBuilder;
-        const tokenSource = new CancellationTokenSource();
+        const tokenSource = startCancelableOperation();
 
         const buildPhases = new Set<DocumentState>();
 
@@ -493,7 +493,7 @@ describe('DefaultDocumentBuilder', () => {
         `, URI.parse('file:///test1.txt'));
         documents.addDocument(document);
 
-        const tokenSource = new CancellationTokenSource();
+        const tokenSource = startCancelableOperation();
         const builder = workspace.DocumentBuilder;
         builder.onBuildPhase(DocumentState.ComputedScopes, () => {
             tokenSource.cancel();

packages/langium/test/workspace/workspace-lock.test.ts

@@ -59,10 +59,10 @@ describe('WorkspaceLock', () => {
 
     test('Write action results can be awaited', async () => {
         const mutex = new DefaultWorkspaceLock();
-        const now = Date.now();
+        const now = performance.now();
         const magicalNumber = await mutex.read(() => new Promise(resolve => setTimeout(() => resolve(42), 10)));
         // Confirm that at least 10ms have elapsed
-        expect(Date.now() - now).toBeGreaterThanOrEqual(10);
+        expect(performance.now() - now).toBeGreaterThanOrEqual(10);
         // Confirm the returned value
         expect(magicalNumber).toBe(42);
     });