Skip to content

Commit 34f54ac

Browse files
committed
Clear the active selected build tool where a project supports multiple.
Signed-off-by: Roland Grunberg <rgrunber@redhat.com>
1 parent 7feba45 commit 34f54ac

2 files changed

Lines changed: 5 additions & 3 deletions

File tree

src/buildFilesSelector.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import { ExtensionContext, MessageItem, QuickPickItem, QuickPickItemKind, Uri, W
22
import { convertToGlob, getExclusionGlob, getInclusionPatternsFromNegatedExclusion } from "./utils";
33
import * as path from "path";
44
import { IBuildTool, getContributedBuildTools } from "./plugin";
5+
import { ACTIVE_BUILD_TOOL_STATE } from "./settings";
56

67
export const PICKED_BUILD_FILES = "java.pickedBuildFiles";
78
export const BUILD_TOOL_FOR_CONFLICTS = "java.buildToolForConflicts";
@@ -293,8 +294,9 @@ interface IBuildFilePicker extends QuickPickItem {
293294
buildToolAndUri: Map<IBuildTool, Uri>;
294295
}
295296

296-
export function cleanupProjectPickerCache(context: ExtensionContext) {
297+
export function cleanupWorkspaceState(context: ExtensionContext) {
297298
context.workspaceState.update(PICKED_BUILD_FILES, undefined);
298299
context.workspaceState.update(BUILD_TOOL_FOR_CONFLICTS, undefined);
299300
context.workspaceState.update(IMPORT_METHOD, undefined);
301+
context.workspaceState.update(ACTIVE_BUILD_TOOL_STATE, undefined);
300302
}

src/extension.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ import { getMessage } from './errorUtils';
3737
import { TelemetryService } from '@redhat-developer/vscode-redhat-telemetry/lib';
3838
import { activationProgressNotification } from "./serverTaskPresenter";
3939
import { loadSupportedJreNames } from './jdkUtils';
40-
import { BuildFileSelector, PICKED_BUILD_FILES, cleanupProjectPickerCache } from './buildFilesSelector';
40+
import { BuildFileSelector, PICKED_BUILD_FILES, cleanupWorkspaceState } from './buildFilesSelector';
4141
import { pasteFile } from './pasteAction';
4242
import { ServerStatusKind } from './serverStatus';
4343

@@ -345,7 +345,7 @@ export async function activate(context: ExtensionContext): Promise<ExtensionAPI>
345345
const data = {};
346346
try {
347347
cleanupLombokCache(context);
348-
cleanupProjectPickerCache(context);
348+
cleanupWorkspaceState(context);
349349
deleteDirectory(workspacePath);
350350
deleteDirectory(syntaxServerWorkspacePath);
351351
} catch (error) {

0 commit comments

Comments
 (0)