Skip to content

Commit

Permalink
Trigger reparsing when files.encoding setting changes (#13047)
Browse files Browse the repository at this point in the history
  • Loading branch information
@Colengms
Colengms authored Dec 16, 2024
1 parent d7ee241 commit fbf8135
Show file tree
Hide file tree
Showing 2 changed files with 47 additions and 6 deletions.
51 changes: 45 additions & 6 deletions Extension/src/LanguageServer/client.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ import { DataBinding } from './dataBinding';
import { cachedEditorConfigSettings, getEditorConfigSettings } from './editorConfig';
import { CppSourceStr, clients, configPrefix, updateLanguageConfigurations, usesCrashHandler, watchForCrashes } from './extension';
import { LocalizeStringParams, getLocaleId, getLocalizedString } from './localization';
import { PersistentFolderState, PersistentWorkspaceState } from './persistentState';
import { PersistentFolderState, PersistentState, PersistentWorkspaceState } from './persistentState';
import { RequestCancelled, ServerCancelled, createProtocolFilter } from './protocolFilter';
import * as refs from './references';
import { CppSettings, OtherSettings, SettingsParams, WorkspaceFolderSettingsParams } from './settings';
Expand Down Expand Up @@ -564,6 +564,16 @@ export interface ProjectContextResult {
fileContext: FileContextResult;
}

interface FolderFilesEncodingChanged {
uri: string;
filesEncoding: string;
}

interface FilesEncodingChanged {
workspaceFallbackEncoding?: string;
foldersFilesEncoding: FolderFilesEncodingChanged[];
}

// Requests
const PreInitializationRequest: RequestType<void, string, void> = new RequestType<void, string, void>('cpptools/preinitialize');
const InitializationRequest: RequestType<CppInitializationParams, void, void> = new RequestType<CppInitializationParams, void, void>('cpptools/initialize');
Expand Down Expand Up @@ -642,6 +652,7 @@ const ReportCodeAnalysisTotalNotification: NotificationType<number> = new Notifi
const DoxygenCommentGeneratedNotification: NotificationType<GenerateDoxygenCommentResult> = new NotificationType<GenerateDoxygenCommentResult>('cpptools/insertDoxygenComment');
const CanceledReferencesNotification: NotificationType<void> = new NotificationType<void>('cpptools/canceledReferences');
const IntelliSenseResultNotification: NotificationType<IntelliSenseResult> = new NotificationType<IntelliSenseResult>('cpptools/intelliSenseResult');
const FilesEncodingChangedNotification: NotificationType<FilesEncodingChanged> = new NotificationType<FilesEncodingChanged>('cpptools/filesEncodingChanged');

let failureMessageShown: boolean = false;

Expand Down Expand Up @@ -819,6 +830,7 @@ export interface Client {
getIncludes(maxDepth: number): Promise<GetIncludesResult>;
getChatContext(uri: vscode.Uri, token: vscode.CancellationToken): Promise<ChatContextResult>;
getProjectContext(uri: vscode.Uri): Promise<ProjectContextResult>;
filesEncodingChanged(filesEncodingChanged: FilesEncodingChanged): void;
}

export function createClient(workspaceFolder?: vscode.WorkspaceFolder): Client {
Expand Down Expand Up @@ -1367,7 +1379,13 @@ export class DefaultClient implements Client {
DefaultClient.isStarted.resolve();
}

private getWorkspaceFolderSettings(workspaceFolderUri: vscode.Uri | undefined, settings: CppSettings, otherSettings: OtherSettings): WorkspaceFolderSettingsParams {
private getWorkspaceFolderSettings(workspaceFolderUri: vscode.Uri | undefined, workspaceFolder: vscode.WorkspaceFolder | undefined, settings: CppSettings, otherSettings: OtherSettings): WorkspaceFolderSettingsParams {
const filesEncoding: string = otherSettings.filesEncoding;
let filesEncodingChanged: boolean = false;
if (workspaceFolder) {
const lastFilesEncoding: PersistentFolderState<string> = new PersistentFolderState<string>("CPP.lastFilesEncoding", "", workspaceFolder);
filesEncodingChanged = lastFilesEncoding.Value !== filesEncoding;
}
const result: WorkspaceFolderSettingsParams = {
uri: workspaceFolderUri?.toString(),
intelliSenseEngine: settings.intelliSenseEngine,
Expand Down Expand Up @@ -1464,7 +1482,8 @@ export class DefaultClient implements Client {
doxygenSectionTags: settings.doxygenSectionTags,
filesExclude: otherSettings.filesExclude,
filesAutoSaveAfterDelay: otherSettings.filesAutoSaveAfterDelay,
filesEncoding: otherSettings.filesEncoding,
filesEncoding: filesEncoding,
filesEncodingChanged: filesEncodingChanged,
searchExclude: otherSettings.searchExclude,
editorAutoClosingBrackets: otherSettings.editorAutoClosingBrackets,
editorInlayHintsEnabled: otherSettings.editorInlayHintsEnabled,
Expand All @@ -1480,10 +1499,10 @@ export class DefaultClient implements Client {
const workspaceFolderSettingsParams: WorkspaceFolderSettingsParams[] = [];
if (vscode.workspace.workspaceFolders && vscode.workspace.workspaceFolders.length > 0) {
for (const workspaceFolder of vscode.workspace.workspaceFolders) {
workspaceFolderSettingsParams.push(this.getWorkspaceFolderSettings(workspaceFolder.uri, new CppSettings(workspaceFolder.uri), new OtherSettings(workspaceFolder.uri)));
workspaceFolderSettingsParams.push(this.getWorkspaceFolderSettings(workspaceFolder.uri, workspaceFolder, new CppSettings(workspaceFolder.uri), new OtherSettings(workspaceFolder.uri)));
}
} else {
workspaceFolderSettingsParams.push(this.getWorkspaceFolderSettings(this.RootUri, workspaceSettings, workspaceOtherSettings));
workspaceFolderSettingsParams.push(this.getWorkspaceFolderSettings(this.RootUri, undefined, workspaceSettings, workspaceOtherSettings));
}
return workspaceFolderSettingsParams;
}
Expand All @@ -1498,9 +1517,13 @@ export class DefaultClient implements Client {
if (this.currentCopilotHoverEnabled && workspaceSettings.copilotHover !== this.currentCopilotHoverEnabled.Value) {
void util.promptForReloadWindowDueToSettingsChange();
}
const workspaceFallbackEncoding: string = workspaceOtherSettings.filesEncoding;
const lastWorkspaceFallbackEncoding: PersistentState<string> = new PersistentState<string>("CPP.lastWorkspaceFallbackEncoding", "");
const workspaceFallbackEncodingChanged = lastWorkspaceFallbackEncoding.Value !== workspaceFallbackEncoding;
return {
filesAssociations: workspaceOtherSettings.filesAssociations,
workspaceFallbackEncoding: workspaceOtherSettings.filesEncoding,
workspaceFallbackEncoding: workspaceFallbackEncoding,
workspaceFallbackEncodingChanged: workspaceFallbackEncodingChanged,
maxConcurrentThreads: workspaceSettings.maxConcurrentThreads,
maxCachedProcesses: workspaceSettings.maxCachedProcesses,
maxMemory: workspaceSettings.maxMemory,
Expand Down Expand Up @@ -2438,6 +2461,7 @@ export class DefaultClient implements Client {
this.languageClient.onNotification(ReportCodeAnalysisTotalNotification, (e) => this.updateCodeAnalysisTotal(e));
this.languageClient.onNotification(DoxygenCommentGeneratedNotification, (e) => void this.insertDoxygenComment(e));
this.languageClient.onNotification(CanceledReferencesNotification, this.serverCanceledReferences);
this.languageClient.onNotification(FilesEncodingChangedNotification, (e) => this.filesEncodingChanged(e));
}

private handleIntelliSenseResult(intelliSenseResult: IntelliSenseResult): void {
Expand Down Expand Up @@ -4085,6 +4109,20 @@ export class DefaultClient implements Client {
public getCopilotHoverProvider(): CopilotHoverProvider | undefined {
return this.copilotHoverProvider;
}

public filesEncodingChanged(filesEncodingChanged: FilesEncodingChanged): void {
if (filesEncodingChanged.workspaceFallbackEncoding !== undefined) {
const lastWorkspaceFallbackEncoding: PersistentState<string> = new PersistentState<string>("CPP.lastWorkspaceFallbackEncoding", "");
lastWorkspaceFallbackEncoding.Value = filesEncodingChanged.workspaceFallbackEncoding;
}
for (const folderFilesEncoding of filesEncodingChanged.foldersFilesEncoding) {
const workspaceFolder: vscode.WorkspaceFolder | undefined = vscode.workspace.getWorkspaceFolder(vscode.Uri.parse(folderFilesEncoding.uri));
if (workspaceFolder !== undefined) {
const lastFilesEncoding: PersistentFolderState<string> = new PersistentFolderState<string>("CPP.lastFilesEncoding", "", workspaceFolder);
lastFilesEncoding.Value = folderFilesEncoding.filesEncoding;
}
}
}
}

function getLanguageServerFileName(): string {
Expand Down Expand Up @@ -4200,4 +4238,5 @@ class NullClient implements Client {
getIncludes(maxDepth: number): Promise<GetIncludesResult> { return Promise.resolve({} as GetIncludesResult); }
getChatContext(uri: vscode.Uri, token: vscode.CancellationToken): Promise<ChatContextResult> { return Promise.resolve({} as ChatContextResult); }
getProjectContext(uri: vscode.Uri): Promise<ProjectContextResult> { return Promise.resolve({} as ProjectContextResult); }
filesEncodingChanged(filesEncodingChanged: FilesEncodingChanged): void { }
}
2 changes: 2 additions & 0 deletions Extension/src/LanguageServer/settings.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,7 @@ export interface WorkspaceFolderSettingsParams {
filesExclude: Excludes;
filesAutoSaveAfterDelay: boolean;
filesEncoding: string;
filesEncodingChanged: boolean;
searchExclude: Excludes;
editorAutoClosingBrackets: string;
editorInlayHintsEnabled: boolean;
Expand All @@ -141,6 +142,7 @@ export interface WorkspaceFolderSettingsParams {
export interface SettingsParams {
filesAssociations: Associations;
workspaceFallbackEncoding: string;
workspaceFallbackEncodingChanged: boolean;
maxConcurrentThreads: number | null;
maxCachedProcesses: number | null;
maxMemory: number | null;
Expand Down

0 comments on commit fbf8135

Please sign in to comment.