Implement languageServer.enable setting migration with fallback logic

Co-authored-by: TwitchBronBron <[email protected]>

Author: Copilot

package.json

@@ -1887,6 +1887,13 @@
                         "scope": "resource"
                     },
                     "brightscript.enableLanguageServer": {
+                        "type": "boolean",
+                        "description": "Enable the Language Server, which includes things like syntax checking, intellisense, completions, etc.",
+                        "default": true,
+                        "scope": "resource",
+                        "deprecationMessage": "Use 'brightscript.languageServer.enable' instead. This setting will be removed in a future version."
+                    },
+                    "brightscript.languageServer.enable": {
                         "type": "boolean",
                         "description": "Enable the Language Server, which includes things like syntax checking, intellisense, completions, etc.",
                         "default": true,

src/LanguageServerManager.spec.ts

@@ -554,4 +554,55 @@ describe('LanguageServerManager', () => {
             expect(client.outputChannel.appendLine.callCount).to.eql(1);
         });
     });
+
+    describe('isLanguageServerEnabledInSettings', () => {
+        beforeEach(() => {
+            // Clear configuration before each test
+            vscode.workspace._configuration = {};
+        });
+
+        it('returns true when new setting is true', () => {
+            vscode.workspace._configuration['brightscript.languageServer.enable'] = true;
+            vscode.workspace._configuration['brightscript.enableLanguageServer'] = false;
+
+            expect(languageServerManager.isLanguageServerEnabledInSettings()).to.be.true;
+        });
+
+        it('returns false when new setting is false', () => {
+            vscode.workspace._configuration['brightscript.languageServer.enable'] = false;
+            vscode.workspace._configuration['brightscript.enableLanguageServer'] = true;
+
+            expect(languageServerManager.isLanguageServerEnabledInSettings()).to.be.false;
+        });
+
+        it('falls back to old setting when new setting is undefined', () => {
+            vscode.workspace._configuration['brightscript.enableLanguageServer'] = true;
+
+            expect(languageServerManager.isLanguageServerEnabledInSettings()).to.be.true;
+        });
+
+        it('falls back to old setting false when new setting is undefined', () => {
+            vscode.workspace._configuration['brightscript.enableLanguageServer'] = false;
+
+            expect(languageServerManager.isLanguageServerEnabledInSettings()).to.be.false;
+        });
+
+        it('returns default true when both settings are undefined', () => {
+            expect(languageServerManager.isLanguageServerEnabledInSettings()).to.be.true;
+        });
+
+        it('prioritizes new setting over old setting when both are defined', () => {
+            vscode.workspace._configuration['brightscript.languageServer.enable'] = false;
+            vscode.workspace._configuration['brightscript.enableLanguageServer'] = true;
+
+            expect(languageServerManager.isLanguageServerEnabledInSettings()).to.be.false;
+        });
+
+        it('prioritizes new setting over old setting when both are true', () => {
+            vscode.workspace._configuration['brightscript.languageServer.enable'] = true;
+            vscode.workspace._configuration['brightscript.enableLanguageServer'] = false;
+
+            expect(languageServerManager.isLanguageServerEnabledInSettings()).to.be.true;
+        });
+    });
 });

src/LanguageServerManager.ts

@@ -138,6 +138,12 @@ export class LanguageServerManager {
             if (configuration.affectsConfiguration('brightscript.bsdk')) {
                 await this.syncVersionAndTryRun();
             }
+
+            //if the language server enable setting changed, restart the language server
+            if (configuration.affectsConfiguration('brightscript.enableLanguageServer') ||
+                configuration.affectsConfiguration('brightscript.languageServer.enable')) {
+                await this.syncVersionAndTryRun();
+            }
         });
         await this.syncVersionAndTryRun();
     }
@@ -428,8 +434,20 @@ export class LanguageServerManager {
 
     public isLanguageServerEnabledInSettings() {
         let settings = vscode.workspace.getConfiguration('brightscript');
-        let value = settings.enableLanguageServer === false ? false : true;
-        return value;
+
+        // Priority: new setting -> old setting -> default (true)
+        const newSetting = settings.get<boolean>('languageServer.enable');
+        if (newSetting !== undefined) {
+            return newSetting;
+        }
+
+        const oldSetting = settings.get<boolean>('enableLanguageServer');
+        if (oldSetting !== undefined) {
+            return oldSetting;
+        }
+
+        // Default to true if neither setting is defined
+        return true;
     }
 
     public async getTranspiledFileContents(pathAbsolute: string) {