Merge pull request #49 from CaptainUnbrauchbar/release

QoL changes and small bug fixes

Author: CaptainUnbrauchbar

README.md

@@ -15,7 +15,7 @@ We added multi-file support with v0.4.0!
 
 ## Usage
 
-![](https://github.com/CaptainUnbrauchbar/asp-language-support/blob/release/media/usage-demo.gif)
+<img src="https://github.com/CaptainUnbrauchbar/asp-language-support/blob/release/media/usage-demo.gif" height="500" alt="demo-gif"/>
 
 Just right click anywhere on a logic program (.lp) file and select `Compute all Answer Sets`, `Compute the first Answer Set` or `Compute Answer Sets (config.json)`.
 This will display Clingo's results in a seperate ASP tab located in the panel. You can also use the buttons in the top right of this tab to run bundled or PATH clingo depending on your `ASPLanguage: Use PATH Clingo` setting.
@@ -32,6 +32,13 @@ See the Clingo [Documentation](https://github.com/potassco/guide/releases/downlo
 
 If you want to use your own Version of Clingo from PATH with this extension, please enable `ASPLanguage: Use PATH Clingo` option in your settings.
 
+## Customization
+
+<img src="https://github.com/CaptainUnbrauchbar/asp-language-support/blob/release/media/customization-demo.gif" height="500" alt="customization-gif"/>
+
+When using the bundled WASM Clingo (Choose in configuration `ASPLanguage: Use PATH Clingo`), you can easily move the panel to the sidebars or change the panel position depending on your preferences.
+The layout will adjust accordingly!
+
 ## Requirements
 
 For the extension to work properly, please install the Answer Set Programming syntax highlighter by abelcour (abelcour.asp-syntax-highlight)

media/customization-demo.gif

@@ -51,7 +51,7 @@ body {
 }
 
 .answer-label-box {
-    width: 30em;
+    width: 100%;
     background-color: var(--vscode-input-border);
     color: var(--vscode-input-foreground);
     padding: 0.1em 0.1em;

media/main.css

@@ -15,6 +15,7 @@
 
             const result = message.answers;
             const cfgFile = message.cfgFile;
+            const useConfig = message.useConfig;
 
             // Create a container for metadata and config boxes
             const infoContainer = document.createElement("div");
@@ -36,7 +37,7 @@ Result: ${result.result}
             // Append the metadata box to the info container
             infoContainer.appendChild(metadataBox);
 
-            if (cfgFile) {
+            if (useConfig) {
                 // Create a config file output box
                 const configBox = document.createElement("textarea");
                 configBox.className = "info-box"; // Reuse the same styling

media/main.js

@@ -1,7 +1,7 @@
 {
     "name": "answer-set-programming-language-support",
     "displayName": "Answer Set Programming Language Support",
-    "version": "1.0.1",
+    "version": "1.0.2",
     "description": "Language Support for Clingo ASP (developed by University of Potsdam).",
     "publisher": "ffrankreiter",
     "jest": {

package.json

@@ -121,9 +121,10 @@ function activate(context) {
      */
     async function runBundledClingo(models, useConfig = false) {
         let additionalArgs = [];
+        let cfgFile = [];
         // Process config information
         if (useConfig) {
-            const cfgFile = readConfig(setConfig, turnMessagesOff, context.asAbsolutePath(""));
+            cfgFile = readConfig(setConfig, turnMessagesOff, context.asAbsolutePath(""));
             models = cfgFile.find((arg) => arg.startsWith("--models")).split(" ")[1];
             additionalArgs = cfgFile.filter((arg) => !arg.startsWith("--models"));
         }
@@ -135,6 +136,8 @@ function activate(context) {
         provider._view?.webview.postMessage({
             type: "updateOutput",
             answers,
+            useConfig,
+            cfgFile,
         });
     }
 
@@ -168,6 +171,7 @@ function activate(context) {
     /**
      * Function to run Clingo with the given models. It checks if the user has selected a valid file and runs Clingo with the given models.
      * @param {Number} models The number of models to run.
+     * @param {Boolean} useConfig If true, it uses the config file to run Clingo.
      * @returns
      */
     async function runClingoCommand(models, useConfig = false) {
@@ -187,15 +191,22 @@ function activate(context) {
     ////////////////////////////////////////////////////////////////////////////////
 
     // Register computeAllSetsCommand command for the extension
-    const computeAllSetsCommand = vscode.commands.registerCommand(
-        "answer-set-programming-language-support.runinterminalall",
-        async () => await runClingoCommand(0, false)
-    );
+    const computeAllSetsCommand = vscode.commands.registerCommand("answer-set-programming-language-support.runinterminalall", async () => {
+        // Focus ASP Tab for easier access to output
+        vscode.commands.executeCommand("workbench.view.extension.aspContainer");
+        // Run WASM Clingo
+        await runClingoCommand(0, false);
+    });
 
     // Register computeSingleSetCommand command for the extension
     const computeSingleSetCommand = vscode.commands.registerCommand(
         "answer-set-programming-language-support.runinterminalsingle",
-        async () => await runClingoCommand(1, false)
+        async () => {
+            // Focus ASP Tab for easier access to output
+            vscode.commands.executeCommand("workbench.view.extension.aspContainer");
+            // Run WASM Clingo
+            await runClingoCommand(1, false);
+        }
     );
 
     // Register computeConfigCommand command for the extension
@@ -207,11 +218,15 @@ function activate(context) {
                 return;
             }
 
+            // Focus ASP Tab for easier access to output
+            vscode.commands.executeCommand("workbench.view.extension.aspContainer");
+
             // Create configPath and sanitize it
             const configPath = join(dirname(vscode.window.activeTextEditor.document.fileName), setConfig.replace(/^(..(\/|\|$))+/, ""));
 
             // Check if config exists, otherwise ask user if they wants to create a new one
             if (fs.existsSync(configPath)) {
+                // Run WASM Clingo with config file (bool operator)
                 runClingoCommand(0, true);
             } else {
                 const chosenOption = Promise.resolve(