Check active rustup override toolchains for updates

Author: alexheretic

lib/index.js

@@ -32,8 +32,7 @@ async function exec(command, { cwd }={}) {
 }
 
 function logErr(e, logFn = console.warn) {
-  const message = e && '' + e
-  message && logFn(message)
+  e && logFn('' + e)
 }
 
 function clearIdeRustInfos() {
@@ -96,6 +95,19 @@ async function hasCommand(rustCommand) {
   }
 }
 
+async function rustupOverrides() {
+  let { stdout } = await exec("rustup override list")
+  return stdout.split(/[\r\n]+/g)
+    .map(line => {
+      let lastSpace = line.lastIndexOf(' ')
+      return {
+        path: line.slice(0, lastSpace).trim(),
+        toolchain: line.slice(lastSpace).trim()
+      }
+    })
+    .filter(({ path, toolchain }) => path && toolchain)
+}
+
 /** @return {?string} developer override of the command to start a Rls instance */
 function rlsCommandOverride() {
   return atom.config.get('ide-rust.rlsCommandOverride')
@@ -291,6 +303,7 @@ class RustLanguageClient extends AutoLanguageClient {
     super()
     /** (projectPath -> RlsProject) mappings */
     this.projects = {}
+    this.activeOverrides = new Set()
     this.disposables = new CompositeDisposable()
 
     /** Configuration schema */
@@ -343,14 +356,31 @@ class RustLanguageClient extends AutoLanguageClient {
     }
   }
 
+  async _refreshActiveOverrides() {
+    try {
+      const overrides = (await rustupOverrides())
+        .filter(({ path }) => Object.keys(this.projects).some(project => project.startsWith(path)))
+        .map(override => override.toolchain)
+      const oldActive = this.activeOverrides
+      this.activeOverrides = new Set(overrides)
+      if (this.activeOverrides.size > oldActive.size) {
+        const confToolchain = configToolchain() || await rustupDefaultToolchain()
+        if (confToolchain) oldActive.add(confToolchain)
+        this._promptToUpdateToolchain({ ignore: oldActive })
+      }
+    } catch (e) {
+      if (await hasCommand("rustup")) logErr(e)
+    }
+  }
+
   /** @param {?string} reason Reason for the restart shown in the notification */
   async _restartLanguageServers(reason) {
     await this.restartAllServers()
     if (reason) atom.notifications.addSuccess(reason, { _src: 'ide-rust' })
   }
 
   // check for toolchain updates if installed & not dated
-  async _promptToUpdateToolchain() {
+  async _promptToUpdateToolchain({ ignore } = {}) {
     if (!atom.config.get('ide-rust.checkForToolchainUpdates')) return
 
     if (!await hasCommand("rustup")) {
@@ -359,49 +389,58 @@ class RustLanguageClient extends AutoLanguageClient {
       return
     }
 
-    const confToolchain = configToolchain() || await rustupDefaultToolchain()
-    if (!confToolchain) return
+    const toolchains = new Set(this.activeOverrides)
 
-    const dated = confToolchain.match(DATED_REGEX)
-    const toolchain = (dated ? dated[1] : confToolchain)
-    const switching = confToolchain !== toolchain
+    const confToolchain = configToolchain() || await rustupDefaultToolchain()
+    if (confToolchain) toolchains.add(confToolchain)
+
+    Array.from(toolchains)
+      .filter(toolchain => !ignore || !ignore.has(toolchain))
+      .forEach(async confToolchain => {
+        const dated = confToolchain.match(DATED_REGEX)
+        let toolchain = (dated ? dated[1] : confToolchain)
+        if (!dated && toolchain.includes('-')) {
+          toolchain = toolchain.split('-')[0]
+        }
 
-    let { stdout: currentVersion } = await rustupRun(confToolchain, "rustc --version")
-    let newVersion = await fetchLatestDist({ toolchain, currentVersion }).catch(() => false)
-    if (!newVersion) return
+        let { stdout: currentVersion } = await rustupRun(confToolchain, "rustc --version")
+        let newVersion = await fetchLatestDist({ toolchain, currentVersion }).catch(() => false)
+        if (!newVersion) return
 
-    atom.notifications.addInfo(`Rls \`${toolchain}\` toolchain update available`, {
-      description: newVersion,
-      _src: 'ide-rust',
-      dismissable: true,
-      buttons: [{
-        text: switching ? 'Update & Switch' : 'Update' ,
-        onDidClick: () => {
-          clearIdeRustInfos()
-
-          const updatePromise = exec(`rustup update ${toolchain}`)
-            // set config in case going from dated -> latest
-            .then(() => switching && atom.config.set('ide-rust.rlsToolchain', toolchain))
-            .then(() => this._checkToolchain())
-            .then(() => checkRls())
-            .then(() => this._restartLanguageServers(`Updated Rls toolchain`))
-            .catch(e => {
-              logErr(e)
-              e && atom.notifications.addError(`\`rustup update ${toolchain}\` failed`, {
-                detail: e,
-                dismissable: true,
+        atom.notifications.addInfo(`Rls \`${toolchain}\` toolchain update available`, {
+          description: newVersion,
+          _src: 'ide-rust',
+          dismissable: true,
+          buttons: [{
+            text: dated ? 'Update & Switch' : 'Update' ,
+            onDidClick: () => {
+              clearIdeRustInfos()
+
+              const updatePromise = exec(`rustup update ${toolchain}`)
+              // set config in case going from dated -> latest
+              .then(() => dated && atom.config.set('ide-rust.rlsToolchain', toolchain))
+              .then(() => this._checkToolchain())
+              .then(() => checkRls())
+              .then(() => this._restartLanguageServers(`Updated Rls toolchain`))
+              .catch(e => {
+                logErr(e)
+                e && atom.notifications.addError(`\`rustup update ${toolchain}\` failed`, {
+                  detail: e,
+                  dismissable: true,
+                })
               })
-            })
 
-          if (this.busySignalService) {
-            this.busySignalService.reportBusyWhile(
-              `Updating rust \`${toolchain}\` toolchain`,
-              () => updatePromise
-            )
-          }
-        }
-      }]
-    })
+              if (this.busySignalService) {
+                this.busySignalService.reportBusyWhile(
+                  `Updating rust \`${toolchain}\` toolchain`,
+                  () => updatePromise
+                )
+              }
+            }
+          }]
+        })
+      })
+
   }
 
   /**
@@ -620,9 +659,12 @@ class RustLanguageClient extends AutoLanguageClient {
 
     server.process.on('exit', () => {
       delete this.projects[server.projectPath]
+      this._refreshActiveOverrides()
     })
 
     project.sendRlsTomlConfig()
+
+    this._refreshActiveOverrides()
   }
 
   getGrammarScopes() {