Fixes #38

package.json

@@ -70,7 +70,7 @@
       }
     ],
     "configuration": {
-      "type": "idris",
+      "type": "object",
       "title": "Settings for Idris project",
       "properties": {
         "idris.executablePath": {

src/controller.js

@@ -22,16 +22,26 @@ let getCommands = () => {
   ]
 }
 
+let getCompilerOptsPromise = () => {
+  let root = vscode.workspace.rootPath
+  let safeRoot = root === undefined ? "" : root
+  let compilerOptions = ipkg.compilerOptions(safeRoot)
+
+  return compilerOptions
+}
+
+let reInitialize = () => {
+  getCompilerOptsPromise().subscribe((compilerOptions) => {
+    commands.reInitialize(compilerOptions)
+  })
+}
+
 let withCompilerOptions = (callback) => {
   let document = vscode.window.activeTextEditor.document
   if (document.languageId != 'idris') return
-
   let uri = document.uri.fsPath
-  let root = vscode.workspace.rootPath
-  let safeRoot = root === undefined ? "" : root
-  let compilerOptions = ipkg.compilerOptions(safeRoot)
 
-  compilerOptions.subscribe((compilerOptions) => {
+  getCompilerOptsPromise().subscribe((compilerOptions) => {
     commands.initialize(compilerOptions)
     callback(uri)
   })
@@ -52,5 +62,6 @@ module.exports = {
   destroy: commands.destroy,
   diagnosticCollection: commands.diagnosticCollection,
   withCompilerOptions: withCompilerOptions,
-  typeCheckOnSave: typeCheckOnSave
+  typeCheckOnSave: typeCheckOnSave,
+  reInitialize: reInitialize
 }

src/extension.js

@@ -5,6 +5,8 @@ let typeHover  = require('./typeHover')
 
 let IDRIS_MODE = { language: 'idris', scheme: 'file' }
 
+let idrisExecutablePath = vscode.workspace.getConfiguration('idris').get('executablePath');
+
 var triggers = []
 for (var i = 0; i < 26; i++) {
   triggers.push(String.fromCharCode(97 + i))
@@ -19,17 +21,23 @@ function activate(context) {
     }
   })
 
-  vscode.workspace.onDidSaveTextDocument((event) => {
-    controller.typeCheckOnSave()
-  })
-
   context.subscriptions.push(controller.diagnosticCollection)
   controller.getCommands().forEach(([key, value]) => {
     let disposable = vscode.commands.registerCommand(key, value)
     context.subscriptions.push(disposable)
   })
   context.subscriptions.push(vscode.languages.registerCompletionItemProvider(IDRIS_MODE, new completion.IdrisCompletionProvider(), ...triggers))
   context.subscriptions.push(vscode.languages.registerHoverProvider(IDRIS_MODE, new typeHover.IdrisHoverProvider()))
+  context.subscriptions.push(vscode.workspace.onDidSaveTextDocument((event) => {
+    controller.typeCheckOnSave()
+  }))
+  context.subscriptions.push(vscode.workspace.onDidChangeConfiguration(() => {
+    let newIdrisExecutablePath = vscode.workspace.getConfiguration('idris').get('executablePath')
+    if (idrisExecutablePath != newIdrisExecutablePath) {
+      idrisExecutablePath = newIdrisExecutablePath
+      controller.reInitialize()
+    }
+  }))
 }
 exports.activate = activate
 

src/idris/commands.js

@@ -15,6 +15,11 @@ let initialize = (compilerOptions) => {
   model.setCompilerOptions(compilerOptions);
 }
 
+let reInitialize = (compilerOptions) => {
+  model = new IdrisModel()
+  model.setCompilerOptions(compilerOptions)
+}
+
 let getModel = () => {
   return model
 }
@@ -489,6 +494,7 @@ module.exports = {
   getModel,
   diagnosticCollection,
   initialize,
+  reInitialize,
   typecheckFile,
   typeForWord,
   docsForWord,