Merge master into feature/LSP-alpha

Author: aws-toolkit-automation

packages/core/src/awsService/cloudformation/extension.ts

@@ -105,7 +105,7 @@ async function startClient(context: ExtensionContext) {
     if (!(await fs.existsFile(serverFile))) {
         throw new Error(`CloudFormation LSP ${serverFile} not found`)
     }
-    getLogger().info(`Found CloudFormation LSP executable: ${serverFile}`)
+    getLogger('awsCfnLsp').info(`Found CloudFormation LSP executable: ${serverFile}`)
     const serverRootDir = await serverProvider.serverRootDir()
 
     const envOptions = {

packages/core/src/awsService/cloudformation/lsp-server/githubManifestAdapter.ts

@@ -21,12 +21,19 @@ export class GitHubManifestAdapter {
         const sortedReleases = envReleases.sort((a, b) => {
             return b.tag_name.localeCompare(a.tag_name)
         })
+        const versions = dedupeAndGetLatestVersions(sortedReleases.map((release) => this.convertRelease(release)))
+        getLogger('awsCfnLsp').info(
+            'Candidate versions: %s',
+            versions
+                .map((v) => `${v.serverVersion}[${v.targets.map((t) => `${t.platform}-${t.arch}`).join(',')}]`)
+                .join(', ')
+        )
         return {
             manifestSchemaVersion: '1.0',
             artifactId: CfnLspName,
             artifactDescription: 'GitHub CloudFormation Language Server',
             isManifestDeprecated: false,
-            versions: dedupeAndGetLatestVersions(sortedReleases.map((release) => this.convertRelease(release))),
+            versions: versions,
         }
     }
 

packages/core/src/awsService/cloudformation/lsp-server/lspInstaller.ts

@@ -41,7 +41,7 @@ export class CfnLspInstaller extends BaseLspInstaller {
             'awsCfnLsp',
             {
                 resolve: async () => {
-                    const log = getLogger()
+                    const log = getLogger('awsCfnLsp')
                     const cfnManifestStorageKey = 'aws.cloudformation.lsp.manifest'
 
                     try {

packages/core/src/awsService/cloudformation/lsp-server/lspServerProvider.ts

@@ -5,6 +5,7 @@
 
 import { Disposable } from 'vscode'
 import { getLogger } from '../../../shared/logger/logger'
+import { ToolkitError } from '../../../shared/errors'
 
 export interface LspServerResolverI {
     serverExecutable(): Promise<string>
@@ -29,7 +30,7 @@ export class LspServerProvider implements LspServerResolverI, Disposable {
         }
 
         this.matchedProviders = matches
-        getLogger().info(
+        getLogger('awsCfnLsp').info(
             `Found CloudFormation LSP provider: ${this.matchedProviders.map((provider) => provider.name())}`
         )
     }
@@ -58,7 +59,9 @@ export class LspServerProvider implements LspServerResolverI, Disposable {
                 this._serverRootDir = dir
                 return
             } catch (err) {
-                getLogger().error(`Failed to resolve CloudFormation LSP provider ${provider.name()}`, err)
+                getLogger().error(
+                    ToolkitError.chain(err, `Failed to resolve CloudFormation LSP provider ${provider.name()}`)
+                )
             }
         }
     }