Fix client/registerCapability request when workspaces/didChangeWorksp… (

#598) * Fix client/registerCapability request when workspaces/didChangeWorkspaceFolder even if dynamicRegistration set to false * rename hasWsChangeWatchedFileDynamicRegistration Co-authored-by: unknown <[email protected]>
redhat-developer · Nov 26, 2021 · fcfe397 · fcfe397
1 parent 47ba49b
commit fcfe397
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/src/yamlServerInit.ts b/src/yamlServerInit.ts
@@ -44,7 +44,7 @@ export class YAMLServerInit {
       }
     );
     this.connection.onInitialized(() => {
-      if (this.yamlSettings.hasWorkspaceFolderCapability) {
+      if (this.yamlSettings.hasWsChangeWatchedFileDynamicRegistration) {
         this.connection.workspace.onDidChangeWorkspaceFolders((changedFolders) => {
           this.yamlSettings.workspaceFolders = workspaceFoldersChanged(this.yamlSettings.workspaceFolders, changedFolders);
         });
@@ -88,6 +88,12 @@ export class YAMLServerInit {
     this.yamlSettings.hasConfigurationCapability = !!(
       this.yamlSettings.capabilities.workspace && !!this.yamlSettings.capabilities.workspace.configuration
     );
+
+    this.yamlSettings.hasWsChangeWatchedFileDynamicRegistration = !!(
+      this.yamlSettings.capabilities.workspace &&
+      this.yamlSettings.capabilities.workspace.didChangeWatchedFiles &&
+      this.yamlSettings.capabilities.workspace.didChangeWatchedFiles.dynamicRegistration
+    );
     this.registerHandlers();
 
     return {

diff --git a/src/yamlSettings.ts b/src/yamlSettings.ts
@@ -84,6 +84,7 @@ export class SettingsState {
   hasConfigurationCapability = false;
   useVSCodeContentRequest = false;
   yamlVersion: YamlVersion = '1.2';
+  hasWsChangeWatchedFileDynamicRegistration = false;
 }
 
 export class TextDocumentTestManager extends TextDocuments<TextDocument> {