Skip to content
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

[#681] re-enable file watcher #688

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

[#681] re-enable file watcher #688

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
69a32f4
re-enable file watcher
WB2210 Sep 21, 2024
c196778
add onConfigChangedForceEnable option
WB2210 Oct 11, 2024
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
5 changes: 5 additions & 0 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,6 +156,11 @@
"Do nothing"
]
},
"clangd.onConfigChangedForceEnable": {
"type": "boolean",
"default": false,
"description": "Force enable of \"On Config Changed\" option regardless of clangd version."
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please also amend the description of onConfigChanged to read:

What to do when clangd configuration files are changed. Ignored for clangd 12+, which can reload such files itself; however, this can be overridden with clangd.onConfigChanged.forceEnable.

},
"clangd.detectExtensionConflicts": {
"type": "boolean",
"default": true,
Expand Down
2 changes: 1 addition & 1 deletion src/clangd-context.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,11 +179,11 @@ export class ClangdContext implements vscode.Disposable {
ast.activate(this);
openConfig.activate(this);
inactiveRegions.activate(this);
configFileWatcher.activate(this);
this.client.start();
console.log('Clang Language Server is now active!');
fileStatus.activate(this);
switchSourceHeader.activate(this);
configFileWatcher.activate(this);
}

get visibleClangdEditors(): vscode.TextEditor[] {
Expand Down
4 changes: 2 additions & 2 deletions src/config-file-watcher.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ class ConfigFileWatcherFeature implements vscodelc.StaticFeature {

initialize(capabilities: vscodelc.ServerCapabilities,
_documentSelector: vscodelc.DocumentSelector|undefined) {
if ((capabilities as ClangdClientCapabilities)
.compilationDatabase?.automaticReload)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd like us to keep respecting the server's automaticReload capability by default.

I was thinking of adding a new config option, like clangd.onConfigChanged.forceEnable: true, and only skipping this automaticReload check if that option is enabled.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've added "onConfigChangedForceEnable" option

(I tried "onConfigChanged.forceEnable" instead of "onConfigChangedForceEnable" but
config.get("onConfigChanged.forceEnable") fails, it doesnt seem to work when fields have "." in it
Any idea?)

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

onConfigChanged.forceEnable works fine for me during local testing, and the documentation of the relevant vscode API says that it supports dotted names.

Could you try again, and if it doesn't work for you then post the version you're trying for further investigation?

if (!config.get<boolean>("onConfigChangedForceEnable") &&
(capabilities as ClangdClientCapabilities).compilationDatabase?.automaticReload)
return;
this.context.subscriptions.push(new ConfigFileWatcher(this.context));
}
Expand Down