@theia/monaco 1.18.0-next.d3501165 → 1.19.0

package/src/browser/monaco-loader.ts

@@ -16,7 +16,7 @@
 
 /* eslint-disable @typescript-eslint/no-explicit-any */
 
-import { nls } from '@theia/core/lib/browser/nls';
+import { nls } from '@theia/core/lib/common/nls';
 
 export function loadVsRequire(context: any): Promise<any> {
     // Monaco uses a custom amd loader that over-rides node's require.
@@ -48,11 +48,15 @@ export function loadVsRequire(context: any): Promise<any> {
 
 export function loadMonaco(vsRequire: any): Promise<void> {
     return new Promise<void>(resolve => {
-        if (nls.locale && ['de', 'es', 'fr', 'it', 'ja', 'ko', 'ru', 'zh-cn', 'zh-tw'].includes(nls.locale)) {
+        if (nls.locale) {
             vsRequire.config({
                 'vs/nls': {
                     availableLanguages: {
                         '*': nls.locale
+                    },
+                    loadBundle: (_name: string, _language: string, callback: (err: unknown, messages: Record<string, string[]>) => void) => {
+                        // The `monaco-nls.json` is build using the `translate-monaco.js` script file
+                        callback(undefined, createMessageBundle(require('../../data/monaco-nls.json')));
                     }
                 }
             });
@@ -162,3 +166,28 @@ export function clearMonacoQuickAccessProviders(): void {
     // Clear Monaco QuickAccessRegistry as it currently includes monaco internal providers and not Theia's providers
     registry.clear();
 }
+
+function createMessageBundle(bundle: Record<string, Record<string, string>>): Record<string, string[]> {
+    const result: Record<string, string[]> = {};
+    for (const [fullName, items] of Object.entries(bundle)) {
+        const nameIndex = fullName.lastIndexOf('/');
+        let name = fullName;
+        if (nameIndex >= 0) {
+            name = fullName.substring(nameIndex + 1);
+        }
+        const array: string[] = [];
+        const keys = Object.keys(items);
+        for (let i = 0; i < keys.length; i++) {
+            let key = keys[i];
+            if (key.startsWith('_duplicate/')) {
+                const index = Number(key.substring('_duplicate/'.length));
+                key = keys[index];
+                keys[i] = key;
+            }
+            const fullItemName = `vscode/${name}/${key}`;
+            array.push(nls.localize(fullItemName, items[key]));
+        }
+        result[fullName] = array;
+    }
+    return result;
+}

package/src/browser/monaco-menu.ts

@@ -16,8 +16,9 @@
 
 import { injectable, inject } from '@theia/core/shared/inversify';
 import { MenuContribution, MenuModelRegistry, MAIN_MENU_BAR, MenuPath } from '@theia/core/lib/common';
-import { EDITOR_CONTEXT_MENU } from '@theia/editor/lib/browser';
+import { EditorMainMenu, EDITOR_CONTEXT_MENU } from '@theia/editor/lib/browser';
 import { MonacoCommandRegistry } from './monaco-command-registry';
+import { nls } from '@theia/core/lib/common/nls';
 import MenuRegistry = monaco.actions.MenuRegistry;
 
 export interface MonacoActionGroup {
@@ -27,6 +28,7 @@ export interface MonacoActionGroup {
 export namespace MonacoMenus {
     export const SELECTION = [...MAIN_MENU_BAR, '3_selection'];
     export const PEEK_CONTEXT_SUBMENU: MenuPath = [...EDITOR_CONTEXT_MENU, 'navigation', 'peek_submenu'];
+    export const MARKERS_GROUP = [...EditorMainMenu.GO, '5_markers_group'];
 }
 
 @injectable()
@@ -50,7 +52,7 @@ export class MonacoEditorMenuContribution implements MenuContribution {
 
         this.registerPeekSubmenu(registry);
 
-        registry.registerSubmenu(MonacoMenus.SELECTION, 'Selection');
+        registry.registerSubmenu(MonacoMenus.SELECTION, nls.localize('vscode/menubar/mSelection', 'Selection'));
         for (const item of MenuRegistry.getMenuItems(monaco.actions.MenuId.MenubarSelectionMenu)) {
             if (!monaco.actions.isIMenuItem(item)) {
                 continue;
@@ -64,10 +66,54 @@ export class MonacoEditorMenuContribution implements MenuContribution {
                 registry.registerMenuAction(menuPath, { commandId, order, label });
             }
         }
+
+        // Builtin monaco language features commands.
+        registry.registerMenuAction(EditorMainMenu.LANGUAGE_FEATURES_GROUP, {
+            commandId: 'editor.action.quickOutline',
+            label: nls.localize('vscode/gotoSymbolQuickAccess/gotoSymbol', 'Go to Symbol in Editor...'),
+            order: '1'
+        });
+        registry.registerMenuAction(EditorMainMenu.LANGUAGE_FEATURES_GROUP, {
+            commandId: 'editor.action.revealDefinition',
+            order: '2'
+        });
+        registry.registerMenuAction(EditorMainMenu.LANGUAGE_FEATURES_GROUP, {
+            commandId: 'editor.action.revealDeclaration',
+            order: '3'
+        });
+        registry.registerMenuAction(EditorMainMenu.LANGUAGE_FEATURES_GROUP, {
+            commandId: 'editor.action.goToTypeDefinition',
+            order: '4'
+        });
+        registry.registerMenuAction(EditorMainMenu.LANGUAGE_FEATURES_GROUP, {
+            commandId: 'editor.action.goToImplementation',
+            order: '5'
+        });
+        registry.registerMenuAction(EditorMainMenu.LANGUAGE_FEATURES_GROUP, {
+            commandId: 'editor.action.goToReferences',
+            order: '6'
+        });
+
+        registry.registerMenuAction(EditorMainMenu.LOCATION_GROUP, {
+            commandId: 'editor.action.jumpToBracket',
+            order: '2'
+        });
+
+        // Builtin monaco problem commands.
+        registry.registerMenuAction(MonacoMenus.MARKERS_GROUP, {
+            commandId: 'editor.action.marker.nextInFiles',
+            label: nls.localize('vscode/gotoError/miGotoNextProblem', 'Next Problem'),
+            order: '1'
+        });
+        registry.registerMenuAction(MonacoMenus.MARKERS_GROUP, {
+            commandId: 'editor.action.marker.prevInFiles',
+            label: nls.localize('vscode/gotoError/miGotoPreviousProblem', 'Previous Problem'),
+            order: '2'
+        });
     }
 
     protected registerPeekSubmenu(registry: MenuModelRegistry): void {
-        registry.registerSubmenu(MonacoMenus.PEEK_CONTEXT_SUBMENU, 'Peek');
+        registry.registerSubmenu(MonacoMenus.PEEK_CONTEXT_SUBMENU, nls.localize('vscode/goToCommands/peek.submenu', 'Peek'));
 
         for (const item of MenuRegistry.getMenuItems(monaco.actions.MenuId.EditorContextPeek)) {
             if (!monaco.actions.isIMenuItem(item)) {

package/src/browser/monaco-quick-input-service.ts

@@ -182,8 +182,17 @@ export class MonacoQuickInputService implements QuickInputService {
     }
 
     input(options?: InputOptions, token?: CancellationToken): Promise<string | undefined> {
-        return this.monacoService.input();
+        let inputOptions: monaco.quickInput.IInputOptions | undefined;
+        if (options) {
+            const { validateInput, ...props } = options;
+            inputOptions = { ...props };
+            if (validateInput) {
+                inputOptions.validateInput = async input => validateInput(input);
+            }
+        }
+        return this.monacoService.input(inputOptions, token);
     }
+
     pick<T extends QuickPickItem, O extends PickOptions<T>>(picks: T[] | Promise<T[]>, options?: O, token?: CancellationToken):
         Promise<(O extends { canPickMany: true; } ? T[] : T) | undefined> {
         return this.monacoService.pick(picks, options, token);
@@ -261,6 +270,12 @@ export class MonacoQuickInputService implements QuickInputService {
             return item;
         });
     }
+
+    createQuickPick<T extends QuickPickItem>(): QuickPick<T> {
+        const quickPick = this.monacoService.createQuickPick<MonacoQuickPickItem<T>>();
+        return this.wrapQuickPick(quickPick);
+    }
+
     wrapQuickPick<T extends QuickPickItem>(wrapped: monaco.quickInput.IQuickPick<MonacoQuickPickItem<T>>): QuickPick<T> {
         return new MonacoQuickPick(wrapped, this.keybindingRegistry);
     }

package/src/browser/style/index.css

@@ -99,6 +99,13 @@
   font-family: sans-serif;
 }
 
+.monaco-editor .monaco-list .monaco-list-row.focused,
+.monaco-editor .monaco-list .monaco-list-row.focused,
+.monaco-editor .monaco-list .monaco-list-row.focused .suggest-icon {
+  color: var(--theia-list-activeSelectionForeground) !important;
+  background-color: var(--theia-list-activeSelectionBackground) !important;
+}
+
 /* Monaco Quick Input */
 .quick-input-widget {
   width: 600px !important;
@@ -140,7 +147,24 @@
 }
 
 .quick-input-list .monaco-list-row.focused {
-  background-color: var(--theia-quickInput-list-focusBackground) !important;
+  background-color: var(--theia-quickInputList-focusBackground) !important;
+}
+
+.quick-input-list .monaco-keybinding > .monaco-keybinding-key {
+  color: inherit !important;
+}
+
+.quick-input-list .monaco-list-row.focused,
+.quick-input-list .monaco-list-row.focused .monaco-highlighted-label,
+.quick-input-list .monaco-list-row.focused .monaco-highlighted-label .codicon,
+.quick-input-list .monaco-list-row.focused .quick-input-list-entry .quick-input-list-separator,
+.quick-input-list .monaco-list-row.focused .monaco-highlighted-label .monaco-keybinding .monaco-keybinding-key,
+.quick-input-list .monaco-list-row.focused .monaco-highlighted-label .monaco-keybinding .monaco-keybinding-key-separator {
+  color: var(--theia-quickInputList-focusForeground) !important;
+}
+
+.quick-input-list .monaco-list-row.focused .monaco-highlighted-label .highlight {
+  color: var(--theia-list-focusHighlightForeground) !important;
 }
 
 .monaco-list-rows
@@ -204,3 +228,11 @@
 .monaco-editor .find-widget .matchesCount {
   font-family: var(--theia-ui-font-family);
 }
+
+.monaco-editor .monaco-action-bar .action-label.codicon {
+  color: var(--theia-foreground);
+}
+
+.monaco-editor .monaco-action-bar .action-item.active {
+	transform: none;
+}

package/src/browser/workspace-symbol-command.ts

@@ -17,25 +17,25 @@
 import { injectable, inject } from '@theia/core/shared/inversify';
 import { environment } from '@theia/core/shared/@theia/application-package/lib/environment';
 import { KeybindingContribution, KeybindingRegistry, OpenerService, LabelProvider } from '@theia/core/lib/browser';
-
 import { QuickAccessContribution, QuickAccessProvider, QuickInputService, QuickAccessRegistry, QuickPicks, QuickPickItem, findMatches } from '@theia/core/lib/browser/quick-input';
 import {
-    CommandRegistry, CommandHandler, Command, SelectionService, CancellationToken
+    CommandRegistry, CommandHandler, Command, SelectionService, CancellationToken,
+    CommandContribution, MenuContribution, MenuModelRegistry, nls
 } from '@theia/core/lib/common';
-import { CommandContribution } from '@theia/core/lib/common';
 import { Range, Position, SymbolInformation } from '@theia/core/shared/vscode-languageserver-types';
 import { WorkspaceSymbolParams } from '@theia/core/shared/vscode-languageserver-protocol';
 import { MonacoLanguages, WorkspaceSymbolProvider } from './monaco-languages';
 import URI from '@theia/core/lib/common/uri';
+import { EditorMainMenu } from '@theia/editor/lib/browser';
 
 @injectable()
-export class WorkspaceSymbolCommand implements QuickAccessProvider, CommandContribution, KeybindingContribution, CommandHandler, QuickAccessContribution {
+export class WorkspaceSymbolCommand implements QuickAccessProvider, CommandContribution, KeybindingContribution, MenuContribution, CommandHandler, QuickAccessContribution {
     public static readonly PREFIX = '#';
 
-    private command: Command = {
+    private command = Command.toLocalizedCommand({
         id: 'languages.workspace.symbol',
         label: 'Go to Symbol in Workspace...'
-    };
+    }, 'vscode/search.contribution/showTriggerActions');
 
     @inject(MonacoLanguages) protected readonly languages: MonacoLanguages;
     @inject(OpenerService) protected readonly openerService: OpenerService;
@@ -56,6 +56,13 @@ export class WorkspaceSymbolCommand implements QuickAccessProvider, CommandContr
         commands.registerCommand(this.command, this);
     }
 
+    registerMenus(menus: MenuModelRegistry): void {
+        menus.registerMenuAction(EditorMainMenu.WORKSPACE_GROUP, {
+            commandId: this.command.id,
+            order: '2'
+        });
+    }
+
     private isElectron(): boolean {
         return environment.electron.is();
     }
@@ -72,7 +79,7 @@ export class WorkspaceSymbolCommand implements QuickAccessProvider, CommandContr
             getInstance: () => this,
             prefix: WorkspaceSymbolCommand.PREFIX,
             placeholder: '',
-            helpEntries: [{ description: 'Go to Symbol in Workspace', needsEditor: false }]
+            helpEntries: [{ description: nls.localize('vscode/search.contribution/symbolsQuickAccess', 'Go to Symbol in Workspace'), needsEditor: false }]
         });
     }
 
@@ -100,7 +107,9 @@ export class WorkspaceSymbolCommand implements QuickAccessProvider, CommandContr
                     const filteredSymbols = symbols.filter(el => el && el.length !== 0);
                     if (filteredSymbols.length === 0) {
                         items.push({
-                            label: filter.length === 0 ? 'Type to search for symbols' : 'No symbols matching',
+                            label: filter.length === 0
+                                ? nls.localize('theia/monaco/typeToSearchForSymbols', 'Type to search for symbols')
+                                : nls.localize('theia/monaco/noSymbolsMatching', 'No symbols matching'),
                         });
                     }
                 }).catch();