Merge pull request #96 from gabro/upgrade-version-fix

Improve version upgrade logic
scalameta · Apr 12, 2019 · 83a874f · 83a874f
2 parents a9cbc6e + d9b81e6
commit 83a874f
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 6 deletions.
diff --git a/package.json b/package.json
@@ -8,7 +8,7 @@
     "language server",
     "scalameta"
   ],
-  "version": "1.3.0",
+  "version": "1.3.1",
   "publisher": "scalameta",
   "contributors": [
     {

diff --git a/src/extension.ts b/src/extension.ts
@@ -14,7 +14,8 @@ import {
   WebviewPanel,
   ViewColumn,
   OutputChannel,
-  ConfigurationTarget
+  ConfigurationTarget,
+  WorkspaceConfiguration
 } from "vscode";
 import {
   LanguageClient,
@@ -526,11 +527,40 @@ function detectLaunchConfigurationChanges() {
   });
 }
 
+function serverVersionInfo(
+  config: WorkspaceConfiguration
+): {
+  serverVersion: string;
+  latestServerVersion: string;
+  configurationTarget: ConfigurationTarget;
+} {
+  const computedVersion = config.get<string>("serverVersion")!;
+  const { defaultValue, workspaceFolderValue, workspaceValue } = config.inspect<
+    string
+  >("serverVersion")!;
+  const configurationTarget = (() => {
+    if (workspaceFolderValue && workspaceFolderValue !== defaultValue) {
+      return ConfigurationTarget.WorkspaceFolder;
+    }
+    if (workspaceValue && workspaceValue !== defaultValue) {
+      return ConfigurationTarget.Workspace;
+    }
+    return ConfigurationTarget.Workspace;
+  })();
+  return {
+    serverVersion: computedVersion,
+    latestServerVersion: defaultValue!,
+    configurationTarget
+  };
+}
+
 function checkServerVersion() {
   const config = workspace.getConfiguration("metals");
-  const serverVersion = config.get<string>("serverVersion")!;
-  const latestServerVersion = config.inspect<string>("serverVersion")!
-    .defaultValue!;
+  const {
+    serverVersion,
+    latestServerVersion,
+    configurationTarget
+  } = serverVersionInfo(config);
   const isOutdated = (() => {
     try {
       return semver.lt(serverVersion, latestServerVersion);
@@ -557,7 +587,7 @@ function checkServerVersion() {
             config.update(
               "serverVersion",
               latestServerVersion,
-              ConfigurationTarget.Global
+              configurationTarget
             );
             break;
           case openSettingsAction: