@theia/core 1.38.0-next.7 → 1.39.0-next.1

package/src/browser/preferences/preference-proxy.ts

@@ -228,12 +228,12 @@ export function createPreferenceProxy<T>(preferences: PreferenceService, promise
                 if (p.startsWith(prefix)) {
                     const idx = p.indexOf('.', prefix.length);
                     if (idx !== -1 && isDeep) {
-                        const pre = p.substr(prefix.length, idx - prefix.length);
+                        const pre = p.substring(prefix.length, idx);
                         if (properties.indexOf(pre) === -1) {
                             properties.push(pre);
                         }
                     }
-                    const prop = p.substr(prefix.length);
+                    const prop = p.substring(prefix.length);
                     if (isFlat || prop.indexOf('.') === -1) {
                         properties.push(prop);
                     }

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

@@ -17,8 +17,9 @@ 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 { CLEAR_COMMAND_HISTORY, quickCommand, QuickCommandService } from './quick-command-service';
+import { CLOSE_QUICK_OPEN, CLEAR_COMMAND_HISTORY, quickCommand, QuickCommandService } from './quick-command-service';
 import { QuickInputService } from './quick-input-service';
+import { ConfirmDialog, Dialog } from '../dialogs';
 
 @injectable()
 export class QuickCommandFrontendContribution implements CommandContribution, KeybindingContribution, MenuContribution {
@@ -36,7 +37,20 @@ export class QuickCommandFrontendContribution implements CommandContribution, Ke
             }
         });
         commands.registerCommand(CLEAR_COMMAND_HISTORY, {
-            execute: () => commands.clearCommandHistory(),
+            execute: async () => {
+                const shouldClear = await new ConfirmDialog({
+                    title: nls.localizeByDefault('Clear Command History'),
+                    msg: nls.localizeByDefault('Do you want to clear the history of recently used commands?'),
+                    ok: nls.localizeByDefault('Clear'),
+                    cancel: Dialog.CANCEL,
+                }).open();
+                if (shouldClear) {
+                    commands.clearCommandHistory();
+                }
+            }
+        });
+        commands.registerCommand(CLOSE_QUICK_OPEN, {
+            execute: () => this.quickInputService?.hide()
         });
     }
 
@@ -56,5 +70,15 @@ export class QuickCommandFrontendContribution implements CommandContribution, Ke
             command: quickCommand.id,
             keybinding: 'ctrlcmd+shift+p'
         });
+        keybindings.registerKeybinding({
+            command: CLOSE_QUICK_OPEN.id,
+            keybinding: 'esc',
+            when: 'inQuickOpen'
+        });
+        keybindings.registerKeybinding({
+            command: CLOSE_QUICK_OPEN.id,
+            keybinding: 'shift+esc',
+            when: 'inQuickOpen'
+        });
     }
 }

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

@@ -33,6 +33,10 @@ export const CLEAR_COMMAND_HISTORY = Command.toDefaultLocalizedCommand({
     label: 'Clear Command History'
 });
 
+export const CLOSE_QUICK_OPEN: Command = {
+    id: 'workbench.action.closeQuickOpen'
+};
+
 @injectable()
 export class QuickCommandService implements QuickAccessContribution, QuickAccessProvider {
     static PREFIX = '>';

package/src/browser/shell/tab-bar-toolbar/tab-bar-toolbar.tsx

@@ -43,6 +43,7 @@ export class TabBarToolbar extends ReactWidget {
     protected more = new Map<string, TabBarToolbarItem>();
 
     protected contextKeyListener: Disposable | undefined;
+    protected toDisposeOnUpdateItems: DisposableCollection = new DisposableCollection();
 
     @inject(CommandRegistry) protected readonly commands: CommandRegistry;
     @inject(LabelParser) protected readonly labelParser: LabelParser;
@@ -59,11 +60,20 @@ export class TabBarToolbar extends ReactWidget {
     }
 
     updateItems(items: Array<TabBarToolbarItem | ReactTabBarToolbarItem>, current: Widget | undefined): void {
+        this.toDisposeOnUpdateItems.dispose();
+        this.toDisposeOnUpdateItems = new DisposableCollection();
         this.inline.clear();
         this.more.clear();
 
         const contextKeys = new Set<string>();
         for (const item of items.sort(TabBarToolbarItem.PRIORITY_COMPARATOR).reverse()) {
+            if ('command' in item) {
+                this.commands.getAllHandlers(item.command).forEach(handler => {
+                    if (handler.onDidChangeEnabled) {
+                        this.toDisposeOnUpdateItems.push(handler.onDidChangeEnabled(() => this.update()));
+                    }
+                });
+            }
             if ('render' in item || item.group === undefined || item.group === 'navigation') {
                 this.inline.set(item.id, item);
             } else {
@@ -149,7 +159,6 @@ export class TabBarToolbar extends ReactWidget {
         const tooltip = item.tooltip || (command && command.label);
 
         const toolbarItemClassNames = this.getToolbarItemClassNames(item);
-        if (item.menuPath && !item.command) { toolbarItemClassNames.push('enabled'); }
         return <div key={item.id}
             className={toolbarItemClassNames.join(' ')}
             onMouseDown={this.onMouseDownEvent}
@@ -162,10 +171,18 @@ export class TabBarToolbar extends ReactWidget {
         </div>;
     }
 
+    protected isEnabled(item: AnyToolbarItem): boolean {
+        if (!!item.command) {
+            return this.commandIsEnabled(item.command) && this.evaluateWhenClause(item.when);
+        } else {
+            return !!item.menuPath;
+        }
+    }
+
     protected getToolbarItemClassNames(item: AnyToolbarItem): string[] {
         const classNames = [TabBarToolbar.Styles.TAB_BAR_TOOLBAR_ITEM];
         if (item.command) {
-            if (this.commandIsEnabled(item.command) && this.evaluateWhenClause(item.when)) {
+            if (this.isEnabled(item)) {
                 classNames.push('enabled');
             }
             if (this.commandIsToggled(item.command)) {
@@ -254,15 +271,15 @@ export class TabBarToolbar extends ReactWidget {
 
         const item: AnyToolbarItem | undefined = this.inline.get(e.currentTarget.id);
 
-        if (!this.evaluateWhenClause(item?.when)) {
+        if (!item || !this.isEnabled(item)) {
             return;
         }
 
-        if (item?.command && item.menuPath) {
+        if (item.command && item.menuPath) {
             this.menuCommandExecutor.executeCommand(item.menuPath, item.command, this.current);
-        } else if (item?.command) {
+        } else if (item.command) {
             this.commands.executeCommand(item.command, this.current);
-        } else if (item?.menuPath) {
+        } else if (item.menuPath) {
             this.renderMoreContextMenu(this.toAnchor(e), item.menuPath);
         }
         this.update();

package/src/browser/tree/search-box-debounce.ts

@@ -67,7 +67,7 @@ export class SearchBoxDebounce implements Disposable {
             this.state = input;
         } else {
             if (input === '\b') {
-                this.state = this.state.length === 1 ? '' : this.state.substr(0, this.state.length - 1);
+                this.state = this.state.length === 1 ? '' : this.state.substring(0, this.state.length - 1);
             } else {
                 this.state += input;
             }

package/src/browser/view-container.ts

@@ -76,6 +76,20 @@ export namespace BadgeWidget {
     }
 }
 
+/**
+ * A widget that may change it's internal structure dynamically.
+ * Current use is to update the toolbar when a contributed view is constructed "lazily".
+ */
+export interface DynamicToolbarWidget {
+    onDidChangeToolbarItems: CommonEvent<void>;
+}
+
+export namespace DynamicToolbarWidget {
+    export function is(arg: unknown): arg is DynamicToolbarWidget {
+        return isObject(arg) && 'onDidChangeToolbarItems' in arg;
+    }
+}
+
 /**
  * A view container holds an arbitrary number of widgets inside a split panel.
  * Each widget is wrapped in a _part_ that displays the widget title and toolbar
@@ -970,6 +984,13 @@ export class ViewContainerPart extends BaseWidget {
             this.wrapped.onDidChangeBadgeTooltip(() => this.onDidChangeBadgeTooltipEmitter.fire(), undefined, this.toDispose);
         }
 
+        if (DynamicToolbarWidget.is(this.wrapped)) {
+            this.wrapped.onDidChangeToolbarItems(() => {
+                this.toolbar.updateTarget(this.wrapped);
+                this.viewContainer?.update();
+            });
+        }
+
         const { header, body, disposable } = this.createContent();
         this.header = header;
         this.body = body;

package/src/browser/widget-decoration.ts

@@ -284,7 +284,7 @@ export namespace WidgetDecoration {
                         result.push({ data });
                     }
                     const { length } = ranges.splice(containerIndex, 1).shift()!;
-                    result.push({ data: caption.substr(i, length), highlight: true });
+                    result.push({ data: caption.substring(i, i + length), highlight: true });
                     data = '';
                     i = i + length - 1;
                 }

package/src/common/command.ts

@@ -122,6 +122,7 @@ export interface CommandHandler {
      */
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     isEnabled?(...args: any[]): boolean;
+    onDidChangeEnabled?: Event<void>;
     /**
      * Test whether menu items for this handler should be visible.
      */

package/src/common/glob.ts

@@ -329,7 +329,7 @@ function parsePattern(arg1: string | IRelativePattern, options: IGlobOptions): P
     // Check for Trivias
     let match: RegExpExecArray;
     if (T1.test(pattern)) { // common pattern: **/*.txt just need endsWith check
-        const base = pattern.substr(4); // '**/*'.length === 4
+        const base = pattern.substring(4); // '**/*'.length === 4
         parsedPattern = function (path, basename): string {
             return path && strings.endsWith(path, base) ? pattern : null!;
         };
@@ -338,7 +338,7 @@ function parsePattern(arg1: string | IRelativePattern, options: IGlobOptions): P
     } else if ((options.trimForExclusions ? T3_2 : T3).test(pattern)) { // repetition of common patterns (see above) {**/*.txt,**/*.png}
         parsedPattern = trivia3(pattern, options);
     } else if (match = T4.exec(trimForExclusions(pattern, options))!) { // common pattern: **/something/else just need endsWith check
-        parsedPattern = trivia4and5(match[1].substr(1), pattern, true);
+        parsedPattern = trivia4and5(match[1].substring(1), pattern, true);
     } else if (match = T5.exec(trimForExclusions(pattern, options))!) { // common pattern: something/else just need equals check
         parsedPattern = trivia4and5(match[1], pattern, false);
     }
@@ -370,7 +370,7 @@ function wrapRelativePattern(parsedPattern: ParsedStringPattern, arg2: string |
 }
 
 function trimForExclusions(pattern: string, options: IGlobOptions): string {
-    return options.trimForExclusions && strings.endsWith(pattern, '/**') ? pattern.substr(0, pattern.length - 2) : pattern; // dropping **, tailing / is dropped later
+    return options.trimForExclusions && strings.endsWith(pattern, '/**') ? pattern.substring(0, pattern.length - 2) : pattern; // dropping **, tailing / is dropped later
 }
 
 // common pattern: **/some.txt just need basename check
@@ -632,7 +632,7 @@ function parsedExpression(expression: IExpression, options: IGlobOptions): Parse
                     basename = paths.basename(path);
                 }
                 if (!name) {
-                    name = basename.substr(0, basename.length - paths.extname(path).length);
+                    name = basename.substring(0, basename.length - paths.extname(path).length);
                 }
             }
             const result = parsedPattern(path, basename, name, hasSibling!);
@@ -726,7 +726,7 @@ function aggregateBasenameMatches(parsedPatterns: (ParsedStringPattern | ParsedE
                     break;
                 }
             }
-            basename = path.substr(i);
+            basename = path.substring(i);
         }
         const index = basenames.indexOf(basename);
         return index !== -1 ? patterns[index] : null!;