Skip to content

Update code analysis mode in Language Status when the settings change #13301

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Feb 21, 2025
Merged

Update code analysis mode in Language Status when the settings change #13301

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3bc1597
Update code analysis mode in Language Status when the settings change
bobbrow Feb 21, 2025
eac341c
Merge branch 'main' into bobbrow/codeAnalysisChanged
bobbrow Feb 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions Extension/src/LanguageServer/client.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1779,6 +1779,10 @@ export class DefaultClient implements Client {
});
}

if (changedSettings['codeAnalysis.runAutomatically'] !== undefined || changedSettings['codeAnalysis.clangTidy.enabled'] !== undefined) {
ui.refreshCodeAnalysisText(this.model.isRunningCodeAnalysis.Value);
}

const showButtonSender: string = "settingsChanged";
if (changedSettings["default.configurationProvider"] !== undefined) {
void ui.ShowConfigureIntelliSenseButton(false, this, ConfigurationType.ConfigProvider, showButtonSender);
Expand Down
17 changes: 11 additions & 6 deletions Extension/src/LanguageServer/ui.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,8 +200,8 @@ export class LanguageStatusUI {
if (this.isParsingWorkspacePaused) {
const displayTwoStatus: boolean = this.isParsingFiles && this.isParsingWorkspace;
return (this.isParsingFiles ? this.parsingFilesTooltip : "")
+ (displayTwoStatus ? " | " : "")
+ (this.isParsingWorkspace ? this.workspaceParsingPausedText : "");
+ (displayTwoStatus ? " | " : "")
+ (this.isParsingWorkspace ? this.workspaceParsingPausedText : "");
} else {
return this.isParsingWorkspace ? this.workspaceParsingRunningText : this.parsingFilesTooltip;
}
Expand Down Expand Up @@ -260,6 +260,13 @@ export class LanguageStatusUI {
};
return item;
}

public refreshCodeAnalysisText(isRunningCodeAnalysis: boolean) {
const activeText: string = this.isCodeAnalysisPaused ? this.codeAnalysisPausedText : this.codeAnalysisRunningText;
const idleText: string = this.codeAnalysisModePrefix + this.codeAnalysisCurrentMode();
this.codeAnalysisStatusItem.text = isRunningCodeAnalysis ? activeText : idleText;
}

private setIsCodeAnalysisPaused(val: boolean): void {
if (!this.isRunningCodeAnalysis) {
return;
Expand All @@ -286,9 +293,7 @@ export class LanguageStatusUI {
}
this.isRunningCodeAnalysis = val;
this.codeAnalysisStatusItem.busy = val;
const activeText: string = this.isCodeAnalysisPaused ? this.codeAnalysisPausedText : this.codeAnalysisRunningText;
const idleText: string = this.codeAnalysisModePrefix + this.codeAnalysisCurrentMode();
this.codeAnalysisStatusItem.text = val ? activeText : idleText;
this.refreshCodeAnalysisText(val);
this.codeAnalysisStatusItem.command = val ? {
command: "C_Cpp.ShowActiveCodeAnalysisCommands",
title: localize("c.cpp.codeanalysis.statusbar.showCodeAnalysisOptions", "Options"),
Expand Down Expand Up @@ -497,7 +502,7 @@ export class LanguageStatusUI {
// TODO: Check some "AlwaysShow" setting here.
this.ShowConfiguration = isCppOrRelated || (util.getWorkspaceIsCpp() &&
(activeEditor.document.fileName.endsWith("tasks.json") ||
activeEditor.document.fileName.endsWith("launch.json")));
activeEditor.document.fileName.endsWith("launch.json")));

if (this.showConfigureIntelliSenseButton) {
if (isCppOrRelated && !!this.currentClient && this.currentClient.getShowConfigureIntelliSenseButton()) {
Expand Down