Skip to content

Commit

Permalink
applied review
Browse files Browse the repository at this point in the history
  • Loading branch information
iusildra committed Aug 27, 2023
1 parent 595334f commit 6168803
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 14 deletions.
22 changes: 21 additions & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,25 @@
"typescript.tsdk": "node_modules/typescript/lib",
"files.watcherExclude": {
"**/target": true
}
},
"workbench.colorCustomizations": {
"activityBar.activeBackground": "#0083dc",
"activityBar.background": "#0083dc",
"activityBar.foreground": "#e7e7e7",
"activityBar.inactiveForeground": "#e7e7e799",
"activityBarBadge.background": "#9f005f",
"activityBarBadge.foreground": "#e7e7e7",
"commandCenter.border": "#e7e7e799",
"sash.hoverBorder": "#0083dc",
"statusBar.background": "#0065a9",
"statusBar.foreground": "#e7e7e7",
"statusBarItem.hoverBackground": "#0083dc",
"statusBarItem.remoteBackground": "#0065a9",
"statusBarItem.remoteForeground": "#e7e7e7",
"titleBar.activeBackground": "#0065a9",
"titleBar.activeForeground": "#e7e7e7",
"titleBar.inactiveBackground": "#0065a999",
"titleBar.inactiveForeground": "#e7e7e799"
},
"peacock.color": "#0065A9"
}
14 changes: 1 addition & 13 deletions packages/metals-vscode/src/hotCodeReplace.ts
Original file line number Diff line number Diff line change
Expand Up @@ -38,18 +38,6 @@ export async function applyHCR() {
return;
}

const serverVersion =
vscode.workspace.getConfiguration("metals").get<string>("serverVersion") ??
"";
if (serverVersion < "1.0.1") {
vscode.workspace
.getConfiguration("metals.debug.settings")
.update("hotCodeReplace", false, vscode.ConfigurationTarget.Workspace);
vscode.window.showErrorMessage(
"Hot code replace is only supported since scala-debug-adapter 3.1.5,\nwhich is shipped with metals 1.0.1"
);
return;
}
if (debugSession.configuration.noDebug) {
vscode.window
.showWarningMessage(
Expand Down Expand Up @@ -82,7 +70,7 @@ export async function applyHCR() {

if (!response?.changedClasses?.length) {
const res = await vscode.window.showWarningMessage(
"No classes were reloaded. Did you applied your changes ?",
"No classes were reloaded",
"Ok",
NO_HCR
);
Expand Down

0 comments on commit 6168803

Please sign in to comment.