Skip to content

Commit 184111d

Browse files
authored
Make the wording in notifications consistent (#2594)
Signed-off-by: Sheng Chen <[email protected]>
1 parent c397ac0 commit 184111d

File tree

3 files changed

+9
-9
lines changed

3 files changed

+9
-9
lines changed

src/extension.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -720,7 +720,7 @@ function makeRandomHexString(length) {
720720

721721
async function cleanWorkspace(workspacePath, force?: boolean) {
722722
if (!force) {
723-
const doIt = 'Restart and delete';
723+
const doIt = 'Reload and delete';
724724
const selection = await window.showWarningMessage('Are you sure you want to clean the Java language server workspace?', 'Cancel', doIt);
725725
if (selection !== doIt) {
726726
return;

src/lombokSupport.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ export async function checkLombokDependency(context: ExtensionContext) {
168168
context.workspaceState.update(JAVA_LOMBOK_PATH, currentLombokClasspath);
169169
const msg = `Lombok version changed from ${previousLombokVersion.split('.jar')[0].split('-')[1]} to ${currentLombokVersion.split('.jar')[0].split('-')[1]} \
170170
. Do you want to reload the window to load the new Lombok version?`;
171-
const action = 'Reload Now';
171+
const action = 'Reload';
172172
const restartId = Commands.RELOAD_WINDOW;
173173
window.showInformationMessage(msg, action).then((selection) => {
174174
if (action === selection) {
@@ -228,7 +228,7 @@ export function registerLombokConfigureCommand(context: ExtensionContext) {
228228
}
229229
if (shouldReload) {
230230
const msg = `The Lombok version used in Java extension has changed, please reload the window.`;
231-
const action = 'Reload Now';
231+
const action = 'Reload';
232232
const restartId = Commands.RELOAD_WINDOW;
233233
window.showInformationMessage(msg, action).then((selection) => {
234234
if (action === selection) {

src/settings.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@ export function onConfigurationChange(workspacePath: string, context: ExtensionC
4646
fs.closeSync(fs.openSync(file, 'w'));
4747
}
4848
if (isFsModeChanged || hasJavaConfigChanged(oldConfig, newConfig)) {
49-
const msg = `Java Language Server configuration changed, please restart ${env.appName}.`;
50-
const action = 'Restart Now';
49+
const msg = `Java Language Server configuration changed, please reload ${env.appName}.`;
50+
const action = 'Reload';
5151
const restartId = Commands.RELOAD_WINDOW;
5252
window.showWarningMessage(msg, action).then((selection) => {
5353
if (action === selection) {
@@ -57,8 +57,8 @@ export function onConfigurationChange(workspacePath: string, context: ExtensionC
5757
}
5858
if (hasConfigKeyChanged('jdt.ls.lombokSupport.enabled', oldConfig, newConfig)) {
5959
if (newConfig.get("jdt.ls.lombokSupport.enabled")) {
60-
const msg = `Lombok support is enabled, please restart ${env.appName}.`;
61-
const action = 'Restart Now';
60+
const msg = `Lombok support is enabled, please reload ${env.appName}.`;
61+
const action = 'Reload';
6262
const restartId = Commands.RELOAD_WINDOW;
6363
window.showWarningMessage(msg, action).then((selection) => {
6464
if (action === selection) {
@@ -68,8 +68,8 @@ export function onConfigurationChange(workspacePath: string, context: ExtensionC
6868
}
6969
else {
7070
cleanupLombokCache(context);
71-
const msg = `Lombok support is disabled, please restart ${env.appName}.`;
72-
const action = 'Restart Now';
71+
const msg = `Lombok support is disabled, please reload ${env.appName}.`;
72+
const action = 'Reload';
7373
const restartId = Commands.RELOAD_WINDOW;
7474
window.showWarningMessage(msg, action).then((selection) => {
7575
if (action === selection) {

0 commit comments

Comments
 (0)