@theia/core 1.43.1 → 1.45.0

package/src/browser/shell/application-shell.ts

@@ -2101,7 +2101,7 @@ export namespace ApplicationShell {
 
     export const areaLabels: Record<Area, string> = {
         main: nls.localizeByDefault('Main'),
-        top: nls.localize('theia/shell-area/top', 'Top'),
+        top: nls.localizeByDefault('Top'),
         left: nls.localizeByDefault('Left'),
         right: nls.localizeByDefault('Right'),
         bottom: nls.localizeByDefault('Bottom'),

package/src/browser/style/index.css

@@ -322,6 +322,7 @@ button.secondary[disabled],
 | Import children style files
 |----------------------------------------------------------------------------*/
 
+@import "./os.css";
 @import "./dockpanel.css";
 @import "./dialog.css";
 @import "./menus.css";

package/src/browser/style/os.css

@@ -0,0 +1,87 @@
+/********************************************************************************
+ * Copyright (C) 2019 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-only WITH Classpath-exception-2.0
+ ********************************************************************************/
+
+.mac {
+  --theia-ui-font-family: -apple-system,BlinkMacSystemFont,sans-serif
+}
+
+.mac:lang(zh-Hans) {
+  --theia-ui-font-family: -apple-system,BlinkMacSystemFont,PingFang SC,Hiragino Sans GB,sans-serif
+}
+
+.mac:lang(zh-Hant) {
+  --theia-ui-font-family: -apple-system,BlinkMacSystemFont,PingFang TC,sans-serif
+}
+
+.mac:lang(ja) {
+  --theia-ui-font-family: -apple-system,BlinkMacSystemFont,Hiragino Kaku Gothic Pro,sans-serif
+}
+
+.mac:lang(ko) {
+  --theia-ui-font-family: -apple-system,BlinkMacSystemFont,Nanum Gothic,Apple SD Gothic Neo,AppleGothic,sans-serif
+}
+
+.windows {
+  --theia-ui-font-family: Segoe WPC,Segoe UI,sans-serif
+}
+
+.windows:lang(zh-Hans) {
+  --theia-ui-font-family: Segoe WPC,Segoe UI,Microsoft YaHei,sans-serif
+}
+
+.windows:lang(zh-Hant) {
+  --theia-ui-font-family: Segoe WPC,Segoe UI,Microsoft Jhenghei,sans-serif
+}
+
+.windows:lang(ja) {
+  --theia-ui-font-family: Segoe WPC,Segoe UI,Yu Gothic UI,Meiryo UI,sans-serif
+}
+
+.windows:lang(ko) {
+  --theia-ui-font-family: Segoe WPC,Segoe UI,Malgun Gothic,Dotom,sans-serif
+}
+
+.linux {
+  --theia-ui-font-family: system-ui,Ubuntu,Droid Sans,sans-serif
+}
+
+.linux:lang(zh-Hans) {
+  --theia-ui-font-family: system-ui,Ubuntu,Droid Sans,Source Han Sans SC,Source Han Sans CN,Source Han Sans,sans-serif
+}
+
+.linux:lang(zh-Hant) {
+  --theia-ui-font-family: system-ui,Ubuntu,Droid Sans,Source Han Sans TC,Source Han Sans TW,Source Han Sans,sans-serif
+}
+
+.linux:lang(ja) {
+  --theia-ui-font-family: system-ui,Ubuntu,Droid Sans,Source Han Sans J,Source Han Sans JP,Source Han Sans,sans-serif
+}
+
+.linux:lang(ko) {
+  --theia-ui-font-family: system-ui,Ubuntu,Droid Sans,Source Han Sans K,Source Han Sans JR,Source Han Sans,UnDotum,FBaekmuk Gulim,sans-serif
+}
+
+.mac {
+  --monaco-monospace-font: "SF Mono",Monaco,Menlo,Courier,monospace
+}
+
+.windows {
+  --monaco-monospace-font: Consolas,"Courier New",monospace
+}
+
+.linux {
+  --monaco-monospace-font: "Ubuntu Mono","Liberation Mono","DejaVu Sans Mono","Courier New",monospace
+}

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

@@ -58,6 +58,12 @@ export class CompressedTreeWidget extends TreeViewWelcomeWidget {
         }
     }
 
+    protected override shouldRenderIndent(node: TreeNode): boolean {
+        return !this.compressionToggle.compress
+            || !this.compressionService.isCompressionParticipant(node)
+            || this.compressionService.getCompressionHead(node) === node;
+    }
+
     protected override shouldDisplayNode(node: TreeNode): boolean {
         if (this.compressionToggle.compress && this.compressionService.isCompressionParticipant(node) && !this.compressionService.isCompressionHead(node)) {
             return false;
@@ -66,14 +72,18 @@ export class CompressedTreeWidget extends TreeViewWelcomeWidget {
     }
 
     protected override getDepthForNode(node: TreeNode, depths: Map<CompositeTreeNode | undefined, number>): number {
-        if (!this.compressionToggle.compress) { return super.getDepthForNode(node, depths); }
+        if (!this.compressionToggle.compress) {
+            return super.getDepthForNode(node, depths);
+        }
         const parent = this.compressionService.getCompressionHead(node.parent) ?? node.parent;
         const parentDepth = depths.get(parent);
         return parentDepth === undefined ? 0 : TreeNode.isVisible(node.parent) ? parentDepth + 1 : parentDepth;
     }
 
     protected override toNodeRow(node: TreeNode, index: number, depth: number): CompressedNodeRow {
-        if (!this.compressionToggle.compress) { return super.toNodeRow(node, index, depth); }
+        if (!this.compressionToggle.compress) {
+            return super.toNodeRow(node, index, depth);
+        }
         const row: CompressedNodeRow = { node, index, depth };
         if (this.compressionService.isCompressionHead(node)) {
             row.compressionChain = this.compressionService.getCompressionChain(node);
@@ -102,7 +112,9 @@ export class CompressedTreeWidget extends TreeViewWelcomeWidget {
     }
 
     protected override getCaptionChildren(node: TreeNode, props: CompressedNodeProps): React.ReactNode {
-        if (!this.compressionToggle.compress || !props.compressionChain) { return super.getCaptionChildren(node, props); }
+        if (!this.compressionToggle.compress || !props.compressionChain) {
+            return super.getCaptionChildren(node, props);
+        }
         return props.compressionChain.map((subNode, index, self) => {
             const classes = ['theia-tree-compressed-label-part'];
             if (SelectableTreeNode.isSelected(subNode)) {
@@ -129,21 +141,27 @@ export class CompressedTreeWidget extends TreeViewWelcomeWidget {
     }
 
     protected override handleUp(event: KeyboardEvent): void {
-        if (!this.compressionToggle.compress) { return super.handleUp(event); }
+        if (!this.compressionToggle.compress) {
+            return super.handleUp(event);
+        }
         const type = this.props.multiSelect && this.hasShiftMask(event) ? TreeSelection.SelectionType.RANGE : undefined;
         this.model.selectPrevRow(type);
         this.node.focus();
     }
 
     protected override handleDown(event: KeyboardEvent): void {
-        if (!this.compressionToggle.compress) { return super.handleDown(event); }
+        if (!this.compressionToggle.compress) {
+            return super.handleDown(event);
+        }
         const type = this.props.multiSelect && this.hasShiftMask(event) ? TreeSelection.SelectionType.RANGE : undefined;
         this.model.selectNextRow(type);
         this.node.focus();
     }
 
     protected override async handleLeft(event: KeyboardEvent): Promise<void> {
-        if (!this.compressionToggle.compress) { return super.handleLeft(event); }
+        if (!this.compressionToggle.compress) {
+            return super.handleLeft(event);
+        }
         if (Boolean(this.props.multiSelect) && (this.hasCtrlCmdMask(event) || this.hasShiftMask(event))) {
             return;
         }
@@ -160,7 +178,9 @@ export class CompressedTreeWidget extends TreeViewWelcomeWidget {
     }
 
     protected override async handleRight(event: KeyboardEvent): Promise<void> {
-        if (!this.compressionToggle.compress) { return super.handleRight(event); }
+        if (!this.compressionToggle.compress) {
+            return super.handleRight(event);
+        }
         if (Boolean(this.props.multiSelect) && (this.hasCtrlCmdMask(event) || this.hasShiftMask(event))) {
             return;
         }

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

@@ -894,22 +894,33 @@ export class TreeWidget extends ReactWidget implements StatefulWidget {
         let current: TreeNode | undefined = node;
         let depth = props.depth;
         while (current && depth) {
-            const classNames: string[] = [TREE_NODE_INDENT_GUIDE_CLASS];
-            if (this.needsActiveIndentGuideline(current)) {
-                classNames.push('active');
-            } else {
-                classNames.push(renderIndentGuides === 'onHover' ? 'hover' : 'always');
+            if (this.shouldRenderIndent(current)) {
+                const classNames: string[] = [TREE_NODE_INDENT_GUIDE_CLASS];
+                if (this.needsActiveIndentGuideline(current)) {
+                    classNames.push('active');
+                } else {
+                    classNames.push(renderIndentGuides === 'onHover' ? 'hover' : 'always');
+                }
+                const paddingLeft = this.getDepthPadding(depth);
+                indentDivs.unshift(<div key={depth} className={classNames.join(' ')} style={{
+                    paddingLeft: `${paddingLeft}px`
+                }} />);
+                depth--;
             }
-            const paddingLeft = this.getDepthPadding(depth);
-            indentDivs.unshift(<div key={depth} className={classNames.join(' ')} style={{
-                paddingLeft: `${paddingLeft}px`
-            }} />);
             current = current.parent;
-            depth--;
         }
         return indentDivs;
     }
 
+    /**
+     * Determines whether an indentation div should be rendered for the specified tree node.
+     * If there are multiple tree nodes inside of a single rendered row,
+     * this method should only return true for the first node.
+     */
+    protected shouldRenderIndent(node: TreeNode): boolean {
+        return true;
+    }
+
     protected needsActiveIndentGuideline(node: TreeNode): boolean {
         const parent = node.parent;
         if (!parent || !this.isExpandable(parent)) {

package/src/browser/user-working-directory-provider.ts

@@ -16,14 +16,34 @@
 
 import { inject, injectable } from 'inversify';
 import URI from '../common/uri';
-import { MaybePromise, SelectionService, UriSelection } from '../common';
+import { MaybePromise, SelectionService, UNTITLED_SCHEME, UriSelection } from '../common';
 import { EnvVariablesServer } from '../common/env-variables';
+import { FrontendApplication } from './frontend-application';
+import { FrontendApplicationContribution } from './frontend-application-contribution';
+import { Widget } from './widgets';
+import { Navigatable } from './navigatable-types';
 
 @injectable()
-export class UserWorkingDirectoryProvider {
+export class UserWorkingDirectoryProvider implements FrontendApplicationContribution {
     @inject(SelectionService) protected readonly selectionService: SelectionService;
     @inject(EnvVariablesServer) protected readonly envVariables: EnvVariablesServer;
 
+    protected lastOpenResource: URI | undefined;
+
+    configure(app: FrontendApplication): void {
+        app.shell.onDidChangeCurrentWidget(e => this.setLastOpenResource(e.newValue ?? undefined));
+        this.setLastOpenResource(app.shell.currentWidget);
+    }
+
+    protected setLastOpenResource(widget?: Widget): void {
+        if (Navigatable.is(widget)) {
+            const uri = widget.getResourceUri();
+            if (uri && uri.scheme !== UNTITLED_SCHEME) {
+                this.lastOpenResource = uri;
+            }
+        }
+    }
+
     /**
      * @returns A {@link URI} that represents a good guess about the directory in which the user is currently operating.
      *
@@ -35,7 +55,16 @@ export class UserWorkingDirectoryProvider {
     }
 
     protected getFromSelection(): MaybePromise<URI | undefined> {
-        return this.ensureIsDirectory(UriSelection.getUri(this.selectionService.selection));
+        const uri = UriSelection.getUri(this.selectionService.selection);
+        if (uri?.scheme === UNTITLED_SCHEME) {
+            // An untitled file is not a valid working directory context.
+            return undefined;
+        }
+        return this.ensureIsDirectory(uri);
+    }
+
+    protected getFromLastOpenResource(): MaybePromise<URI | undefined> {
+        return this.ensureIsDirectory(this.lastOpenResource);
     }
 
     protected getFromUserHome(): MaybePromise<URI> {

package/src/browser/window/default-secondary-window-service.ts

@@ -19,6 +19,8 @@ import { WindowService } from './window-service';
 import { ExtractableWidget } from '../widgets';
 import { ApplicationShell } from '../shell';
 import { Saveable } from '../saveable';
+import { PreferenceService } from '../preferences';
+import { environment } from '../../common';
 
 @injectable()
 export class DefaultSecondaryWindowService implements SecondaryWindowService {
@@ -38,6 +40,9 @@ export class DefaultSecondaryWindowService implements SecondaryWindowService {
     @inject(WindowService)
     protected readonly windowService: WindowService;
 
+    @inject(PreferenceService)
+    protected readonly preferenceService: PreferenceService;
+
     @postConstruct()
     init(): void {
         // Set up messaging with secondary windows
@@ -100,7 +105,13 @@ export class DefaultSecondaryWindowService implements SecondaryWindowService {
     }
 
     protected doCreateSecondaryWindow(widget: ExtractableWidget, shell: ApplicationShell): Window | undefined {
-        const newWindow = window.open(DefaultSecondaryWindowService.SECONDARY_WINDOW_URL, this.nextWindowId(), 'popup') ?? undefined;
+        let options;
+        const [height, width, left, top] = this.findSecondaryWindowCoordinates(widget);
+        options = `popup=1,width=${width},height=${height},left=${left},top=${top}`;
+        if (this.preferenceService.get('window.secondaryWindowAlwaysOnTop')) {
+            options += ',alwaysOnTop=true';
+        }
+        const newWindow = window.open(DefaultSecondaryWindowService.SECONDARY_WINDOW_URL, this.nextWindowId(), options) ?? undefined;
         if (newWindow) {
             newWindow.addEventListener('DOMContentLoaded', () => {
                 newWindow.addEventListener('beforeunload', evt => {
@@ -124,6 +135,48 @@ export class DefaultSecondaryWindowService implements SecondaryWindowService {
         return newWindow;
     }
 
+    protected findSecondaryWindowCoordinates(widget: ExtractableWidget): (number | undefined)[] {
+        const clientBounds = widget.node.getBoundingClientRect();
+        const preference = this.preferenceService.get('window.secondaryWindowPlacement');
+
+        let height; let width; let left; let top;
+        const offsetY = 20; // Offset to avoid the window title bar
+
+        switch (preference) {
+            case 'originalSize': {
+                height = widget.node.clientHeight;
+                width = widget.node.clientWidth;
+                left = window.screenLeft + clientBounds.x;
+                top = window.screenTop + (window.outerHeight - window.innerHeight) + offsetY;
+                if (environment.electron.is()) {
+                    top = window.screenTop + clientBounds.y;
+                }
+                break;
+            }
+            case 'halfWidth': {
+                height = window.innerHeight - (window.outerHeight - window.innerHeight);
+                width = window.innerWidth / 2;
+                left = window.screenLeft;
+                top = window.screenTop;
+                if (!environment.electron.is()) {
+                    height = window.innerHeight + clientBounds.y - offsetY;
+                }
+                break;
+            }
+            case 'fullSize': {
+                height = window.innerHeight - (window.outerHeight - window.innerHeight);
+                width = window.innerWidth;
+                left = window.screenLeft;
+                top = window.screenTop;
+                if (!environment.electron.is()) {
+                    height = window.innerHeight + clientBounds.y - offsetY;
+                }
+                break;
+            }
+        }
+        return [height, width, left, top];
+    }
+
     focus(win: Window): void {
         win.focus();
     }

package/src/common/contribution-filter/contribution-filter.ts

@@ -50,6 +50,15 @@ export const FilterContribution = Symbol('FilterContribution');
 export interface FilterContribution {
     /**
      * Use the registry to register your contribution filters.
+     * * Note that filtering contributions based on their class (constructor) name is discouraged.
+     * Class names are minified in production builds and therefore not reliable.
+     * Use instance of checks or direct constructor comparison instead:
+     *
+     * ```ts
+     * registry.addFilters('*', [
+     *     contrib => !(contrib instanceof SampleFilteredCommandContribution)
+     * ]);
+     * ```
      */
     registerContributionFilters(registry: ContributionFilterRegistry): void;
 }

package/src/common/event.ts

@@ -456,7 +456,7 @@ export class AsyncEmitter<T extends WaitUntilEvent> extends Emitter<T> {
                 delete (asyncEvent as any)['waitUntil'];
             }
             if (!waitables.length) {
-                return;
+                continue;
             }
             try {
                 await Promise.all(waitables);