From 15a2e262ebcf618a77d88cd77e198d5d6f4cd87b Mon Sep 17 00:00:00 2001
From: George Tsiolis <tsiolis.g@gmail.com>
Date: Mon, 3 Jan 2022 19:22:25 +0000
Subject: [PATCH] Rename editor preference section heading

---
 components/dashboard/src/settings/Preferences.tsx      | 2 +-
 components/dashboard/src/whatsnew/WhatsNew-2021-04.tsx | 2 +-
 components/server/src/ide-config.ts                    | 6 +++---
 installer/pkg/components/server/ide/configmap.go       | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/components/dashboard/src/settings/Preferences.tsx b/components/dashboard/src/settings/Preferences.tsx
index 298050fec3f68e..d59a13665fc3d4 100644
--- a/components/dashboard/src/settings/Preferences.tsx
+++ b/components/dashboard/src/settings/Preferences.tsx
@@ -112,7 +112,7 @@ export default function Preferences() {
     return <div>
         <PageWithSubMenu subMenu={settingsMenu} title='Preferences' subtitle='Configure user preferences.'>
             {ideOptions && browserIdeOptions && <>
-                <h3>Default IDE</h3>
+                <h3>Editor</h3>
                 <p className="text-base text-gray-500 dark:text-gray-400">Choose which IDE you want to use.</p>
                 <div className="my-4 space-x-4 flex">
                     {
diff --git a/components/dashboard/src/whatsnew/WhatsNew-2021-04.tsx b/components/dashboard/src/whatsnew/WhatsNew-2021-04.tsx
index 2749f6901be7d2..39c0b5ae470f29 100644
--- a/components/dashboard/src/whatsnew/WhatsNew-2021-04.tsx
+++ b/components/dashboard/src/whatsnew/WhatsNew-2021-04.tsx
@@ -10,7 +10,7 @@ import { WhatsNewEntry } from "./WhatsNew";
 
 export const switchToVSCodeAction = async (user: User) => {
     const additionalData = user.additionalData = user.additionalData || {};
-    // make sure code is set as the default IDE
+    // make sure code is set as the editor preference
     const ideSettings = additionalData.ideSettings = additionalData.ideSettings || {};
     ideSettings.defaultIde = 'code';
     user = await getGitpodService().server.updateLoggedInUser({
diff --git a/components/server/src/ide-config.ts b/components/server/src/ide-config.ts
index f5fc9def51573e..47c628d647aec8 100644
--- a/components/server/src/ide-config.ts
+++ b/components/server/src/ide-config.ts
@@ -131,16 +131,16 @@ export class IDEConfigService {
                 }
 
                 if (!(newValue.ideOptions.defaultIde in newValue.ideOptions.options)) {
-                    throw new Error(`invalid: There is no IDEOption entry for default IDE '${newValue.ideOptions.defaultIde}'.`);
+                    throw new Error(`invalid: There is no IDEOption entry for editor '${newValue.ideOptions.defaultIde}'.`);
                 }
                 if (!(newValue.ideOptions.defaultDesktopIde in newValue.ideOptions.options)) {
                     throw new Error(`invalid: There is no IDEOption entry for default desktop IDE '${newValue.ideOptions.defaultDesktopIde}'.`);
                 }
                 if (newValue.ideOptions.options[newValue.ideOptions.defaultIde].type != "browser") {
-                    throw new Error(`invalid: Default IDE '${newValue.ideOptions.defaultIde}' needs to be of type 'browser' but is '${newValue.ideOptions.options[newValue.ideOptions.defaultIde].type}'.`);
+                    throw new Error(`invalid: Editor '${newValue.ideOptions.defaultIde}' needs to be of type 'browser' but is '${newValue.ideOptions.options[newValue.ideOptions.defaultIde].type}'.`);
                 }
                 if (newValue.ideOptions.options[newValue.ideOptions.defaultDesktopIde].type != "desktop") {
-                    throw new Error(`invalid: Default desktop IDE '${newValue.ideOptions.defaultDesktopIde}' needs to be of type 'desktop' but is '${newValue.ideOptions.options[newValue.ideOptions.defaultIde].type}'.`);
+                    throw new Error(`invalid: Editor (desktop), '${newValue.ideOptions.defaultDesktopIde}' needs to be of type 'desktop' but is '${newValue.ideOptions.options[newValue.ideOptions.defaultIde].type}'.`);
                 }
 
                 value = newValue;
diff --git a/installer/pkg/components/server/ide/configmap.go b/installer/pkg/components/server/ide/configmap.go
index 28a0c6a50bd39b..d6cb3708da8f40 100644
--- a/installer/pkg/components/server/ide/configmap.go
+++ b/installer/pkg/components/server/ide/configmap.go
@@ -97,7 +97,7 @@ func configmap(ctx *common.RenderContext) ([]runtime.Object, error) {
 	}
 
 	if idecfg.IDEOptions.Options[idecfg.IDEOptions.DefaultIDE].Type != typeBrowser {
-		return nil, fmt.Errorf("default IDE '%s' does not point to a browser IDE option", idecfg.IDEOptions.DefaultIDE)
+		return nil, fmt.Errorf("editor '%s' does not point to a browser IDE option", idecfg.IDEOptions.DefaultIDE)
 	}
 
 	if idecfg.IDEOptions.Options[idecfg.IDEOptions.DefaultDesktopIDE].Type != typeDesktop {