Merge branch 'informaticup' into dependabot/github_actions/github-actions-e1d721b46e

Author: richilino

package-lock.json

@@ -1,7 +1,7 @@
 {
     "name": "answer-set-programming-language-support",
     "displayName": "Clingo for VSCode",
-    "version": "1.0.6",
+    "version": "1.0.8",
     "description": "Language Support for Clingo ASP (developed at University of Potsdam).",
     "publisher": "ffrankreiter",
     "jest": {
@@ -162,19 +162,19 @@
                 "command": "answer-set-programming-language-support.runinterminalall",
                 "key": "ctrl+shift+a",
                 "mac": "cmd+shift+a",
-                "when": "editorTextFocus"
+                "when": "editorTextFocus && editorLangId == 'asp'"
             },
             {
                 "command": "answer-set-programming-language-support.runinterminalsingle",
-                "key": "ctrl+shift+s",
-                "mac": "cmd+shift+s",
-                "when": "editorTextFocus"
+                "key": "ctrl+shift+x",
+                "mac": "cmd+shift+x",
+                "when": "editorTextFocus && editorLangId == 'asp'"
             },
             {
                 "command": "answer-set-programming-language-support.runinterminalconfig",
                 "key": "ctrl+shift+c",
                 "mac": "cmd+shift+c",
-                "when": "editorTextFocus"
+                "when": "editorTextFocus && editorLangId == 'asp'"
             }
         ]
     },

package.json

@@ -18,6 +18,7 @@
         },
         "preProcessor": false,
         "models": 0,
+        "constants": ["const1=value1", "const2=value2"],
         "customArgs": ""
     }
 }

sampleConfig.json

@@ -6,7 +6,7 @@
         "name": { "type": "string" },
         "author": { "type": "string" },
         "version": { "type": "string" },
-        "additionalFile": { "type": "array" },
+        "additionalFiles": { "type": "array" },
         "args": {
             "type": "object",
             "properties": {
@@ -26,6 +26,7 @@
                 "timeLimit": { "type": "integer" },
                 "preProcessor": { "type": "boolean" },
                 "models": { "type": "integer" },
+                "constants": { "type": "array" },
                 "customArgs": { "type": "string" }
             }
         }

schema.json

@@ -27,6 +27,7 @@ function readConfig(setConfig, turnMessagesOff, contextAbsolutePath) {
         args.push(...readModels());
         args.push(...readCustomArgs());
         args.push(...readFiles());
+        args.push(...readConstants());
 
         if (!turnMessagesOff) {
             vscode.window.showInformationMessage(
@@ -42,6 +43,14 @@ function readConfig(setConfig, turnMessagesOff, contextAbsolutePath) {
     return args;
 }
 
+function readConstants() {
+    if (jsonConfig.args.constants != undefined) {
+        return jsonConfig.args.constants.map((constant) => `--const ${constant}`);
+    } else {
+        return [];
+    }
+}
+
 /**
  * @param {string} contextAbsolutePath
  * @param {string} pathToConfig
@@ -127,8 +136,30 @@ function readModels() {
 
 function readCustomArgs() {
     if (jsonConfig.args.customArgs != undefined) {
-        return jsonConfig.args.customArgs.split(" ");
+        const str = jsonConfig.args.customArgs;
+        // split custom args into seperate tokens
+        const tokens = str.match(/(?:[^\s"]+|"[^"]*")+/g) || [];
+        const result = [];
+        // process tokens as possible pairs
+        for (let i = 0; i < tokens.length; i++) {
+            let token = tokens[i];
+            if (token.startsWith("-") && i + 1 < tokens.length) {
+                if (tokens[i + 1].startsWith("-")) {
+                    // next token is another flag, so current token is standalone
+                    result.push(token);
+                    continue;
+                }
+                let next = tokens[i + 1];
+                result.push(`${token} ${next}`);
+                i++;
+            } else {
+                // no possible pair remaining
+                result.push(token);
+            }
+        }
+        return result;
     } else {
+        // no custom args
         return [];
     }
 }

src/configReader.js

@@ -84,7 +84,7 @@ function activate(context) {
                 solve: result?.Time.Solve,
                 model: result?.Time.Model,
             },
-            answers: result?.Call.flatMap((call) => call.Witnesses.map((witness) => witness.Value.join(", "))),
+            answers: result?.Call.flatMap((call) => call.Witnesses?.map((witness) => witness.Value.join(", "))),
             result: result?.Result,
         };
     }

src/extension.js

@@ -25,12 +25,12 @@ async function runClingoWasmForFileWithProgress(vscode, progress, filePath, mode
 
     fileContent = await fs.promises.readFile(filePath, "utf8");
 
-    const additionalFiles = options?.filter((arg) => arg && !arg.startsWith("--")).map((filePath) => filePath.replace(/"/g, ""));
+    const additionalFiles = options?.filter((arg) => arg && !arg.startsWith("-")).map((filePath) => filePath.replace(/"/g, ""));
 
     if (additionalFiles?.length) {
         for (const additionalFilePath of additionalFiles) {
             if (!fs.existsSync(additionalFilePath)) {
-                vscode.window.showErrorMessage(`File not found: ${filePath}`);
+                vscode.window.showErrorMessage(`File not found: ${additionalFilePath}`);
                 return null;
             }
             const additionalContent = await fs.promises.readFile(additionalFilePath, "utf8");
@@ -41,7 +41,7 @@ async function runClingoWasmForFileWithProgress(vscode, progress, filePath, mode
     }
 
     // Filter options for Clingo
-    const clingoOptions = options?.filter((arg) => arg.startsWith("--"));
+    const clingoOptions = options?.filter((arg) => arg.startsWith("-"));
 
     progress.report({
         increment: 50,
@@ -57,7 +57,7 @@ async function runClingoWasmForFileWithProgress(vscode, progress, filePath, mode
     });
 
     // Validate the result
-    if (["ERROR", "UNSATISFIABLE", "UNKNOWN"].includes(wasmResult.Result)) {
+    if (["ERROR", "UNKNOWN"].includes(wasmResult.Result)) {
         if ("Error" in wasmResult) {
             vscode.window.showErrorMessage(`Clingo WASM Error: ${wasmResult.Error}`);
         } else {