Merge pull request #47 from lf-lang/view-output

Add button to view output from build
lf-lang · May 17, 2022 · f9c4f2d · f9c4f2d
2 parents b4f7c20 + f3bad0e
commit f9c4f2d
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 4 deletions.
diff --git a/.gitignore b/.gitignore
@@ -4,4 +4,4 @@
 node_modules/*
 out/*
 .gradle/*
-
+__pycache__/*
diff --git a/.vscodeignore b/.vscodeignore
@@ -1,12 +1,19 @@
 node_modules/
 .git/
+.github/
+.gitmodules/
 lingua-franca/
+__pycache__/*
 src/**
 
 *.vsix
 .gitignore
 .vscodeignore
+CHANGELOG.md
+LICENSE.txt
+jest.config.ts
 tsconfig.json
 tslint.json
+uf.py
 package-lock.json
 developer-notes.md
diff --git a/lingua-franca b/lingua-franca
diff --git a/src/extension.ts b/src/extension.ts
@@ -68,14 +68,24 @@ export async function activate(context: ExtensionContext) {
 
     client.start();
 
+    type messageShower = (message: string, ...items: string[]) => Thenable<string | undefined>
+    const withLogs = (showMessage: messageShower) => (message: string) => showMessage(
+        message, "Show output"
+    ).then(choice => {
+        if (choice === "Show output") client.outputChannel.show()
+    })
+
     context.subscriptions.push(commands.registerTextEditorCommand(
         'linguafranca.build',
         (textEditor: TextEditor, _) => {
             const uri = getLfUri(textEditor.document)
             if (!uri) return;
             workspace.saveAll().then(function(successful) {
                 if (!successful) return;
-                client.sendRequest('generator/build', uri).then(window.showInformationMessage);
+                client.sendRequest('generator/build', uri).then((message: string) => {
+                    if (message) withLogs(window.showInformationMessage)(message);
+                    else withLogs(window.showErrorMessage)('Build failed.');
+                });
             });
         }
     ));
@@ -88,7 +98,7 @@ export async function activate(context: ExtensionContext) {
                 if (!successful) return;
                 client.sendRequest('generator/buildAndRun', uri).then((command: string[]) => {
                     if (!command || !command.length) {
-                        window.showErrorMessage('Build failed.');
+                        withLogs(window.showErrorMessage)('Build failed.');
                         return;
                     }
                     const runTerminalName = 'Lingua Franca: Run';