Don't nullify driver on cancel of configure or build (#4254)

* I don't see any reason to nullify the cmakeDriver just because we stopped a configure or build

* no reason to nullify driver on cancel

* need to reconfigure when a configure is stopped

Author: gcampbell-msft

src/cmakeProject.ts

@@ -2401,7 +2401,6 @@ export class CMakeProject {
 
         return drv.stopCurrentProcess().then(async () => {
             await this.activeBuild;
-            this.cmakeDriver = Promise.resolve(null);
             this.isBusy.set(false);
             return true;
         }, () => false);
@@ -2415,7 +2414,6 @@ export class CMakeProject {
 
         return drv.stopCurrentProcess().then(async () => {
             await this.activeBuild;
-            this.cmakeDriver = Promise.resolve(null);
             return true;
         }, () => false);
     }

src/drivers/cmakeDriver.ts

@@ -146,6 +146,14 @@ export abstract class CMakeDriver implements vscode.Disposable {
         return this._isConfiguredAtLeastOnce;
     }
 
+    protected _needsReconfigure = true;
+    /**
+     * Check if we need to reconfigure, such as if an important file has changed
+     */
+    public async checkNeedsReconfigure(): Promise<boolean> {
+        return this._needsReconfigure;
+    }
+
     protected async doPreCleanConfigure(): Promise<void> {
         return Promise.resolve();
     }
@@ -163,10 +171,6 @@ export abstract class CMakeDriver implements vscode.Disposable {
      */
     protected abstract get isCacheConfigSupported(): boolean;
 
-    /**
-     * Check if we need to reconfigure, such as if an important file has changed
-     */
-    abstract checkNeedsReconfigure(): Promise<boolean>;
     /**
      * Event registration for code model updates
      *
@@ -2031,6 +2035,7 @@ export abstract class CMakeDriver implements vscode.Disposable {
         if (this.configureProcess && this.configureProcess.child) {
             await util.termProc(this.configureProcess.child);
             this.configureProcess = null;
+            this._needsReconfigure = true;
         }
         if (this.cmakeBuildRunner) {
             await this.cmakeBuildRunner.stop();
@@ -2057,6 +2062,7 @@ export abstract class CMakeDriver implements vscode.Disposable {
         const initBaseDriverWithPresetLoc = localize("init.driver.using.preset", "Initializing base driver using preset");
         const initBaseDriverWithKitLoc = localize("init.driver.using.kit", "Initializing base driver using kit");
         log.debug(`${useCMakePresets ? initBaseDriverWithPresetLoc : initBaseDriverWithKitLoc}`);
+
         // Load up kit or presets before starting any drivers.
         if (useCMakePresets) {
             if (configurePreset) {

src/drivers/cmakeFileApiDriver.ts

@@ -81,8 +81,6 @@ export class CMakeFileApiDriver extends CMakeDriver {
             preferredGenerators);
     }
 
-    private _needsReconfigure = true;
-
     /**
      * Watcher for the CMake cache file on disk.
      */
@@ -162,9 +160,6 @@ export class CMakeFileApiDriver extends CMakeDriver {
         this._needsReconfigure = true;
         await onConfigureSettingsChange();
     }
-    async checkNeedsReconfigure(): Promise<boolean> {
-        return this._needsReconfigure;
-    }
 
     async doSetKit(cb: () => Promise<void>): Promise<void> {
         this._needsReconfigure = true;
@@ -208,7 +203,6 @@ export class CMakeFileApiDriver extends CMakeDriver {
     }
 
     async doCacheConfigure(): Promise<number> {
-        this._needsReconfigure = true;
         await this.updateCodeModel();
         return 0;
     }

src/drivers/cmakeLegacyDriver.ts

@@ -43,14 +43,10 @@ export class CMakeLegacyDriver extends CMakeDriver {
         super(cmake, config, sourceDir, isMultiProject, workspaceFolder, preconditionHandler);
     }
 
-    private _needsReconfigure = true;
     async doConfigureSettingsChange(): Promise<void> {
         this._needsReconfigure = true;
         await onConfigureSettingsChange();
     }
-    async checkNeedsReconfigure(): Promise<boolean> {
-        return this._needsReconfigure;
-    }
 
     async doSetKit(cb: () => Promise<void>): Promise<void> {
         this._needsReconfigure = true;