@theia/editor 1.55.1 → 1.57.0-next.112

package/src/browser/editor-language-quick-pick-service.ts

@@ -42,8 +42,11 @@ export class EditorLanguageQuickPickService {
 
     protected toQuickPickLanguage(value: Language, current: string): QuickPickValue<Language> {
         const languageUri = this.toLanguageUri(value);
-        const icon = this.labelProvider.getIcon(languageUri);
-        const iconClasses = icon !== '' ? [icon + ' file-icon'] : undefined;
+        const iconClasses = this.labelProvider.getIcon(languageUri).split(' ').filter(v => v.length > 0);
+        if (iconClasses.length > 0) {
+            iconClasses.push('file-icon');
+        }
+
         const configured = current === value.id;
         return {
             value,

package/src/browser/editor-manager.ts

@@ -18,7 +18,7 @@ import { injectable, postConstruct, inject } from '@theia/core/shared/inversify'
 import URI from '@theia/core/lib/common/uri';
 import { RecursivePartial, Emitter, Event, MaybePromise, CommandService, nls } from '@theia/core/lib/common';
 import {
-    WidgetOpenerOptions, NavigatableWidgetOpenHandler, NavigatableWidgetOptions, Widget, PreferenceService, CommonCommands, OpenWithService, getDefaultHandler,
+    WidgetOpenerOptions, NavigatableWidgetOpenHandler, NavigatableWidgetOptions, Widget, PreferenceService, CommonCommands, getDefaultHandler,
     defaultHandlerPriority
 } from '@theia/core/lib/browser';
 import { EditorWidget } from './editor-widget';
@@ -59,7 +59,6 @@ export class EditorManager extends NavigatableWidgetOpenHandler<EditorWidget> {
 
     @inject(CommandService) protected readonly commands: CommandService;
     @inject(PreferenceService) protected readonly preferenceService: PreferenceService;
-    @inject(OpenWithService) protected readonly openWithService: OpenWithService;
 
     @postConstruct()
     protected override init(): void {
@@ -88,16 +87,7 @@ export class EditorManager extends NavigatableWidgetOpenHandler<EditorWidget> {
                 this.addRecentlyVisible(widget);
             }
         }
-        this.openWithService.registerHandler({
-            id: 'default',
-            label: this.label,
-            providerName: nls.localizeByDefault('Built-in'),
-            canHandle: () => 100,
-            // Higher priority than any other handler
-            // so that the text editor always appears first in the quick pick
-            getOrder: () => 10000,
-            open: uri => this.open(uri)
-        });
+
         this.updateCurrentEditor();
     }
 

package/src/browser/editor-preferences.ts

@@ -29,7 +29,7 @@ import { nls } from '@theia/core/lib/common/nls';
 import { environment } from '@theia/core';
 import { editorGeneratedPreferenceProperties, GeneratedEditorPreferences } from './editor-generated-preference-schema';
 
-/* eslint-disable @theia/localization-check,max-len,no-null/no-null */
+/* eslint-disable max-len,no-null/no-null */
 // #region src/vs/workbench/contrib/codeActions/browser/codeActionsContribution.ts
 
 const codeActionsContributionSchema: PreferenceSchema['properties'] = {
@@ -53,7 +53,7 @@ const codeActionsContributionSchema: PreferenceSchema['properties'] = {
             }
         ],
         default: {},
-        description: nls.localizeByDefault('Code action kinds to be run on save.'),
+        markdownDescription: nls.localizeByDefault('Run Code Actions for the editor on save. Code Actions must be specified and the editor must not be shutting down. Example: `"source.organizeImports": "explicit" `'),
         scope: 'language-overridable',
     }
 };
@@ -82,7 +82,7 @@ const fileContributionSchema: PreferenceSchema['properties'] = {
         'enumDescriptions': [
             nls.localizeByDefault('Format the whole file.'),
             nls.localizeByDefault('Format modifications (requires source control).'),
-            nls.localize('theia/editor/editor.formatOnSaveMode.modificationsIfAvailable', "Will attempt to format modifications only (requires source control). If source control can't be used, then the whole file will be formatted."),
+            nls.localizeByDefault("Will attempt to format modifications only (requires source control). If source control can't be used, then the whole file will be formatted."),
         ],
         'markdownDescription': nls.localizeByDefault('Controls if format on save formats the whole file or only modifications. Only applies when `#editor.formatOnSave#` is enabled.'),
         'scope': PreferenceScope.fromString('language-overridable'),
@@ -109,13 +109,13 @@ const fileContributionSchema: PreferenceSchema['properties'] = {
         'type': 'string',
         'enum': ['off', 'afterDelay', 'onFocusChange', 'onWindowChange'],
         'markdownEnumDescriptions': [
-            nls.localize('theia/editor/files.autoSave.off', 'An editor with changes is never automatically saved.'),
-            nls.localize('theia/editor/files.autoSave.afterDelay', 'An editor with changes is automatically saved after the configured `#files.autoSaveDelay#`.'),
-            nls.localize('theia/editor/files.autoSave.onFocusChange', 'An editor with changes is automatically saved when the editor loses focus.'),
-            nls.localize('theia/editor/files.autoSave.onWindowChange', 'An editor with changes is automatically saved when the window loses focus.')
+            nls.localizeByDefault('An editor with changes is never automatically saved.'),
+            nls.localizeByDefault('An editor with changes is automatically saved after the configured `#files.autoSaveDelay#`.'),
+            nls.localizeByDefault('An editor with changes is automatically saved when the editor loses focus.'),
+            nls.localizeByDefault('An editor with changes is automatically saved when the window loses focus.')
         ],
         'default': environment.electron.is() ? 'off' : 'afterDelay',
-        'markdownDescription': nls.localize('theia/editor/files.autoSave', 'Controls [auto save](https://code.visualstudio.com/docs/editor/codebasics#_save-auto-save) of editors that have unsaved changes.', 'off', 'afterDelay', 'onFocusChange', 'onWindowChange', 'afterDelay')
+        'markdownDescription': nls.localizeByDefault('Controls [auto save](https://code.visualstudio.com/docs/editor/codebasics#_save-auto-save) of editors that have unsaved changes.')
     },
     'files.autoSaveDelay': {
         'type': 'number',