@theia/api-tests 1.26.0-next.4 → 1.26.0-next.44

package/package.json

@@ -1,9 +1,9 @@
 {
   "name": "@theia/api-tests",
-  "version": "1.26.0-next.4+eb0930a267c",
+  "version": "1.26.0-next.44+4099a4ec58f",
   "description": "Theia API tests",
   "dependencies": {
-    "@theia/core": "1.26.0-next.4+eb0930a267c"
+    "@theia/core": "1.26.0-next.44+4099a4ec58f"
   },
   "license": "EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0",
   "repository": {
@@ -20,5 +20,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "eb0930a267cda577b31532474a404e45b5ae350b"
+  "gitHead": "4099a4ec58f8573a36b32514d37b7d8541db7030"
 }

package/src/preferences.spec.js

@@ -66,6 +66,13 @@ describe('Preferences', function () {
     }
 
     async function deleteAllValues() {
+        return setValueTo(undefined);
+    }
+
+    /**
+     * @param {any} value - A JSON value to write to the workspace preference file.
+     */
+    async function setValueTo(value) {
         const reference = await modelService.createModelReference(uri);
         if (reference.object.dirty) {
             await reference.object.revert();
@@ -73,7 +80,7 @@ describe('Preferences', function () {
         /** @type {import ('@theia/preferences/lib/browser/folder-preference-provider').FolderPreferenceProvider} */
         const provider = Array.from(folderPreferences['providers'].values()).find(candidate => candidate.getConfigUri().isEqual(uri));
         assert.isDefined(provider);
-        await provider['doSetPreference']('', [], undefined);
+        await provider['doSetPreference']('', [], value);
         reference.dispose();
     }
 
@@ -92,7 +99,10 @@ describe('Preferences', function () {
         if (!fileExistsBeforehand) {
             await fileService.delete(uri, { fromUserGesture: false }).catch(() => { });
         } else {
-            await fileService.write(uri, contentBeforehand);
+            let content = '';
+            try { content = JSON.parse(contentBeforehand); } catch { }
+            // Use the preference service because its promise is guaranteed to resolve after the file change is complete.
+            await setValueTo(content);
         }
     });
 

package/src/typescript.spec.js

@@ -48,6 +48,7 @@ describe('TypeScript', function () {
     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} */
     const preferences = container.get(PreferenceService);
@@ -108,11 +109,12 @@ describe('TypeScript', function () {
     /**
      * @param {() => Promise<unknown> | unknown} condition
      * @param {number | undefined} [timeout]
+     * @param {string | undefined} [message]
      * @returns {Promise<void>}
      */
-    function waitForAnimation(condition, timeout) {
-        const success = new Promise(async (resolve, dispose) => {
-            toTearDown.push({ dispose });
+    function waitForAnimation(condition, timeout, message) {
+        const success = new Promise(async (resolve, reject) => {
+            toTearDown.push({ dispose: () => reject(message ?? 'Test terminated before resolution.') });
             do {
                 await animationFrame();
             } while (!condition());
@@ -120,8 +122,8 @@ describe('TypeScript', function () {
         });
         if (timeout !== undefined) {
             const timedOut = new Promise((_, fail) => {
-                const toClear = setTimeout(() => fail(new Error('Wait for animation timed out.')), timeout);
-                toTearDown.push({ dispose: () => (fail(new Error('Wait for animation timed out.')), clearTimeout(toClear)) });
+                const toClear = setTimeout(() => fail(new Error(message ?? 'Wait for animation timed out.')), timeout);
+                toTearDown.push({ dispose: () => (fail(new Error(message ?? 'Wait for animation timed out.')), clearTimeout(toClear)) });
             });
             return Promise.race([success, timedOut]);
         }
@@ -277,6 +279,7 @@ describe('TypeScript', function () {
             const from = 'an editor' + (preview ? ' preview' : '');
             it('within ' + from, async function () {
                 const editor = await openEditor(demoFileUri, preview);
+                editor.getControl().revealLine(24);
                 // const demoInstance = new Demo|Class('demo');
                 editor.getControl().setPosition({ lineNumber: 24, column: 30 });
                 assert.equal(editor.getControl().getModel().getWordAtPosition(editor.getControl().getPosition()).word, 'DemoClass');
@@ -299,6 +302,7 @@ describe('TypeScript', function () {
                 await editorManager.open(definitionFileUri, { mode: 'open' });
 
                 const editor = await openEditor(demoFileUri, preview);
+                editor.getControl().revealLine(32);
                 // const bar: Defined|Interface = { coolField: [] };
                 editor.getControl().setPosition({ lineNumber: 32, column: 19 });
                 assert.equal(editor.getControl().getModel().getWordAtPosition(editor.getControl().getPosition()).word, 'DefinedInterface');
@@ -319,6 +323,7 @@ describe('TypeScript', function () {
 
             it(`from ${from} to an editor preview`, async function () {
                 const editor = await openEditor(demoFileUri);
+                editor.getControl().revealLine(32);
                 // const bar: Defined|Interface = { coolField: [] };
                 editor.getControl().setPosition({ lineNumber: 32, column: 19 });
                 assert.equal(editor.getControl().getModel().getWordAtPosition(editor.getControl().getPosition()).word, 'DefinedInterface');
@@ -576,17 +581,17 @@ DIV {
         assert.equal(activeEditor.getControl().getModel().getWordAtPosition({ lineNumber, column }).word, 'DemoClass');
     });
 
-    // TODO: FIXME! As of 28/01/2022 this test is failing or timing out for unknown reasons.
-    it.skip('run reference code lens', async function () {
-        this.timeout(300_000); // 5 min (give time to `tsserver` to initialize and then respond to make this test pass.)
-        const globalValue = preferences.inspect('javascript.referencesCodeLens.enabled').globalValue;
-        toTearDown.push({ dispose: () => preferences.set('javascript.referencesCodeLens.enabled', globalValue, PreferenceScope.User) });
+    it('run reference code lens', async function () {
+        const preferenceName = 'typescript.referencesCodeLens.enabled';
+        const globalValue = preferences.inspect(preferenceName).globalValue;
+        toTearDown.push({ dispose: () => preferences.set(preferenceName, globalValue, PreferenceScope.User) });
+        await preferences.set(preferenceName, false, PreferenceScope.User);
 
         const editor = await openEditor(demoFileUri);
 
-        /** @type any */
+        /** @type {import('@theia/monaco-editor-core/src/vs/editor/contrib/codelens/browser/codelensController').CodeLensContribution} */
         const codeLens = editor.getControl().getContribution('css.editor.codeLens');
-        const codeLensNode = () => codeLens._lenses[0] && codeLens._lenses[0]._contentWidget && codeLens._lenses[0]._contentWidget._domNode;
+        const codeLensNode = () => codeLens['_lenses'][0]?.['_contentWidget']?.['_domNode'];
         const codeLensNodeVisible = () => {
             const n = codeLensNode();
             return !!n && n.style.visibility !== 'hidden';
@@ -594,46 +599,28 @@ DIV {
 
         assert.isFalse(codeLensNodeVisible());
 
-        // [export ]function load(raw) {
-        const position = { lineNumber: 16, column: 1 };
-        editor.getControl().getModel().applyEdits([{
-            range: Range.fromPositions(position, position),
-            forceMoveMarkers: false,
-            text: 'export '
-        }]);
-        await preferences.set('javascript.referencesCodeLens.enabled', true, PreferenceScope.User);
-
-        // Recall `applyEdits` to workaround `vscode` bug, See: https://github.com/eclipse-theia/theia/issues/9714#issuecomment-876582947.
-        editor.getControl().getModel().applyEdits([{
-            range: Range.fromPositions(position, position),
-            forceMoveMarkers: false,
-            text: ' '
-        }]);
+        // |interface DemoInterface {
+        const position = { lineNumber: 2, column: 1 };
+        await preferences.set(preferenceName, true, PreferenceScope.User);
 
         editor.getControl().revealPosition(position);
         await waitForAnimation(() => codeLensNodeVisible());
 
         assert.isTrue(codeLensNodeVisible());
         const node = codeLensNode();
-        if (node) {
-            assert.equal(nodeAsString(node), `
+        assert.isDefined(node);
+        assert.equal(nodeAsString(node), `
 SPAN {
   A {
-    "20 references"
+    "1 reference"
   }
 }
 `);
-            const link = node.getElementsByTagName('a').item(0);
-            if (link) {
-                link.dispatchEvent(new MouseEvent('mousedown', { bubbles: true }));
-                await assertPeekOpened(editor);
-                await closePeek(editor);
-            } else {
-                assert.isDefined(link);
-            }
-        } else {
-            assert.isDefined(node);
-        }
+        const link = node.getElementsByTagName('a').item(0);
+        assert.isDefined(link);
+        link.dispatchEvent(new MouseEvent('mousedown', { bubbles: true }));
+        await assertPeekOpened(editor);
+        await closePeek(editor);
     });
 
     it('editor.action.quickFix', async function () {
@@ -747,5 +734,4 @@ SPAN {
             assert.equal(getResultText(), expectedMessage);
         });
     }
-
 });

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

@@ -32,6 +32,7 @@ describe('Undo, Redo and Select All', function () {
     const { MonacoEditor } = require('@theia/monaco/lib/browser/monaco-editor');
     const { ScmContribution } = require('@theia/scm/lib/browser/scm-contribution');
     const { Range } = require('@theia/monaco-editor-core/esm/vs/editor/common/core/range');
+    const { PreferenceService, PreferenceScope } = require('@theia/core/lib/browser');
 
     const container = window.theia.container;
     const editorManager = container.get(EditorManager);
@@ -41,6 +42,8 @@ describe('Undo, Redo and Select All', function () {
     const navigatorContribution = container.get(FileNavigatorContribution);
     const shell = container.get(ApplicationShell);
     const scmContribution = container.get(ScmContribution);
+    /** @type {PreferenceService} */
+    const preferenceService = container.get(PreferenceService)
 
     const rootUri = workspaceService.tryGetRoots()[0].resource;
     const fileUri = rootUri.resolve('webpack.config.js');
@@ -61,8 +64,10 @@ describe('Undo, Redo and Select All', function () {
             resolve(undefined);
         });
     }
-
-    before(() => {
+    let originalValue = undefined;
+    before(async () => {
+        originalValue = preferenceService.inspect('files.autoSave').globalValue;
+        await preferenceService.set('files.autoSave', 'off', PreferenceScope.User);
         shell.leftPanelHandler.collapse();
     });
 
@@ -79,7 +84,8 @@ describe('Undo, Redo and Select All', function () {
         await editorManager.closeAll({ save: false });
     });
 
-    after(() => {
+    after(async () => {
+        await preferenceService.set('files.autoSave', originalValue, PreferenceScope.User);
         shell.leftPanelHandler.collapse();
     });