Skip to content

Commit 9b0eebd

Browse files
gtsiolisroboquat
authored andcommitted
Rename editor preference section heading
1 parent ee68fdd commit 9b0eebd

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

components/dashboard/src/settings/Preferences.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ export default function Preferences() {
112112
return <div>
113113
<PageWithSubMenu subMenu={settingsMenu} title='Preferences' subtitle='Configure user preferences.'>
114114
{ideOptions && browserIdeOptions && <>
115-
<h3>Default IDE</h3>
115+
<h3>Editor</h3>
116116
<p className="text-base text-gray-500 dark:text-gray-400">Choose which IDE you want to use.</p>
117117
<div className="my-4 space-x-4 flex">
118118
{

components/dashboard/src/whatsnew/WhatsNew-2021-04.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import { WhatsNewEntry } from "./WhatsNew";
1010

1111
export const switchToVSCodeAction = async (user: User) => {
1212
const additionalData = user.additionalData = user.additionalData || {};
13-
// make sure code is set as the default IDE
13+
// make sure code is set as the editor preference
1414
const ideSettings = additionalData.ideSettings = additionalData.ideSettings || {};
1515
ideSettings.defaultIde = 'code';
1616
user = await getGitpodService().server.updateLoggedInUser({

components/server/src/ide-config.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -131,16 +131,16 @@ export class IDEConfigService {
131131
}
132132

133133
if (!(newValue.ideOptions.defaultIde in newValue.ideOptions.options)) {
134-
throw new Error(`invalid: There is no IDEOption entry for default IDE '${newValue.ideOptions.defaultIde}'.`);
134+
throw new Error(`invalid: There is no IDEOption entry for editor '${newValue.ideOptions.defaultIde}'.`);
135135
}
136136
if (!(newValue.ideOptions.defaultDesktopIde in newValue.ideOptions.options)) {
137137
throw new Error(`invalid: There is no IDEOption entry for default desktop IDE '${newValue.ideOptions.defaultDesktopIde}'.`);
138138
}
139139
if (newValue.ideOptions.options[newValue.ideOptions.defaultIde].type != "browser") {
140-
throw new Error(`invalid: Default IDE '${newValue.ideOptions.defaultIde}' needs to be of type 'browser' but is '${newValue.ideOptions.options[newValue.ideOptions.defaultIde].type}'.`);
140+
throw new Error(`invalid: Editor '${newValue.ideOptions.defaultIde}' needs to be of type 'browser' but is '${newValue.ideOptions.options[newValue.ideOptions.defaultIde].type}'.`);
141141
}
142142
if (newValue.ideOptions.options[newValue.ideOptions.defaultDesktopIde].type != "desktop") {
143-
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}'.`);
143+
throw new Error(`invalid: Editor (desktop), '${newValue.ideOptions.defaultDesktopIde}' needs to be of type 'desktop' but is '${newValue.ideOptions.options[newValue.ideOptions.defaultIde].type}'.`);
144144
}
145145

146146
value = newValue;

installer/pkg/components/server/ide/configmap.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ func configmap(ctx *common.RenderContext) ([]runtime.Object, error) {
9797
}
9898

9999
if idecfg.IDEOptions.Options[idecfg.IDEOptions.DefaultIDE].Type != typeBrowser {
100-
return nil, fmt.Errorf("default IDE '%s' does not point to a browser IDE option", idecfg.IDEOptions.DefaultIDE)
100+
return nil, fmt.Errorf("editor '%s' does not point to a browser IDE option", idecfg.IDEOptions.DefaultIDE)
101101
}
102102

103103
if idecfg.IDEOptions.Options[idecfg.IDEOptions.DefaultDesktopIDE].Type != typeDesktop {

0 commit comments

Comments
 (0)