@theia/api-tests 1.65.0-next.6 → 1.66.0-next.0

package/package.json

@@ -1,9 +1,9 @@
 {
   "name": "@theia/api-tests",
-  "version": "1.65.0-next.6+4384a9461",
+  "version": "1.66.0-next.0+008c83404",
   "description": "Theia API tests",
   "dependencies": {
-    "@theia/core": "1.65.0-next.6+4384a9461"
+    "@theia/core": "1.66.0-next.0+008c83404"
   },
   "license": "EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0",
   "repository": {
@@ -20,5 +20,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "4384a946123dd1b41e65708e58928fc1af707c8d"
+  "gitHead": "008c8340465f7e42298839881d814863bef0b039"
 }

package/src/launch-preferences.spec.js

@@ -26,16 +26,17 @@
  * See https://github.com/akosyakov/vscode-launch/blob/master/src/test/extension.test.ts
  */
 describe('Launch Preferences', function () {
-    this.timeout(10_000);
+    this.timeout(30_000);
 
     const { assert } = chai;
 
-    const { PreferenceProvider } = require('@theia/core/lib/browser');
-    const { PreferenceService, PreferenceScope } = require('@theia/core/lib/browser/preferences/preference-service');
+    const { PreferenceProvider } = require('@theia/core/lib/common');
+    const { PreferenceService } = require('@theia/core/lib/common/preferences/preference-service');
+    const { PreferenceScope } = require('@theia/core/lib/common/preferences/preference-scope');
     const { WorkspaceService } = require('@theia/workspace/lib/browser/workspace-service');
     const { FileService } = require('@theia/filesystem/lib/browser/file-service');
     const { FileResourceResolver } = require('@theia/filesystem/lib/browser/file-resource');
-    const { AbstractResourcePreferenceProvider } = require('@theia/preferences/lib/browser/abstract-resource-preference-provider');
+    const { AbstractResourcePreferenceProvider } = require('@theia/preferences/lib/common/abstract-resource-preference-provider');
     const { waitForEvent } = require('@theia/core/lib/common/promise-util');
 
     const container = window.theia.container;
@@ -431,7 +432,7 @@ describe('Launch Preferences', function () {
         }
     }
 
-    function deleteWorkspacePreferences() {
+    async function deleteWorkspacePreferences() {
         const promises = [];
         for (const configPath of ['.theia', '.vscode']) {
             for (const name of ['settings', 'launch']) {
@@ -441,7 +442,11 @@ describe('Launch Preferences', function () {
                     try {
                         if (provider) {
                             if (provider.valid) {
-                                await waitForEvent(provider.onDidChangeValidity, 5000);
+                                try {
+                                    await waitForEvent(provider.onDidChangeValidity, 1000);
+                                } catch (e) {
+                                    console.log('timed out waiting for validity change'); // sometimes, we seen to miss events: https://github.com/eclipse-theia/theia/issues/16088
+                                }
                             }
                             await provider['readPreferencesFromFile']();
                             await provider['fireDidPreferencesChanged']();
@@ -454,11 +459,10 @@ describe('Launch Preferences', function () {
                 })());
             }
         }
-        return Promise.all([
-            ...promises,
-            fileService.delete(rootUri.resolve('.theia'), { fromUserGesture: false, recursive: true }).catch(() => { }),
-            fileService.delete(rootUri.resolve('.vscode'), { fromUserGesture: false, recursive: true }).catch(() => { })
-        ]);
+
+        await fileService.delete(rootUri.resolve('.theia'), { fromUserGesture: false, recursive: true }).catch(() => { });
+        await fileService.delete(rootUri.resolve('.vscode'), { fromUserGesture: false, recursive: true }).catch(() => { });
+        await Promise.all(promises);
     }
 
 
@@ -574,7 +578,7 @@ describe('Launch Preferences', function () {
                 await Promise.all(promises);
             });
 
-            after(() => deleteWorkspacePreferences());
+            after(async () => await deleteWorkspacePreferences());
 
             const testItOnly = !!only ? it.only : it;
             const testIt = testItOnly;
@@ -724,5 +728,4 @@ describe('Launch Preferences', function () {
         });
 
     }
-
 });

package/src/monaco-api.spec.js

@@ -14,6 +14,7 @@
 // SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
 // *****************************************************************************
 
+const { timeout } = require('@theia/core/lib/common/promise-util');
 const { IOpenerService } = require('@theia/monaco-editor-core/esm/vs/platform/opener/common/opener');
 
 // @ts-check
@@ -34,7 +35,6 @@ describe('Monaco API', async function () {
     const { TokenizationRegistry } = require('@theia/monaco-editor-core/esm/vs/editor/common/languages');
     const { MonacoContextKeyService } = require('@theia/monaco/lib/browser/monaco-context-key-service');
     const { URI } = require('@theia/monaco-editor-core/esm/vs/base/common/uri');
-    const { animationFrame } = require('@theia/core/lib/browser/browser');
 
     const container = window.theia.container;
     const editorManager = container.get(EditorManager);
@@ -190,7 +190,7 @@ describe('Monaco API', async function () {
             assert.isTrue(contextKeys.match(inQuickOpenContextKey));
 
             await commands.executeCommand(CommandThatChangesFocus);
-            await animationFrame();
+            await timeout(0);
             assert.isFalse(contextKeys.match(inQuickOpenContextKey));
         }
     });

package/src/preferences.spec.js

@@ -19,27 +19,29 @@
 describe('Preferences', function () {
     this.timeout(5_000);
     const { assert } = chai;
-    const { PreferenceProvider } = require('@theia/core/lib/browser/preferences/preference-provider');
-    const { PreferenceService, PreferenceScope } = require('@theia/core/lib/browser/preferences/preference-service');
+    const { PreferenceProvider } = require('@theia/core/lib/common/preferences/preference-provider');
+    const { PreferenceService, PreferenceScope } = require('@theia/core/lib/common/preferences');
     const { FileService } = require('@theia/filesystem/lib/browser/file-service');
-    const { PreferenceLanguageOverrideService } = require('@theia/core/lib/browser/preferences/preference-language-override-service');
+    const { PreferenceLanguageOverrideService } = require('@theia/core/lib/common/preferences/preference-language-override-service');
     const { MonacoTextModelService } = require('@theia/monaco/lib/browser/monaco-text-model-service');
-    const { PreferenceSchemaProvider } = require('@theia/core/lib/browser/preferences/preference-contribution')
+    const { PreferenceSchemaService } = require('@theia/core/lib/common/preferences')
     const { container } = window.theia;
-    /** @type {import ('@theia/core/lib/browser/preferences/preference-service').PreferenceService} */
+    /** @type {import ('@theia/core/lib/common/preferences/preference-service').PreferenceService} */
     const preferenceService = container.get(PreferenceService);
-    /** @type {import ('@theia/core/lib/browser/preferences/preference-language-override-service').PreferenceLanguageOverrideService} */
+    /** @type {import ('@theia/core/lib/common/preferences/preference-language-override-service').PreferenceLanguageOverrideService} */
     const overrideService = container.get(PreferenceLanguageOverrideService);
     const fileService = container.get(FileService);
     /** @type {import ('@theia/core/lib/common/uri').default} */
     const uri = preferenceService.getConfigUri(PreferenceScope.Workspace);
     /** @type {import('@theia/preferences/lib/browser/folders-preferences-provider').FoldersPreferencesProvider} */
     const folderPreferences = container.getNamed(PreferenceProvider, PreferenceScope.Folder);
-    /** @type PreferenceSchemaProvider */
-    const schemaProvider = container.get(PreferenceSchemaProvider);
+    /** @type PreferenceSchemaService */
+    const schemaService = container.get(PreferenceSchemaService);
     const modelService = container.get(MonacoTextModelService);
 
+
     const overrideIdentifier = 'bargle-noddle-zaus'; // Probably not in our preference files...
+    schemaService.registerOverrideIdentifier(overrideIdentifier);
     const tabSize = 'editor.tabSize';
     const fontSize = 'editor.fontSize';
     const override = overrideService.markLanguageOverride(overrideIdentifier);
@@ -91,7 +93,7 @@ describe('Preferences', function () {
         assert.isDefined(uri, 'The workspace config URI should be defined!');
         fileExistsBeforehand = await fileService.exists(uri);
         contentBeforehand = await fileService.read(uri).then(({ value }) => value).catch(() => '');
-        schemaProvider.registerOverrideIdentifier(overrideIdentifier);
+        schemaService.registerOverrideIdentifier(overrideIdentifier);
         await deleteAllValues();
     });
 

package/src/saveable.spec.js

@@ -22,14 +22,14 @@ describe('Saveable', function () {
 
     const { EditorManager } = require('@theia/editor/lib/browser/editor-manager');
     const { EditorWidget } = require('@theia/editor/lib/browser/editor-widget');
-    const { PreferenceService } = require('@theia/core/lib/browser/preferences/preference-service');
+    const { PreferenceService } = require('@theia/core/lib/common/preferences/preference-service');
     const { Saveable, SaveableWidget } = require('@theia/core/lib/browser/saveable');
     const { WorkspaceService } = require('@theia/workspace/lib/browser/workspace-service');
     const { FileService } = require('@theia/filesystem/lib/browser/file-service');
     const { FileResource } = require('@theia/filesystem/lib/browser/file-resource');
     const { ETAG_DISABLED } = require('@theia/filesystem/lib/common/files');
     const { MonacoEditor } = require('@theia/monaco/lib/browser/monaco-editor');
-    const { Deferred } = require('@theia/core/lib/common/promise-util');
+    const { Deferred, timeout } = require('@theia/core/lib/common/promise-util');
     const { Disposable, DisposableCollection } = require('@theia/core/lib/common/disposable');
     const { Range } = require('@theia/monaco-editor-core/esm/vs/editor/common/core/range');
 
@@ -38,7 +38,7 @@ describe('Saveable', function () {
     const editorManager = container.get(EditorManager);
     const workspaceService = container.get(WorkspaceService);
     const fileService = container.get(FileService);
-    /** @type {import('@theia/core/lib/browser/preferences/preference-service').PreferenceService} */
+    /** @type {import('@theia/core/lib/common/preferences/preference-service').PreferenceService} */
     const preferences = container.get(PreferenceService);
 
     /** @type {EditorWidget & SaveableWidget} */
@@ -73,9 +73,19 @@ describe('Saveable', function () {
         await preferences.set('files.autoSave', 'off', undefined, rootUri.toString());
         await preferences.set(closeOnFileDelete, true);
         await editorManager.closeAll({ save: false });
+        const watcher = fileService.watch(fileUri); // create/delete events are sometimes coalesced on Mac
+        const gotCreate = new Deferred();
+        const listener = fileService.onDidFilesChange(e => {
+            if (e.contains(fileUri, { type: 1 })) { // FileChangeType.ADDED
+                gotCreate.resolve();
+            }
+        });
         await fileService.create(fileUri, 'foo', { fromUserGesture: false, overwrite: true });
-        widget =  /** @type {EditorWidget & SaveableWidget} */
-            (await editorManager.open(fileUri, { mode: 'reveal' }));
+        await Promise.race([await timeout(2000), gotCreate.promise]);
+        watcher.dispose();
+        listener.dispose();
+
+        widget =  /** @type {EditorWidget & SaveableWidget} */ (await editorManager.open(fileUri, { mode: 'reveal' }));
         editor = /** @type {MonacoEditor} */ (MonacoEditor.get(widget));
     });
 
@@ -499,5 +509,4 @@ describe('Saveable', function () {
             listener.dispose();
         }
     });
-
 });

package/src/scm.spec.js

@@ -14,12 +14,13 @@
 // SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
 // *****************************************************************************
 
+const { timeout } = require('@theia/core/lib/common/promise-util');
+
 // @ts-check
 describe('SCM', function () {
 
     const { assert } = chai;
 
-    const { animationFrame } = require('@theia/core/lib/browser/browser');
     const { HostedPluginSupport } = require('@theia/plugin-ext/lib/hosted/browser/hosted-plugin');
     const Uri = require('@theia/core/lib/common/uri');
     const { ApplicationShell } = require('@theia/core/lib/browser/shell/application-shell');
@@ -55,30 +56,20 @@ describe('SCM', function () {
          * @param {string | undefined} [message]
          * @returns {Promise<void>}
          */
-    function waitForAnimation(condition, timeout, message) {
-        const success = new Promise(async (resolve, reject) => {
-            if (timeout === undefined) {
-                timeout = 100000;
+    async function waitForAnimation(condition, maxWait, message) {
+        if (maxWait === undefined) {
+            maxWait = 100000;
+        }
+        const endTime = Date.now() + maxWait;
+        do {
+            await (timeout(100));
+            if (condition()) {
+                return true;
             }
-
-            let timedOut = false;
-            const handle = setTimeout(() => {
-                console.log(message);
-                timedOut = true;
-            }, timeout);
-
-            do {
-                await animationFrame();
-            } while (!timedOut && !condition());
-            if (timedOut) {
-                reject(new Error(message ?? 'Wait for animation timed out.'));
-            } else {
-                clearTimeout(handle);
-                resolve(undefined);
+            if (Date.now() > endTime) {
+                throw new Error(message ?? 'Wait for animation timed out.');
             }
-
-        });
-        return success;
+        } while (true);
     }
 
 

package/src/typescript.spec.js

@@ -16,10 +16,11 @@
 
 // @ts-check
 describe('TypeScript', function () {
-    this.timeout(200_000);
+    this.timeout(360_000);
 
     const { assert } = chai;
     const { timeout } = require('@theia/core/lib/common/promise-util');
+    const { MenuModelRegistry } = require('@theia/core/lib/common/menu/menu-model-registry');
 
     const Uri = require('@theia/core/lib/common/uri');
     const { DisposableCollection } = require('@theia/core/lib/common/disposable');
@@ -34,8 +35,8 @@ describe('TypeScript', function () {
     const { CommandRegistry } = require('@theia/core/lib/common/command');
     const { KeybindingRegistry } = require('@theia/core/lib/browser/keybinding');
     const { OpenerService, open } = require('@theia/core/lib/browser/opener-service');
-    const { animationFrame } = require('@theia/core/lib/browser/browser');
-    const { PreferenceService, PreferenceScope } = require('@theia/core/lib/browser/preferences/preference-service');
+    const { PreferenceService } = require('@theia/core/lib/common/preferences/preference-service');
+    const { PreferenceScope } = require('@theia/core/lib/common/preferences/preference-scope');
     const { ProgressStatusBarItem } = require('@theia/core/lib/browser/progress-status-bar-item');
     const { PluginViewRegistry } = require('@theia/plugin-ext/lib/main/browser/view/plugin-view-registry');
     const { Range } = require('@theia/monaco-editor-core/esm/vs/editor/common/core/range');
@@ -45,13 +46,14 @@ describe('TypeScript', function () {
     const editorManager = container.get(EditorManager);
     const workspaceService = container.get(WorkspaceService);
     const menuFactory = container.get(BrowserMainMenuFactory);
+    const menuRegistry = container.get(MenuModelRegistry);
     const pluginService = container.get(HostedPluginSupport);
     const contextKeyService = container.get(ContextKeyService);
     const commands = container.get(CommandRegistry);
     const openerService = container.get(OpenerService);
     /** @type {KeybindingRegistry} */
     const keybindings = container.get(KeybindingRegistry);
-    /** @type {import('@theia/core/lib/browser/preferences/preference-service').PreferenceService} */
+    /** @type {import('@theia/core/lib/common/preferences/preference-service').PreferenceService} */
     const preferences = container.get(PreferenceService);
     const progressStatusBarItem = container.get(ProgressStatusBarItem);
     /** @type {PluginViewRegistry} */
@@ -59,7 +61,6 @@ describe('TypeScript', function () {
 
     const typescriptPluginId = 'vscode.typescript-language-features';
     const referencesPluginId = 'vscode.references-view';
-    const eslintPluginId = 'dbaeumer.vscode-eslint';
     /** @type Uri.URI */
     const rootUri = workspaceService.tryGetRoots()[0].resource;
     const demoFileUri = rootUri.resolveToAbsolute('../api-tests/test-ts-workspace/demo-file.ts');
@@ -68,7 +69,7 @@ describe('TypeScript', function () {
 
     before(async function () {
         await pluginService.didStart;
-        await Promise.all([typescriptPluginId, referencesPluginId, eslintPluginId].map(async pluginId => {
+        await Promise.all([typescriptPluginId, referencesPluginId].map(async pluginId => {
             if (!pluginService.getPlugin(pluginId)) {
                 throw new Error(pluginId + ' should be started');
             }
@@ -123,43 +124,33 @@ describe('TypeScript', function () {
         assert.isDefined(editor);
         // wait till tsserver is running, see:
         // https://github.com/microsoft/vscode/blob/93cbbc5cae50e9f5f5046343c751b6d010468200/extensions/typescript-language-features/src/extension.ts#L98-L103
-        await waitForAnimation(() => contextKeyService.match('typescript.isManagedFile'));
+        await waitForAnimation(() => contextKeyService.match('typescript.isManagedFile'), 1000000, 'waiting for "typescript.isManagedFile"');
 
         waitLanguageServerReady();
         return /** @type {MonacoEditor} */ (editor);
     }
 
+
     /**
-     * @param {() => Promise<unknown> | unknown} condition
-     * @param {number | undefined} [timeout]
-     * @param {string | undefined} [message]
-     * @returns {Promise<void>}
-     */
-    function waitForAnimation(condition, timeout, message) {
-        const success = new Promise(async (resolve, reject) => {
-            if (timeout === undefined) {
-                timeout = 100000;
+         * @param {() => unknown} condition
+         * @param {number | undefined} [maxWait]
+         * @param {string | function | undefined} [message]
+         * @returns {Promise<void>}
+         */
+    async function waitForAnimation(condition, maxWait, message) {
+        if (maxWait === undefined) {
+            maxWait = 100000;
+        }
+        const endTime = Date.now() + maxWait;
+        do {
+            await (timeout(100));
+            if (condition()) {
+                return;
             }
-
-            let timedOut = false;
-            const handle = setTimeout(() => {
-                console.log(message);
-                timedOut = true;
-            }, timeout);
-
-            toTearDown.push({ dispose: () => reject(message ?? 'Test terminated before resolution.') });
-            do {
-                await animationFrame();
-            } while (!timedOut && !condition());
-            if (timedOut) {
-                reject(new Error(message ?? 'Wait for animation timed out.'));
-            } else {
-                clearTimeout(handle);
-                resolve(undefined);
+            if (Date.now() > endTime) {
+                throw new Error((typeof message === 'function' ? message() : message) ?? 'Wait for animation timed out.');
             }
-
-        });
-        return success;
+        } while (true);
     }
 
     /**
@@ -170,6 +161,9 @@ describe('TypeScript', function () {
      * @returns {string}
      */
     function nodeAsString(element, indentation = '') {
+        if (!element) {
+            return '';
+        }
         const header = element.tagName;
         let body = '';
         const childIndentation = indentation + '  ';
@@ -237,13 +231,13 @@ describe('TypeScript', function () {
 
     it('document formatting should be visible and enabled', async function () {
         await openEditor(demoFileUri);
-        const menu = menuFactory.createContextMenu(EDITOR_CONTEXT_MENU);
+        const menu = menuFactory.createContextMenu(EDITOR_CONTEXT_MENU, menuRegistry.getMenu(EDITOR_CONTEXT_MENU), contextKeyService);
         const item = menu.items.find(i => i.command === 'editor.action.formatDocument');
         if (item) {
-            assert.isTrue(item.isVisible);
-            assert.isTrue(item.isEnabled);
+            assert.isTrue(item.isVisible, 'item is visible');
+            assert.isTrue(item.isEnabled, 'item is enabled');
         } else {
-            assert.isDefined(item);
+            assert.isDefined(item, 'item is defined');
         }
     });
 
@@ -253,8 +247,8 @@ describe('TypeScript', function () {
             it('within ' + from, async function () {
                 const editor = await openEditor(demoFileUri, preview);
                 // const demoInstance = new Demo|Class('demo');
-                editor.getControl().setPosition({ lineNumber: 24, column: 30 });
-                assert.equal(editor.getControl().getModel().getWordAtPosition(editor.getControl().getPosition()).word, 'DemoClass');
+                editor.getControl().setPosition({ lineNumber: 28, column: 5 });
+                assert.equal(editor.getControl().getModel().getWordAtPosition(editor.getControl().getPosition()).word, 'demoVariable');
 
                 await commands.executeCommand('editor.action.revealDefinition');
 
@@ -263,8 +257,8 @@ describe('TypeScript', function () {
                 assert.equal(activeEditor.uri.toString(), demoFileUri.toString());
                 // constructor(someString: string) {
                 const { lineNumber, column } = activeEditor.getControl().getPosition();
-                assert.deepEqual({ lineNumber, column }, { lineNumber: 11, column: 5 });
-                assert.equal(activeEditor.getControl().getModel().getWordAtPosition({ lineNumber, column }).word, 'constructor');
+                assert.deepEqual({ lineNumber, column }, { lineNumber: 26, column: 7 });
+                assert.equal(activeEditor.getControl().getModel().getWordAtPosition({ lineNumber, column }).word, 'demoVariable');
             });
 
             // Note: this test generate annoying but apparently harmless error traces, during cleanup:
@@ -410,7 +404,7 @@ describe('TypeScript', function () {
         const suggestController = editor.getControl().getContribution('editor.contrib.suggestController');
 
         waitForAnimation(() => {
-            const content = nodeAsString(suggestController ? ['_widget']?.['_value']?.['element']?.['domNode']);
+            const content = suggestController ? nodeAsString(suggestController['_widget']?.['_value']?.['element']?.['domNode']) : '';
             return !content.includes('loading');
         });
 
@@ -574,8 +568,8 @@ describe('TypeScript', function () {
         editor.getControl().setPosition({ lineNumber: 8, column: 7 });
         assert.equal(editor.getControl().getModel().getWordAtPosition(editor.getControl().getPosition()).word, 'DemoClass');
 
-        /** @type {import('@theia/monaco-editor-core/src/vs/editor/contrib/hover/browser/hover').ModesHoverController} */
-        const hover = editor.getControl().getContribution('editor.contrib.hover');
+        /** @type {import('@theia/monaco-editor-core/src/vs/editor/contrib/hover/browser/contentHoverController').ContentHoverController} */
+        const hover = editor.getControl().getContribution('editor.contrib.contentHover');
 
         assert.isTrue(contextKeyService.match('editorTextFocus'));
         assert.isFalse(contextKeyService.match('editorHoverVisible'));
@@ -586,34 +580,14 @@ describe('TypeScript', function () {
         assert.isTrue(contextKeyService.match('editorTextFocus'));
 
         waitForAnimation(() => {
-            const content = nodeAsString(hover['_contentWidget']?.['_widget']?.['_hover']?.['contentsDomNode']);
+            const content = nodeAsString(hover['_contentWidget']?.['widget']?.['_hover']?.['contentsDomNode']);
             return !content.includes('loading');
         });
 
-        assert.deepEqual(nodeAsString(hover['_contentWidget']?.['_widget']?.['_hover']?.['contentsDomNode']).trim(), `
-DIV {
-  DIV {
-    DIV {
-      DIV {
-        DIV {
-          SPAN {
-            DIV {
-              SPAN {
-                "class"
-              }
-              SPAN {
-                " "
-              }
-              SPAN {
-                "DemoClass"
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-}`.trim());
+        const content = nodeAsString(hover['_contentWidget']?.['widget']?.['_hover']?.['contentsDomNode']);
+
+        assert.isTrue(content.includes('class', 'did not include'));
+        assert.isTrue(content.includes('DemoClass', 'did not include'));
         await dismissWithEscape('editorHoverVisible');
         assert.isTrue(contextKeyService.match('editorTextFocus'));
         assert.isFalse(Boolean(hover['_contentWidget']?.['_widget']?.['_visibleData']));
@@ -751,6 +725,7 @@ SPAN {
         };
 
         await timeout(1000); // quick fix is always available: need to wait for the error fix to become available.
+
         await commands.executeCommand('editor.action.quickFix');
         const codeActionSelector = '.action-widget';
         assert.isFalse(!!document.querySelector(codeActionSelector), 'Failed at assert 3 - codeActionWidget should not be visible');
@@ -764,7 +739,7 @@ SPAN {
             }
             return true;
         }, 10000, 'Timed-out waiting for the QuickFix widget to appear');
-        await animationFrame();
+        await timeout();
 
         assert.isTrue(lightBulbVisible(), 'Failed at assert 4');
         keybindings.dispatchKeyDown('Enter');
@@ -825,31 +800,28 @@ SPAN {
             const lightbulbVisibility = codeActionController['_lightBulbWidget'].rawValue?.['_domNode'].style.visibility;
             return lightbulbVisibility !== undefined && lightbulbVisibility !== 'hidden';
         }
-        assert.isFalse(isActionAvailable());
         assert.strictEqual(editor.getControl().getModel().getLineContent(30), 'import { DefinedInterface } from "./demo-definitions-file";');
         editor.getControl().revealLine(30);
         editor.getControl().setSelection(new Selection(30, 1, 30, 60));
         await waitForAnimation(() => isActionAvailable(), 5000, 'No code action available. (1)');
         assert.isTrue(isActionAvailable());
 
-        try { // for some reason, we need to wait a second here, otherwise, we  run into some cancellation. 
-            await waitForAnimation(() => false, 1000);
-        } catch (e) {
-        }
+        await timeout(1000)
 
         await commands.executeCommand('editor.action.quickFix');
         await waitForAnimation(() => {
             const elements = document.querySelector('.action-widget');
             return !!elements;
         }, 5000, 'No context menu appeared. (1)');
-        await animationFrame();
+
+        await timeout();
 
         keybindings.dispatchKeyDown('Enter');
 
         assert.isNotNull(editor.getControl());
         assert.isNotNull(editor.getControl().getModel());
         console.log(`content: ${editor.getControl().getModel().getLineContent(30)}`);
-        await waitForAnimation(() => editor.getControl().getModel().getLineContent(30) === 'import * as demoDefinitionsFile from "./demo-definitions-file";', 5000, 'The namespace import did not take effect.');
+        await waitForAnimation(() => editor.getControl().getModel().getLineContent(30) === 'import * as demoDefinitionsFile from "./demo-definitions-file";', 5000, 'The namespace import did not take effect :' + editor.getControl().getModel().getLineContent(30));
 
         // momentarily toggle selection, waiting for code action to become unavailable.
         // Without doing this, the call to the quickfix command would sometimes fail because of an
@@ -875,13 +847,13 @@ SPAN {
         // Change import back: https://github.com/eclipse-theia/theia/issues/11059
         await commands.executeCommand('editor.action.quickFix');
         await waitForAnimation(() => Boolean(document.querySelector('.context-view-pointerBlock')), 5000, 'No context menu appeared. (2)');
-        await animationFrame();
+        await timeout();
 
         keybindings.dispatchKeyDown('Enter');
 
         assert.isNotNull(editor.getControl());
         assert.isNotNull(editor.getControl().getModel());
-        await waitForAnimation(() => editor.getControl().getModel().getLineContent(30) === 'import { DefinedInterface } from "./demo-definitions-file";', 5000, 'The named import did not take effect.');
+        await waitForAnimation(() => editor.getControl().getModel().getLineContent(30) === 'import { DefinedInterface } from "./demo-definitions-file";', 10000, () => 'The named import did not take effect.' + editor.getControl().getModel().getLineContent(30));
     });
 
     for (const referenceViewCommand of ['references-view.find', 'references-view.findImplementations']) {

package/src/undo-redo-selectAll.spec.js

@@ -14,13 +14,14 @@
 // SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
 // *****************************************************************************
 
+
 // @ts-check
 describe('Undo, Redo and Select All', function () {
     this.timeout(5000);
 
     const { assert } = chai;
 
-    const { animationFrame } = require('@theia/core/lib/browser/browser');
+    const { timeout } = require('@theia/core/lib/common/promise-util');
     const { DisposableCollection } = require('@theia/core/lib/common/disposable');
     const { CommonCommands } = require('@theia/core/lib/browser/common-frontend-contribution');
     const { EditorManager } = require('@theia/editor/lib/browser/editor-manager');
@@ -51,22 +52,32 @@ describe('Undo, Redo and Select All', function () {
     const toTearDown = new DisposableCollection();
 
     /**
-     * @template T
-     * @param {() => Promise<T> | T} condition
-     * @returns {Promise<T>}
-     */
-    function waitForAnimation(condition) {
-        return new Promise(async (resolve, dispose) => {
-            toTearDown.push({ dispose });
-            do {
-                await animationFrame();
-            } while (!condition());
-            resolve(undefined);
-        });
+         * @param {() => unknown} condition
+         * @param {number | undefined} [maxWait]
+         * @param {string | undefined} [message]
+         * @returns {Promise<void>}
+         */
+    async function waitForAnimation(condition, maxWait, message) {
+        if (maxWait === undefined) {
+            maxWait = 100000;
+        }
+        const endTime = Date.now() + maxWait;
+        do {
+            await (timeout(100));
+            if (condition()) {
+                return true;
+            }
+            if (Date.now() > endTime) {
+                throw new reject(new Error(message ?? 'Wait for animation timed out.'));
+            }
+        } while (true);
     }
+
     const originalValue = preferenceService.get('files.autoSave', undefined, rootUri.toString());
     before(async () => {
         await preferenceService.set('files.autoSave', 'off', undefined, rootUri.toString());
+        await preferenceService.set('git.autoRepositoryDetection', true);
+        await preferenceService.set('git.openRepositoryInParentFolders', 'always');
         shell.leftPanelHandler.collapse();
     });
 
@@ -157,25 +168,25 @@ describe('Undo, Redo and Select All', function () {
 
         keybindings.dispatchCommand(CommonCommands.UNDO.id);
         await waitForAnimation(() => scmInput.value === originalValue);
-        assert.equal(scmInput.value, originalValue);
+        assert.equal(scmInput.value, originalValue, 'value equal');
 
         keybindings.dispatchCommand(CommonCommands.REDO.id);
         await waitForAnimation(() => scmInput.value === modifiedValue);
-        assert.equal(scmInput.value, modifiedValue);
+        assert.equal(scmInput.value, modifiedValue, 'value not equal');
 
         const selection = document.getSelection();
         if (!selection) {
-            assert.isDefined(selection);
+            assert.isDefined(selection, 'selection defined');
             return;
         }
 
         selection.empty();
-        assert.equal(selection.rangeCount, 0);
+        assert.equal(selection.rangeCount, 0, 'rangeCount equal');
 
         keybindings.dispatchCommand(CommonCommands.SELECT_ALL.id);
         await waitForAnimation(() => !!selection.rangeCount);
-        assert.notEqual(selection.rangeCount, 0);
-        assert.isTrue(selection.containsNode(scmInput));
+        assert.notEqual(selection.rangeCount, 0, 'rangeCount not equal');
+        assert.isTrue(selection.containsNode(scmInput), 'selection contains');
     }
 
     it('in the active scm in workspace without the current editor', async function () {

package/src/views.spec.js

@@ -14,7 +14,6 @@
 // SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
 // *****************************************************************************
 
-const { timeout } = require('@theia/core/lib/common/promise-util');
 
 // @ts-check
 describe('Views', function () {
@@ -22,6 +21,7 @@ describe('Views', function () {
 
     const { assert } = chai;
 
+    const { timeout } = require('@theia/core/lib/common/promise-util');
     const { ApplicationShell } = require('@theia/core/lib/browser/shell/application-shell');
     const { FileNavigatorContribution } = require('@theia/navigator/lib/browser/navigator-contribution');
     const { ScmContribution } = require('@theia/scm/lib/browser/scm-contribution');