feat: add settings section for ls specific settings

Author: Hweinstock

packages/amazonq/package.json

@@ -209,6 +209,23 @@
                     "items": {
                         "type": "string"
                     }
+                },
+                "amazonQ.lsp.traceChannel": {
+                    "type": "boolean",
+                    "markdownDescription": "%AWS.configuration.description.amazonq.lsp.traceChannel%",
+                    "default": false
+                },
+                "amazonQ.lsp.logLevel": {
+                    "type": "string",
+                    "markdownDescription": "%AWS.configuration.description.amazonq.lsp.logLevel%",
+                    "default": "info",
+                    "enum": [
+                        "error",
+                        "warn",
+                        "info",
+                        "log",
+                        "debug"
+                    ]
                 }
             }
         },

packages/amazonq/src/lsp/client.ts

@@ -63,7 +63,7 @@ export async function startLanguageServer(
     })
     const clientId = `amazonq`
     const documentSelector = [{ scheme: 'file', language: '*' }]
-    const lspLogSettings = getLspLogSettings(clientId)
+    const lspLogSettings = getLspLogSettings()
 
     getLogger('amazonqLsp').info(`Sending log settings to lsp: %O`, lspLogSettings)
 
@@ -149,7 +149,7 @@ export async function startLanguageServer(
          *   When trace server is enabled, logs go to a seperate "Amazon Q Language Server" output.
          *   Otherwise, logs go to the regular "Amazon Q Logs" channel.
          */
-        ...(lspLogSettings.seperateTraceChannel
+        ...(lspLogSettings.traceChannelEnabled
             ? {}
             : {
                   outputChannel: globals.logOutputChannel,

packages/amazonq/src/lsp/config.ts

@@ -31,14 +31,13 @@ export function getAmazonQLspConfig(): ExtendedAmazonQLSPConfig {
 }
 
 // TODO: expose lsp logging settings to users and re-send on update.
-export function getLspLogSettings(clientId: string) {
-    const traceServerSetting = `${clientId}.trace.server`
-    const lspLogLevelSetting = `${clientId}.lsp.logLevel`
-    const seperateTraceChannel = Settings.instance.get(traceServerSetting)
-    const lspLogLevel = Settings.instance.get(lspLogLevelSetting, String, 'info')
+export function getLspLogSettings() {
+    const lspSettings = Settings.instance.getSection('lsp')
+    const lspLogLevel = lspSettings.get('logLevel', 'info')
+    const traceChannelEnabled = lspSettings.get('trace', false)
 
     return {
-        seperateTraceChannel,
+        traceChannelEnabled,
         lspLogLevel: sanitizeLogLevel(lspLogLevel),
     }
 }

packages/core/package.nls.json

@@ -98,6 +98,8 @@
     "AWS.configuration.description.amazonq.workspaceIndexIgnoreFilePatterns": "File patterns to ignore when indexing your workspace files",
     "AWS.configuration.description.amazonq.workspaceIndexCacheDirPath": "The path to the directory that contains the cache of the index of your workspace files",
     "AWS.configuration.description.amazonq.ignoredSecurityIssues": "Specifies a list of code issue identifiers that Amazon Q should ignore when reviewing your workspace. Each item in the array should be a unique string identifier for a specific code issue. This allows you to suppress notifications for known issues that you've assessed and determined to be false positives or not applicable to your project. Use this setting with caution, as it may cause you to miss important security alerts.",
+    "AWS.configuration.description.amazonq.lsp.traceChannel": "View detailed log messages sent to/from the language server in a seperate output channel named 'Amazon Q Language Server'. All language server logs will be routed to this output channel instead.",
+    "AWS.configuration.description.amazonq.lsp.logLevel": "Set the logging level of the language server.",
     "AWS.command.apig.copyUrl": "Copy URL",
     "AWS.command.apig.invokeRemoteRestApi": "Invoke in the cloud",
     "AWS.command.apig.invokeRemoteRestApi.cn": "Invoke on Amazon",

packages/core/src/shared/settings-amazonq.gen.ts

@@ -35,7 +35,9 @@ export const amazonqSettings = {
     "amazonQ.workspaceIndexMaxFileSize": {},
     "amazonQ.workspaceIndexCacheDirPath": {},
     "amazonQ.workspaceIndexIgnoreFilePatterns": {},
-    "amazonQ.ignoredSecurityIssues": {}
+    "amazonQ.ignoredSecurityIssues": {},
+    "amazonQ.lsp.traceChannel": {},
+    "amazonQ.lsp.logLevel": {}
 }
 
 export default amazonqSettings