Merge branch 'master' into fa/QuickInputRegressionFix

eclipse-theia · Mar 30, 2023 · ee1a94d · ee1a94d
2 parents 005c21b + 99b8648
commit ee1a94d
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,6 +8,7 @@
 
 <a name="breaking_changes_1.36.0">[Breaking Changes:](#breaking_changes_1.36.0)</a>
 
+- [core] changed default icon theme from `none` to `theia-file-icons` [#11028](https://github.com/eclipse-theia/theia/pull/12346)
 - [plugin] renamed `TreeViewExtImpl#toTreeItem()` to `TreeViewExtImpl#toTreeElement()`
 - [scm] Fixing 'scm' inline commands, introduces the following breaking changes: [#12295](https://github.com/eclipse-theia/theia/pull/12295)
     - Interface ScmInlineAction removes 'commands: CommandRegistry'

diff --git a/dev-packages/application-package/src/api.ts b/dev-packages/application-package/src/api.ts
@@ -18,4 +18,4 @@
  * The default supported API version the framework supports.
  * The version should be in the format `x.y.z`.
  */
-export const DEFAULT_SUPPORTED_API_VERSION = '1.70.2';
+export const DEFAULT_SUPPORTED_API_VERSION = '1.72.2';
diff --git a/dev-packages/application-package/src/application-props.ts b/dev-packages/application-package/src/application-props.ts
@@ -70,7 +70,7 @@ export namespace FrontendApplicationConfig {
     export const DEFAULT: FrontendApplicationConfig = {
         applicationName: 'Eclipse Theia',
         defaultTheme: { light: 'light', dark: 'dark' },
-        defaultIconTheme: 'none',
+        defaultIconTheme: 'theia-file-icons',
         electron: ElectronFrontendApplicationConfig.DEFAULT,
         defaultLocale: '',
         validatePreferencesSchema: true

diff --git a/packages/core/src/browser/widgets/widget.ts b/packages/core/src/browser/widgets/widget.ts
@@ -333,7 +333,7 @@ export function waitForRevealed(widget: Widget): Promise<void> {
  * Resolves when the given widget is hidden regardless of attachment.
  */
 export function waitForHidden(widget: Widget): Promise<void> {
-    return waitForVisible(widget, true);
+    return waitForVisible(widget, false);
 }
 
 function waitForVisible(widget: Widget, visible: boolean, attached?: boolean): Promise<void> {

diff --git a/packages/file-search/src/browser/quick-file-open.ts b/packages/file-search/src/browser/quick-file-open.ts
@@ -278,7 +278,10 @@ export class QuickFileOpenService implements QuickAccessProvider {
                     widget.editor.restoreViewState(closedEditor.viewState);
                 }
             })
-            .catch(error => this.messageService.error(error));
+            .catch(error => {
+                console.warn(error);
+                this.messageService.error(nls.localizeByDefault("Unable to open '{0}'", uri.path.toString()));
+            });
     }
 
     protected buildOpenerOptions(): EditorOpenerOptions {