@theia/api-tests 1.55.0-next.4 → 1.55.0

package/package.json

@@ -1,9 +1,9 @@
 {
   "name": "@theia/api-tests",
-  "version": "1.55.0-next.4+f6ace675e",
+  "version": "1.55.0",
   "description": "Theia API tests",
   "dependencies": {
-    "@theia/core": "1.55.0-next.4+f6ace675e"
+    "@theia/core": "1.55.0"
   },
   "license": "EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0",
   "repository": {
@@ -20,5 +20,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "f6ace675e712c3d2227d1cd19e9c905a6e4d9ad6"
+  "gitHead": "0e7a523b8e798679d2e098709c63bd7060e54c8a"
 }

package/src/explorer-open-close.spec.js

@@ -123,7 +123,6 @@ describe('Explorer and Editor - open and close', function () {
 
     async function openEditor() {
         await editorManager.open(fileUri, { mode: 'activate' });
-        await waitLanguageServerReady();
         const activeEditor = /** @type {MonacoEditor} */ MonacoEditor.get(editorManager.activeEditor);
         assert.isDefined(activeEditor);
         assert.equal(activeEditor.uri.resolveToAbsolute().toString(), fileUri.resolveToAbsolute().toString());
@@ -135,21 +134,4 @@ describe('Explorer and Editor - open and close', function () {
         assert.isUndefined(activeEditor);
     }
 
-    async function waitLanguageServerReady() {
-        // quite a bit of jitter in the "Initializing LS" status bar entry,
-        // so we want to read a few times in a row that it's done (undefined)
-        const MAX_N = 5
-        let n = MAX_N;
-        while (n > 0) {
-            await pause(1);
-            if (progressStatusBarItem.currentProgress) {
-                n = MAX_N;
-            } else {
-                n--;
-            }
-            if (n < MAX_N) {
-                console.debug('n = ' + n);
-            }
-        }
-    }
 });

package/src/find-replace.spec.js

@@ -143,28 +143,9 @@ describe('Find and Replace', function () {
 
     async function openEditor() {
         await editorManager.open(fileUri, { mode: 'activate' });
-        await waitLanguageServerReady();
         const activeEditor = /** @type {MonacoEditor} */ MonacoEditor.get(editorManager.activeEditor);
         assert.isDefined(activeEditor);
         // @ts-ignore
         assert.equal(activeEditor.uri.resolveToAbsolute().toString(), fileUri.resolveToAbsolute().toString());
     }
-
-    async function waitLanguageServerReady() {
-        // quite a bit of jitter in the "Initializing LS" status bar entry,
-        // so we want to read a few times in a row that it's done (undefined)
-        const MAX_N = 5
-        let n = MAX_N;
-        while (n > 0) {
-            await pause(1);
-            if (progressStatusBarItem.currentProgress) {
-                n = MAX_N;
-            } else {
-                n--;
-            }
-            if (n < 5) {
-                console.debug('n = ' + n);
-            }
-        }
-    }
 });

package/src/scm.spec.js

@@ -14,9 +14,6 @@
 // SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
 // *****************************************************************************
 
-
-
-
 // @ts-check
 describe('SCM', function () {
 
@@ -31,6 +28,8 @@ describe('SCM', function () {
     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');
+    const { PreferenceService } = require('@theia/core/lib/browser');
+
 
     /** @type {import('inversify').Container} */
     const container = window['theia'].container;
@@ -40,6 +39,7 @@ describe('SCM', function () {
     const service = container.get(ScmService);
     const commandRegistry = container.get(CommandRegistry);
     const pluginService = container.get(HostedPluginSupport);
+    const preferences = container.get(PreferenceService);
 
     /** @type {ScmWidget} */
     let scmWidget;
@@ -81,6 +81,12 @@ describe('SCM', function () {
         return success;
     }
 
+
+    before(async () => {
+        preferences.set('git.autoRepositoryDetection', true);
+        preferences.set('git.openRepositoryInParentFolders', 'always');
+    });
+
     beforeEach(async () => {
         if (!pluginService.getPlugin(gitPluginId)) {
             throw new Error(gitPluginId + ' should be started');

package/src/typescript.spec.js

@@ -16,7 +16,7 @@
 
 // @ts-check
 describe('TypeScript', function () {
-    this.timeout(30_000);
+    this.timeout(200_000);
 
     const { assert } = chai;
     const { timeout } = require('@theia/core/lib/common/promise-util');
@@ -94,6 +94,24 @@ describe('TypeScript', function () {
         await preferences.set('files.autoSave', originalAutoSaveValue);
     })
 
+    async function waitLanguageServerReady() {
+        // quite a bit of jitter in the "Initializing LS" status bar entry,
+        // so we want to read a few times in a row that it's done (undefined)
+        const MAX_N = 5
+        let n = MAX_N;
+        while (n > 0) {
+            await timeout(1000);
+            if (progressStatusBarItem.currentProgress) {
+                n = MAX_N;
+            } else {
+                n--;
+            }
+            if (n < 5) {
+                console.debug('n = ' + n);
+            }
+        }
+    }
+
     /**
      * @param {Uri.default} uri
      * @param {boolean} preview
@@ -106,8 +124,8 @@ describe('TypeScript', function () {
         // 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'));
-        // https://github.com/microsoft/vscode/blob/4aac84268c6226d23828cc6a1fe45ee3982927f0/extensions/typescript-language-features/src/typescriptServiceClient.ts#L911
-        await waitForAnimation(() => !progressStatusBarItem.currentProgress);
+
+        waitLanguageServerReady();
         return /** @type {MonacoEditor} */ (editor);
     }
 
@@ -388,6 +406,14 @@ describe('TypeScript', function () {
         assert.isTrue(contextKeyService.match('editorTextFocus'));
         assert.isTrue(contextKeyService.match('suggestWidgetVisible'));
 
+
+        const suggestController = editor.getControl().getContribution('editor.contrib.suggestController');
+
+        waitForAnimation(() => {
+            const content = nodeAsString(suggestController ? ['_widget']?.['_value']?.['element']?.['domNode']);
+            return !content.includes('loading');
+        });
+
         // May need a couple extra "Enter" being sent for the suggest to be accepted
         keybindings.dispatchKeyDown('Enter');
         await waitForAnimation(() => {
@@ -398,7 +424,7 @@ describe('TypeScript', function () {
                 return false;
             }
             return true;
-        }, 5000, 'Suggest widget has not been dismissed despite attempts to accept suggestion');
+        }, 20000, 'Suggest widget has not been dismissed despite attempts to accept suggestion');
 
         assert.isTrue(contextKeyService.match('editorTextFocus'));
         assert.isFalse(contextKeyService.match('suggestWidgetVisible'));
@@ -542,6 +568,7 @@ describe('TypeScript', function () {
     });
 
     it('editor.action.showHover', async function () {
+
         const editor = await openEditor(demoFileUri);
         // class |DemoClass);
         editor.getControl().setPosition({ lineNumber: 8, column: 7 });
@@ -558,6 +585,11 @@ describe('TypeScript', function () {
         assert.isTrue(contextKeyService.match('editorHoverVisible'));
         assert.isTrue(contextKeyService.match('editorTextFocus'));
 
+        waitForAnimation(() => {
+            const content = nodeAsString(hover['_contentWidget']?.['_widget']?.['_hover']?.['contentsDomNode']);
+            return !content.includes('loading');
+        });
+
         assert.deepEqual(nodeAsString(hover['_contentWidget']?.['_widget']?.['_hover']?.['contentsDomNode']).trim(), `
 DIV {
   DIV {