@theia/api-tests 1.24.0-next.7 → 1.24.0-next.71

package/package.json

@@ -1,9 +1,9 @@
 {
   "name": "@theia/api-tests",
-  "version": "1.24.0-next.7+481d2cf0edd",
+  "version": "1.24.0-next.71+b3d41033c29",
   "description": "Theia API tests",
   "dependencies": {
-    "@theia/core": "1.24.0-next.7+481d2cf0edd"
+    "@theia/core": "1.24.0-next.71+b3d41033c29"
   },
   "license": "EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0",
   "repository": {
@@ -20,5 +20,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "481d2cf0edd33d8495662b9589b9232dcd6c8b34"
+  "gitHead": "b3d41033c29cb4f0ed8efbe969cfce41986c48e0"
 }

package/src/launch-preferences.spec.js

@@ -492,7 +492,7 @@ describe('Launch Preferences', function () {
         describe(JSON.stringify(configMode, undefined, 2), () => {
             const configPaths = Array.isArray(configMode) ? configMode : [configMode];
 
-            /** @typedef {monaco.editor.IReference<import('@theia/monaco/lib/browser/monaco-editor-model').MonacoEditorModel>} ConfigModelReference */
+            /** @typedef {import('@theia/monaco-editor-core/esm/vs/base/common/lifecycle').IReference<import('@theia/monaco/lib/browser/monaco-editor-model').MonacoEditorModel>} ConfigModelReference */
             /** @type {ConfigModelReference[]} */
             beforeEach(async () => {
                 /** @type {Promise<void>[]} */

package/src/monaco-api.spec.js

@@ -26,6 +26,12 @@ 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 { 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 { KeyCode } = require('@theia/monaco-editor-core/esm/vs/base/common/keyCodes');
+    const { TokenizationRegistry } = require('@theia/monaco-editor-core/esm/vs/editor/common/languages');
+    const { Uri } = require('@theia/monaco-editor-core');
 
     const container = window.theia.container;
     const editorManager = container.get(EditorManager);
@@ -49,12 +55,12 @@ describe('Monaco API', async function () {
     });
 
     it('KeybindingService.resolveKeybinding', () => {
-        const simpleKeybinding = new monaco.keybindings.SimpleKeybinding(true, true, true, true, monaco.KeyCode.KEY_K);
+        const simpleKeybinding = new SimpleKeybinding(true, true, true, true, KeyCode.KeyK);
         const chordKeybinding = simpleKeybinding.toChord();
         assert.equal(chordKeybinding.parts.length, 1);
         assert.equal(chordKeybinding.parts[0], simpleKeybinding);
 
-        const resolvedKeybindings = monacoEditor.getControl()._standaloneKeybindingService.resolveKeybinding(chordKeybinding);
+        const resolvedKeybindings = StandaloneServices.get(IKeybindingService).resolveKeybinding(chordKeybinding);
         assert.equal(resolvedKeybindings.length, 1);
 
         const resolvedKeybinding = resolvedKeybindings[0];
@@ -124,7 +130,7 @@ describe('Monaco API', async function () {
     it('TokenizationRegistry.getColorMap', async () => {
         if (textmateService['monacoThemeRegistry'].getThemeData().base !== 'vs') {
             const didChangeColorMap = new Promise(resolve => {
-                const toDispose = monaco.modes.TokenizationRegistry.onDidChange(() => {
+                const toDispose = TokenizationRegistry.onDidChange(() => {
                     toDispose.dispose();
                     resolve();
                 });
@@ -136,7 +142,7 @@ describe('Monaco API', async function () {
         const textMateColorMap = textmateService['grammarRegistry'].getColorMap();
         assert.notEqual(textMateColorMap.indexOf('#795E26'), -1, 'Expected custom toke colors for the light theme to be enabled.');
 
-        const monacoColorMap = (monaco.modes.TokenizationRegistry.getColorMap() || []).
+        const monacoColorMap = (TokenizationRegistry.getColorMap() || []).
             splice(0, textMateColorMap.length).map(c => c.toString().toUpperCase());
         assert.deepStrictEqual(monacoColorMap, textMateColorMap, 'Expected textmate colors to have the same index in the monaco color map.');
     });
@@ -148,7 +154,7 @@ describe('Monaco API', async function () {
             assert.fail('hoverContribution does not have OpenerService');
             return;
         }
-        /** @type {monaco.services.OpenerService} */
+        /** @type {import('@theia/monaco-editor-core/esm/vs/editor/browser/services/openerService').OpenerService} */
         const openerService = hoverContribution['_openerService'];
 
         let opened = false;
@@ -157,7 +163,7 @@ describe('Monaco API', async function () {
             execute: arg => (console.log(arg), opened = arg === 'foo')
         });
         try {
-            await openerService.open(monaco.Uri.parse('command:' + id + '?"foo"'));
+            await openerService.open(Uri.parse('command:' + id + '?"foo"'));
             assert.isTrue(opened);
         } finally {
             unregisterCommand.dispose();

package/src/preferences.spec.js

@@ -24,23 +24,27 @@ describe('Preferences', function () {
     const { FileService } = require('@theia/filesystem/lib/browser/file-service');
     const { PreferenceLanguageOverrideService } = require('@theia/core/lib/browser/preferences/preference-language-override-service');
     const { MonacoTextModelService } = require('@theia/monaco/lib/browser/monaco-text-model-service');
+    const { PreferenceSchemaProvider } = require('@theia/core/lib/browser/preferences/preference-contribution')
     const { container } = window.theia;
     /** @type {import ('@theia/core/lib/browser/preferences/preference-service').PreferenceService} */
     const preferenceService = container.get(PreferenceService);
+    /** @type {import ('@theia/core/lib/browser/preferences/preference-language-override-service').PreferenceLanguageOverrideService} */
     const overrideService = container.get(PreferenceLanguageOverrideService);
     const fileService = container.get(FileService);
     /** @type {import ('@theia/core/lib/common/uri').default} */
     const uri = preferenceService.getConfigUri(PreferenceScope.Workspace);
     /** @type {import('@theia/preferences/lib/browser/folders-preferences-provider').FoldersPreferencesProvider} */
     const folderPreferences = container.getNamed(PreferenceProvider, PreferenceScope.Folder);
+    /** @type PreferenceSchemaProvider */
+    const schemaProvider = container.get(PreferenceSchemaProvider);
     const modelService = container.get(MonacoTextModelService);
 
-    const swift = 'swift'; // Probably not in our preference files...
+    const overrideIdentifier = 'bargle-noddle-zaus'; // Probably not in our preference files...
     const tabSize = 'editor.tabSize';
     const fontSize = 'editor.fontSize';
-    const override = overrideService.markLanguageOverride(swift);
-    const overriddenTabSize = overrideService.overridePreferenceName({ overrideIdentifier: swift, preferenceName: tabSize });
-    const overriddenFontSize = overrideService.overridePreferenceName({ overrideIdentifier: swift, preferenceName: fontSize });
+    const override = overrideService.markLanguageOverride(overrideIdentifier);
+    const overriddenTabSize = overrideService.overridePreferenceName({ overrideIdentifier, preferenceName: tabSize });
+    const overriddenFontSize = overrideService.overridePreferenceName({ overrideIdentifier, preferenceName: fontSize });
     /**
      * @returns {Promise<Record<string, any>>}
      */
@@ -80,6 +84,7 @@ describe('Preferences', function () {
         assert.isDefined(uri, 'The workspace config URI should be defined!');
         fileExistsBeforehand = await fileService.exists(uri);
         contentBeforehand = await fileService.read(uri).then(({ value }) => value).catch(() => '');
+        schemaProvider.registerOverrideIdentifier(overrideIdentifier);
         await deleteAllValues();
     });
 
@@ -157,4 +162,36 @@ describe('Preferences', function () {
         const prefs = await getPreferences();
         shouldBeUndefined(prefs[override], override);
     });
+
+    it('Handles many synchronous settings of preferences gracefully', async function () {
+        let settings = 0;
+        const promises = [];
+        const searchPref = 'search.searchOnTypeDebouncePeriod'
+        const channelPref = 'output.maxChannelHistory'
+        const hoverPref = 'workbench.hover.delay';
+        let searchDebounce;
+        let channelHistory;
+        let hoverDelay;
+        /** @type import ('@theia/core/src/browser/preferences/preference-service').PreferenceChanges | undefined */
+        let event;
+        const toDispose = preferenceService.onPreferencesChanged(e => event = e);
+        while (settings++ < 50) {
+            searchDebounce = 100 + Math.floor(Math.random() * 500);
+            channelHistory = 200 + Math.floor(Math.random() * 800);
+            hoverDelay = 250 + Math.floor(Math.random() * 2_500);
+            promises.push(
+                preferenceService.set(searchPref, searchDebounce),
+                preferenceService.set(channelPref, channelHistory),
+                preferenceService.set(hoverPref, hoverDelay)
+            );
+        }
+        const results = await Promise.allSettled(promises);
+        const expectedValues = { [searchPref]: searchDebounce, [channelPref]: channelHistory, [hoverPref]: hoverDelay };
+        const actualValues = { [searchPref]: preferenceService.get(searchPref), [channelPref]: preferenceService.get(channelPref), [hoverPref]: preferenceService.get(hoverPref), }
+        const eventValues = event && Object.keys(event).reduce((accu, key) => { accu[key] = event[key].newValue; return accu; }, {});
+        toDispose.dispose();
+        assert(results.every(setting => setting.status === 'fulfilled'), 'All promises should have resolved rather than rejected.');
+        assert.deepEqual(actualValues, eventValues, 'The event should reflect the current state of the service.');
+        assert.deepEqual(expectedValues, actualValues, 'The service state should reflect the most recent setting');
+    });
 });

package/src/saveable.spec.js

@@ -31,6 +31,7 @@ describe('Saveable', function () {
     const { MonacoEditor } = require('@theia/monaco/lib/browser/monaco-editor');
     const { Deferred } = require('@theia/core/lib/common/promise-util');
     const { Disposable, DisposableCollection } = require('@theia/core/lib/common/disposable');
+    const { Range } = require('@theia/monaco-editor-core');
 
     const container = window.theia.container;
     /** @type {EditorManager} */
@@ -66,10 +67,10 @@ describe('Saveable', function () {
     const toTearDown = new DisposableCollection();
 
     /** @type {string | undefined} */
-    const autoSave = preferences.get('editor.autoSave', undefined, rootUri.toString());
+    const autoSave = preferences.get('files.autoSave', undefined, rootUri.toString());
 
     beforeEach(async () => {
-        await preferences.set('editor.autoSave', 'off', undefined, rootUri.toString());
+        await preferences.set('files.autoSave', 'off', undefined, rootUri.toString());
         await preferences.set(closeOnFileDelete, true);
         await editorManager.closeAll({ save: false });
         await fileService.create(fileUri, 'foo', { fromUserGesture: false, overwrite: true });
@@ -80,7 +81,7 @@ describe('Saveable', function () {
 
     afterEach(async () => {
         toTearDown.dispose();
-        await preferences.set('editor.autoSave', autoSave, undefined, rootUri.toString());
+        await preferences.set('files.autoSave', autoSave, undefined, rootUri.toString());
         // @ts-ignore
         editor = undefined;
         // @ts-ignore
@@ -112,7 +113,7 @@ describe('Saveable', function () {
 
         // @ts-ignore
         editor.getControl().getModel().applyEdits([{
-            range: monaco.Range.fromPositions({ lineNumber: 1, column: 1 }, { lineNumber: 1, column: 4 }),
+            range: Range.fromPositions({ lineNumber: 1, column: 1 }, { lineNumber: 1, column: 4 }),
             forceMoveMarkers: false,
             text: ''
         }]);

package/src/typescript.spec.js

@@ -39,6 +39,7 @@ describe('TypeScript', function () {
     const { FileService } = require('@theia/filesystem/lib/browser/file-service');
     const { PluginViewRegistry } = require('@theia/plugin-ext/lib/main/browser/view/plugin-view-registry');
     const { Deferred } = require('@theia/core/lib/common/promise-util');
+    const { Range } = require('@theia/monaco-editor-core');
 
     const container = window.theia.container;
     const editorManager = container.get(EditorManager);
@@ -215,7 +216,8 @@ module.exports = (port, host, argv) => Promise.resolve()
      * @param {MonacoEditor} editor
      */
     async function assertPeekOpened(editor) {
-        const referencesController = editor.getControl()._contributions['editor.contrib.referencesController'];
+        /** @type any */
+        const referencesController = editor.getControl().getContribution('editor.contrib.referencesController');
         await waitForAnimation(() => referencesController._widget && referencesController._widget._tree.getFocus().length);
 
         assert.isFalse(contextKeyService.match('editorTextFocus'));
@@ -459,7 +461,8 @@ module.exports = (port, host, argv) => Promise.resolve()
         // @ts-ignore
         assert.equal(editor.getControl().getModel().getWordAtPosition(editor.getControl().getPosition()).word, 'Container');
 
-        const suggest = editor.getControl()._contributions['editor.contrib.suggestController'];
+        /** @type any */
+        const suggest = editor.getControl().getContribution('editor.contrib.suggestController');
         const getFocusedLabel = () => {
             const focusedItem = suggest.widget.value.getFocusedItem();
             return focusedItem && focusedItem.item.completion.label;
@@ -521,7 +524,7 @@ module.exports = (port, host, argv) => Promise.resolve()
 
         // all rename edits should be grouped in one edit operation and applied in the same tick
         const waitForApplyRenameEdits = new Deferred();
-        editor.getControl().onDidChangeModelContent(waitForApplyRenameEdits.resolve);
+        editor.getControl().onDidChangeModelContent(() => waitForApplyRenameEdits.resolve());
         await waitForApplyRenameEdits.promise;
 
         assert.isTrue(contextKeyService.match('editorTextFocus'));
@@ -567,7 +570,8 @@ module.exports = (port, host, argv) => Promise.resolve()
         // @ts-ignore
         assert.equal(editor.getControl().getModel().getWordAtPosition(editor.getControl().getPosition()).word, 'backendApplicationModule');
 
-        const hover = editor.getControl()._contributions['editor.contrib.hover'];
+        /** @type any */
+        const hover = editor.getControl().getContribution('editor.contrib.hover');
 
         assert.isTrue(contextKeyService.match('editorTextFocus'));
         assert.isFalse(!!hover._contentWidget && hover._contentWidget._isVisible);
@@ -692,7 +696,8 @@ DIV {
 
         const editor = await openEditor(serverUri);
 
-        const codeLens = editor.getControl()._contributions['css.editor.codeLens'];
+        /** @type any */
+        const codeLens = editor.getControl().getContribution('css.editor.codeLens');
         const codeLensNode = () => codeLens._lenses[0] && codeLens._lenses[0]._contentWidget && codeLens._lenses[0]._contentWidget._domNode;
         const codeLensNodeVisible = () => {
             const n = codeLensNode();
@@ -705,7 +710,7 @@ DIV {
         const position = { lineNumber: 16, column: 1 };
         // @ts-ignore
         editor.getControl().getModel().applyEdits([{
-            range: monaco.Range.fromPositions(position, position),
+            range: Range.fromPositions(position, position),
             forceMoveMarkers: false,
             text: 'export '
         }]);
@@ -714,7 +719,7 @@ DIV {
         // Recall `applyEdits` to workaround `vscode` bug, See: https://github.com/eclipse-theia/theia/issues/9714#issuecomment-876582947.
         // @ts-ignore
         editor.getControl().getModel().applyEdits([{
-            range: monaco.Range.fromPositions(position, position),
+            range: Range.fromPositions(position, position),
             forceMoveMarkers: false,
             text: ' '
         }]);
@@ -766,7 +771,8 @@ SPAN {
         editor.getControl().revealPosition({ lineNumber, column });
         assert.equal(currentChar(), ')');
 
-        const quickFixController = editor.getControl()._contributions['editor.contrib.quickFixController'];
+        /** @type any */
+        const quickFixController = editor.getControl().getContribution('editor.contrib.quickFixController');
         const lightBulbNode = () => {
             const ui = quickFixController._ui.rawValue;
             const lightBulb = ui && ui._lightBulbWidget.rawValue;
@@ -803,7 +809,7 @@ SPAN {
         // const { Container[ ] } = require('inversify');
         // @ts-ignore
         editor.getControl().getModel().applyEdits([{
-            range: monaco.Range.fromPositions({ lineNumber, column: 18 }, { lineNumber, column: 18 }),
+            range: Range.fromPositions({ lineNumber, column: 18 }, { lineNumber, column: 18 }),
             forceMoveMarkers: false,
             text: ' '
         }]);
@@ -826,7 +832,7 @@ SPAN {
         // const { Container[  }  ]= require('inversify');
         // @ts-ignore
         editor.getControl().getModel().applyEdits([{
-            range: monaco.Range.fromPositions({ lineNumber, column: 18 }, { lineNumber, column: 21 }),
+            range: Range.fromPositions({ lineNumber, column: 18 }, { lineNumber, column: 21 }),
             forceMoveMarkers: false,
             text: '  }  '
         }]);

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

@@ -31,6 +31,7 @@ describe('Undo, Redo and Select All', function () {
     const { ApplicationShell } = require('@theia/core/lib/browser/shell/application-shell');
     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');
 
     const container = window.theia.container;
     const editorManager = container.get(EditorManager);
@@ -48,7 +49,7 @@ describe('Undo, Redo and Select All', function () {
 
     /**
      * @template T
-     * @param {() => Promise<T> | T} condition
+     * @param {() => Promise<T> | T} condition
      * @returns {Promise<T>}
      */
     function waitForAnimation(condition) {
@@ -57,7 +58,7 @@ describe('Undo, Redo and Select All', function () {
             do {
                 await animationFrame();
             } while (!condition());
-            resolve();
+            resolve(undefined);
         });
     }
 
@@ -90,7 +91,7 @@ describe('Undo, Redo and Select All', function () {
         const editor = /** @type {MonacoEditor} */ (MonacoEditor.get(widget));
         editor.getControl().pushUndoStop();
         editor.getControl().executeEdits('test', [{
-            range: new monaco.Range(1, 1, 1, 1),
+            range: new Range(1, 1, 1, 1),
             text: 'A'
         }]);
         editor.getControl().pushUndoStop();