@theia/core 1.67.0-next.0 → 1.67.0-next.13

package/src/browser/index.ts

@@ -28,6 +28,8 @@ export * from './tree';
 export * from './messaging';
 export * from './endpoint';
 export * from './common-frontend-contribution';
+export * from './common-menus';
+export * from './common-commands';
 export * from './quick-input';
 export * from './widget-manager';
 export * from './saveable';
@@ -48,3 +50,4 @@ export * from './hover-service';
 export * from './saveable-service';
 export * from './undo-redo-handler';
 export * from './widget-status-bar-service';
+export * from './badges';

package/src/browser/quick-input/quick-command-frontend-contribution.ts

@@ -16,7 +16,7 @@
 import { injectable, inject, optional } from 'inversify';
 import { CommandRegistry, CommandContribution, MenuContribution, MenuModelRegistry, nls } from '../../common';
 import { KeybindingRegistry, KeybindingContribution } from '../keybinding';
-import { CommonMenus } from '../common-frontend-contribution';
+import { CommonMenus } from '../common-menus';
 import { CLOSE_QUICK_OPEN, CLEAR_COMMAND_HISTORY, quickCommand, QuickCommandService } from './quick-command-service';
 import { QuickInputService } from './quick-input-service';
 import { ConfirmDialog, Dialog } from '../dialogs';

package/src/browser/shell/shell-layout-restorer.ts

@@ -24,7 +24,7 @@ import { CommandContribution, CommandRegistry, Command } from '../../common/comm
 import { ThemeService } from '../theming';
 import { ContributionProvider } from '../../common/contribution-provider';
 import { ApplicationShell, applicationShellLayoutVersion, ApplicationShellLayoutVersion } from './application-shell';
-import { CommonCommands } from '../common-frontend-contribution';
+import { CommonCommands } from '../common-commands';
 import { WindowService } from '../window/window-service';
 import { StopReason } from '../../common/frontend-application-state';
 import { isFunction, isObject, MaybePromise } from '../../common';

package/src/browser/shell/tab-bars.ts

@@ -183,11 +183,9 @@ export class TabBarRenderer extends TabBar.Renderer {
             ? nls.localizeByDefault('Unpin')
             : nls.localizeByDefault('Close');
 
-        const hover = isHorizontal && this.corePreferences?.['window.tabbar.enhancedPreview'] === 'classic'
-            ? { title: title.caption }
-            : {
-                onmouseenter: this.handleMouseEnterEvent
-            };
+        const hover = {
+            onmouseenter: this.handleMouseEnterEvent
+        };
 
         const tabLabel = h.div(
             { className: 'theia-tab-icon-label' },
@@ -550,7 +548,7 @@ export class TabBarRenderer extends TabBar.Renderer {
         return h.div({ className: baseClassName, style }, data.title.iconLabel);
     }
 
-    protected renderEnhancedPreview = (title: Title<Widget>) => {
+    protected renderEnhancedPreview(title: Title<Widget>): HTMLDivElement {
         const hoverBox = document.createElement('div');
         hoverBox.classList.add('theia-horizontal-tabBar-hover-div');
         const labelElement = document.createElement('p');
@@ -625,26 +623,26 @@ export class TabBarRenderer extends TabBar.Renderer {
     }
 
     protected handleMouseEnterEvent = (event: MouseEvent) => {
-        if (this.tabBar && this.hoverService && event.currentTarget instanceof HTMLElement) {
-            const id = event.currentTarget.id;
-            const title = this.tabBar.titles.find(t => this.createTabId(t) === id);
-            if (title) {
-                if (this.tabBar.orientation === 'horizontal') {
-                    this.hoverService.requestHover({
-                        content: this.renderEnhancedPreview(title),
-                        target: event.currentTarget,
-                        position: 'bottom',
-                        cssClasses: ['extended-tab-preview'],
-                        visualPreview: this.corePreferences?.['window.tabbar.enhancedPreview'] === 'visual' ? width => this.renderVisualPreview(width, title) : undefined
-                    });
-                } else if (title.caption) {
-                    this.hoverService.requestHover({
-                        content: title.caption,
-                        target: event.currentTarget,
-                        position: 'right'
-                    });
-                }
-            }
+        if (!this.tabBar || !this.hoverService || !(event.currentTarget instanceof HTMLElement)) { return; }
+        const id = event.currentTarget.id;
+        const title = this.tabBar.titles.find(t => this.createTabId(t) === id);
+        if (!title) { return; }
+        if (this.tabBar.orientation === 'horizontal' && this.corePreferences?.['window.tabbar.enhancedPreview'] !== 'classic' && EnhancedPreviewWidget.is(title.owner)) {
+            this.hoverService.requestHover({
+                content: this.renderEnhancedPreview(title),
+                target: event.currentTarget,
+                position: 'bottom',
+                cssClasses: ['extended-tab-preview'],
+                visualPreview: this.corePreferences?.['window.tabbar.enhancedPreview'] === 'visual' ? width => this.renderVisualPreview(width, title) : undefined
+            });
+        } else if (title.caption) {
+            const position = this.tabBar.orientation === 'horizontal' ? 'bottom' : 'right';
+            const tooltip = ArrayUtils.coalesce([title.caption, ...this.getDecorationData(title, 'tooltip')]).join(' - ');
+            this.hoverService.requestHover({
+                content: tooltip,
+                target: event.currentTarget,
+                position
+            });
         }
     };
 

package/src/browser/shell/view-contribution.ts

@@ -22,7 +22,7 @@ import {
 } from '../../common';
 import { KeybindingContribution, KeybindingRegistry } from '../keybinding';
 import { WidgetManager } from '../widget-manager';
-import { CommonMenus } from '../common-frontend-contribution';
+import { CommonMenus } from '../common-menus';
 import { ApplicationShell } from './application-shell';
 import { QuickViewService } from '../quick-input';
 

package/src/browser/tree/tree-widget.tsx

@@ -1668,10 +1668,9 @@ export namespace TreeWidget {
         protected readonly scrollIntoViewIfNeeded = () => {
             const { scrollToRow } = this.props;
             if (this.list && scrollToRow !== undefined) {
-                this.list.scrollToIndex({
+                this.list.scrollIntoView({
                     index: scrollToRow,
-                    align: 'center',
-                    behavior: 'smooth'
+                    align: 'center'
                 });
             }
         };
@@ -1681,7 +1680,7 @@ export namespace TreeWidget {
         }
 
         override componentDidUpdate(prevProps: ViewProps): void {
-            if (this.props.scrollToRow !== prevProps.scrollToRow || this.props.rows !== prevProps.rows) {
+            if (this.props.scrollToRow !== prevProps.scrollToRow) {
                 this.scrollIntoViewIfNeeded();
             }
         }

package/src/browser/window-contribution.ts

@@ -19,7 +19,7 @@ import { Command, CommandContribution, CommandRegistry, environment } from '../c
 import { WindowService } from './window/window-service';
 import { KeybindingContribution, KeybindingRegistry } from './keybinding';
 import { MenuContribution, MenuModelRegistry } from '../common/menu';
-import { CommonMenus } from '../browser/common-frontend-contribution';
+import { CommonMenus } from './common-menus';
 
 export namespace WindowCommands {
 

package/src/common/preferences/preference-service.ts

@@ -361,8 +361,13 @@ export class PreferenceServiceImpl implements PreferenceService {
                 const provider = this.getProvider(scope);
                 if (provider) {
                     const scopeValue: JSONValue | undefined = provider.get(preferenceName);
-                    // Skip if a more specific scope has this preference defined
                     if (scope > change.scope && scopeValue !== undefined) {
+                        const preference = this.schemaService.getSchemaProperty(change.preferenceName);
+                        if (!preference?.type || preference.type === 'object' || preference.type === 'array'
+                            || Array.isArray(preference.type) && preference.type.some(candidate => candidate === 'object' || candidate === 'array')) {
+                            // Merge object/array preferences
+                            acceptChange(change);
+                        }
                         break;
                     }
                     // Handle changes in the same scope