Reenable Typescript codelens test (#11141)

Author: colin-grant-work

examples/api-tests/src/typescript.spec.js

@@ -576,64 +576,46 @@ 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';
         };
 
         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 () {

examples/api-tests/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', false, 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();
     });