Address review feedback

Signed-off-by: Simon Graband <sgraband@eclipsesource.com>

Author: sgraband

packages/editor/src/browser/language-status/editor-formatter-status-contribution.ts

@@ -339,8 +339,8 @@ export class EditorFormatterStatusContribution {
         // No formatter configured
         return {
             icon: FormatterIcon.Info,
-            label: nls.localize('theia/editor/nFormatters', '{0} formatters', formatterCount),
-            tooltip: nls.localize('theia/editor/noDefaultConfigured', 'No default formatter configured'),
+            label: nls.localize('theia/editor/noDefaultConfiguredLabel', 'No default formatter configured'),
+            tooltip: nls.localize('theia/editor/noDefaultConfiguredTooltip', 'No default formatter configured ({0} formatters available)', formatterCount),
             hasConfigureAction: true,
             severity: Severity.Info
         };

packages/editor/src/browser/language-status/editor-language-status-service.ts

@@ -287,8 +287,7 @@ export class EditorLanguageStatusService {
         const itemContainer = document.createElement('div');
         itemContainer.classList.add('hover-language-status');
 
-        const alwaysShowIcon = this.isFormatterItem(item);
-        itemContainer.appendChild(this.createSeverityIndicator(item.severity, alwaysShowIcon));
+        itemContainer.appendChild(this.createSeverityIndicator(item.severity));
 
         const textContainer = document.createElement('div');
         textContainer.className = 'element';

packages/monaco/src/browser/monaco-formatter-service.ts

@@ -15,7 +15,8 @@
 // *****************************************************************************
 
 import { inject, injectable, postConstruct } from '@theia/core/shared/inversify';
-import { Emitter, Event, PreferenceLanguageOverrideService, PreferenceScope, PreferenceService } from '@theia/core';
+import { Emitter, Event, PreferenceInspection, PreferenceLanguageOverrideService, PreferenceScope, PreferenceService } from '@theia/core';
+import { WorkspaceService } from '@theia/workspace/lib/browser';
 import { FormatterInfo, FormatterService, FormatterSettingScope, FormatterStatus } from '@theia/editor/lib/browser/editor-formatter-service';
 import { TextEditor } from '@theia/editor/lib/browser';
 import { StandaloneServices } from '@theia/monaco-editor-core/esm/vs/editor/standalone/browser/standaloneServices';
@@ -54,6 +55,9 @@ export class MonacoFormatterService implements FormatterService {
     @inject(PreferenceLanguageOverrideService)
     protected readonly preferenceSchema: PreferenceLanguageOverrideService;
 
+    @inject(WorkspaceService)
+    protected readonly workspaceService: WorkspaceService;
+
     protected readonly onDidChangeFormattersEmitter = new Emitter<void>();
     readonly onDidChangeFormatters: Event<void> = this.onDidChangeFormattersEmitter.event;
 
@@ -125,14 +129,8 @@ export class MonacoFormatterService implements FormatterService {
             return undefined;
         }
 
-        let scope: FormatterSettingScope;
-        if (inspection.workspaceFolderValue !== undefined) {
-            scope = 'folder';
-        } else if (inspection.workspaceValue !== undefined) {
-            scope = 'workspace';
-        } else {
-            scope = 'user';
-        }
+        const preferenceScope = this.getConfiguredScopeFromInspection(inspection);
+        const scope = this.preferenceToFormatterScope(preferenceScope);
         const formatter = formatters.find(f => f.id === configuredFormatterId);
 
         return {
@@ -143,6 +141,37 @@ export class MonacoFormatterService implements FormatterService {
         };
     }
 
+    /**
+     * Determines the preference scope from an inspection result.
+     * In single-folder workspaces, folder and workspace scopes are equivalent,
+     * so we need to check if we're in a multi-root workspace.
+     */
+    protected getConfiguredScopeFromInspection<T>(inspection: PreferenceInspection<T>): PreferenceScope | undefined {
+        if (this.workspaceService.isMultiRootWorkspaceOpened && inspection.workspaceFolderValue !== undefined) {
+            return PreferenceScope.Folder;
+        }
+        if (inspection.workspaceValue !== undefined) {
+            return PreferenceScope.Workspace;
+        }
+        if (inspection.globalValue !== undefined) {
+            return PreferenceScope.User;
+        }
+        return undefined;
+    }
+
+    protected preferenceToFormatterScope(scope: PreferenceScope | undefined): FormatterSettingScope {
+        switch (scope) {
+            case PreferenceScope.Folder:
+                return 'folder';
+            case PreferenceScope.Workspace:
+                return 'workspace';
+            case PreferenceScope.User:
+                return 'user';
+            default:
+                return 'none';
+        }
+    }
+
     getAvailableFormatters(editor: TextEditor): FormatterInfo[] {
         const model = this.getEditorModel(editor);
         if (!model) {
@@ -207,15 +236,6 @@ export class MonacoFormatterService implements FormatterService {
             return undefined;
         }
 
-        if (inspection.workspaceFolderValue !== undefined) {
-            return PreferenceScope.Folder;
-        }
-        if (inspection.workspaceValue !== undefined) {
-            return PreferenceScope.Workspace;
-        }
-        if (inspection.globalValue !== undefined) {
-            return PreferenceScope.User;
-        }
-        return undefined;
+        return this.getConfiguredScopeFromInspection(inspection);
     }
 }