@theia/api-tests 1.34.2 → 1.34.3

package/src/monaco-api.spec.js

@@ -1,188 +1,188 @@
-// *****************************************************************************
-// Copyright (C) 2020 TypeFox and others.
-//
-// This program and the accompanying materials are made available under the
-// terms of the Eclipse Public License v. 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0.
-//
-// This Source Code may also be made available under the following Secondary
-// Licenses when the conditions for such availability set forth in the Eclipse
-// Public License v. 2.0 are satisfied: GNU General Public License, version 2
-// with the GNU Classpath Exception which is available at
-// https://www.gnu.org/software/classpath/license.html.
-//
-// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-// *****************************************************************************
-
-// @ts-check
-describe('Monaco API', async function () {
-    this.timeout(5000);
-
-    const { assert } = chai;
-
-    const { EditorManager } = require('@theia/editor/lib/browser/editor-manager');
-    const { WorkspaceService } = require('@theia/workspace/lib/browser/workspace-service');
-    const { MonacoEditor } = require('@theia/monaco/lib/browser/monaco-editor');
-    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 { TokenizationRegistry } = require('@theia/monaco-editor-core/esm/vs/editor/common/languages');
-    const { MonacoContextKeyService } = require('@theia/monaco/lib/browser/monaco-context-key-service');
-    const { URI } = require('@theia/monaco-editor-core/esm/vs/base/common/uri');
-
-    const container = window.theia.container;
-    const editorManager = container.get(EditorManager);
-    const workspaceService = container.get(WorkspaceService);
-    const textmateService = container.get(MonacoTextmateService);
-    /** @type {import('@theia/core/src/common/command').CommandRegistry} */
-    const commands = container.get(CommandRegistry);
-    /** @type {import('@theia/monaco/src/browser/monaco-context-key-service').MonacoContextKeyService} */
-    const contextKeys = container.get(MonacoContextKeyService);
-
-    /** @type {MonacoEditor} */
-    let monacoEditor;
-
-    before(async () => {
-        const root = workspaceService.tryGetRoots()[0];
-        const editor = await editorManager.open(root.resource.resolve('package.json'), {
-            mode: 'reveal'
-        });
-        monacoEditor = /** @type {MonacoEditor} */ (MonacoEditor.get(editor));
-    });
-
-    after(async () => {
-        await editorManager.closeAll({ save: false });
-    });
-
-    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 resolvedKeybindings = StandaloneServices.get(IKeybindingService).resolveKeybinding(chordKeybinding);
-        assert.equal(resolvedKeybindings.length, 1);
-
-        const resolvedKeybinding = resolvedKeybindings[0];
-        if (resolvedKeybinding instanceof MonacoResolvedKeybinding) {
-            const label = resolvedKeybinding.getLabel();
-            const ariaLabel = resolvedKeybinding.getAriaLabel();
-            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 platform = window.navigator.platform;
-            let expected;
-            if (platform.includes('Mac')) {
-                // Mac os
-                expected = {
-                    label: '⌃⇧⌥⌘K',
-                    ariaLabel: '⌃⇧⌥⌘K',
-                    electronAccelerator: 'Ctrl+Shift+Alt+Cmd+K',
-                    userSettingsLabel: 'ctrl+shift+alt+cmd+K',
-                    WYSIWYG: true,
-                    chord: false,
-                    parts: [{
-                        altKey: true,
-                        ctrlKey: true,
-                        keyAriaLabel: 'K',
-                        keyLabel: 'K',
-                        metaKey: true,
-                        shiftKey: true
-                    }],
-                    dispatchParts: [
-                        'ctrl+shift+alt+meta+K'
-                    ]
-                };
-            } else {
-                expected = {
-                    label: 'Ctrl+Shift+Alt+K',
-                    ariaLabel: 'Ctrl+Shift+Alt+K',
-                    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
-                    }],
-                    dispatchParts: [
-                        'ctrl+shift+alt+K'
-                    ]
-                };
-            }
-
-            assert.deepStrictEqual({
-                label, ariaLabel, electronAccelerator, userSettingsLabel, WYSIWYG, chord, parts, dispatchParts
-            }, expected);
-        } else {
-            assert.fail(`resolvedKeybinding must be of ${MonacoResolvedKeybinding.name} type`);
-        }
-    });
-
-    it('TokenizationRegistry.getColorMap', async () => {
-        if (textmateService['monacoThemeRegistry'].getThemeData().base !== 'vs') {
-            const didChangeColorMap = new Promise(resolve => {
-                const toDispose = TokenizationRegistry.onDidChange(() => {
-                    toDispose.dispose();
-                    resolve();
-                });
-            });
-            textmateService['themeService'].setCurrentTheme('light');
-            await didChangeColorMap;
-        }
-
-        const textMateColorMap = textmateService['grammarRegistry'].getColorMap();
-        assert.notEqual(textMateColorMap.indexOf('#795E26'), -1, 'Expected custom toke colors for the light theme to be enabled.');
-
-        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.');
-    });
-
-    it('OpenerService.open', async () => {
-        const hoverContribution = monacoEditor.getControl().getContribution('editor.contrib.hover');
-        assert.isDefined(hoverContribution);
-        if (!('_openerService' in hoverContribution)) {
-            assert.fail('hoverContribution does not have OpenerService');
-            return;
-        }
-        /** @type {import('@theia/monaco-editor-core/esm/vs/editor/browser/services/openerService').OpenerService} */
-        const openerService = hoverContribution['_openerService'];
-
-        let opened = false;
-        const id = '__test:OpenerService.open';
-        const unregisterCommand = commands.registerCommand({ id }, {
-            execute: arg => (console.log(arg), opened = arg === 'foo')
-        });
-        try {
-            await openerService.open(URI.parse('command:' + id + '?"foo"'));
-            assert.isTrue(opened);
-        } finally {
-            unregisterCommand.dispose();
-        }
-    });
-
-    it('Supports setting contexts using the command registry', async () => {
-        const setContext = 'setContext';
-        const key = 'monaco-api-test-context';
-        const firstValue = 'first setting';
-        const secondValue = 'second setting';
-        assert.isFalse(contextKeys.match(`${key} == ${firstValue}`));
-        await commands.executeCommand(setContext, key, firstValue);
-        assert.isTrue(contextKeys.match(`${key} == ${firstValue}`));
-        await commands.executeCommand(setContext, key, secondValue);
-        assert.isTrue(contextKeys.match(`${key} == ${secondValue}`));
-    });
-
-});
+// *****************************************************************************
+// Copyright (C) 2020 TypeFox and others.
+//
+// This program and the accompanying materials are made available under the
+// terms of the Eclipse Public License v. 2.0 which is available at
+// http://www.eclipse.org/legal/epl-2.0.
+//
+// This Source Code may also be made available under the following Secondary
+// Licenses when the conditions for such availability set forth in the Eclipse
+// Public License v. 2.0 are satisfied: GNU General Public License, version 2
+// with the GNU Classpath Exception which is available at
+// https://www.gnu.org/software/classpath/license.html.
+//
+// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+// *****************************************************************************
+
+// @ts-check
+describe('Monaco API', async function () {
+    this.timeout(5000);
+
+    const { assert } = chai;
+
+    const { EditorManager } = require('@theia/editor/lib/browser/editor-manager');
+    const { WorkspaceService } = require('@theia/workspace/lib/browser/workspace-service');
+    const { MonacoEditor } = require('@theia/monaco/lib/browser/monaco-editor');
+    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 { TokenizationRegistry } = require('@theia/monaco-editor-core/esm/vs/editor/common/languages');
+    const { MonacoContextKeyService } = require('@theia/monaco/lib/browser/monaco-context-key-service');
+    const { URI } = require('@theia/monaco-editor-core/esm/vs/base/common/uri');
+
+    const container = window.theia.container;
+    const editorManager = container.get(EditorManager);
+    const workspaceService = container.get(WorkspaceService);
+    const textmateService = container.get(MonacoTextmateService);
+    /** @type {import('@theia/core/src/common/command').CommandRegistry} */
+    const commands = container.get(CommandRegistry);
+    /** @type {import('@theia/monaco/src/browser/monaco-context-key-service').MonacoContextKeyService} */
+    const contextKeys = container.get(MonacoContextKeyService);
+
+    /** @type {MonacoEditor} */
+    let monacoEditor;
+
+    before(async () => {
+        const root = workspaceService.tryGetRoots()[0];
+        const editor = await editorManager.open(root.resource.resolve('package.json'), {
+            mode: 'reveal'
+        });
+        monacoEditor = /** @type {MonacoEditor} */ (MonacoEditor.get(editor));
+    });
+
+    after(async () => {
+        await editorManager.closeAll({ save: false });
+    });
+
+    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 resolvedKeybindings = StandaloneServices.get(IKeybindingService).resolveKeybinding(chordKeybinding);
+        assert.equal(resolvedKeybindings.length, 1);
+
+        const resolvedKeybinding = resolvedKeybindings[0];
+        if (resolvedKeybinding instanceof MonacoResolvedKeybinding) {
+            const label = resolvedKeybinding.getLabel();
+            const ariaLabel = resolvedKeybinding.getAriaLabel();
+            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 platform = window.navigator.platform;
+            let expected;
+            if (platform.includes('Mac')) {
+                // Mac os
+                expected = {
+                    label: '⌃⇧⌥⌘K',
+                    ariaLabel: '⌃⇧⌥⌘K',
+                    electronAccelerator: 'Ctrl+Shift+Alt+Cmd+K',
+                    userSettingsLabel: 'ctrl+shift+alt+cmd+K',
+                    WYSIWYG: true,
+                    chord: false,
+                    parts: [{
+                        altKey: true,
+                        ctrlKey: true,
+                        keyAriaLabel: 'K',
+                        keyLabel: 'K',
+                        metaKey: true,
+                        shiftKey: true
+                    }],
+                    dispatchParts: [
+                        'ctrl+shift+alt+meta+K'
+                    ]
+                };
+            } else {
+                expected = {
+                    label: 'Ctrl+Shift+Alt+K',
+                    ariaLabel: 'Ctrl+Shift+Alt+K',
+                    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
+                    }],
+                    dispatchParts: [
+                        'ctrl+shift+alt+K'
+                    ]
+                };
+            }
+
+            assert.deepStrictEqual({
+                label, ariaLabel, electronAccelerator, userSettingsLabel, WYSIWYG, chord, parts, dispatchParts
+            }, expected);
+        } else {
+            assert.fail(`resolvedKeybinding must be of ${MonacoResolvedKeybinding.name} type`);
+        }
+    });
+
+    it('TokenizationRegistry.getColorMap', async () => {
+        if (textmateService['monacoThemeRegistry'].getThemeData().base !== 'vs') {
+            const didChangeColorMap = new Promise(resolve => {
+                const toDispose = TokenizationRegistry.onDidChange(() => {
+                    toDispose.dispose();
+                    resolve();
+                });
+            });
+            textmateService['themeService'].setCurrentTheme('light');
+            await didChangeColorMap;
+        }
+
+        const textMateColorMap = textmateService['grammarRegistry'].getColorMap();
+        assert.notEqual(textMateColorMap.indexOf('#795E26'), -1, 'Expected custom toke colors for the light theme to be enabled.');
+
+        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.');
+    });
+
+    it('OpenerService.open', async () => {
+        const hoverContribution = monacoEditor.getControl().getContribution('editor.contrib.hover');
+        assert.isDefined(hoverContribution);
+        if (!('_openerService' in hoverContribution)) {
+            assert.fail('hoverContribution does not have OpenerService');
+            return;
+        }
+        /** @type {import('@theia/monaco-editor-core/esm/vs/editor/browser/services/openerService').OpenerService} */
+        const openerService = hoverContribution['_openerService'];
+
+        let opened = false;
+        const id = '__test:OpenerService.open';
+        const unregisterCommand = commands.registerCommand({ id }, {
+            execute: arg => (console.log(arg), opened = arg === 'foo')
+        });
+        try {
+            await openerService.open(URI.parse('command:' + id + '?"foo"'));
+            assert.isTrue(opened);
+        } finally {
+            unregisterCommand.dispose();
+        }
+    });
+
+    it('Supports setting contexts using the command registry', async () => {
+        const setContext = 'setContext';
+        const key = 'monaco-api-test-context';
+        const firstValue = 'first setting';
+        const secondValue = 'second setting';
+        assert.isFalse(contextKeys.match(`${key} == ${firstValue}`));
+        await commands.executeCommand(setContext, key, firstValue);
+        assert.isTrue(contextKeys.match(`${key} == ${firstValue}`));
+        await commands.executeCommand(setContext, key, secondValue);
+        assert.isTrue(contextKeys.match(`${key} == ${secondValue}`));
+    });
+
+});

package/src/navigator.spec.js

@@ -1,92 +1,92 @@
-// *****************************************************************************
-// Copyright (C) 2020 TypeFox and others.
-//
-// This program and the accompanying materials are made available under the
-// terms of the Eclipse Public License v. 2.0 which is available at
-// http://www.eclipse.org/legal/epl-2.0.
-//
-// This Source Code may also be made available under the following Secondary
-// Licenses when the conditions for such availability set forth in the Eclipse
-// Public License v. 2.0 are satisfied: GNU General Public License, version 2
-// with the GNU Classpath Exception which is available at
-// https://www.gnu.org/software/classpath/license.html.
-//
-// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-// *****************************************************************************
-
-// @ts-check
-describe('Navigator', function () {
-    this.timeout(5000);
-
-    const { assert } = chai;
-
-    const { FileService } = require('@theia/filesystem/lib/browser/file-service');
-    const { DirNode, FileNode } = require('@theia/filesystem/lib/browser/file-tree/file-tree');
-    const { WorkspaceService } = require('@theia/workspace/lib/browser/workspace-service');
-    const { FileNavigatorContribution } = require('@theia/navigator/lib/browser/navigator-contribution');
-
-    /** @type {import('inversify').Container} */
-    const container = window['theia'].container;
-    const fileService = container.get(FileService);
-    const workspaceService = container.get(WorkspaceService);
-    const navigatorContribution = container.get(FileNavigatorContribution);
-
-    const rootUri = workspaceService.tryGetRoots()[0].resource;
-    const fileUri = rootUri.resolve('.test/nested/source/text.txt');
-    const targetUri = rootUri.resolve('.test/target');
-
-    beforeEach(async () => {
-        await fileService.create(fileUri, 'foo', { fromUserGesture: false, overwrite: true });
-        await fileService.createFolder(targetUri);
-    });
-
-    afterEach(async () => {
-        await fileService.delete(targetUri.parent, { fromUserGesture: false, useTrash: false, recursive: true });
-    });
-
-    /** @type {Array<['copy' | 'move', boolean]>} */
-    const operations = [
-        ['copy', false],
-        ['move', false]
-    ];
-    /** @type {Array<['file' | 'dir', boolean]>} */
-    const fileTypes = [
-        ['file', false],
-        ['dir', false],
-    ];
-    for (const [operation, onlyOperation] of operations) {
-        for (const [fileType, onlyFileType] of fileTypes) {
-            const ExpectedNodeType = fileType === 'file' ? FileNode : DirNode;
-            (onlyOperation || onlyFileType ? it.only : it)(operation + ' ' + fileType, async function () {
-                const navigator = await navigatorContribution.openView({ reveal: true });
-                await navigator.model.refresh();
-
-                const sourceUri = fileType === 'file' ? fileUri : fileUri.parent;
-                const sourceNode = await navigator.model.revealFile(sourceUri);
-                if (!ExpectedNodeType.is(sourceNode)) {
-                    return assert.isTrue(ExpectedNodeType.is(sourceNode));
-                }
-
-                const targetNode = await navigator.model.revealFile(targetUri);
-                if (!DirNode.is(targetNode)) {
-                    return assert.isTrue(DirNode.is(targetNode));
-                }
-
-                let actualUri;
-                if (operation === 'copy') {
-                    actualUri = await navigator.model.copy(sourceUri, targetNode);
-                } else {
-                    actualUri = await navigator.model.move(sourceNode, targetNode);
-                }
-                if (!actualUri) {
-                    return assert.isDefined(actualUri);
-                }
-
-                await navigator.model.refresh(targetNode);
-                const actualNode = await navigator.model.revealFile(actualUri);
-                assert.isTrue(ExpectedNodeType.is(actualNode));
-            });
-        }
-    }
-
-});
+// *****************************************************************************
+// Copyright (C) 2020 TypeFox and others.
+//
+// This program and the accompanying materials are made available under the
+// terms of the Eclipse Public License v. 2.0 which is available at
+// http://www.eclipse.org/legal/epl-2.0.
+//
+// This Source Code may also be made available under the following Secondary
+// Licenses when the conditions for such availability set forth in the Eclipse
+// Public License v. 2.0 are satisfied: GNU General Public License, version 2
+// with the GNU Classpath Exception which is available at
+// https://www.gnu.org/software/classpath/license.html.
+//
+// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+// *****************************************************************************
+
+// @ts-check
+describe('Navigator', function () {
+    this.timeout(5000);
+
+    const { assert } = chai;
+
+    const { FileService } = require('@theia/filesystem/lib/browser/file-service');
+    const { DirNode, FileNode } = require('@theia/filesystem/lib/browser/file-tree/file-tree');
+    const { WorkspaceService } = require('@theia/workspace/lib/browser/workspace-service');
+    const { FileNavigatorContribution } = require('@theia/navigator/lib/browser/navigator-contribution');
+
+    /** @type {import('inversify').Container} */
+    const container = window['theia'].container;
+    const fileService = container.get(FileService);
+    const workspaceService = container.get(WorkspaceService);
+    const navigatorContribution = container.get(FileNavigatorContribution);
+
+    const rootUri = workspaceService.tryGetRoots()[0].resource;
+    const fileUri = rootUri.resolve('.test/nested/source/text.txt');
+    const targetUri = rootUri.resolve('.test/target');
+
+    beforeEach(async () => {
+        await fileService.create(fileUri, 'foo', { fromUserGesture: false, overwrite: true });
+        await fileService.createFolder(targetUri);
+    });
+
+    afterEach(async () => {
+        await fileService.delete(targetUri.parent, { fromUserGesture: false, useTrash: false, recursive: true });
+    });
+
+    /** @type {Array<['copy' | 'move', boolean]>} */
+    const operations = [
+        ['copy', false],
+        ['move', false]
+    ];
+    /** @type {Array<['file' | 'dir', boolean]>} */
+    const fileTypes = [
+        ['file', false],
+        ['dir', false],
+    ];
+    for (const [operation, onlyOperation] of operations) {
+        for (const [fileType, onlyFileType] of fileTypes) {
+            const ExpectedNodeType = fileType === 'file' ? FileNode : DirNode;
+            (onlyOperation || onlyFileType ? it.only : it)(operation + ' ' + fileType, async function () {
+                const navigator = await navigatorContribution.openView({ reveal: true });
+                await navigator.model.refresh();
+
+                const sourceUri = fileType === 'file' ? fileUri : fileUri.parent;
+                const sourceNode = await navigator.model.revealFile(sourceUri);
+                if (!ExpectedNodeType.is(sourceNode)) {
+                    return assert.isTrue(ExpectedNodeType.is(sourceNode));
+                }
+
+                const targetNode = await navigator.model.revealFile(targetUri);
+                if (!DirNode.is(targetNode)) {
+                    return assert.isTrue(DirNode.is(targetNode));
+                }
+
+                let actualUri;
+                if (operation === 'copy') {
+                    actualUri = await navigator.model.copy(sourceUri, targetNode);
+                } else {
+                    actualUri = await navigator.model.move(sourceNode, targetNode);
+                }
+                if (!actualUri) {
+                    return assert.isDefined(actualUri);
+                }
+
+                await navigator.model.refresh(targetNode);
+                const actualNode = await navigator.model.revealFile(actualUri);
+                assert.isTrue(ExpectedNodeType.is(actualNode));
+            });
+        }
+    }
+
+});