@theia/api-tests 1.45.0 → 1.46.0-next.106

package/package.json

@@ -1,9 +1,9 @@
 {
   "name": "@theia/api-tests",
-  "version": "1.45.0",
+  "version": "1.46.0-next.106+cf038c17c",
   "description": "Theia API tests",
   "dependencies": {
-    "@theia/core": "1.45.0"
+    "@theia/core": "1.46.0-next.106+cf038c17c"
   },
   "license": "EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0",
   "repository": {
@@ -20,5 +20,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "2b20a60a0f9b54b19838a0f71760989a19622495"
+  "gitHead": "cf038c17c3b3b210d9ae02b09d64921f639247f9"
 }

package/src/monaco-api.spec.js

@@ -26,7 +26,7 @@ describe('Monaco API', async function () {
     const { MonacoResolvedKeybinding } = require('@theia/monaco/lib/browser/monaco-resolved-keybinding');
     const { MonacoTextmateService } = require('@theia/monaco/lib/browser/textmate/monaco-textmate-service');
     const { CommandRegistry } = require('@theia/core/lib/common/command');
-    const { SimpleKeybinding } = require('@theia/monaco-editor-core/esm/vs/base/common/keybindings');
+    const { KeyCodeChord, ResolvedChord } = require('@theia/monaco-editor-core/esm/vs/base/common/keybindings');
     const { IKeybindingService } = require('@theia/monaco-editor-core/esm/vs/platform/keybinding/common/keybinding');
     const { StandaloneServices } = require('@theia/monaco-editor-core/esm/vs/editor/standalone/browser/standaloneServices');
     const { TokenizationRegistry } = require('@theia/monaco-editor-core/esm/vs/editor/common/languages');
@@ -59,10 +59,10 @@ describe('Monaco API', async function () {
     });
 
     it('KeybindingService.resolveKeybinding', () => {
-        const simpleKeybinding = new SimpleKeybinding(true, true, true, true, 41 /* KeyCode.KeyK */);
-        const chordKeybinding = simpleKeybinding.toChord();
-        assert.equal(chordKeybinding.parts.length, 1);
-        assert.equal(chordKeybinding.parts[0], simpleKeybinding);
+        const chord = new KeyCodeChord(true, true, true, true, 41 /* KeyCode.KeyK */);
+        const chordKeybinding = chord.toKeybinding();
+        assert.equal(chordKeybinding.chords.length, 1);
+        assert.equal(chordKeybinding.chords[0], chord);
 
         const resolvedKeybindings = StandaloneServices.get(IKeybindingService).resolveKeybinding(chordKeybinding);
         assert.equal(resolvedKeybindings.length, 1);
@@ -74,9 +74,8 @@ describe('Monaco API', async function () {
             const electronAccelerator = resolvedKeybinding.getElectronAccelerator();
             const userSettingsLabel = resolvedKeybinding.getUserSettingsLabel();
             const WYSIWYG = resolvedKeybinding.isWYSIWYG();
-            const chord = resolvedKeybinding.isChord();
-            const parts = resolvedKeybinding.getParts();
-            const dispatchParts = resolvedKeybinding.getDispatchParts();
+            const parts = resolvedKeybinding.getChords();
+            const dispatchParts = resolvedKeybinding.getDispatchChords().map(str => str === null ? '' : str);
 
             const platform = window.navigator.platform;
             let expected;
@@ -89,14 +88,14 @@ describe('Monaco API', async function () {
                     userSettingsLabel: 'ctrl+shift+alt+cmd+K',
                     WYSIWYG: true,
                     chord: false,
-                    parts: [{
-                        altKey: true,
-                        ctrlKey: true,
-                        keyAriaLabel: 'K',
-                        keyLabel: 'K',
-                        metaKey: true,
-                        shiftKey: true
-                    }],
+                    parts: [new ResolvedChord(
+                        true,
+                        true,
+                        true,
+                        true,
+                        'K',
+                        'K',
+                    )],
                     dispatchParts: [
                         'ctrl+shift+alt+meta+K'
                     ]
@@ -108,15 +107,14 @@ describe('Monaco API', async function () {
                     electronAccelerator: 'Ctrl+Shift+Alt+K',
                     userSettingsLabel: 'ctrl+shift+alt+K',
                     WYSIWYG: true,
-                    chord: false,
-                    parts: [{
-                        altKey: true,
-                        ctrlKey: true,
-                        keyAriaLabel: 'K',
-                        keyLabel: 'K',
-                        metaKey: false,
-                        shiftKey: true
-                    }],
+                    parts: [new ResolvedChord(
+                        true,
+                        true,
+                        true,
+                        false,
+                        'K',
+                        'K'
+                    )],
                     dispatchParts: [
                         'ctrl+shift+alt+K'
                     ]
@@ -124,7 +122,7 @@ describe('Monaco API', async function () {
             }
 
             assert.deepStrictEqual({
-                label, ariaLabel, electronAccelerator, userSettingsLabel, WYSIWYG, chord, parts, dispatchParts
+                label, ariaLabel, electronAccelerator, userSettingsLabel, WYSIWYG, parts, dispatchParts
             }, expected);
         } else {
             assert.fail(`resolvedKeybinding must be of ${MonacoResolvedKeybinding.name} type`);
@@ -136,7 +134,7 @@ describe('Monaco API', async function () {
             const didChangeColorMap = new Promise(resolve => {
                 const toDispose = TokenizationRegistry.onDidChange(() => {
                     toDispose.dispose();
-                    resolve();
+                    resolve(undefined);
                 });
             });
             textmateService['themeService'].setCurrentTheme('light');
@@ -175,15 +173,15 @@ describe('Monaco API', async function () {
     });
 
     it('Supports setting contexts using the command registry', async () => {
-        const setContext = 'setContext';
+        const setContext = '_setContext';
         const key = 'monaco-api-test-context';
         const firstValue = 'first setting';
         const secondValue = 'second setting';
-        assert.isFalse(contextKeys.match(`${key} == ${firstValue}`));
+        assert.isFalse(contextKeys.match(`${key} == '${firstValue}'`));
         await commands.executeCommand(setContext, key, firstValue);
-        assert.isTrue(contextKeys.match(`${key} == ${firstValue}`));
+        assert.isTrue(contextKeys.match(`${key} == '${firstValue}'`));
         await commands.executeCommand(setContext, key, secondValue);
-        assert.isTrue(contextKeys.match(`${key} == ${secondValue}`));
+        assert.isTrue(contextKeys.match(`${key} == '${secondValue}'`));
     });
 
     it('Supports context key: inQuickOpen', async () => {

package/src/saveable.spec.js

@@ -16,7 +16,7 @@
 
 // @ts-check
 describe('Saveable', function () {
-    this.timeout(5000);
+    this.timeout(30000);
 
     const { assert } = chai;
 

package/src/typescript.spec.js

@@ -19,6 +19,7 @@ describe('TypeScript', function () {
     this.timeout(30_000);
 
     const { assert } = chai;
+    const { timeout } = require('@theia/core/lib/common/promise-util');
 
     const Uri = require('@theia/core/lib/common/uri');
     const { DisposableCollection } = require('@theia/core/lib/common/disposable');
@@ -118,19 +119,28 @@ describe('TypeScript', function () {
      */
     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);
+
             toTearDown.push({ dispose: () => reject(message ?? 'Test terminated before resolution.') });
             do {
                 await animationFrame();
-            } while (!condition());
-            resolve();
+            } while (!timedOut && !condition());
+            if (timedOut) {
+                reject(new Error(message ?? 'Wait for animation timed out.'));
+            } else {
+                clearTimeout(handle);
+                resolve(undefined);
+            }
+
         });
-        if (timeout !== undefined) {
-            const timedOut = new Promise((_, fail) => {
-                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]);
-        }
         return success;
     }
 
@@ -688,11 +698,10 @@ SPAN {
         editor.getControl().revealPosition({ lineNumber, column });
         assert.equal(currentChar(), ';', 'Failed at assert 1');
 
-        /** @type {import('@theia/monaco-editor-core/src/vs/editor/contrib/codeAction/browser/codeActionCommands').CodeActionController} */
+        /** @type {import('@theia/monaco-editor-core/src/vs/editor/contrib/codeAction/browser/codeActionController').CodeActionController} */
         const codeActionController = editor.getControl().getContribution('editor.contrib.codeActionController');
         const lightBulbNode = () => {
-            const ui = codeActionController['_ui'].rawValue;
-            const lightBulb = ui && ui['_lightBulbWidget'].rawValue;
+            const lightBulb = codeActionController['_lightBulbWidget'].rawValue;
             return lightBulb && lightBulb['_domNode'];
         };
         const lightBulbVisible = () => {
@@ -700,18 +709,16 @@ SPAN {
             return !!node && node.style.visibility !== 'hidden';
         };
 
-        assert.isFalse(lightBulbVisible(), 'Failed at assert 2');
-        await waitForAnimation(() => lightBulbVisible());
-
+        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 = '.codeActionWidget';
+        const codeActionSelector = '.action-widget';
         assert.isFalse(!!document.querySelector(codeActionSelector), 'Failed at assert 3 - codeActionWidget should not be visible');
 
         console.log('Waiting for Quick Fix widget to be visible');
         await waitForAnimation(() => {
             const quickFixWidgetVisible = !!document.querySelector(codeActionSelector);
             if (!quickFixWidgetVisible) {
-                console.log('...');
+                // console.log('...');
                 return false;
             }
             return true;
@@ -721,20 +728,9 @@ SPAN {
         assert.isTrue(lightBulbVisible(), 'Failed at assert 4');
         keybindings.dispatchKeyDown('Enter');
         console.log('Waiting for confirmation that QuickFix has taken effect');
-        await waitForAnimation(() => {
-            const quickFixHasTakenEffect = !lightBulbVisible();
-            if (!quickFixHasTakenEffect) {
-                console.log('...');
-                return false;
-            }
-            return true;
-        }, 5000, 'Quickfix widget has not been dismissed despite attempts to accept suggestion');
 
-        await waitForAnimation(() => currentChar() === 'd', 5000, 'Failed to detect expected selected char: "d"');
+        await waitForAnimation(() => currentChar() === 'd', 10000, 'Failed to detect expected selected char: "d"');
         assert.equal(currentChar(), 'd', 'Failed at assert 5');
-
-        await waitForAnimation(() => !lightBulbVisible());
-        assert.isFalse(lightBulbVisible(), 'Failed at assert 6');
     });
 
     it('editor.action.formatDocument', async function () {
@@ -780,27 +776,12 @@ SPAN {
         assert.equal(editor.getControl().getModel().getLineLength(lineNumber), originalLength);
     });
 
-    for (const referenceViewCommand of ['references-view.find', 'references-view.findImplementations']) {
-        it(referenceViewCommand, async function () {
-            let steps = 0;
-            const editor = await openEditor(demoFileUri);
-            editor.getControl().setPosition({ lineNumber: 24, column: 11 });
-            assert.equal(editor.getControl().getModel().getWordAtPosition(editor.getControl().getPosition()).word, 'demoInstance');
-            await commands.executeCommand(referenceViewCommand);
-            const view = await pluginViewRegistry.openView('references-view.tree', { reveal: true });
-            const expectedMessage = referenceViewCommand === 'references-view.find' ? '2 results in 1 file' : '1 result in 1 file';
-            const getResultText = () => view.node.getElementsByClassName('theia-TreeViewInfo').item(0)?.textContent;
-            await waitForAnimation(() => getResultText() === expectedMessage, 5000);
-            assert.equal(getResultText(), expectedMessage);
-        });
-    }
-
     it('Can execute code actions', async function () {
         const editor = await openEditor(demoFileUri);
-        /** @type {import('@theia/monaco-editor-core/src/vs/editor/contrib/codeAction/browser/codeActionCommands').CodeActionController} */
+        /** @type {import('@theia/monaco-editor-core/src/vs/editor/contrib/codeAction/browser/codeActionController').CodeActionController} */
         const codeActionController = editor.getControl().getContribution('editor.contrib.codeActionController');
         const isActionAvailable = () => {
-            const lightbulbVisibility = codeActionController['_ui'].rawValue?.['_lightBulbWidget'].rawValue?.['_domNode'].style.visibility;
+            const lightbulbVisibility = codeActionController['_lightBulbWidget'].rawValue?.['_domNode'].style.visibility;
             return lightbulbVisibility !== undefined && lightbulbVisibility !== 'hidden';
         }
         assert.isFalse(isActionAvailable());
@@ -810,8 +791,16 @@ SPAN {
         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 commands.executeCommand('editor.action.quickFix');
-        await waitForAnimation(() => Boolean(document.querySelector('.context-view-pointerBlock')), 5000, 'No context menu appeared. (1)');
+        await waitForAnimation(() => {
+            const elements = document.querySelector('.action-widget');
+            return !!elements;
+        }, 5000, 'No context menu appeared. (1)');
         await animationFrame();
 
         keybindings.dispatchKeyDown('Enter');
@@ -853,4 +842,19 @@ SPAN {
         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.');
     });
+
+    for (const referenceViewCommand of ['references-view.find', 'references-view.findImplementations']) {
+        it(referenceViewCommand, async function () {
+            let steps = 0;
+            const editor = await openEditor(demoFileUri);
+            editor.getControl().setPosition({ lineNumber: 24, column: 11 });
+            assert.equal(editor.getControl().getModel().getWordAtPosition(editor.getControl().getPosition()).word, 'demoInstance');
+            await commands.executeCommand(referenceViewCommand);
+            const view = await pluginViewRegistry.openView('references-view.tree', { reveal: true });
+            const expectedMessage = referenceViewCommand === 'references-view.find' ? '2 results in 1 file' : '1 result in 1 file';
+            const getResultText = () => view.node.getElementsByClassName('theia-TreeViewInfo').item(0)?.textContent;
+            await waitForAnimation(() => getResultText() === expectedMessage, 5000);
+            assert.equal(getResultText(), expectedMessage);
+        });
+    }
 });