Fixed official VSIX build (#2041)

Azure · Mar 29, 2021 · a1a3561 · a1a3561
1 parent 4857aef
commit a1a3561
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/.pipelines/Common.yml b/.pipelines/Common.yml
@@ -224,7 +224,7 @@ stages:
       displayName: Copy language server for packaging
       inputs:
         sourceFolder: '$(Pipeline.Workspace)/drop_build_bicep_windows/bicep.LangServer/'
-        contents: '*.*'
+        contents: '**'
         targetFolder: '$(Build.SourcesDirectory)/src/vscode-bicep/bicepLanguageServer'
 
     - script: npm run test:unit

diff --git a/src/vscode-bicep/src/extension.ts b/src/vscode-bicep/src/extension.ts
@@ -16,9 +16,14 @@ export async function activate(
     context,
     outputChannel,
     async () => {
-      createLogger(context, outputChannel);
+      const logger = createLogger(context, outputChannel);
 
-      await launchLanguageServiceWithProgressReport(context, outputChannel);
+      try {
+        await launchLanguageServiceWithProgressReport(context, outputChannel);
+      } catch (e) {
+        logger.error(e);
+        throw e;
+      }
     }
   );
 }

diff --git a/src/vscode-bicep/src/utils/logger.ts b/src/vscode-bicep/src/utils/logger.ts
@@ -92,7 +92,7 @@ function isTestEnv() {
 export function createLogger(
   context: vscode.ExtensionContext,
   outputChannel: vscode.OutputChannel
-): void {
+): Logger {
   // TODO:
   // - make log level configurable
   // - Default log level should be info
@@ -102,6 +102,8 @@ export function createLogger(
   logger.info("Current log level: debug.");
 
   context.subscriptions.push(winstonLogger);
+
+  return logger;
 }
 
 export function getLogger(): Logger {