@theia/api-tests 1.49.1 → 1.50.1

package/package.json

@@ -1,9 +1,9 @@
 {
   "name": "@theia/api-tests",
-  "version": "1.49.1",
+  "version": "1.50.1",
   "description": "Theia API tests",
   "dependencies": {
-    "@theia/core": "1.49.1"
+    "@theia/core": "1.50.1"
   },
   "license": "EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0",
   "repository": {
@@ -20,5 +20,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "5bab04a50e95f7515a4d276fce963bef0e89db28"
+  "gitHead": "ffefc7ac2c0f6c63256042b7710551304200e5e1"
 }

package/src/monaco-api.spec.js

@@ -87,7 +87,6 @@ describe('Monaco API', async function () {
                     electronAccelerator: 'Ctrl+Shift+Alt+Cmd+K',
                     userSettingsLabel: 'ctrl+shift+alt+cmd+K',
                     WYSIWYG: true,
-                    chord: false,
                     parts: [new ResolvedChord(
                         true,
                         true,

package/src/saveable.spec.js

@@ -81,13 +81,13 @@ describe('Saveable', function () {
 
     afterEach(async () => {
         toTearDown.dispose();
-        await preferences.set('files.autoSave', autoSave, undefined, rootUri.toString());
         // @ts-ignore
         editor = undefined;
         // @ts-ignore
         widget = undefined;
         await editorManager.closeAll({ save: false });
         await fileService.delete(fileUri.parent, { fromUserGesture: false, useTrash: false, recursive: true });
+        await preferences.set('files.autoSave', autoSave, undefined, rootUri.toString());
     });
 
     it('normal save', async function () {

package/src/scm.spec.js

@@ -14,17 +14,23 @@
 // SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
 // *****************************************************************************
 
+
+
+
 // @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');
     const { ContextKeyService } = require('@theia/core/lib/browser/context-key-service');
     const { ScmContribution } = require('@theia/scm/lib/browser/scm-contribution');
     const { ScmService } = require('@theia/scm/lib/browser/scm-service');
     const { ScmWidget } = require('@theia/scm/lib/browser/scm-widget');
+    const { CommandRegistry } = require('@theia/core/lib/common');
 
     /** @type {import('inversify').Container} */
     const container = window['theia'].container;
@@ -32,6 +38,8 @@ describe('SCM', function () {
     const scmContribution = container.get(ScmContribution);
     const shell = container.get(ApplicationShell);
     const service = container.get(ScmService);
+    const commandRegistry = container.get(CommandRegistry);
+    const pluginService = container.get(HostedPluginSupport);
 
     /** @type {ScmWidget} */
     let scmWidget;
@@ -39,10 +47,49 @@ describe('SCM', function () {
     /** @type {ScmService} */
     let scmService;
 
+    const gitPluginId = 'vscode.git';
+
+    /**
+         * @param {() => 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;
+            }
+
+            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);
+            }
+
+        });
+        return success;
+    }
+
     beforeEach(async () => {
+        if (!pluginService.getPlugin(gitPluginId)) {
+            throw new Error(gitPluginId + ' should be started');
+        }
+        await pluginService.activatePlugin(gitPluginId);
         await shell.leftPanelHandler.collapse();
         scmWidget = await scmContribution.openView({ activate: true, reveal: true });
         scmService = service;
+        await waitForAnimation(() => scmService.selectedRepository, 10000, 'selected repository is not defined');
     });
 
     afterEach(() => {
@@ -53,7 +100,6 @@ describe('SCM', function () {
     });
 
     describe('scm-view', () => {
-
         it('the view should open and activate successfully', () => {
             assert.notEqual(scmWidget, undefined);
             assert.strictEqual(scmWidget, shell.activeWidget);
@@ -125,6 +171,9 @@ describe('SCM', function () {
                 const foundRepository = scmService.findRepository(new Uri.default(rootUri));
                 assert.notEqual(foundRepository, undefined);
             }
+            else {
+                assert.fail('Selected repository is undefined');
+            }
         });
 
         it('should not find a repository for an unknown uri', () => {
@@ -150,6 +199,9 @@ describe('SCM', function () {
                     assert.notEqual(commit, undefined);
                 }
             }
+            else {
+                assert.fail('Selected repository is undefined');
+            }
         });
 
     });

package/src/typescript.spec.js

@@ -64,7 +64,7 @@ describe('TypeScript', function () {
     const rootUri = workspaceService.tryGetRoots()[0].resource;
     const demoFileUri = rootUri.resolveToAbsolute('../api-tests/test-ts-workspace/demo-file.ts');
     const definitionFileUri = rootUri.resolveToAbsolute('../api-tests/test-ts-workspace/demo-definitions-file.ts');
-    let originalAutoSaveValue = preferences.inspect('files.autoSave').globalValue;
+    let originalAutoSaveValue = preferences.get('files.autoSave');
 
     before(async function () {
         await pluginService.didStart;
@@ -73,8 +73,9 @@ describe('TypeScript', function () {
                 throw new Error(pluginId + ' should be started');
             }
             await pluginService.activatePlugin(pluginId);
-        }).concat(preferences.set('files.autoSave', 'off', PreferenceScope.User)));
-        await preferences.set('files.refactoring.autoSave', 'off', PreferenceScope.User);
+        }));
+        await preferences.set('files.autoSave', 'off');
+        await preferences.set('files.refactoring.autoSave', 'off');
     });
 
     beforeEach(async function () {
@@ -90,7 +91,7 @@ describe('TypeScript', function () {
     });
 
     after(async () => {
-        await preferences.set('files.autoSave', originalAutoSaveValue, PreferenceScope.User);
+        await preferences.set('files.autoSave', originalAutoSaveValue);
     })
 
     /**
@@ -102,10 +103,10 @@ describe('TypeScript', function () {
         const editorWidget = widget instanceof EditorWidget ? widget : undefined;
         const editor = MonacoEditor.get(editorWidget);
         assert.isDefined(editor);
+        await timeout(1000); // workaround for https://github.com/eclipse-theia/theia/issues/13679
         // 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'));
-        // wait till projects are loaded, see:
+        // await waitForAnimation(() => contextKeyService.match('typescript.isManagedFile'));
         // https://github.com/microsoft/vscode/blob/4aac84268c6226d23828cc6a1fe45ee3982927f0/extensions/typescript-language-features/src/typescriptServiceClient.ts#L911
         await waitForAnimation(() => !progressStatusBarItem.currentProgress);
         return /** @type {MonacoEditor} */ (editor);
@@ -210,16 +211,8 @@ describe('TypeScript', function () {
         await assertPeekOpened(editor);
 
         console.log('closePeek() - Attempt to close by sending "Escape"');
-        keybindings.dispatchKeyDown('Escape');
-        await waitForAnimation(() => {
-            const isClosed = !contextKeyService.match('listFocus');
-            if (!isClosed) {
-                console.log('...');
-                keybindings.dispatchKeyDown('Escape');
-                return false;
-            }
-            return true;
-        });
+        await dismissWithEscape('listFocus');
+
         assert.isTrue(contextKeyService.match('editorTextFocus'));
         assert.isFalse(contextKeyService.match('referenceSearchVisible'));
         assert.isFalse(contextKeyService.match('listFocus'));
@@ -510,7 +503,23 @@ describe('TypeScript', function () {
         assert.equal(activeEditor.getControl().getModel().getWordAtPosition({ lineNumber: 28, column: 1 }).word, 'foo');
     });
 
+    async function dismissWithEscape(contextKey) {
+        keybindings.dispatchKeyDown('Escape');
+        // once in a while, a second "Escape" is needed to dismiss widget
+        return waitForAnimation(() => {
+            const suggestWidgetDismissed = !contextKeyService.match(contextKey);
+            if (!suggestWidgetDismissed) {
+                console.log(`Re-try to dismiss ${contextKey} using "Escape" key`);
+                keybindings.dispatchKeyDown('Escape');
+                return false;
+            }
+            return true;
+        }, 5000, `${contextKey} widget not dismissed`);
+    }
+
     it('editor.action.triggerParameterHints', async function () {
+        this.timeout(30000);
+        console.log('start trigger parameter hint');
         const editor = await openEditor(demoFileUri);
         // const demoInstance = new DemoClass('|demo');
         editor.getControl().setPosition({ lineNumber: 24, column: 37 });
@@ -520,13 +529,14 @@ describe('TypeScript', function () {
         assert.isFalse(contextKeyService.match('parameterHintsVisible'));
 
         await commands.executeCommand('editor.action.triggerParameterHints');
+        console.log('trigger command');
         await waitForAnimation(() => contextKeyService.match('parameterHintsVisible'));
+        console.log('context key matched');
 
         assert.isTrue(contextKeyService.match('editorTextFocus'));
         assert.isTrue(contextKeyService.match('parameterHintsVisible'));
 
-        keybindings.dispatchKeyDown('Escape');
-        await waitForAnimation(() => !contextKeyService.match('parameterHintsVisible'));
+        await dismissWithEscape('parameterHintsVisible');
 
         assert.isTrue(contextKeyService.match('editorTextFocus'));
         assert.isFalse(contextKeyService.match('parameterHintsVisible'));
@@ -542,12 +552,13 @@ describe('TypeScript', function () {
         const hover = editor.getControl().getContribution('editor.contrib.hover');
 
         assert.isTrue(contextKeyService.match('editorTextFocus'));
-        assert.isFalse(Boolean(hover['_contentWidget']?.['_widget']?.['_visibleData']));
+        assert.isFalse(contextKeyService.match('editorHoverVisible'));
         await commands.executeCommand('editor.action.showHover');
         let doLog = true;
-        await waitForAnimation(() => hover['_contentWidget']?.['_widget']?.['_visibleData']);
+        await waitForAnimation(() => contextKeyService.match('editorHoverVisible'));
+        assert.isTrue(contextKeyService.match('editorHoverVisible'));
         assert.isTrue(contextKeyService.match('editorTextFocus'));
-        assert.isTrue(Boolean(hover['_contentWidget']?.['_widget']?.['_visibleData']));
+
         assert.deepEqual(nodeAsString(hover['_contentWidget']?.['_widget']?.['_hover']?.['contentsDomNode']).trim(), `
 DIV {
   DIV {
@@ -572,8 +583,7 @@ DIV {
     }
   }
 }`.trim());
-        keybindings.dispatchKeyDown('Escape');
-        await waitForAnimation(() => !hover['_contentWidget']?.['_widget']?.['_visibleData']);
+        await dismissWithEscape('editorHoverVisible');
         assert.isTrue(contextKeyService.match('editorTextFocus'));
         assert.isFalse(Boolean(hover['_contentWidget']?.['_widget']?.['_visibleData']));
     });