Merge pull request #17 from LPCIC/next

Next

Author: gares

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Change Log
 
+### 0.2.5
+
+- Colorblind friendly color schema
+- Fix display of (moltiple) additional attempts for the same goal
+
 ### 0.2.4
 
 - Fix search for binaries in $PATH

media/main.css

@@ -234,7 +234,7 @@ html, body
 {
   height: 16px;
   width: 16px;
-  background-color: var(--vscode-charts-green);
+  background-color: var(--vscode-charts-blue);
   border-radius: 50%;
   border: 2px solid #999999;
   display: inline-block;
@@ -264,7 +264,7 @@ html, body
 {
   height: 16px;
   width: 16px;
-  background: linear-gradient(90deg, var(--vscode-charts-yellow), 80%, var(--vscode-charts-green));
+  background: linear-gradient(90deg, var(--vscode-charts-yellow), 50%, var(--vscode-charts-blue));
   border-radius: 50%;
   border: 2px solid #999999;
   display: inline-block;
@@ -274,7 +274,7 @@ html, body
 {
   height: 16px;
   width: 16px;
-  background: linear-gradient(90deg, var(--vscode-charts-yellow), 80%, var(--vscode-charts-red));
+  background: linear-gradient(90deg, var(--vscode-charts-yellow), 50%, var(--vscode-charts-red));
   border-radius: 50%;
   border: 2px solid #999999;
   display: inline-block;
@@ -369,8 +369,8 @@ hr
 
 .panel-heading
 {
-  color: var(--vscode-foreground);
-  background-color: var(--vscode-charts-blue);
+  background-color: var(--vscode-editor-background);
+  color: var(--vscode-editor-foreground);
 }
 
 .panel.is-danger .panel-heading
@@ -380,7 +380,7 @@ hr
 
 .panel.is-success .panel-heading
 {
-  background-color: var(--vscode-charts-green);
+  background-color: var(--vscode-charts-blue);
 }
 
 .tag:not(body)
@@ -398,7 +398,7 @@ hr
 .tag.tag-green
 {
   color: #ffffff;
-  background-color: var(--vscode-charts-green);
+  background-color: var(--vscode-charts-blue);
 }
 
 .tag.tag-yellow
@@ -410,13 +410,13 @@ hr
 .tag.tag-yellowgreen
 {
   color: #000000;
-  background: linear-gradient(90deg, var(--vscode-charts-yellow), 80%, var(--vscode-charts-green));
+  background: linear-gradient(90deg, var(--vscode-charts-yellow), 50%, var(--vscode-charts-blue));
 }
 
 .tag.tag-yellowred
 {
   color: #000000;
-  background: linear-gradient(90deg, var(--vscode-charts-yellow), 80%, var(--vscode-charts-red));
+  background: linear-gradient(90deg, var(--vscode-charts-yellow), 50%, var(--vscode-charts-red));
 }
 
 .tag.tag-grey
@@ -588,7 +588,7 @@ a.dropdown-item:hover
 
 .card-footer-green
 {
-  background-color: var(--vscode-charts-green);
+  background-color: var(--vscode-charts-blue);
 }
 
 .card-footer-yellow
@@ -603,12 +603,12 @@ a.dropdown-item:hover
 
 .card-footer-yellowgreen
 {
-  background: linear-gradient(90deg, var(--vscode-charts-yellow), 80%, var(--vscode-charts-green));
+  background: linear-gradient(90deg, var(--vscode-charts-yellow), 50%, var(--vscode-charts-blue));
 }
 
 .card-footer-yellowred
 {
-  background: linear-gradient(90deg, var(--vscode-charts-yellow), 80%, var(--vscode-charts-red));
+  background: linear-gradient(90deg, var(--vscode-charts-yellow), 50%, var(--vscode-charts-red));
 }
 
 /* ***************************************************************************
@@ -623,12 +623,12 @@ a.dropdown-item:hover
   --shiki-color-text: var(--vscode-symbolIcon-textForeground);
   --shiki-color-background: var(--vscode-sideBar-background);
   --shiki-token-constant: var(--vscode-charts-blue);
-  --shiki-token-string: var(--vscode-charts-green);
+  --shiki-token-string: var(--vscode-charts-blue);
   --shiki-token-comment: var(--vscode-charts-lines);
   --shiki-token-keyword: var(--vscode-charts-purple);
   --shiki-token-parameter: var(--vscode-charts-purple);
   --shiki-token-function: var(--vscode-charts-blue);
-  --shiki-token-string-expression: var(--vscode-charts-green);
+  --shiki-token-string-expression: var(--vscode-charts-blue);
   --shiki-token-punctuation: var(--vscode-charts-orange) ;
   --shiki-token-link: var(--vscode-charts-blue);
 }

media/main.js

@@ -302,8 +302,33 @@
         let ds_s = -1;
         let ds_g = -1;
 
-        for(var i = 0; i < card.step.value.more_successful_attempts.length; i++) {
-            let step_id = card.step.value.more_successful_attempts[i];
+        let all_attempts = card.step.value.more_successful_attempts.concat(card.step.value.more_failing_attempts);
+
+
+        for(var i = 0; i < all_attempts.length; i++) {
+            let step_id = all_attempts[i];
+            let runt_id = card.runtime_id;
+            let goal_ds = [];
+
+            goal_ds[0] = step_id;
+
+            for(var j = 0; j < trace.length; j++) {
+                if(trace[j].step_id    == step_id
+                && trace[j].runtime_id == runt_id) {
+                    goal_ds[1] = goal_id(trace[j].step);
+                    break;
+                }
+            }
+                    
+            goal_ds[2] = ids_for_rt_st_gl(ds_r, goal_ds[0], goal_ds[1])[0];
+            destinations.push(goal_ds);
+
+        }
+        return destinations;
+
+
+        for(var i = 0; i < all_attempts.length; i++) {
+            let step_id = all_attempts[i];
             let runt_id = card.runtime_id;
 
             // console.log('goal_status_label', 'seeking goal id for', step_id, runt_id);
@@ -510,7 +535,7 @@
         contents += format_successful_attempts(step.value.successful_attempts, r_id, s_id);
         if (status.includes("Yellow") && card.step.kind == "Inference")
         {
-            contents += format_more_successful_attempts(msg.data, window.trace, r_id, s_id);
+            contents += format_more_attempts(msg.data, window.trace, r_id, s_id);
         }
         contents += format_stack(step.value.stack, r_id, s_id);
 
@@ -811,19 +836,23 @@ ${step.value.findall_solution_text}
         return contents;
     }
 
-    function format_more_successful_attempts(card, trace, r_id, s_id)
+    function format_more_attempts(card, trace, r_id, s_id)
     {
-        // console.log('Formatting more successful attempts', JSON.stringify(card.step.value.more_successful_attempts));
+        // console.log('Formatting more attempts', JSON.stringify(card.step.value.more_successful_attempts), JSON.stringify(card.step.value.more_failing_attempts));
 
         let contents = "";
 
-        if(card.step.value.more_successful_attempts == undefined)
+        if(card.step.value.more_successful_attempts == undefined && card.step.value.more_failing_attempts == undefined)
             return contents;
 
+        let panel_class = "is-success";
+        if (card.step.value.more_successful_attempts.length == 0)
+            panel_class = "is-danger";
+
         contents = `
-<article class="panel is-success">
+<article class="panel ${panel_class}">
     <div class="panel-heading">
-        More successful attempts (${card.step.value.more_successful_attempts.length})
+        More attempts (${card.step.value.more_successful_attempts.length} / ${card.step.value.more_failing_attempts.length})
         <span id="toggle_ms" class="tag" style="float:right;">Toggle</span>
     </div>
     <div>

package-lock.json

@@ -3,7 +3,7 @@
 	"displayName": "Elpi lang",
 	"publisher": "gares",
 	"description": "Elpi programming language support",
-	"version": "0.2.4",
+	"version": "0.2.5",
 	"homepage": "https://github.com/LPCIC/elpi-lang",
 	"repository": {
 		"type": "git",
@@ -91,7 +91,7 @@
 				},
 				"elpi.elpi_trace_view.syntax_highlighting": {
 					"type": "boolean",
-					"default": "true",
+					"default": "false",
 					"markdownDescription": "Highlight elpi code statements"
 				}
 			}

package.json

@@ -56,6 +56,7 @@ type inference = {
   failed_attempts : attempt list;
   successful_attempts : successful_attempt list;
   more_successful_attempts : step_id list;
+  more_failing_attempts : step_id list;
   stack : stack;
 }
 

src/trace.atd

@@ -61,6 +61,7 @@ export type Inference = {
   failed_attempts: Attempt[];
   successful_attempts: SuccessfulAttempt[];
   more_successful_attempts: StepId[];
+  more_failing_attempts: StepId[];
   stack: Stack;
 }
 
@@ -369,6 +370,7 @@ export function writeInference(x: Inference, context: any = x): any {
     'failed_attempts': _atd_write_required_field('Inference', 'failed_attempts', _atd_write_array(writeAttempt), x.failed_attempts, x),
     'successful_attempts': _atd_write_required_field('Inference', 'successful_attempts', _atd_write_array(writeSuccessfulAttempt), x.successful_attempts, x),
     'more_successful_attempts': _atd_write_required_field('Inference', 'more_successful_attempts', _atd_write_array(writeStepId), x.more_successful_attempts, x),
+    'more_failing_attempts': _atd_write_field_with_default(_atd_write_array(writeStepId), [], x.more_failing_attempts, x),
     'stack': _atd_write_required_field('Inference', 'stack', writeStack, x.stack, x),
   };
 }
@@ -381,6 +383,7 @@ export function readInference(x: any, context: any = x): Inference {
     failed_attempts: _atd_read_required_field('Inference', 'failed_attempts', _atd_read_array(readAttempt), x['failed_attempts'], x),
     successful_attempts: _atd_read_required_field('Inference', 'successful_attempts', _atd_read_array(readSuccessfulAttempt), x['successful_attempts'], x),
     more_successful_attempts: _atd_read_required_field('Inference', 'more_successful_attempts', _atd_read_array(readStepId), x['more_successful_attempts'], x),
+    more_failing_attempts: _atd_read_field_with_default(_atd_read_array(readStepId), [], x['more_failing_attempts'], x),
     stack: _atd_read_required_field('Inference', 'stack', readStack, x['stack'], x),
   };
 }
@@ -1059,7 +1062,7 @@ function _atd_write_option<T>(write_elt: (x: T, context: any) => any):
   return write_option
 }
 
-function _atd_write_nullable<T>(write_elt: (x: T | null, context: any) => any):
+function _atd_write_nullable<T>(write_elt: (x: T, context: any) => any):
   (x: T | null, context: any) => any {
   function write_option(x: T | null, context: any): any {
     if (x === null)